--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -299,16 +299,18 @@ These should match what Safari and other
 <!ENTITY addons.commandkey            "A">
 
 <!ENTITY webDeveloperMenu.label       "網頁開發者">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
 <!ENTITY inspectContextMenu.label     "檢測元素">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
+<!ENTITY inspectA11YContextMenu.label     "檢測輔助功能環境屬性">
+
 <!ENTITY fileMenu.label         "檔案">
 <!ENTITY fileMenu.accesskey       "F">
 <!ENTITY newUserContext.label             "新增容器分頁">
 <!ENTITY newUserContext.accesskey         "B">
 <!ENTITY newNavigatorCmd.label        "開新視窗">
 <!ENTITY newNavigatorCmd.key        "N">
 <!ENTITY newNavigatorCmd.accesskey      "N">
 <!ENTITY newPrivateWindow.label     "新增隱私視窗">

--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -34,19 +34,18 @@ cmd_addFoundEngine=新增「%S」
 cmd_addFoundEngineMenu=新增搜尋引擎
 
 # LOCALIZATION NOTE (searchForSomethingWith):
 # This string is used to build the header above the list of one-click
 # search providers:  "Search for <user-typed string> with:"
 # NB: please leave the <span> and its class exactly as it is in English.
 searchForSomethingWith=用以下的工具尋找 <span class='contentSearchSearchWithHeaderSearchText'></span>：
 
-searchAddFoundEngine=新增「%S」至快捷搜尋引擎清單
-searchAddFoundEngineMenu=新增快捷搜尋引擎
-searchAddedFoundEngine=已新增至搜尋下拉選單
+searchAddFoundEngine2=新增搜尋引擎
+searchAddedFoundEngine2=已新增搜尋引擎
 
 # LOCALIZATION NOTE (searchForSomethingWith2):
 # This string is used to build the header above the list of one-click
 # search providers:  "Search for <user-typed string> with:"
 searchForSomethingWith2=搜尋 %S 使用:
 
 # LOCALIZATION NOTE (searchWithHeader):
 # The wording of this string should be as close as possible to

--- a/browser/extensions/formautofill/formautofill.properties
+++ b/browser/extensions/formautofill/formautofill.properties
@@ -49,21 +49,16 @@ updateCreditCardMessage = 您想要用這筆新資訊來更新信用卡資料嗎？
 updateCreditCardDescriptionLabel = 要更新的信用卡:
 createCreditCardLabel = 新增信用卡
 createCreditCardAccessKey = C
 updateCreditCardLabel = 更新信用卡
 updateCreditCardAccessKey = U
 # LOCALIZATION NOTE (openAutofillMessagePanel): Tooltip label for Form Autofill doorhanger icon on address bar.
 openAutofillMessagePanel = 開啟表單自動填寫訊息面版
 
-# LOCALIZATION NOTE (autocompleteFooterOption, autocompleteFooterOptionOSX): Used as a label for the button,
-# displayed at the bottom of the drop down suggestion, to open Form Autofill browser preferences.
-autocompleteFooterOption = 表單自動填寫選項
-autocompleteFooterOptionOSX = 表單自動填寫偏好設定
-
 # LOCALIZATION NOTE ( (autocompleteFooterOptionShort, autocompleteFooterOptionOSXShort): Used as a label for the button,
 # displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
 autocompleteFooterOptionShort = 更多選項
 autocompleteFooterOptionOSXShort = 偏好設定
 # LOCALIZATION NOTE (category.address, category.name, category.organization2, category.tel, category.email):
 # Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
 category.address = 地址
 category.name = 姓名
@@ -76,17 +71,16 @@ fieldNameSeparator = 、
 # text that is displayed for informing users what categories are about to be filled.
 # "%S" will be replaced with a list generated from the pre-defined categories.
 # The text would be e.g. Also autofills organization, phone, email.
 phishingWarningMessage = 也會寫入 %S 欄位
 phishingWarningMessage2 = 將自動填入 %S 欄位
 # LOCALIZATION NOTE (insecureFieldWarningDescription): %S is brandShortName. This string is used in drop down
 # suggestion when users try to autofill credit card on an insecure website (without https).
 insecureFieldWarningDescription = %S 偵測到此網站為不安全的網站，將暫時停用表單自動填寫功能
-
 # LOCALIZATION NOTE (clearFormBtnLabel2): Label for the button in the dropdown menu that used to clear the populated
 # form.
 clearFormBtnLabel2 = 清除自動填寫的表單內容
 
 # LOCALIZATION NOTE (autofillAddressesCheckbox): Label for the checkbox that enables autofilling addresses.
 autofillAddressesCheckbox = 自動填寫地址
 # LOCALIZATION NOTE (learnMoreLabel): Label for the link that leads users to the Form Autofill SUMO page.
 learnMoreLabel = 了解更多
@@ -107,17 +101,16 @@ manageCreditCardsTitle = 已存信用卡資料
 # in browser preferences.
 addressesListHeader = 地址
 creditCardsListHeader = 信用卡
 showCreditCardsBtnLabel = 顯示信用卡
 hideCreditCardsBtnLabel = 隱藏信用卡
 removeBtnLabel = 移除
 addBtnLabel = 新增…
 editBtnLabel = 編輯…
-
 # LOCALIZATION NOTE (manageDialogsWidth): This strings sets the default width for windows used to manage addresses and
 # credit cards.
 manageDialogsWidth = 560px
 
 # LOCALIZATION NOTE (addNewAddressTitle, editAddressTitle): The dialog title for creating or editing addresses
 # in browser preferences.
 addNewAddressTitle = 新增地址
 editAddressTitle = 編輯地址
@@ -131,19 +124,18 @@ province = 省分
 state = 州別
 postalCode = 郵遞區號
 zip = 郵遞區號
 country = 國家或地區
 tel = 電話號碼
 email = 電子郵件
 cancelBtnLabel = 取消
 saveBtnLabel = 儲存
-countryWarningMessage = 目前僅能在表單中自動填寫美國地址
-
 countryWarningMessage2 = 目前僅能在表單中自動填寫部分國家的地址。
 
 # LOCALIZATION NOTE (addNewCreditCardTitle, editCreditCardTitle): The dialog title for creating or editing
 # credit cards in browser preferences.
 addNewCreditCardTitle = 新增信用卡
 editCreditCardTitle = 編輯信用卡
 cardNumber = 卡號
 nameOnCard = 持卡人姓名
 cardExpires = 到期日
+billingAddress = 帳單地址