Update for 50
authorPeter Pin-Guang Chen <petercpg@mail.moztw.org>
Fri, 05 Aug 2016 15:58:58 +0800
changeset 1224 44f7af038a84568eb3af75ad4e5d3a0187505cff
parent 1223 aa4391a374a6a788472e13ffb9ca8395e65e0cd3
child 1225 733824e07d8fc08659317fb4043086f67964aed1
push id726
push userpetercpg@mail.moztw.org
push dateFri, 05 Aug 2016 07:59:59 +0000
Update for 50
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/accounts.properties
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/preferences/connection.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/chrome/browser/sitePermissions.properties
browser/chrome/overrides/appstrings.properties
chat/xmpp.properties
devtools/client/aboutdebugging.properties
devtools/client/debugger.properties
devtools/client/filterwidget.dtd
devtools/client/filterwidget.properties
devtools/client/font-inspector.dtd
devtools/client/inspector.dtd
devtools/client/inspector.properties
devtools/client/markers.properties
devtools/client/netmonitor.properties
devtools/client/responsive.properties
devtools/client/scratchpad.properties
devtools/client/sourceeditor.properties
devtools/client/storage.properties
devtools/client/styleinspector.dtd
devtools/client/webconsole.properties
devtools/shared/gclicommands.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/css.properties
dom/chrome/layout/layout_errors.properties
dom/chrome/security/caps.properties
dom/chrome/security/csp.properties
dom/chrome/security/security.properties
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/migration/migration.dtd
mail/chrome/messenger/preferences/general.dtd
mobile/android/base/android_strings.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/phishing.dtd
mobile/android/chrome/pippki.properties
mobile/overrides/appstrings.properties
netwerk/necko.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/pippki.properties
suite/chrome/browser/navigatorOverlay.dtd
suite/chrome/common/console/console.dtd
suite/chrome/common/console/console.properties
suite/chrome/common/helpviewer/help.dtd
suite/chrome/common/helpviewer/help.properties
suite/chrome/common/pref/pref-http.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/importDialog.dtd
suite/chrome/mailnews/msgHdrViewOverlay.dtd
suite/chrome/mailnews/pref/pref-composing_messages.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/commonDialogs.properties
toolkit/chrome/global/findbar.dtd
toolkit/chrome/global/findbar.properties
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/update/updates.dtd
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -60,16 +60,17 @@
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "正在檢查更新…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "已經是最新版本的 &brandShortName;">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "您的系統管理員已停用更新">
 <!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
 <!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; 正被其他執行中的實例更新">
+<!ENTITY update.restarting          "重新啟動中…">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.failed.start        "更新失敗。">
 <!ENTITY update.failed.linkText     "下載最新版本">
--- a/browser/chrome/browser/accounts.properties
+++ b/browser/chrome/browser/accounts.properties
@@ -22,10 +22,39 @@ verificationSentTitle = 已寄出驗證信
 # LOCALIZATION NOTE (verificationSentBody) - %S = Email address of user's Firefox Account
 verificationSentBody = 已將驗證鏈結發送到 %S。
 verificationNotSentTitle = 無法傳送驗證信
 verificationNotSentBody = 我們暫時無法寄出驗證信,請稍後再試。
 
 # LOCALIZATION NOTE (syncStartNotification.title, syncStartNotification.body)
 # These strings are used in a notification shown after Sync is connected.
 syncStartNotification.title = 已開啟 Sync
-syncStartNotification.body = Firefox 稍後將開始同步。
+# %S is brandShortName
+syncStartNotification.body2 = %S 稍後將開始同步。
+
+# LOCALIZATION NOTE (deviceDisconnectedNotification.title, deviceDisconnectedNotification.body)
+# These strings are used in a notification shown after Sync was disconnected remotely.
+deviceDisconnectedNotification.title = 已取消鏈結 Sync
+deviceDisconnectedNotification.body = 已成功自 Firefox Sync 取消鏈結此電腦。
+
+# LOCALIZATION NOTE (sendTabToAllDevices.menuitem)
+# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link.
+sendTabToAllDevices.menuitem = 所有裝置
 
+# LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotification.body,
+# tabsArrivingNotification.title, tabsArrivingNotification.body)
+# These strings are used in a notification shown when we're opening tab(s) another device sent us to display.
+tabArrivingNotification.title = 收到分頁
+# LOCALIZATION NOTE (tabArrivingNotification.body) %1 is the title of the tab and %2 is the device name.
+tabArrivingNotification.body = 已從 %2$S 收到「%1$S」分頁。
+
+tabsArrivingNotification.title = 收到多個分頁
+# LOCALIZATION NOTE (unnamedTabsArrivingNotification.body):
+# Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of tabs received and #2 is the device name.
+unnamedTabsArrivingNotification.body = 已收到來自 #2 的 #1 個分頁。
+# LOCALIZATION NOTE (unnamedTabsArrivingNotificationMultiple.body):
+# Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of tabs received.
+unnamedTabsArrivingNotificationMultiple.body = 已收到來自其他連結裝置的 #1 個分頁。
+
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -35,16 +35,22 @@ left instead of right. -->
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
 <!ENTITY  pinTab.label                       "釘選分頁">
 <!ENTITY  pinTab.accesskey                   "P">
 <!ENTITY  unpinTab.label                     "還原成普通分頁">
 <!ENTITY  unpinTab.accesskey                 "b">
+<!ENTITY  sendTabToDevice.label              "將分頁傳送至裝置">
+<!ENTITY  sendTabToDevice.accesskey          "D">
+<!ENTITY  sendPageToDevice.label             "將頁面傳送至裝置">
+<!ENTITY  sendPageToDevice.accesskey         "D">
+<!ENTITY  sendLinkToDevice.label             "將鏈結傳送至裝置">
+<!ENTITY  sendLinkToDevice.accesskey         "D">
 <!ENTITY  moveToNewWindow.label              "移動到新視窗">
 <!ENTITY  moveToNewWindow.accesskey          "w">
 <!ENTITY  bookmarkAllTabs.label              "將所有分頁加入書籤…">
 <!ENTITY  bookmarkAllTabs.accesskey          "T">
 <!ENTITY  undoCloseTab.label                 "復原已關閉分頁">
 <!ENTITY  undoCloseTab.accesskey             "U">
 <!ENTITY  closeTab.label                     "關閉分頁">
 <!ENTITY  closeTab.accesskey                 "C">
@@ -100,16 +106,17 @@ These should match what Safari and other
 <!ENTITY enterFullScreenCmd.accesskey "F">
 <!ENTITY exitFullScreenCmd.label "離開全螢幕模式">
 <!ENTITY exitFullScreenCmd.accesskey "F">
 <!ENTITY fullScreenCmd.label "全螢幕">
 <!ENTITY fullScreenCmd.accesskey "F">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "顯示所有分頁">
 <!ENTITY showAllTabsCmd.accesskey "A">
+<!ENTITY toggleReaderMode.key "R">
 
 <!ENTITY fxaSignIn.label "登入至 &syncBrand.shortName.label;">
 <!ENTITY fxaSignedIn.tooltip "開啟 &syncBrand.shortName.label; 偏好設定">
 <!ENTITY fxaSignInError.label "重新連線至 &syncBrand.shortName.label;">
 <!ENTITY fxaUnverified.label "確認您的帳號">
 
 
 <!ENTITY fullScreenMinimize.tooltip "縮到最小">
@@ -123,24 +130,34 @@ These should match what Safari and other
 <!-- LOCALIZATION NOTE (fullscreenWarning.beforeDomain.label,
      fullscreenWarning.afterDomain.label): these two strings are used
      respectively before and after the domain requiring fullscreen.
      Localizers can use one of them, or both, to better adapt this
      sentence to their language. -->
 <!ENTITY fullscreenWarning.beforeDomain.label "">
 <!ENTITY fullscreenWarning.afterDomain.label "已進入全螢幕">
 <!ENTITY fullscreenWarning.generic.label "此文件已進入全螢幕">
+
 <!-- LOCALIZATION NOTE (exitDOMFullscreen.button,
      exitDOMFullscreenMac.button): the "escape" button on PC keyboards
      is uppercase, while on Mac keyboards it is lowercase -->
 <!ENTITY exitDOMFullscreen.button "離開全螢幕(Esc)">
 <!ENTITY exitDOMFullscreenMac.button "離開全螢幕(Esc)">
 <!ENTITY leaveDOMFullScreen.label "離開全螢幕模式">
 <!ENTITY leaveDOMFullScreen.accesskey "u">
 
+<!-- LOCALIZATION NOTE (pointerlockWarning.beforeDomain.label,
+     pointerlockWarning.afterDomain.label): these two strings are used
+     respectively before and after the domain requiring pointerlock.
+     Localizers can use one of them, or both, to better adapt this
+     sentence to their language. -->
+<!ENTITY pointerlockWarning.beforeDomain.label "">
+<!ENTITY pointerlockWarning.afterDomain.label "可控制您的滑鼠游標,按 Esc 取回控制權。">
+<!ENTITY pointerlockWarning.generic.label "此文件可控制您的滑鼠游標,按 Esc 取回控制權。">
+
 <!ENTITY closeWindow.label "關閉視窗">
 <!ENTITY closeWindow.accesskey "d">
 
 <!ENTITY bookmarksMenu.label "書籤">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "將本頁加入書籤">
 <!ENTITY editThisBookmarkCmd.label "編輯此書籤">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -766,22 +783,18 @@ you can use these alternative items. Oth
 <!ENTITY social.toggleSidebar.label "顯示側邊欄">
 <!ENTITY social.toggleSidebar.accesskey "S">
 
 <!ENTITY social.addons.label "管理服務…">
 
 <!ENTITY social.toggleNotifications.label "顯示桌面通知">
 <!ENTITY social.toggleNotifications.accesskey "n">
 
-<!ENTITY social.activated.description "已啟用來自 <label/> 的服務。您可以在 <label class='text-link'>附加元件管理員中</label> 修改服務選項。">
-<!ENTITY social.activated.undo.label "喔喔,我要還原!">
-<!ENTITY social.activated.undo.accesskey "U">
 <!ENTITY social.learnMore.label "更多資訊…">
 <!ENTITY social.learnMore.accesskey "l">
-<!ENTITY social.closeNotificationItem.label "現在不要">
 
 <!ENTITY social.directory.label "可啟用項目">
 <!ENTITY social.directory.text "您可於目錄中啟用分享服務。">
 <!ENTITY social.directory.button "帶我到那邊去!">
 <!ENTITY social.directory.introText "點擊任一個服務以將其新增到 &brandShortName;。">
 <!ENTITY social.directory.viewmore.text "檢視更多">
 
 <!ENTITY customizeMode.menuAndToolbars.header2 "其他工具與功能">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -383,27 +383,16 @@ webNotifications.alwaysReceive.accesskey
 webNotifications.neverShow=永不顯示通知
 webNotifications.neverShow.accesskey=N
 webNotifications.receiveFromSite=您想要接收來自此網站的通知嗎?
 # LOCALIZATION NOTE (webNotifications.upgradeTitle): When using native notifications on OS X, the title may be truncated around 32 characters.
 webNotifications.upgradeTitle=升級版的通知功能
 # LOCALIZATION NOTE (webNotifications.upgradeBody): When using native notifications on OS X, the body may be truncated around 100 characters in some views.
 webNotifications.upgradeBody=您現在可以接受來自未開啟的網站的通知。點擊此處了解更多資訊。
 
-# Pointer lock UI
-
-pointerLock.allow2=隱藏游標
-pointerLock.allow2.accesskey=H
-pointerLock.alwaysAllow=總是允許隱藏
-pointerLock.alwaysAllow.accesskey=A
-pointerLock.neverAllow=永不允許隱藏
-pointerLock.neverAllow.accesskey=N
-pointerLock.title3=您想要允許在此網站上隱藏滑鼠游標嗎?
-pointerLock.autoLock.title3=此網站將隱藏滑鼠游標。
-
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notADeceptiveSite, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
 safebrowsing.getMeOutOfHereButton.label=帶我離開這裡!
 safebrowsing.getMeOutOfHereButton.accessKey=G
 safebrowsing.deceptiveSite=詐騙網站!
 safebrowsing.notADeceptiveSiteButton.label=這不是詐騙網站…
@@ -436,32 +425,16 @@ safeModeRestartButton=重新啟動
 # Encoding" menu in the main Firefox button on Windows. Any other value will
 # hide it. Regardless of the value of this setting, the "Text Encoding"
 # menu will always be accessible via the "Web Developer" menu.
 # This is not a string to translate; it just controls whether the menu shows
 # up in the Firefox button. If users frequently use the "Text Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=true
 
-# LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
-# the add bookmark star panel.  %S will be replaced by syncBrandShortName.
-# The final space separates this text from the Learn More link.
-syncPromoNotification.bookmarks.description=您可以透過 %S 在您所有的裝置上存取您的書籤。
-syncPromoNotification.learnMoreLinkText=更多資訊
-# LOCALIZATION NOTE (syncPromoNotification.addons.label): This appears in
-# the add-on install complete panel when Sync isn't set.
-# %S will be replaced by syncBrandShortName.
-# The final space separates this text from the Learn More link.
-syncPromoNotification.addons.description=您可以透過 %S 在您的所有裝置間同步附加元件。
-# LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
-# This appears in the add-on install complete panel when Sync is set
-# but addons sync is not. %S will be replaced by syncBrandShortName.
-# The final space separates this text from the Learn More link.
-syncPromoNotification.addons-sync-disabled.description=您可以使用您的 %S 帳號在不同裝置間同步附加元件。
-
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message       = %1$S 將會自動傳送一些資料給 %2$S,讓我們能夠改善您的使用體驗。
 dataReportingNotification.button.label  = 選擇我要分享的項目
 dataReportingNotification.button.accessKey  = C
 
 # Process hang reporter
 processHang.label = 有張網頁讓您的瀏覽器變慢了,您想要怎麼處理?
 processHang.button_stop.label = 停下來
@@ -702,35 +675,40 @@ e10s.accessibilityNotice.mainMessage2 = 由於與 %S 新功能有相容性問題,已暫時取消無障礙輔助功能的支援。
 e10s.accessibilityNotice.acceptButton.label = 確定
 e10s.accessibilityNotice.acceptButton.accesskey = O
 e10s.accessibilityNotice.enableAndRestart.label = 啟用(需要重新啟動)
 e10s.accessibilityNotice.enableAndRestart.accesskey = E
 
 # LOCALIZATION NOTE (userContextPersonal.label,
 #                    userContextWork.label,
 #                    userContextShopping.label,
-#                    userContextBanking.label):
+#                    userContextBanking.label,
+#                    userContextNone.label):
 # These strings specify the four predefined contexts included in support of the
 # Contextual Identity / Containers project. Each context is meant to represent
 # the context that the user is in when interacting with the site. Different
 # contexts will store cookies and other information from those sites in
 # different, isolated locations. You can enable the feature by typing
 # about:config in the URL bar and changing privacy.userContext.enabled to true.
 # Once enabled, you can open a new tab in a specific context by clicking
 # File > New Container Tab > (1 of 4 contexts). Once opened, you will see these
 # strings on the right-hand side of the URL bar.
 userContextPersonal.label = 私人
 userContextWork.label = 商務
 userContextBanking.label = 網路銀行
 userContextShopping.label = 購物
+userContextNone.label = 無容器
 
 userContextPersonal.accesskey = P
 userContextWork.accesskey = W
 userContextBanking.accesskey = B
 userContextShopping.accesskey = S
+userContextNone.accesskey = N
+
+userContextOpenLink.label = 用新 %S 分頁開啟鏈結
 
 muteTab.label = 分頁靜音
 muteTab.accesskey = M
 unmuteTab.label = 取消分頁靜音
 unmuteTab.accesskey = M
 
 # LOCALIZATION NOTE (weakCryptoOverriding.message): %S is brandShortName
 weakCryptoOverriding.message = %S 建議您不要在這個網站上輸入密碼、信用卡號或任何其他個人資訊。
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -94,29 +94,16 @@ email-link-button.tooltiptext3 = 寄出本頁面的鏈結
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.linux2 = 離開 %1$S (%2$S)
 # LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.mac = 離開 %1$S (%2$S)
 
-# LOCALIZATION NOTE(loop-call-button3.label): This is a brand name, request
-# approval before you change it.
-loop-call-button3.label = Hello
-loop-call-button3.tooltiptext2 = 與朋友一起瀏覽此頁面
-loop-call-button3-error.tooltiptext = 錯誤!
-loop-call-button3-donotdisturb.tooltiptext = 勿干擾
-loop-call-button3-screensharing.tooltiptext = 您正在分享畫面
-loop-call-button3-active.tooltiptext2 = 您正在分享分頁
-loop-call-button3-participantswaiting.tooltiptext2 = 有人正在等您
-# LOCALIZATION NOTE(loop-call-button3-pb.tooltiptext): Shown when the button is
-# placed inside a Private Browsing window. %S is the value of loop-call-button3.label.
-loop-call-button3-pb.tooltiptext = 無法於隱私瀏覽模式使用 %S
-
 social-share-button.label = 分享此頁面
 social-share-button.tooltiptext = 分享此頁面
 
 panic-button.label = 忘記
 panic-button.tooltiptext = 忘掉一些瀏覽紀錄
 
 # LOCALIZATION NOTE(devtools-webide-button.label, devtools-webide-button.tooltiptext):
 # widget is only visible after WebIDE has been started once (Tools > Web Developers > WebIDE)
--- a/browser/chrome/browser/preferences/connection.dtd
+++ b/browser/chrome/browser/preferences/connection.dtd
@@ -27,17 +27,17 @@
 <!ENTITY  ssl.label                     "SSL Proxy:">
 <!ENTITY  ssl.accesskey                 "L">
 <!ENTITY  socks.label                   "SOCKS 主機:">
 <!ENTITY  socks.accesskey               "C">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks4.accesskey              "K">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  socks5.accesskey              "v">
-<!ENTITY  socksRemoteDNS.label          "遠端 DNS">
+<!ENTITY  socksRemoteDNS.label2         "使用 SOCKS v5 時也代理 DNS 查詢">
 <!ENTITY  socksRemoteDNS.accesskey      "d">
 <!ENTITY  port.label                    "Port:">
 <!ENTITY  HTTPport.accesskey            "P">
 <!ENTITY  SSLport.accesskey             "o">
 <!ENTITY  FTPport.accesskey             "r">
 <!ENTITY  SOCKSport.accesskey           "t">
 <!ENTITY  noproxy.label                 "直接連線:">
 <!ENTITY  noproxy.accesskey             "N">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -42,17 +42,17 @@
 <!ENTITY  font.langGroup.canadian                 "加拿大統一音節字">
 <!ENTITY  font.langGroup.ethiopic                 "衣索比亞文">
 <!ENTITY  font.langGroup.georgian                 "喬治亞文">
 <!ENTITY  font.langGroup.gujarati                 "古吉拉特文">
 <!ENTITY  font.langGroup.gurmukhi                 "古魯穆奇字">
 <!ENTITY  font.langGroup.khmer                    "高棉文">
 <!ENTITY  font.langGroup.malayalam                "馬拉亞拉姆文">
 <!ENTITY  font.langGroup.math                     "數學方程式">
-<!ENTITY  font.langGroup.oriya                    "奧里亞文">
+<!ENTITY  font.langGroup.odia                     "奧里亞文">
 <!ENTITY  font.langGroup.telugu                   "泰盧固文">
 <!ENTITY  font.langGroup.kannada                  "康納達文">
 <!ENTITY  font.langGroup.sinhala                  "僧加羅文">
 <!ENTITY  font.langGroup.tibetan                  "藏文">
 <!-- Minimum font size -->
 <!ENTITY minSize.label                            "最小字型大小:">
 <!ENTITY minSize.accesskey                        "o">
 <!ENTITY minSize.none                             "無">
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -100,8 +100,13 @@
 <!ENTITY  rememberSearchForm.accesskey   "f">
 
 <!ENTITY  clearOnClose.label             "結束 &brandShortName; 時清除歷史記錄">
 <!ENTITY  clearOnClose.accesskey         "r">
 
 <!ENTITY  clearOnCloseSettings.label     "設定…">
 <!ENTITY  clearOnCloseSettings.accesskey "t">
 
+<!ENTITY  browserContainersHeader.label         "容器分頁">
+<!ENTITY  browserContainersLearnMore.label      "詳細資訊">
+<!ENTITY  browserContainersEnabled.label        "開啟容器分頁">
+<!ENTITY  browserContainersEnabled.accesskey    "n">
+
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -1,12 +1,15 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+<!ENTITY ctrlTabRecentlyUsedOrder.label       "按下 Ctrl+Tab 時,依照最近使用分頁的順序切換分頁標籤">
+<!ENTITY ctrlTabRecentlyUsedOrder.accesskey   "T">
+
 <!ENTITY newWindowsAsTabs.label       "以新分頁取代新視窗">
 <!ENTITY newWindowsAsTabs.accesskey   "t">
 
 <!ENTITY warnCloseMultipleTabs.label  "關閉多個分頁時警告我">
 <!ENTITY warnCloseMultipleTabs.accesskey  "m">
 
 <!ENTITY warnOpenManyTabs.label       "開啟多個分頁使 &brandShortName; 變慢時警告">
 <!ENTITY warnOpenManyTabs.accesskey   "o">
--- a/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -9,30 +9,25 @@
   shown. -->
 <!ENTITY safeb.palm.notdeceptive.label "這不是詐騙網站…">
 <!-- Localization note (safeb.palm.notdeceptive.accesskey) - Because
   safeb.palm.notdeceptive.label and reportDeceptiveSiteMenu.title from
   report-phishing.dtd are never shown at the same time, the same accesskey can
   be used for them. -->
 <!ENTITY safeb.palm.notdeceptive.accesskey "d">
 <!ENTITY safeb.palm.reportPage.label "為什麼要封鎖此網頁?">
-<!ENTITY safeb.palm.whyForbidden.label "為什麼要封鎖此網頁?">
 
 <!ENTITY safeb.blocked.malwarePage.title "已知的有害網頁!">
 <!-- Localization note (safeb.blocked.malwarePage.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.malwarePage.shortDesc "這個在 <span id='malware_sitename'/> 的網頁已被回報為有害網頁,依據您所選擇的安全設定予以封鎖。">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>有害網頁會嘗試安裝能竊取隱私資訊、利用您的電腦攻擊他人或破壞作業系統等的惡意軟體到您的電腦上。</p><p>某些有害網頁會故意安裝有害軟體到電腦上,但更多網頁是在連網頁擁有者都不知情的情況下,成為有害軟體散佈的溫床。</p>">
 
 <!ENTITY safeb.blocked.unwantedPage.title "已回報為不安全的軟體網頁!">
 <!-- Localization note (safeb.blocked.unwantedPage.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.unwantedPage.shortDesc "此網頁 <span id='unwanted_sitename'/> 已被回報為疑似提供不安全的軟體。依照您的安全性偏好設定已封鎖此網頁。">
 <!ENTITY safeb.blocked.unwantedPage.longDesc "<p>提供不安全軟體的網站可能會嘗試安裝詐騙軟體,並以您預期外的方式影響系統。</p>">
 
 <!ENTITY safeb.blocked.phishingPage.title2 "詐騙網站!">
 <!-- Localization note (safeb.blocked.phishingPage.shortDesc2) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc2 "位於 <span id='phishing_sitename'/> 的這張網頁已被回報為詐騙網站,並已依照您的安全性偏好設定封鎖。">
 <!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>詐騙網站會設計來誤導您做某些危險的事情,例如安裝軟體或提供密碼、手機號碼、信用卡號等個人資訊。</p><p>在這些網頁中輸入任何資訊可能會導致個人身分被盜用,或其他詐騙事件。</p>">
 
-<!ENTITY safeb.blocked.forbiddenPage.title2 "已封鎖網站">
-<!-- Localization note (safeb.blocked.forbiddenPage.shortDesc2) - Please don't translate the contents of the <span id="forbidden_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.forbiddenPage.shortDesc2 "已依照您的管理設定封鎖 <span id='forbidden_sitename'/> 網頁。">
 
-
--- a/browser/chrome/browser/sitePermissions.properties
+++ b/browser/chrome/browser/sitePermissions.properties
@@ -11,10 +11,9 @@ permission.cookie.label = 設定 Cookie
 permission.desktop-notification2.label = 接收通知
 permission.image.label = 載入圖片
 permission.camera.label = 使用攝影機
 permission.microphone.label = 使用麥克風
 permission.install.label = 安裝附加元件
 permission.popup.label = 開啟彈出型視窗
 permission.geo.label = 存取您的位置
 permission.indexedDB.label = 使用離線儲存空間
-permission.pointerLock.label = 隱藏滑鼠游標
 
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -28,17 +28,16 @@ externalProtocolTitle=外部通訊協定要求
 externalProtocolPrompt=要處理 %1$S: 鏈結需要外部程式。\n\n\n要求鏈結:\n\n%2$S\n應用程式: %3$S\n\n\n若這不在您的預期之中,可能是有人在試圖利用其它程式入侵。除非您很確定這沒問題,不然請選取消。
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<未知>
 externalProtocolChkMsg=對於此類鏈結一律使用並記住我的選擇
 externalProtocolLaunchBtn=執行程式
 malwareBlocked=%S 這個網站被回報為有害網站,已依照您的安全性偏好設定予以封鎖。
 unwantedBlocked=%S 這個網站被回報為提供不安全的軟體,已依照您的安全性偏好設定予以封鎖。
 deceptiveBlocked=位於 %S 的這張網頁已被回報為詐騙網站,並已依照安全性偏好設定封鎖。
-forbiddenBlocked=已依您的瀏覽器設定封鎖 %S 網站。
 cspBlocked=這個頁面包含了內容安全政策以致於無法以這種方式被載入。
 corruptedContentErrorv2=網站 %S 發生了違反通訊協定的情況,無法修復。
 remoteXUL=這個頁面使用了已經預設不再於 Firefox 可用的未支援技術。
 ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
 sslv3Used=Firefox 無法保證您在 %S 的資料安全,因為此網站使用 SSLv3 通訊協定,這個協定已不再安全。
 ## LOCALIZATION NOTE (weakCryptoUsed) - Do not translate "%S".
 weakCryptoUsed=%S 的網站管理員未正確設定好網站。為了確保您的資訊不會被盜走,Firefox 並未連線至該網站。
 inadequateSecurityError=此網站嘗試建立安全性不足的連線。
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -29,16 +29,18 @@ connection.error.startTLSRequired=伺服器需要加密連線,但您已停用
 connection.error.startTLSNotSupported=伺服器不支援加密,但您在設定當中要求加密
 connection.error.failedToStartTLS=無法起始加密
 connection.error.noAuthMec=伺服器未提供認證機制
 connection.error.noCompatibleAuthMec=不支援伺服器所提供的認證機制
 connection.error.notSendingPasswordInClear=伺服器只支援傳送明碼的認證機制
 connection.error.authenticationFailure=認證失敗
 connection.error.notAuthorized=未被授權(您是不是打錯密碼了?)
 connection.error.failedToGetAResource=無法取得資源
+connection.error.failedMaxResourceLimit=此帳號同時跟太多地方連結。
+connection.error.failedResourceNotValid=資源無效。
 connection.error.XMPPNotSupported=該伺服器不支援 XMPP
 
 # LOCALIZATION NOTE (conversation.error.notDelivered):
 #   This is displayed in a conversation as an error message when a message
 #   the user has sent wasn't delivered.
 #   %S is replaced by the text of the message that wasn't delivered.
 conversation.error.notDelivered=無法傳送此訊息: %S
 #   This is displayed in a conversation as an error message when joining a MUC
@@ -79,16 +81,22 @@ conversation.error.banKickCommandConflict=抱歉,您無法將自己踢出聊天室。
 conversation.error.changeNickFailedConflict=此暱稱已被使用,無法將您的暱稱變更為 %S。
 conversation.error.changeNickFailedNotAcceptable=此聊天室內的暱稱已被鎖定,無法將您的暱稱變更為 %S。
 conversation.error.inviteFailedForbidden=您不需要權限即可邀請成員加入此聊天室。
 #   %S is the jid of user that is invited.
 conversation.error.failedJIDNotFound=無法與 %S 聯繫。
 #   %S is the jid that is invalid.
 conversation.error.invalidJID=%S 是無效的 jid(Jabber ID 必須是 user@domain 格式)。
 conversation.error.commandFailedNotInRoom=您必須重新加入聊天室才能使用此指令。
+#   %S is the name of the recipient.
+conversation.error.resourceNotAvailable=您必須先與 %S 通話才能與超過一個客戶端連結。
+
+# LOCALIZATION NOTE (conversation.error.version.*):
+#   %S is the name of the recipient.
+conversation.error.version.unknown=%S 的客戶端不接受查詢軟體版本。
 
 # LOCALIZATION NOTE (tooltip.*):
 #   These are the titles of lines of information that will appear in
 #   the tooltip showing details about a contact or conversation.
 # LOCALIZATION NOTE (tooltip.status):
 #   %S will be replaced by the XMPP resource identifier
 tooltip.status=狀態(%S)
 tooltip.statusNoResource=狀態
@@ -117,17 +125,23 @@ chatRoomField.password=密碼(_P)
 # LOCALIZATION NOTE (conversation.muc.*):
 #   These are displayed as a system message when a chatroom invitation is
 #   received.
 #   %1$S is the inviter.
 #   %2$S is the room.
 #   %3$S is the reason which is a message provided by the person sending the
 #   invitation.
 conversation.muc.invitationWithReason=%1$S 邀請您加入 %2$S: %3$S
+#   %3$S is the password of the room.
+#   %4$S is the reason which is a message provided by the person sending the
+#   invitation.
+conversation.muc.invitationWithReason.password==%1$S 已邀請您使用密碼 %3$S 加入 %2$S: %4$S
 conversation.muc.invitationWithoutReason=%1$S 邀請您加入 %2$S
+#   %3$S is the password of the room.
+conversation.muc.invitationWithoutReason.password=%1$S 已邀請您使用密碼 %3$S 加入 %2$S
 
 # LOCALIZATION NOTE (conversation.muc.join):
 #   This is displayed as a system message when a participant joins room.
 #   %S is the nick of the participant.
 conversation.message.join=%S 已加入聊天室。
 
 # LOCALIZATION NOTE (conversation.muc.rejoined):
 #   This is displayed as a system message when a participant rejoins room after
@@ -202,16 +216,24 @@ conversation.message.removedNonMember.you=由於聊天室更改設定為限定成員,您已經被踢出聊天室。
 #   %1$S is the person who changed the room configuration.
 conversation.message.removedNonMember.you.actor=由於 %1$S 更改聊天室設定為限定成員,您已經被踢出聊天室。
 
 # LOCALIZATION NOTE (conversation.message.MUCShutdown):
 #   These are displayed as a system message when a participant is removed from
 #   a room because of a system shutdown.
 conversation.message.mucShutdown=由於系統關閉,您已被踢出聊天室。
 
+# LOCALIZATION NOTE (conversation.message.version*):
+#   %1$S is the name of the user whose version was requested.
+#   %2$S is the client name response from the client.
+#   %3$S is the client version response from the client.
+#   %4$S is the operating system(OS) response from the client.
+conversation.message.version=%1$S 正在使用「%2$S %3$S」。
+conversation.message.versionWithOS=%1$S 正在使用 %4$S 上的「%2$S %3$S」。
+
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
 options.resource=資源
 options.priority=重要性
 options.connectionSecurity=連線安全性
 options.connectionSecurity.requireEncryption=必需加密
 options.connectionSecurity.opportunisticTLS=可用時加密
@@ -240,12 +262,14 @@ odnoklassniki.usernameHint=個人資料 ID
 # LOCALZIATION NOTE (command.*):
 #  These are the help messages for each command.
 command.join3=%S [&lt;聊天室&gt;[@&lt;伺服器&gt;][/&lt;暱稱&gt;]] [&lt;密碼&gt;]: 加入聊天室,可另外指定連線至不同的伺服器、指定暱稱或使用聊天室密碼。
 command.part2=%S [&lt;訊息&gt;]: 離開聊天室,可留下離開訊息。
 command.topic=%S [&lt;新主題&gt;]: 設定此聊天室的新主題。
 command.ban=%S &lt;暱稱&gt;[&lt;訊息&gt;]:您必須擁有此聊天室管理員的資格,才能封鎖此聊天室中的某人。
 command.kick=%S &lt;暱稱&gt;[&lt;訊息&gt;]:您必須擁有此聊天室管理員的資格,才能踢除此聊天室中的某人。
 command.invite=%S &lt;jid&gt;[&lt;message&gt;]:邀請使用者加入目前聊天室並留下訊息。
+command.inviteto=%S &lt;聊天室 jid&gt;[&lt;密碼&gt;]: 邀請您的通訊夥伴加入聊天室,若需要的話可輸入密碼。
 command.me=%S &lt;要做的動作&gt;: 做出某個動作。
 command.nick=%S &lt;新暱稱&gt;: 修改您的暱稱。
 command.msg=%S &lt;暱稱&gt; &lt;訊息&gt;: 傳送私人訊息給聊天室內的成員。
+command.version=%S: 請求您的通訊夥伴提供正在使用中的客戶端版本資訊。
 
--- a/devtools/client/aboutdebugging.properties
+++ b/devtools/client/aboutdebugging.properties
@@ -1,34 +1,92 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# LOCALIZATION NOTE (debug):
+# This string is displayed as a label of the button that starts
+# debugging a service worker.
 debug = 除錯
+
+# LOCALIZATION NOTE (push):
+# This string is displayed as a label of the button that pushes a test payload
+# to a service worker.
 push = 推送
+
+# LOCALIZATION NOTE (start):
+# This string is displayed as a label of the button that starts a service worker.
 start = 開始
 
 scope = Scope
 unregister = 取消註冊
 
+pushService = 推送服務
+
+# LOCALIZATION NOTE (addons):
+# This string is displayed as a header of the about:debugging#addons page.
 addons = 附加元件
+
+# LOCALIZATION NOTE (addonDebugging.label):
+# This string is displayed next to a check box that enables the user to switch
+# addon debugging on/off.
 addonDebugging.label = 啟用附加元件除錯
+
+# LOCALIZATION NOTE (addonDebugging.tooltip):
+# This string is displayed in a tooltip that appears when hovering over a check
+# box that switches addon debugging on/off.
 addonDebugging.tooltip = 開啟此功能將允許您對附加元件及瀏覽器 chrome 的某些部分除錯。
+
+# LOCALIZATION NOTE (moreInfo):
+# This string is displayed next to addonDebugging.label as a link to a page
+# with documentation.
 moreInfo = 更多資訊
+
+# LOCALIZATION NOTE (loadTemporaryAddon):
+# This string is displayed as a label of a button that allows the user to
+# load additional add-ons.
 loadTemporaryAddon = 載入暫用附加元件
+
+# LOCALIZATION NOTE (extensions):
+# This string is displayed as a header above the list of loaded add-ons.
 extensions = 擴充套件
-selectAddonFromFile2 = 選擇安裝資訊檔或元件封包(.xpi)
+
+# LOCALIZATION NOTE (selectAddonFromFile2):
+# This string is displayed as the title of the file picker that appears when
+# the user clicks the 'Load Temporary Add-on' button
+selectAddonFromFile2 = 選擇安裝資訊檔或元件封裝(.xpi)
+
+# LOCALIZATION NOTE (reload):
+# This string is displayed as a label of the button that reloads a given addon.
 reload = 重新載入
-reloadDisabledTooltip = 只有一時安裝的附加元件能被重新載入。
 
+# LOCALIZATION NOTE (reloadDisabledTooltip):
+# This string is displayed in a tooltip that appears when hovering over a
+# disabled 'reload' button.
+reloadDisabledTooltip = 僅可重新載入暫時安裝的附加元件
+
+# LOCALIZATION NOTE (workers):
+# This string is displayed as a header of the about:debugging#workers page.
 workers = Workers
+
 serviceWorkers = Service Workers
 sharedWorkers = 共享 Workers
 otherWorkers = 其他 Workers
 
+# LOCALIZATION NOTE (tabs):
+# This string is displayed as a header of the about:debugging#tabs page.
 tabs = 分頁
 
+# LOCALIZATION NOTE (pageNotFound):
+# This string is displayed as the main message at any error/invalid page.
 pageNotFound = 找不到頁面
+
+# LOCALIZATION NOTE (doesNotExist):
+# This string is displayed as an error message when navigating to an invalid page
+# %S will be replaced by the name of the page at run-time.
 doesNotExist = #%S 不存在!
 
+# LOCALIZATION NOTE (nothing):
+# This string is displayed when the list of workers is empty.
 nothing = 尚未開始。
+
 configurationIsNotCompatible = 您的瀏覽器設定與 Service Worker 不相容
 
--- a/devtools/client/debugger.properties
+++ b/devtools/client/debugger.properties
@@ -14,24 +14,16 @@
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxDebugger.label=除錯器
 
 # LOCALIZATION NOTE (ToolboxDebugger.panelLabel):
 # This is used as the label for the toolbox panel.
 ToolboxDebugger.panelLabel=除錯器面板
 
-# LOCALIZATION NOTE (DebuggerWindowTitle):
-# The title displayed for the debugger window.
-DebuggerWindowTitle=瀏覽器除錯器
-
-# LOCALIZATION NOTE (DebuggerWindowScriptTitle):
-# The title displayed for the debugger window when a script is selected.
-DebuggerWindowScriptTitle=瀏覽器除錯器 - %S
-
 # LOCALIZATION NOTE (ToolboxDebugger.tooltip2):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window..
 # A keyboard shortcut for JS Debugger will be shown inside brackets.
 ToolboxDebugger.tooltip2=JavaScript 除錯器(%S)
 
 # LOCALIZATION NOTE (debuggerMenu.commandkey, debuggerMenu.accesskey)
 # Used for the menuitem in the tool menu
deleted file mode 100644
--- a/devtools/client/filterwidget.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- LOCALIZATION NOTE : FILE These strings are used in the CSS Filter Editor Widget
-   - which can be found in a tooltip that appears in the Rule View when clicking
-   - on a filter swatch displayed next to CSS declarations like 'filter: blur(2px)'. -->
-
-<!-- LOCALIZATION NOTE (filterListSelectPlaceholder): This string is used as
-   - a preview option in the list of possible filters <select> -->
-<!ENTITY filterListSelectPlaceholder "選擇 Filter">
-
-<!-- LOCALIZATION NOTE (addNewFilterButton): This string is displayed on a button used to add new filters -->
-<!ENTITY addNewFilterButton "新增">
-
-<!-- LOCALIZATION NOTE (newPresetPlaceholder): This string is used as
-   - a placeholder in the list of presets which is used to save a new preset -->
-<!ENTITY newPresetPlaceholder "預設篩選器名稱">
-
-<!-- LOCALIZATION NOTE (savePresetButton): This string is displayed on a button used to save a new preset -->
-<!ENTITY savePresetButton "儲存">
-
-<!-- LOCALIZATION NOTE(presetsToggleButton): This string is used in a button which toggles the presets list -->
-<!ENTITY presetsToggleButton "預設篩選器">
-
--- a/devtools/client/filterwidget.properties
+++ b/devtools/client/filterwidget.properties
@@ -31,8 +31,30 @@ dropShadowPlaceholder=X Y 半徑色彩
 dragHandleTooltipText=向上或向下拖曳以重新排序 filter
 
 # LOCALIZATION NOTE (labelDragTooltipText):
 # This string is used as a tooltip text (shown on mouse hover) on the
 # filters' labels which can be dragged left/right to increase/decrease
 # the filter's value (like photoshop)
 labelDragTooltipText=向左或向右拖曳來增減值
 
+# LOCALIZATION NOTE (filterListSelectPlaceholder):
+# This string is used as a preview option in the list of possible filters
+# <select>
+filterListSelectPlaceholder=選擇 Filter
+
+# LOCALIZATION NOTE (addNewFilterButton):
+# This string is displayed on a button used to add new filters
+addNewFilterButton=新增
+
+# LOCALIZATION NOTE (newPresetPlaceholder):
+# This string is used as a placeholder in the list of presets which is used to
+# save a new preset
+newPresetPlaceholder=預設篩選器名稱
+
+# LOCALIZATION NOTE (savePresetButton):
+# This string is displayed on a button used to save a new preset
+savePresetButton=儲存
+
+# LOCALIZATION NOTE(presetsToggleButton):
+# This string is used in a button which toggles the presets list
+presetsToggleButton=預設篩選器
+
--- a/devtools/client/font-inspector.dtd
+++ b/devtools/client/font-inspector.dtd
@@ -1,16 +1,15 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- LOCALIZATION NOTE : FILE This file contains the Font Inspector strings.
   - The Font Inspector is the panel accessible in the Inspector sidebar. -->
 
-<!ENTITY fontInspectorTitle "字型">
 <!ENTITY showAllFonts "顯示此頁面中所有使用的字型 ">
 <!ENTITY usedAs "用來做為:">
 <!ENTITY system "系統">
 <!ENTITY remote "遠端">
 
 <!-- LOCALIZATION NOTE (previewHint): This is the label shown as the
      placeholder in font inspector preview text box. -->
 <!ENTITY previewHint "預覽文字">
--- a/devtools/client/inspector.dtd
+++ b/devtools/client/inspector.dtd
@@ -1,180 +1,22 @@
-<!-- LOCALIZATION NOTE (inspectorHTMLEdit.label): This is the label shown
-     in the inspector contextual-menu for the item that lets users edit the
-     (outer) HTML of the current node -->
-<!ENTITY inspectorHTMLEdit.label       "編輯 HTML">
-<!ENTITY inspectorHTMLEdit.accesskey   "E">
-
-<!-- LOCALIZATION NOTE (inspectorCopyInnerHTML.label): This is the label shown
-     in the inspector contextual-menu for the item that lets users copy the
-     inner HTML of the current node -->
-<!ENTITY inspectorCopyInnerHTML.label       "內部 HTML">
-<!ENTITY inspectorCopyInnerHTML.accesskey   "I">
-
-<!-- LOCALIZATION NOTE (inspectorCopyOuterHTML.label): This is the label shown
-     in the inspector contextual-menu for the item that lets users copy the
-     outer HTML of the current node -->
-<!ENTITY inspectorCopyOuterHTML.label       "外部 HTML">
-<!ENTITY inspectorCopyOuterHTML.accesskey   "O">
-
-<!-- LOCALIZATION NOTE (inspectorCopyCSSSelector.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users copy
-     the CSS Selector of the current node -->
-<!ENTITY inspectorCopyCSSSelector.label "CSS 選擇器">
-<!ENTITY inspectorCopyCSSSelector.accesskey "S">
-
-<!-- LOCALIZATION NOTE (inspectorPasteOuterHTML.label): This is the label shown
-     in the inspector contextual-menu for the item that lets users paste outer
-     HTML in the current node -->
-<!ENTITY inspectorPasteOuterHTML.label      "外部 HTML">
-<!ENTITY inspectorPasteOuterHTML.accesskey  "O">
-
-<!-- LOCALIZATION NOTE (inspectorPasteInnerHTML.label): This is the label shown
-     in the inspector contextual-menu for the item that lets users paste inner
-     HTML in the current node -->
-<!ENTITY inspectorPasteInnerHTML.label      "內部 HTML">
-<!ENTITY inspectorPasteInnerHTML.accesskey  "I">
-
-<!-- LOCALIZATION NOTE (inspectorHTMLPasteExtraSubmenu.label): This is the label
-     shown in the inspector contextual-menu for the sub-menu of the other Paste
-     items, which allow to paste HTML:
-     - before the current node
-     - after the current node
-     - as the first child of the current node
-     - as the last child of the current node -->
-<!ENTITY inspectorHTMLPasteExtraSubmenu.label      "貼到…">
-<!ENTITY inspectorHTMLPasteExtraSubmenu.accesskey  "t">
-
-<!-- LOCALIZATION NOTE (inspectorHTMLPasteBefore.label): This is the label shown
-     in the inspector contextual-menu for the item that lets users paste
-     the HTML before the current node -->
-<!ENTITY inspectorHTMLPasteBefore.label      "之前">
-<!ENTITY inspectorHTMLPasteBefore.accesskey  "B">
-
-<!-- LOCALIZATION NOTE (inspectorHTMLPasteAfter.label): This is the label shown
-     in the inspector contextual-menu for the item that lets users paste
-     the HTML after the current node -->
-<!ENTITY inspectorHTMLPasteAfter.label       "之後">
-<!ENTITY inspectorHTMLPasteAfter.accesskey   "A">
-
-<!-- LOCALIZATION NOTE (inspectorHTMLPasteFirstChild.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users paste
-     the HTML as the first child the current node -->
-<!ENTITY inspectorHTMLPasteFirstChild.label      "第一個子元素">
-<!ENTITY inspectorHTMLPasteFirstChild.accesskey  "F">
-
-<!-- LOCALIZATION NOTE (inspectorHTMLPasteLastChild.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users paste
-     the HTML as the last child the current node -->
-<!ENTITY inspectorHTMLPasteLastChild.label       "最後一個子元素">
-<!ENTITY inspectorHTMLPasteLastChild.accesskey   "L">
-
-<!-- LOCALIZATION NOTE (inspectorScrollNodeIntoView.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users scroll
-     the current node into view -->
-<!ENTITY inspectorScrollNodeIntoView.label       "將畫面捲動至此節點">
-<!ENTITY inspectorScrollNodeIntoView.accesskey   "S">
-
-<!-- LOCALIZATION NOTE (inspectorHTMLDelete.label): This is the label shown in
-     the inspector contextual-menu for the item that lets users delete the
-     current node -->
-<!ENTITY inspectorHTMLDelete.label          "刪除節點">
-<!ENTITY inspectorHTMLDelete.accesskey      "D">
-
-<!-- LOCALIZATION NOTE (inspectorAttributesSubmenu.label): This is the label
-     shown in the inspector contextual-menu for the sub-menu of the other
-     attribute items, which allow to:
-     - add new attribute
-     - edit attribute
-     - remove attribute -->
-<!ENTITY inspectorAttributesSubmenu.label      "屬性">
-<!ENTITY inspectorAttributesSubmenu.accesskey  "A">
-
-<!-- LOCALIZATION NOTE (inspectorAddAttribute.label): This is the label shown in
-     the inspector contextual-menu for the item that lets users add attribute
-     to current node -->
-<!ENTITY inspectorAddAttribute.label        "新增屬性">
-<!ENTITY inspectorAddAttribute.accesskey    "A">
-
-<!-- LOCALIZATION NOTE (inspectorEditAttribute.label): This is the label shown in
-     the inspector contextual-menu for the item that lets users edit attribute
-     for current node -->
-<!ENTITY inspectorEditAttribute.label        "編輯屬性">
-<!ENTITY inspectorEditAttribute.accesskey    "E">
-
 <!-- LOCALIZATION NOTE (inspectorRemoveAttribute.label): This is the label shown in
      the inspector contextual-menu for the item that lets users delete attribute
      from current node -->
 <!ENTITY inspectorRemoveAttribute.label        "移除屬性">
 <!ENTITY inspectorRemoveAttribute.accesskey    "R">
 
 <!ENTITY inspector.selectButton.tooltip     "使用滑鼠選取元素">
 
 <!-- LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that is
      shown as the placeholder for the markup view search in the inspector. -->
 <!ENTITY inspectorSearchHTML.label3 "搜尋 HTML">
 
-<!-- LOCALIZATION NOTE (inspectorImageDataUri.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users copy
-     the URL embedding the image data encoded in Base 64 (what we name
-     here Image Data URL). For more information:
-     https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs -->
-<!ENTITY inspectorImageDataUri.label       "圖片的 Data-URL">
-
-<!-- LOCALIZATION NOTE (inspectorShowDOMProperties.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users see
-     the DOM properties of the current node. When triggered, this item
-     opens the split Console and displays the properties in its side panel. -->
-<!ENTITY inspectorShowDOMProperties.label       "顯示 DOM 屬性">
-
-<!-- LOCALIZATION NOTE (inspectorUseInConsole.label): This is the label
-     shown in the inspector contextual-menu for the item that outputs a
-     variable for the current node to the console. When triggered,
-     this item opens the split Console. -->
-<!ENTITY inspectorUseInConsole.label       "在主控台使用">
-
-<!-- LOCALIZATION NOTE (inspectorExpandNode.label): This is the label
-     shown in the inspector contextual-menu for recursively expanding
-     mark-up elements -->
-<!ENTITY inspectorExpandNode.label       "展開全部">
-
-<!-- LOCALIZATION NOTE (inspectorCollapseNode.label): This is the label
-     shown in the inspector contextual-menu for recursively collapsing
-     mark-up elements -->
-<!ENTITY inspectorCollapseNode.label       "收起">
-
-<!-- LOCALIZATION NOTE (inspectorScreenshotNode.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users take
-     a screenshot of the currently selected node. -->
-<!ENTITY inspectorScreenshotNode.label       "擷取該節點的圖片">
-
-<!-- LOCALIZATION NOTE (inspectorDuplicateNode.label): This is the label
-     shown in the inspector contextual-menu for the item that lets users
-     duplicate the currently selected node. -->
-<!ENTITY inspectorDuplicateNode.label       "重製節點">
-
 <!-- LOCALIZATION NOTE (inspectorAddNode.label): This is the label shown in
      the inspector toolbar for the button that lets users add elements to the
      DOM (as children of the currently selected element). -->
 <!ENTITY inspectorAddNode.label       "建立新節點">
 <!ENTITY inspectorAddNode.accesskey   "C">
 
-<!-- LOCALIZATION NOTE (inspectorCopyHTMLSubmenu.label): This is the label
-     shown in the inspector contextual-menu for the sub-menu of the other
-     copy items, which allow to:
-     - Copy Inner HTML
-     - Copy Outer HTML
-     - Copy Unique selector
-     - Copy Image data URI -->
-<!ENTITY inspectorCopyHTMLSubmenu.label      "複製">
 
-<!-- LOCALIZATION NOTE (inspectorPasteHTMLSubmenu.label): This is the label
-     shown in the inspector contextual-menu for the sub-menu of the other
-     paste items, which allow to:
-     - Paste Inner HTML
-     - Paste Outer HTML
-     - Before
-     - After
-     - As First Child
-     - As Last Child -->
-<!ENTITY inspectorPasteHTMLSubmenu.label      "貼上">
-
+<!-- LOCALIZATION NOTE (inspectorEyeDropper.label): A string displayed as the tooltip of
+     a button in the inspector which toggles the Eyedropper tool -->
+<!ENTITY inspectorEyeDropper.label       "從頁面中挑選色彩">
\ No newline at end of file
--- a/devtools/client/inspector.properties
+++ b/devtools/client/inspector.properties
@@ -105,27 +105,29 @@ inspector.menu.copyUrlToClipboard.label=複製鏈結網址
 
 # LOCALIZATION NOTE (inspector.menu.selectElement.label): This is the label of a
 # menu item in the inspector contextual-menu that appears when the user right-
 # clicks on the attribute of a node in the inspector that is the ID of another
 # element in the DOM (like with <label for="input-id">), and that allows to
 # select that element in the inspector.
 inspector.menu.selectElement.label=選擇元素 #%S
 
-# LOCALIZATION NOTE (inspector.menu.editAttribute.label): This is the label of a
+# LOCALIZATION NOTE (inspectorEditAttribute.label): This is the label of a
 # sub-menu "Attribute" in the inspector contextual-menu that appears
 # when the user right-clicks on the node in the inspector, and that allows
 # to edit an attribute on this node.
-inspector.menu.editAttribute.label=編輯屬性 %S
+inspectorEditAttribute.label=編輯屬性 %S
+inspectorEditAttribute.accesskey=E
 
-# LOCALIZATION NOTE (inspector.menu.removeAttribute.label): This is the label of a
+# LOCALIZATION NOTE (inspectorRemoveAttribute.label): This is the label of a
 # sub-menu "Attribute" in the inspector contextual-menu that appears
 # when the user right-clicks on the attribute of a node in the inspector,
 # and that allows to remove this attribute.
-inspector.menu.removeAttribute.label=移除屬性 %S
+inspectorRemoveAttribute.label=移除屬性 %S
+inspectorRemoveAttribute.accesskey=R
 
 # LOCALIZATION NOTE (inspector.nodePreview.selectNodeLabel):
 # This string is displayed in a tooltip that is shown when hovering over a DOM
 # node preview (e.g. something like "div#foo.bar").
 # DOM node previews can be displayed in places like the animation-inspector, the
 # console or the object inspector.
 # The tooltip invites the user to click on the node in order to select it in the
 # inspector panel.
@@ -136,16 +138,188 @@ inspector.nodePreview.selectNodeLabel=點擊以在檢測器中選擇此節點
 # inspector icon displayed next to a DOM node preview (e.g. next to something
 # like "div#foo.bar").
 # DOM node previews can be displayed in places like the animation-inspector, the
 # console or the object inspector.
 # The tooltip invites the user to click on the icon in order to highlight the
 # node in the page.
 inspector.nodePreview.highlightNodeLabel=點擊以在頁面中強調此節點
 
+# LOCALIZATION NOTE (inspectorHTMLEdit.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users edit the
+# (outer) HTML of the current node
+inspectorHTMLEdit.label=編輯 HTML
+inspectorHTMLEdit.accesskey=E
+
+# LOCALIZATION NOTE (inspectorCopyInnerHTML.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users copy the
+# inner HTML of the current node
+inspectorCopyInnerHTML.label=內部 HTML
+inspectorCopyInnerHTML.accesskey=I
+
+# LOCALIZATION NOTE (inspectorCopyOuterHTML.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users copy the
+# outer HTML of the current node
+inspectorCopyOuterHTML.label=外部 HTML
+inspectorCopyOuterHTML.accesskey=O
+
+# LOCALIZATION NOTE (inspectorCopyCSSSelector.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users copy
+# the CSS Selector of the current node
+inspectorCopyCSSSelector.label=CSS 選擇器
+inspectorCopyCSSSelector.accesskey=S
+
+# LOCALIZATION NOTE (inspectorPasteOuterHTML.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users paste outer
+# HTML in the current node
+inspectorPasteOuterHTML.label=外部 HTML
+inspectorPasteOuterHTML.accesskey=O
+
+# LOCALIZATION NOTE (inspectorPasteInnerHTML.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users paste inner
+# HTML in the current node
+inspectorPasteInnerHTML.label=內部 HTML
+inspectorPasteInnerHTML.accesskey=I
+
+# LOCALIZATION NOTE (inspectorHTMLPasteExtraSubmenu.label): This is the label
+# shown in the inspector contextual-menu for the sub-menu of the other Paste
+# items, which allow to paste HTML:
+# - before the current node
+# - after the current node
+# - as the first child of the current node
+# - as the last child of the current node
+inspectorHTMLPasteExtraSubmenu.label=貼到…
+inspectorHTMLPasteExtraSubmenu.accesskey=t
+
+# LOCALIZATION NOTE (inspectorHTMLPasteBefore.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users paste
+# the HTML before the current node
+inspectorHTMLPasteBefore.label=之前
+inspectorHTMLPasteBefore.accesskey=B
+
+# LOCALIZATION NOTE (inspectorHTMLPasteAfter.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users paste
+# the HTML after the current node
+inspectorHTMLPasteAfter.label=之後
+inspectorHTMLPasteAfter.accesskey=A
+
+# LOCALIZATION NOTE (inspectorHTMLPasteFirstChild.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users paste
+# the HTML as the first child the current node
+inspectorHTMLPasteFirstChild.label=第一個子元素
+inspectorHTMLPasteFirstChild.accesskey=F
+
+# LOCALIZATION NOTE (inspectorHTMLPasteLastChild.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users paste
+# the HTML as the last child the current node
+inspectorHTMLPasteLastChild.label=最後一個子元素
+inspectorHTMLPasteLastChild.accesskey=L
+
+# LOCALIZATION NOTE (inspectorScrollNodeIntoView.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users scroll
+# the current node into view
+inspectorScrollNodeIntoView.label=將畫面捲動至此節點
+inspectorScrollNodeIntoView.accesskey=S
+
+# LOCALIZATION NOTE (inspectorHTMLDelete.label): This is the label shown in
+# the inspector contextual-menu for the item that lets users delete the
+# current node
+inspectorHTMLDelete.label=刪除節點
+inspectorHTMLDelete.accesskey=D
+
+# LOCALIZATION NOTE (inspectorAttributesSubmenu.label): This is the label
+# shown in the inspector contextual-menu for the sub-menu of the other
+# attribute items, which allow to:
+# - add new attribute
+# - edit attribute
+# - remove attribute
+inspectorAttributesSubmenu.label=屬性
+inspectorAttributesSubmenu.accesskey=A
+
+# LOCALIZATION NOTE (inspectorAddAttribute.label): This is the label shown in
+# the inspector contextual-menu for the item that lets users add attribute
+# to current node
+inspectorAddAttribute.label=新增屬性
+inspectorAddAttribute.accesskey=A
+
+# LOCALIZATION NOTE (inspectorSearchHTML.label2): This is the label shown as
+# the placeholder in inspector search box
+inspectorSearchHTML.label2=使用 CSS 選擇器搜尋
+inspectorSearchHTML.key=F
+
+# LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that is
+# shown as the placeholder for the markup view search in the inspector.
+inspectorSearchHTML.label3=搜尋 HTML
+
+# LOCALIZATION NOTE (inspectorImageDataUri.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users copy
+# the URL embedding the image data encoded in Base 64 (what we name
+# here Image Data URL). For more information:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs
+inspectorImageDataUri.label=圖片的 Data-URL
+
+# LOCALIZATION NOTE (inspectorShowDOMProperties.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users see
+# the DOM properties of the current node. When triggered, this item
+# opens the split Console and displays the properties in its side panel.
+inspectorShowDOMProperties.label=顯示 DOM 屬性
+
+# LOCALIZATION NOTE (inspectorUseInConsole.label): This is the label
+# shown in the inspector contextual-menu for the item that outputs a
+# variable for the current node to the console. When triggered,
+# this item opens the split Console.
+inspectorUseInConsole.label=在主控台使用
+
+# LOCALIZATION NOTE (inspectorExpandNode.label): This is the label
+# shown in the inspector contextual-menu for recursively expanding
+# mark-up elements
+inspectorExpandNode.label=展開全部
+
+# LOCALIZATION NOTE (inspectorCollapseNode.label): This is the label
+# shown in the inspector contextual-menu for recursively collapsing
+# mark-up elements
+inspectorCollapseNode.label=收起
+
+# LOCALIZATION NOTE (inspectorScreenshotNode.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users take
+# a screenshot of the currently selected node.
+inspectorScreenshotNode.label=擷取該節點的圖片
+
+# LOCALIZATION NOTE (inspectorDuplicateNode.label): This is the label
+# shown in the inspector contextual-menu for the item that lets users
+# duplicate the currently selected node.
+inspectorDuplicateNode.label=重製節點
+
+# LOCALIZATION NOTE (inspectorAddNode.label): This is the label shown in
+# the inspector toolbar for the button that lets users add elements to the
+# DOM (as children of the currently selected element).
+inspectorAddNode.label=建立新節點
+inspectorAddNode.accesskey=C
+
+# LOCALIZATION NOTE (inspectorCopyHTMLSubmenu.label): This is the label
+# shown in the inspector contextual-menu for the sub-menu of the other
+# copy items, which allow to:
+# - Copy Inner HTML
+# - Copy Outer HTML
+# - Copy Unique selector
+# - Copy Image data URI
+inspectorCopyHTMLSubmenu.label=複製
+
+# LOCALIZATION NOTE (inspectorPasteHTMLSubmenu.label): This is the label
+# shown in the inspector contextual-menu for the sub-menu of the other
+# paste items, which allow to:
+# - Paste Inner HTML
+# - Paste Outer HTML
+# - Before
+# - After
+# - As First Child
+# - As Last Child
+inspectorPasteHTMLSubmenu.label=貼上
+
+
 # LOCALIZATION NOTE (inspector.searchHTML.key):
 # Key shortcut used to focus the DOM element search box on top-right corner of
 # the markup view
 inspector.searchHTML.key=CmdOrCtrl+F
 
 # LOCALIZATION NOTE (markupView.hide.key):
 # Key shortcut used to hide the selected node in the markup view.
 markupView.hide.key=h
@@ -154,8 +328,35 @@ markupView.hide.key=h
 # Key shortcut used to hide the selected node in the markup view.
 markupView.edit.key=F2
 
 # LOCALIZATION NOTE (markupView.scrollInto.key):
 # Key shortcut used to scroll the webpage in order to ensure the selected node
 # is visible
 markupView.scrollInto.key=s
 
+# LOCALIZATION NOTE (inspector.sidebar.fontInspectorTitle):
+# This is the title shown in a tab in the side panel of the Inspector panel
+# that corresponds to the tool displaying the list of fonts used in the page.
+inspector.sidebar.fontInspectorTitle=字型
+
+# LOCALIZATION NOTE (inspector.sidebar.ruleViewTitle):
+# This is the title shown in a tab in the side panel of the Inspector panel
+# that corresponds to the tool displaying the list of CSS rules used
+# in the page.
+inspector.sidebar.ruleViewTitle=規則
+
+# LOCALIZATION NOTE (inspector.sidebar.computedViewTitle):
+# This is the title shown in a tab in the side panel of the Inspector panel
+# that corresponds to the tool displaying the list of computed CSS values
+# used in the page.
+inspector.sidebar.computedViewTitle=計算樣式
+
+# LOCALIZATION NOTE (inspector.sidebar.layoutViewTitle):
+# This is the title shown in a tab in the side panel of the Inspector panel
+# that corresponds to the tool displaying box model of the selected element.
+inspector.sidebar.layoutViewTitle=Box Model
+
+# LOCALIZATION NOTE (inspector.sidebar.animationInspectorTitle):
+# This is the title shown in a tab in the side panel of the Inspector panel
+# that corresponds to the tool displaying animations defined in the page.
+inspector.sidebar.animationInspectorTitle=動畫
+
--- a/devtools/client/markers.properties
+++ b/devtools/client/markers.properties
@@ -98,17 +98,16 @@ marker.value.DOMEventTargetPhase=目標
 marker.value.DOMEventCapturingPhase=捕捉
 marker.value.DOMEventBubblingPhase=Bubbling
 
 # LOCALIZATION NOTE (marker.gcreason.label.*):
 # These strings are used to give a concise but readable description of a GC reason.
 marker.gcreason.label.API=API 呼叫
 marker.gcreason.label.EAGER_ALLOC_TRIGGER=Eager Allocation Trigger
 marker.gcreason.label.DESTROY_RUNTIME=程式結束
-marker.gcreason.label.DESTROY_CONTEXT=程式結束
 marker.gcreason.label.LAST_DITCH=記憶體不足
 marker.gcreason.label.TOO_MUCH_MALLOC=配置太多記憶體
 marker.gcreason.label.ALLOC_TRIGGER=太多配置數
 marker.gcreason.label.DEBUG_GC=對 GC 除錯
 marker.gcreason.label.COMPARTMENT_REVIVED=Dead Global Revived
 marker.gcreason.label.RESET=完成漸增循環
 marker.gcreason.label.OUT_OF_NURSERY=Nursery is Full
 marker.gcreason.label.EVICT_NURSERY=Nursery Eviction
@@ -138,17 +137,16 @@ marker.gcreason.label.USER_INACTIVE=使用者閒置
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
 
 # LOCALIZATION NOTE (marker.gcreason.description.*):
 # These strings are used to give an expanded description of why a GC occurred.
 marker.gcreason.description.API=有個 API 呼叫強制執行資源回收。
 marker.gcreason.description.EAGER_ALLOC_TRIGGER=JavaScript 回到事件迴圈,在觸發新的 GC 循環時已配置了足夠的記憶體。
 marker.gcreason.description.DESTROY_RUNTIME=Firefox 毀滅了 JavaScript runtime 或環境,這是在結束前最後的資源回收。
-marker.gcreason.description.DESTROY_CONTEXT=Firefox 毀滅了 JavaScript runtime 或環境,這是在結束前最後的資源回收。
 marker.gcreason.description.LAST_DITCH=JavaScript 嘗試進行配置,但沒有記憶體可用。進行完整的壓縮資源回收以嘗試清出記憶體。
 marker.gcreason.description.TOO_MUCH_MALLOC=JavaScript 配置了太多位元組,強制進行資源回收。
 marker.gcreason.description.ALLOC_TRIGGER=JavaScript 配置了太多次,強制進行資源回收。
 marker.gcreason.description.DEBUG_GC=由於 Zeal 除錯設定,故進行資源回收。
 marker.gcreason.description.COMPARTMENT_REVIVED=有個在 GC 循環開始時以為是死掉的全域物件在 GC 循環結束後復活了。
 marker.gcreason.description.RESET=進行中的逐增 GC 循環被強迫立即完成。
 marker.gcreason.description.OUT_OF_NURSERY=JavaScript allocated enough new objects in the nursery that it became full and triggered a minor GC.
 marker.gcreason.description.EVICT_NURSERY=Work needed to be done on the tenured heap, requiring the nursery to be empty.
--- a/devtools/client/netmonitor.properties
+++ b/devtools/client/netmonitor.properties
@@ -316,8 +316,13 @@ netRequest.post=POST
 # LOCALIZATION NOTE (netRequest.cookies): A label used for Cookies tab
 # This tab displays request and response cookies.
 netRequest.cookies=Cookies
 
 # LOCALIZATION NOTE (netRequest.params): A label used for URL parameters tab
 # This tab displays data parsed from URL query string.
 netRequest.params=參數
 
+# LOCALIZATION NOTE (netRequest.callstack): A label used for request stacktrace tab
+# This tab displays the request's JavaScript stack trace. Should be identical to
+# debuggerUI.tabs.callstack
+netRequest.callstack=呼叫堆疊
+
--- a/devtools/client/responsive.properties
+++ b/devtools/client/responsive.properties
@@ -13,27 +13,43 @@
 
 # LOCALIZATION NOTE (responsive.editDeviceList): option displayed in the device
 # selector
 responsive.editDeviceList=編輯清單…
 
 # LOCALIZATION NOTE (responsive.exit): tooltip text of the exit button.
 responsive.exit=關閉適應性設計模式
 
+# LOCALIZATION NOTE (responsive.deviceListLoading): placeholder text for
+# device selector when it's still fetching devices
+responsive.deviceListLoading=載入中…
+
+# LOCALIZATION NOTE (responsive.deviceListError): placeholder text for
+# device selector when an error occurred
+responsive.deviceListError=無可用清單
+
 # LOCALIZATION NOTE (responsive.done): button text in the device list modal
 responsive.done=完成
 
 # LOCALIZATION NOTE (responsive.noDeviceSelected): placeholder text for the
 # device selector
 responsive.noDeviceSelected=尚未選擇裝置
 
 # LOCALIZATION NOTE  (responsive.title): the title displayed in the global
 # toolbar
 responsive.title=適應性設計模式
 
+# LOCALIZATION NOTE (responsive.enableTouch): tooltip text for the touch
+# simulation button when it's disabled
+responsive.enableTouch=開啟觸控模擬
+
+# LOCALIZATION NOTE (responsive.disableTouch): tooltip text for the touch
+# simulation button when it's enabled
+responsive.disableTouch=關閉觸控模擬
+
 # LOCALIZATION NOTE  (responsive.screenshot): tooltip of the screenshot button.
 responsive.screenshot=拍攝 viewport 的擷取圖
 
 # LOCALIZATION NOTE (responsive.screenshotGeneratedFilename): The auto generated
 # filename.
 # The first argument (%1$S) is the date string in yyyy-mm-dd format and the
 # second argument (%2$S) is the time string in HH.MM.SS format.
 responsive.screenshotGeneratedFilename=畫面擷取於 %1$S %2$S
--- a/devtools/client/scratchpad.properties
+++ b/devtools/client/scratchpad.properties
@@ -11,18 +11,17 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
 # the user attempts to save to an already existing file.
 export.fileOverwriteConfirmation=檔案已存在。要覆蓋嗎?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
-# when Scratchpad does not find any recently active window of navigator:browser
-# type.
+# when Scratchpad does not find any recently active main browser window.
 browserWindow.unavailable=程式碼速記本找不到可以執行程式碼的瀏覽器視窗。
 
 # LOCALIZATION NOTE  (scratchpadContext.invalid): This error message is shown
 # when user tries to run an operation in Scratchpad in an unsupported context.
 scratchpadContext.invalid=程式碼速記本無法在目前模式下執行此操作。
 
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
--- a/devtools/client/sourceeditor.properties
+++ b/devtools/client/sourceeditor.properties
@@ -79,30 +79,38 @@ indentLess.commandkey=[
 # LOCALIZATION NOTE  (indentMore.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to increase
 # indentation level in CodeMirror. However, its default value also used by
 # the Toolbox to switch between tools
 #
 # DO NOT translate this key without proper synchronization with toolbox.dtd.
 indentMore.commandkey=]
 
-# LOCALIZATION NOTE  (moveLineUp.commandkey): This is the key to use to move
-# the selected lines up.
+# LOCALIZATION NOTE  (moveLineUp.commandkey): This is the combination of keys
+# used to move the current line up.
+# Do not localize "Alt", "Up", or change the format of the string. These are key
+# identifiers, not messages displayed to the user.
 moveLineUp.commandkey=Alt-Up
 
-# LOCALIZATION NOTE  (moveLineDown.commandkey): This is the key to use to move
-# the selected lines down.
+# LOCALIZATION NOTE  (moveLineDown.commandkey): This is the combination of keys
+# used to move the current line up.
+# Do not localize "Alt", "Down", or change the format of the string. These are
+# key identifiers, not messages displayed to the user.
 moveLineDown.commandkey=Alt-Down
 
-# LOCALIZATION NOTE  (autocomplete.commandkey): This is the key to use
-# in conjunction with Ctrl for autocompletion.
+# LOCALIZATION NOTE  (autocompletion.commandkey): This is the key, used with
+# Ctrl, for code autocompletion.
+# Do not localize "Space", it's the key identifier, not a message displayed to
+# the user.
 autocompletion.commandkey=Space
 
-# LOCALIZATION NOTE  (showInformation2.commandkey): This is the key to use to
-# show more information, like type inference.
+# LOCALIZATION NOTE  (showInformation2.commandkey): This is the combination of
+# keys used to display more information, like type inference.
+# Do not localize "Shift", "Ctrl", "Space", or change the format of the string.
+# These are key identifiers, not messages displayed to the user.
 showInformation2.commandkey=Shift-Ctrl-Space
 
 # LOCALIZATION NOTE  (find.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to find
 # the typed search
 find.commandkey=F
 
 # LOCALIZATION NOTE  (findAgain.commandkey): This is the key to use in
--- a/devtools/client/storage.properties
+++ b/devtools/client/storage.properties
@@ -32,16 +32,20 @@ storage.menuLabel=儲存空間檢測器
 storage.panelLabel=儲存空間面板
 
 # LOCALIZATION NOTE (storage.tooltip3):
 # This string is displayed in the tooltip of the tab when the storage editor is
 # displayed inside the developer tools window.
 # A keyboard shortcut for Storage Inspector will be shown inside the brackets.
 storage.tooltip3=儲存空間檢測器(Cookie、本機儲存空間…)(%S)
 
+# LOCALIZATION NOTE (storage.filter.key):
+# Key shortcut used to focus the filter box on top of the data view
+storage.filter.key=CmdOrCtrl+F
+
 # LOCALIZATION NOTE (tree.emptyText):
 # This string is displayed when the Storage Tree is empty. This can happen when
 # there are no websites on the current page (about:blank)
 tree.emptyText=頁面中沒有任何主機
 
 # LOCALIZATION NOTE (table.emptyText):
 # This string is displayed when there are no rows in the Storage Table for the
 # selected host.
--- a/devtools/client/styleinspector.dtd
+++ b/devtools/client/styleinspector.dtd
@@ -32,12 +32,8 @@
   -  rule view toolbar. -->
 <!ENTITY togglePseudoClassPanel  "切換 pseudo-classes">
 
 <!-- LOCALIZATION NOTE (noPropertiesFound): In the case where there are no CSS
   -  properties to display e.g. due to search criteria this message is
   -  displayed. -->
 <!ENTITY noPropertiesFound     "找不到 CSS 屬性。">
 
-<!-- FIXME: notes -->
-<!ENTITY computedViewTitle     "計算樣式">
-<!ENTITY ruleViewTitle         "規則">
-
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -253,16 +253,17 @@ table.key=鍵值
 table.value=值
 
 # LOCALIZATION NOTE (severity.error, severity.warn, severity.info, severity.log):
 # tooltip for icons next to console output
 severity.error=錯誤
 severity.warn=警告
 severity.info=資訊
 severity.log=記錄
+severity.debug=除錯
 
 # LOCALIZATION NOTE (webconsole.find.key)
 # Key shortcut used to focus the search box on upper right of the console
 webconsole.find.key=CmdOrCtrl+F
 
 # LOCALIZATION NOTE (webconsole.close.key)
 # Key shortcut used to close the Browser console (doesn't work in regular web console)
 webconsole.close.key=CmdOrCtrl+W
--- a/devtools/shared/gclicommands.properties
+++ b/devtools/shared/gclicommands.properties
@@ -61,36 +61,20 @@ screenshotFilenameManual=要將畫面擷圖寫入到什麼檔案名稱(應有「.png」附檔名)。
 # a dialog when the user is using this command.
 screenshotClipboardDesc=複製畫面擷圖到剪貼簿? (true/false)
 
 # LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
 # 'clipboard' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotClipboardManual=若設定為 true,代表您想要將畫面擷圖複製到剪貼簿,而不是儲存為檔案。
 
-# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
-# the 'chrome' parameter to the 'screenshot' command, which is displayed in
-# a dialog when the user is using this command.
-# The argument (%1$S) is the browser name.
-screenshotChromeDesc2=捕捉 %1$S chrome 視窗? (true/false)
-
-# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
-# 'chrome' parameter to the 'screenshot' command, displayed when the user
-# asks for help on what it does.
-# The argument (%1$S) is the browser name.
-screenshotChromeManual2=若設定為 true,代表您想要捕捉 %1$S 視窗的擷圖,而非網頁內容視窗的擷圖。
-
 # LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
 # the screenshot command.
 screenshotGroupOptions=選項
 
-# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
-# the screenshot command.
-screenshotAdvancedOptions=進階選項
-
 # LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
 # the 'delay' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotDelayDesc=延遲(秒)
 
 # LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
 # 'delay' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
@@ -111,21 +95,16 @@ screenshotDPRManual=擷取畫面時使用的裝置畫素比例
 # a dialog when the user is using this command.
 screenshotFullPageDesc=擷取整張網頁?(true/false)
 
 # LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
 # 'fullscreen' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotFullPageManual=若設定為 true 則畫面擷圖將會包含目前網頁當中未捲動到的部分。
 
-# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
-# tries to use 'selector' option along with 'chrome' option of the screenshot
-# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
-screenshotSelectorChromeConflict=Chrome 選項設定為 true 時,不支援 selector 選項
-
 # LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
 # when no file name is provided. The first argument (%1$S) is the date string
 # in yyyy-mm-dd format and the second argument (%2$S) is the time string
 # in HH.MM.SS format. Please don't add the extension here.
 screenshotGeneratedFilename=畫面擷取於 %1$S %2$S
 
 # LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
 # encountering error while saving the screenshot to the file specified.
@@ -326,20 +305,16 @@ inspectNodeManual=CSS 選擇器將會使用 Document.querySelector 來識別某個單一元素
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 eyedropperDesc=從頁面中挑選色彩
 
 # LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
 # command, displayed when the user asks for help on what it does.
 eyedropperManual=開啟頁面放大鏡,檢測頁面中的像素並複製色碼
 
-# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
-# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
-eyedropperTooltip=從頁面中挑選色彩
-
 # LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
 # to explain that the debugger must be opened first.
 debuggerClosed=必須先開啟除錯器才能使用此指令
 
 # LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
 # to explain that the debugger must be opened first before setting breakpoints.
 debuggerStopped=必須在設定中斷點前就開啟除錯器
 
@@ -1477,17 +1452,17 @@ folderInvalidPath=請輸入有效的路徑
 # describe the result of the 'folder open' command.
 # The argument (%1$S) is the folder path.
 folderOpenDirResult=已開啟 %1$S
 
 # LOCALIZATION NOTE (mdnDesc) A very short string used to describe the
 # use of 'mdn' command.
 mdnDesc=自 MDN 取得文件
 # LOCALIZATION NOTE (mdnCssDesc) A very short string used to describe the
-# result of the 'mdn css' commmand.
+# result of the 'mdn css' command.
 mdnCssDesc=自 MDN 取得指定的 CSS 屬性名稱的文件
 # LOCALIZATION NOTE (mdnCssProp) String used to describe the 'property name'
 # parameter used in the 'mdn css' command.
 mdnCssProp=屬性名稱
 # LOCALIZATION NOTE (mdnCssPropertyNotFound) String used to display an error in
 # the result of the 'mdn css' command. Errors occur when a given CSS property
 # wasn't found on MDN. The %1$S parameter will be replaced with the name of the
 # CSS property.
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -27,16 +27,15 @@ externalProtocolTitle=外部通訊協定要求
 externalProtocolPrompt=要處理 %1$S: 鏈結需要外部程式。\n\n\n要求鏈結:\n\n%2$S\n應用程式: %3$S\n\n\n若這不在您的預期之中,可能是有人在試圖利用其它程式入侵。除非您很確定這沒問題,不然請選取消。
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<未知>
 externalProtocolChkMsg=對於此類鏈結一律使用並記住我的選擇
 externalProtocolLaunchBtn=執行程式
 malwareBlocked=%S 這個網站被回報為有害網站,已依照您的安全性偏好設定予以封鎖。
 unwantedBlocked=%S 這個網站被回報為提供不安全的軟體,已依照您的安全性偏好設定予以封鎖。
 deceptiveBlocked=位於 %S 的這張網頁已被回報為詐騙網站,並已依照安全性偏好設定封鎖。
-forbiddenBlocked=已依您的瀏覽器設定封鎖 %S 網站。
 cspBlocked=這個頁面包含了內容安全政策以致於無法以這種方式被載入。
 corruptedContentErrorv2=網站 %S 發生了違反通訊協定的情況,無法修復。
 remoteXUL=這個頁面使用了已經預設不再可用的未支援技術。
 sslv3Used=無法保證您在 %S 的資料安全,因為此網站使用 SSLv3 通訊協定,這個協定已不再安全。
 weakCryptoUsed=%S 的網站管理員未正確設定好網站。為了確保您的資訊不會被盜走,並未建立與該網站間的連線。
 inadequateSecurityError=此網站嘗試建立安全性不足的連線。
 
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -17,16 +17,18 @@ OnBeforeUnloadMessage=此頁面正在詢問您是否要離開 - 您所輸入的資料可能還沒儲存。
 OnBeforeUnloadStayButton=留在此頁
 OnBeforeUnloadLeaveButton=離開頁面
 UnexpectedCanvasVariantStyle=canvas: 嘗試將 strokeStyle 或 fillStyle 的值設定成非字串、CanvasGradient,或已忽略 CanvasPattern。
 EmptyGetElementByIdParam=傳給 getElementById() 的是空字串。
 LowMemoryTitle=警告:記憶體不足
 LowMemoryMessage=此頁面的一份 script 已經因為記憶體不足被停止執行。
 SpeculationFailed=一個使用 document.write() 寫成的不平衡樹造成網路資料被重新剖析。若需更多資訊請參照 https://developer.mozilla.org/en/Optimizing_Your_Pages_for_Speculative_Parsing
 DocumentWriteIgnored=一個同步讀取的外部程式碼(Script)所呼叫的 document.write() 被忽略。
+# LOCALIZATION NOTE (EditorFileDropFailed): Do not translate contenteditable, %S is the error message explaining why the drop failed.
+EditorFileDropFailed=將檔案置放於 contenteditable 元素失敗: %S。
 FormValidationTextTooLong=請把這段文字縮減到 %S 個字元以內(您現在用了 %S 個字)。
 FormValidationValueMissing=請填寫此欄位。
 FormValidationCheckboxMissing=必須勾選此方塊才能繼續。
 FormValidationRadioMissing=請在這些選項當中挑一個。
 FormValidationFileMissing=請選擇一個檔案。
 FormValidationSelectMissing=請在清單中選出一個項目。
 FormValidationInvalidEmail=請輸入一個電子郵件地址。
 FormValidationInvalidURL=請輸入一個網址。
@@ -71,16 +73,25 @@ FullscreenDeniedNotInputDriven=已拒絕進入全螢幕的要求,因為 Element.requestFullscreen() 不是在使用者產生的短期執行事件控制器當中呼叫的。
 FullscreenDeniedNotInDocument=已拒絕進入全螢幕的要求,因為請求元素已經不在文件之中。
 FullscreenDeniedMovedDocument=已拒絕進入全螢幕的要求,因為請求的元素已經移動了文件。
 FullscreenDeniedLostWindow=已拒絕進入全螢幕的要求,因為視窗已經消失。
 FullscreenDeniedSubDocFullscreen=已拒絕進入全螢幕的要求,因為要求進入全螢幕模式的文件的子文件已經全螢幕。
 FullscreenDeniedNotDescendant=已拒絕進入全螢幕的要求,因為請求元素不是目前的全螢幕元素的子元素。
 FullscreenDeniedNotFocusedTab=已拒絕進入全螢幕的要求,因為請求元素不在目前焦點所在的分頁當中。
 RemovedFullscreenElement=因為已自螢幕移除全螢幕元素,已結束全螢幕模式。
 FocusedWindowedPluginWhileFullscreen=因為焦點移動至外掛程式視窗中,已結束全螢幕。
+PointerLockDeniedDisabled=因為使用者偏好設定中已關閉 Pointer Lock API,游標鎖定請求已被拒絕。
+PointerLockDeniedInUse=因為游標正由其他文件控制,游標鎖定請求已被拒絕。
+PointerLockDeniedNotInDocument=因為請求的元素不在文件中,游標鎖定請求已被拒絕。
+PointerLockDeniedSandboxed=因為已透過沙盒限制 Pointer Lock API,游標鎖定請求已被拒絕。
+PointerLockDeniedHidden=因為文件不可見,游標鎖定請求已被拒絕。
+PointerLockDeniedNotFocused=因為焦點不在文件中,游標鎖定請求已被拒絕。
+PointerLockDeniedMovedDocument=因為請求的元素移動了文件,游標鎖定請求已被拒絕。
+PointerLockDeniedNotInputDriven=因為 Element.requestPointerLock() 並不由使用者產生的短期事件控制器所呼叫、文件也非全螢幕,游標鎖定請求已被拒絕。
+PointerLockDeniedFailedToLock=因為瀏覽器無法鎖定游標,游標鎖定請求已被拒絕。
 HTMLSyncXHRWarning=在同步模式當中,不支援剖析 XMLHttpRequest 當中的 HTML。
 InvalidRedirectChannelWarning=無法重導到 %S,因為該頻道並未實作 nsIWritablePropertyBag2。
 ResponseTypeSyncXHRWarning=在同步模式的視窗內容當中,不再支援使用 XMLHttpRequest 當中的 responseType 屬性。
 TimeoutSyncXHRWarning=在同步模式的視窗內容當中,不再支援使用 XMLHttpRequest 當中的 timeout  屬性。
 JSONCharsetWarning=嘗試將透過 XMLHttpRequest 取得的 JSON 宣告為非 UTF-8 編碼,但只支援使用 UTF-8 解碼 JSON。
 # LOCALIZATION NOTE: Do not translate AudioBufferSourceNode
 MediaBufferSourceNodeResampleOutOfMemory=記憶體不足,無法重新取樣 AudioBufferSourceNode 以進行播放。
 # LOCALIZATION NOTE: Do not translate decodeAudioData.
@@ -108,17 +119,19 @@ MediaLoadSourceMediaNotMatched=指定的「media」屬性當中的「%1$S」與環境不符。媒體資源 %2$S 載入失敗。
 # LOCALIZATION NOTE: %1$S is the MIME type HTTP header being sent by the web server, %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedMimeType=不支援 HTTP Content-Type 為「%1$S」。媒體資源 %2$S 載入失敗。
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load because of error in decoding.
 MediaLoadDecodeError=媒體資源 %S 無法被解碼。
 MediaWidevineNoWMFNoSilverlight=嘗試在缺少 Windows Media Foundation(也沒有 Silverlight 作為備用機制)的情況下播放 Widevine,請參考 https://support.mozilla.org/kb/fix-video-audio-problems-firefox-windows
 # LOCALIZATION NOTE: %S is a comma-separated list of codecs (e.g. 'video/mp4, video/webm')
 MediaWMFNeeded=需要安裝微軟的其他軟體才能播放 %S 格式的影片。請參考 https://support.mozilla.org/kb/fix-video-audio-problems-firefox-windows
 # LOCALIZATION NOTE: %S is a comma-separated list of codecs (e.g. 'video/mp4, video/webm')
-MediaPlatformDecoderNotFound=無法播放此頁面中的影片。您的系統可能缺少 %S 必要的視訊解碼器
+MediaUnsupportedBeforeWindowsVista=微軟不支援在 Windows Vista 以前版本播放格式 %S 的影片
+# LOCALIZATION NOTE: %S is a comma-separated list of codecs (e.g. 'video/mp4, video/webm')
+MediaPlatformDecoderNotFound=無法播放此頁面中的影片。您的系統可能缺少 %S 格式必要的視訊解碼器
 # LOCALIZATION NOTE: %S is a comma-separated list of codecs (e.g. 'video/mp4, video/webm')
 MediaCannotPlayNoDecoders=無法播放媒體內容,缺少 %S 格式的視訊解碼器
 # LOCALIZATION NOTE: %S is a comma-separated list of codecs (e.g. 'video/mp4, video/webm')
 MediaNoDecoders=缺少下列請求格式的解碼器: %S
 # LOCALIZATION NOTE: Do not translate "MediaRecorder".
 MediaRecorderMultiTracksNotSupported=MediaRecorder 目前還不支援錄製多軌同類型的內容。
 # LOCALIZATION NOTE: %S is the ID of the MediaStreamTrack passed to MediaStream.addTrack(). Do not translate "MediaStreamTrack" and "AudioChannel".
 MediaStreamAddTrackDifferentAudioChannel=因為屬於不同的 AudioChannel,並未新增 MediaStreamTrack %S。
@@ -202,33 +215,50 @@ BadRedirectModeInterceptionWithURL=「%S」載入失敗。ServiceWorker 在 RedirectMode 不是「follow」的情況下傳送了被重導的 Response 給 FetchEvent.respondWith()。
 # LOCALIZATION NOTE: Do not translate "ServiceWorker" or "FetchEvent.preventDefault()". %S is a URL.
 InterceptionCanceledWithURL=「%S」載入失敗。ServiceWorker 呼叫了 FetchEvent.preventDefault() 取消載入。
 # LOCALIZATION NOTE: Do not translate "ServiceWorker", "promise", or "FetchEvent.respondWith()". %1$S is a URL. %2$S is an error string.
 InterceptionRejectedResponseWithURL=「%1$S」載入失敗。ServiceWorker 傳送了 promise 給 FetchEvent.respondWith(),因下列錯誤被拒絕:「%2$S」。
 # LOCALIZATION NOTE: Do not translate "ServiceWorker", "promise", "FetchEvent.respondWith()", or "Response". %1$S is a URL. %2$S is an error string.
 InterceptedNonResponseWithURL=「%1$S」載入失敗。ServiceWorker 傳送了 promise 給解出了非 Response 值「%2$S」的 FetchEvent.respondWith()。
 # LOCALIZATION NOTE: Do not translate "ServiceWorker", "Service-Worker-Allowed" or "HTTP". %1$S and %2$S are URLs.
 ServiceWorkerScopePathMismatch=ServiceWorker 註冊失敗: 提供的 scope「%1$S」路徑不在最大允許的 scope「%2$S」當中。請調整 scope、移動 Service Worker 指令碼,或使用 Service-Worker-Allowed HTTP 檔頭以允許該 scope。
+# LOCALIZATION NOTE: Do not translate "ServiceWorker". %1$S is a URL representing the scope of the ServiceWorker, %2$S is a stringified numeric HTTP status code like "404" and %3$S is a URL.
+ServiceWorkerRegisterNetworkError=為 scope「%1$S」註冊或更新 ServiceWorker 失敗: 指令碼「%3$S」載入失敗,狀態為 %2$S。
+# LOCALIZATION NOTE: Do not translate "ServiceWorker". %1$S is a URL representing the scope of the ServiceWorker, %2$S is a MIME Media Type like "text/plain" and %3$S is a URL.
+ServiceWorkerRegisterMimeTypeError=為 scope「%1$S」註冊或更新 ServiceWorker 失敗: 收到指令碼「%3$S」的 Content-Type 為「%2$S」。必須為「text/javascript」、「application/x-javascript」或「application/javascript」。
+# LOCALIZATION NOTE: Do not translate "ServiceWorker". %1$S is a URL representing the scope of the ServiceWorker.
+ServiceWorkerGraceTimeoutTermination=因為寬限期逾時,在仍有進行中的 waitUntil/respondWith promise 的情況下結束 scope「%1$S」的 ServiceWorker。
 ExecCommandCutCopyDeniedNotInputDriven=因為並不是從由使用者產生的短期執行事件處理器呼叫,已拒絕執行 document.execCommand(‘cut’/‘copy’)。
 ManifestShouldBeObject=Manifest 應為物件。
 ManifestScopeURLInvalid=節點網址無效。
 ManifestScopeNotSameOrigin=節點網址必須與文件來源相同。
 ManifestStartURLOutsideScope=啟動網址在 scope 外,該 scope 無效。
 ManifestStartURLInvalid=啟動網址無效。
 ManifestStartURLShouldBeSameOrigin=啟動網址應與文件來源相同。
 # LOCALIZATION NOTE: %1$S is the name of the object whose property is invalid. %2$S is the name of the invalid property. %3$S is the expected type of the property value. E.g. "Expected the manifest's start_url member to be a string."
 ManifestInvalidType=預期 %1$S 的成員 %2$S 應為 %3$S。
 # LOCALIZATION NOTE: %1$S is the name of the property whose value is invalid. %2$S is the (invalid) value of the property. E.g. "theme_color: 42 is not a valid CSS color."
 ManifestInvalidCSSColor=%1$S: %2$S 不是有效的 CSS 色彩。
 PatternAttributeCompileFailure=因為 regexp 模式無效,無法檢查 <input pattern='%S'>: %S
 # LOCALIZATION NOTE: Do not translate "postMessage" or DOMWindow. %S values are origins, like https://domain.com:port
 TargetPrincipalDoesNotMatch=無法於「DOMWindow」執行「postMessage」: 提供的目標來源(%S)與接收的視窗來源(%S)不符。
-# LOCALIZATION NOTE: Do not translate 'youtube'. %S values are origins, like https://domain.com:port
-RewriteYoutubeEmbed=將舊版 Youtube Flash embed(%S)重寫為 iframe embed(%S)。若可行的話,請更新頁面改用 iframe。
-# LOCALIZATION NOTE: Do not translate 'youtube'. %S values are origins, like https://domain.com:port
-RewriteYoutubeEmbedInvalidQuery=將舊版 Youtube Flash embed(%S)重寫為 iframe embed(%S)。Query 無效,已自網址移除。若可行的話,請更新頁面改用 iframe。
+# LOCALIZATION NOTE: Do not translate 'YouTube'. %S values are origins, like https://domain.com:port
+RewriteYouTubeEmbed=將舊版 Youtube Flash embed(%S)重寫為 iframe embed(%S)。若可行的話,請更新頁面改用 iframe。
+# LOCALIZATION NOTE: Do not translate 'YouTube'. %S values are origins, like https://domain.com:port
+RewriteYouTubeEmbedPathParams=將舊版 Youtube Flash embed(%S)重寫為 iframe embed(%S)。Query 無效,已自網址移除。若可行的話,請更新頁面改用 iframe。
 # LOCALIZATION NOTE: Do not translate "ServiceWorker". %1$S is the ServiceWorker scope URL. %2$S is an error string.
 PushMessageDecryptionFailure=scope「%1$S」的 ServiceWorker 在解密推送訊息時遇到錯誤:「%2$S」。若需關於加密功能的說明,請參考 https://developer.mozilla.org/en-US/docs/Web/API/Push_API/Using_the_Push_API#Encryption
 # LOCALIZATION NOTE: %1$S is the type of a DOM event. 'passive' is a literal parameter from the DOM spec.
 PreventDefaultFromPassiveListenerWarning=忽略從註冊為「passive」的 listener 對「%1$S」類型事件的「preventDefault()」呼叫。
-NavigatorBatteryWarning=navigator.battery 已被棄用,請改用 navigator.getBattery()。
 FileLastModifiedDateWarning=File.lastModifiedDate 已被棄用,請改用 File.lastModified。
+ChromeScriptedDOMParserWithoutPrincipal=已棄用建立 DOMParser 時不含主體的方法。
+IIRFilterChannelCountChangeWarning=IIRFilterNode 頻道數量變更可能會造成雜音。
+BiquadFilterChannelCountChangeWarning=BiquadFilterNode 頻道數量變更可能會造成雜音。
+# LOCALIZATION NOTE: %1$S is the unanimatable paced property.
+UnanimatablePacedProperty=被移動的屬性「%1$S」不是可放入動畫的屬性。
+# LOCALIZATION NOTE: Do not translate ".jpeg"
+GenericImageNameJPEG=圖片.jpeg
+# LOCALIZATION NOTE: Do not translate ".gif"
+GenericImageNameGIF=圖片.gif
+# LOCALIZATION NOTE: Do not translate ".png"
+GenericImageNamePNG=圖片.png
+GenericFileName=檔案
 
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -1,17 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Reset=重設
 Submit=送出查詢
 Browse=瀏覽…
-ChooseFiles=選擇檔案…
-ChooseDirs=選擇資料夾…
 FileUpload=上傳檔案
 # LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string 
 # should be a space (U+0020) in most locales. The prompt is followed by an 
 # input field. The space needs be escaped in the property file to avoid 
 # trimming.
 IsIndexPromptWithSpace=這是一個可搜尋的索引。請輸入關鍵字:\u0020
 ForgotPostWarning=表格含有 enctype=%S 但未使用 method=post。傳送時會使用 method=GET 且忽略 enctype 設定。
 ForgotFileEnctypeWarning=表格含有上傳檔案的輸入,但未使用 method=POST 與 enctype=multipart/form-data。檔案將不會被上傳。
@@ -20,21 +18,26 @@ DefaultFormSubject=來自 %S 的表單
 CannotEncodeAllUnicode=有一張使用 %S 編碼送出的表單無法對所有的 Unicode 字元進行編碼,所以使用者所輸入的東西可能發生錯誤。若要避免這個問題,應該修改此網頁,或是在表單元素上指定 accept-charset=utf-8,以透過 UTF-8 編碼送出表單。
 AllSupportedTypes=所有支援的類型
 # LOCALIZATION NOTE (NoFileSelected): this string is shown on a
 # <input type='file'> when there is no file selected yet.
 NoFileSelected=未選擇檔案。
 # LOCALIZATION NOTE (NoFilesSelected): this string is shown on a
 # <input type='file' multiple> when there is no file selected yet.
 NoFilesSelected=未選擇檔案。
+# LOCALIZATION NOTE (NoDirSelected): this string is shown on a
+# <input type='file' directory/webkitdirectory> when there is no directory
+# selected yet.
+NoDirSelected=未選擇目錄。
 # LOCALIZATION NOTE (XFilesSelected): this string is shown on a
 # <input type='file' multiple> when there are more than one selected file.
 # %S will be a number greater or equal to 2.
 XFilesSelected=選擇了 %S 個檔案。
 ColorPicker=選擇一種色彩
+DatePicker=選擇日期
 # LOCALIZATION NOTE (AndNMoreFiles): Semi-colon list of plural forms. 
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals 
 # This string is shown at the end of the tooltip text for <input type='file'
 # multiple> when there are more than 21 files selected (when we will only list
 # the first 20, plus an "and X more" line). #1 represents the number of files
 # minus 20 and will always be a number equal to or greater than 2. So the
 # singular case will never be used.
 AndNMoreFiles=還有 #1 個檔案
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -171,8 +171,11 @@ PEExpectedVariableNameEOF=變數名稱的指示符
 PEExpectedVariableName=預期應有變數名稱的指示符,卻出現「%1$S」。
 PEExpectedVariableFallback=在「,」後預期應為 variable reference fallback。
 PEExpectedVariableCommaOrCloseParen=variable reference 中的變數名稱後預期應為「,」或「)」,卻出現「%1$S」。
 PESubgridNotSupported=CSS Grid 中,未啟用關鍵字「subgrid」的說明。
 PEMoreThanOneGridRepeatAutoFillInNameList=subgrid 的名稱清單中僅允許一個 repeat(auto-fill, …)。
 PEMoreThanOneGridRepeatAutoFillFitInTrackList=track 清單中僅允許一個 repeat(auto-fill, …) 或 repeat(auto-fit, …)。
 PEMoreThanOneGridRepeatTrackSize=repeat(auto-fit/auto-fill, …) 中僅允許一個 track 大小。
 
+TooLargeDashedRadius=「dashed」樣式的邊框半徑太大(限制為 100000px),以 solid 描繪。
+TooLargeDottedRadius=「dotted」樣式的邊框半徑太大(限制為 100000px),以 solid 描繪。
+
--- a/dom/chrome/layout/layout_errors.properties
+++ b/dom/chrome/layout/layout_errors.properties
@@ -30,9 +30,10 @@ CompositorAnimationWarningTransformPreserve3D=「transform-style: preserve-3d」變形動畫無法在合成器上執行
 ##                   CompositorAnimationWarningTransformWithGeometricProperties,
 ##                   CompositorAnimationWarningTransformFrameInactive,
 ##                   CompositorAnimationWarningOpacityFrameInactive):
 ## 'transform' and 'opacity' mean CSS property names, don't translate it.
 CompositorAnimationWarningTransformSVG=元素以 SVG 變形的動畫無法在合成器上執行
 CompositorAnimationWarningTransformWithGeometricProperties=當幾何屬性在相同元素中同時執行時,「transform」動畫無法在合成器上執行
 CompositorAnimationWarningTransformFrameInactive=畫框並未標示為進行「transform」動畫,無法在合成器上執行
 CompositorAnimationWarningOpacityFrameInactive=畫框並未標示為進行「opacity」動畫,無法在合成器上執行
+CompositorAnimationWarningHasRenderingObserver=因為元素有正在描繪中的 observer,動畫無法在合成器上執行(-moz-element 或 SVG 剪裁/遮罩)
 
--- a/dom/chrome/security/caps.properties
+++ b/dom/chrome/security/caps.properties
@@ -1,12 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CheckMessage = 記住此決定
 CheckLoadURIError = 安全性錯誤: %S 的內容無法由 %S 載入資料或鏈結。
 CheckSameOriginError = 安全性錯誤: %S 的內容無法由 %S 載入資料。
 ExternalDataError = 安全性錯誤: 位於 %S 的內容嘗試載入 %S,但作為圖片使用時不應載入外部資料。
 
 # LOCALIZATION NOTE (GetPropertyDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
 # %2$S is the type of object it was.
 # %3$S is the property of that object that access was denied for.
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -69,17 +69,20 @@ hostNameMightBeKeyword = 將 %1$S 解譯為主機名稱而非關鍵字。若您刻意要將其設為關鍵字,請改用 '%2$S'(用單引號包起來)。
 # directive is not supported (e.g. 'reflected-xss')
 notSupportingDirective = 不支援指示「%1$S」,將忽略該指示與指示值。
 # LOCALIZATION NOTE (blockAllMixedContent):
 # %1$S is the URL of the blocked resource load.
 blockAllMixedContent = 封鎖不安全的請求「%1$S」。
 
 # LOCALIZATION NOTE (ignoringDirectiveWithNoValues):
 # %1$S is the name of a CSP directive that requires additional values (e.g., 'require-sri-for')
-ignoringDirectiveWithNoValues = 因不含任何參數,已忽略「%1$S」。
+ignoringDirectiveWithNoValues = 由於不含任何參數,忽略「%1$S」。
+# LOCALIZATION NOTE (ignoringReportOnlyDirective):
+# %1$S is the directive that is ignored in report-only mode.
+ignoringReportOnlyDirective = 在以唯讀政策「%1$S」傳遞時,忽略沙盒指示
 
 # CSP Errors:
 # LOCALIZATION NOTE (couldntParseInvalidSource):
 # %1$S is the source that could not be parsed
 couldntParseInvalidSource = 無法剖析無效來源 %1$S
 # LOCALIZATION NOTE (couldntParseInvalidHost):
 # %1$S is the host that's invalid
 couldntParseInvalidHost = 無法剖析無效主機 %1$S
@@ -90,9 +93,12 @@ couldntParseScheme = 無法剖析  %1$S 中的格式
 # %1$S is the string source
 couldntParsePort = 無法剖析 %1$S 當中的埠號
 # LOCALIZATION NOTE (duplicateDirective):
 # %1$S is the name of the duplicate directive
 duplicateDirective = 偵測到重複的 %1$S 指示。將忽略第一個以外的指示。
 # LOCALIZATION NOTE (deprecatedDirective):
 # %1$S is the name of the deprecated directive, %2$S is the name of the replacement.
 deprecatedDirective = 指示「%1$S」已被棄用,請改用「%2$S」。
+# LOCALIZATION NOTE (couldntParseInvalidSandboxFlag):
+# %1$S is the option that could not be understood
+couldntParseInvalidSandboxFlag = 無法剖析無效的沙盒旗標「%1$S」
 
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -68,8 +68,14 @@ IneligibleResource=因為並未開啟 CORS,也沒有設定 same-origin,「%1$S」無法用作完整性檢查。
 # LOCALIZATION NOTE: Do not translate "integrity". "%1$S" is the invalid hash algorithm found in the attribute.
 UnsupportedHashAlg=integrity 屬性中有不支援的雜湊演算法:「%1$S」
 # LOCALIZATION NOTE: Do not translate "integrity"
 NoValidMetadata=integrity 未含任何有效的後設資料。
 
 # LOCALIZATION NOTE: Do not translate "RC4".
 WeakCipherSuiteWarning=此網站使用了已被棄用且不再安全的 RC4 演算法進行加密。
 
+#XCTO: nosniff
+# LOCALIZATION NOTE: Do not translate "X-Content-Type-Options: nosniff".
+MimeTypeMismatch=MIME 類型不符合,所以來自「%1$S」的資源被封鎖(X-Content-Type-Options: nosniff)。
+# LOCALIZATION NOTE: Do not translate "X-Content-Type-Options" and also do not trasnlate "nosniff".
+XCTOHeaderValueMissing=X-Content-Type-Options 標頭警告: 此值原本為「%1$S」;您是不是要傳「nosniff」?
+
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -39,16 +39,18 @@
 <!ENTITY helpus.start               "想幫忙嗎?">
 <!-- LOCALIZATION NOTE (helpus.donateLink): This is a link title that links to the thunderbird donation page -->
 <!ENTITY helpus.donateLink          "捐款給我們">
 <!ENTITY helpus.middle              "或">
 <!-- LOCALIZATION NOTE (helpus.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
 <!ENTITY helpus.getInvolvedLink     "出力參與!">
 <!ENTITY helpus.end                 "">
 
+<!ENTITY releaseNotes.link          "新鮮事">
+
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "授權資訊">
 
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 <!ENTITY bottomLinks.rights         "使用者權利">
 
 <!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy        "隱私權保護政策">
--- a/mail/chrome/messenger/importDialog.dtd
+++ b/mail/chrome/messenger/importDialog.dtd
@@ -33,16 +33,17 @@ LOCALIZATION NOTE : Do not translate any
 <!ENTITY importDescription1.label "此精靈可以從其它程式匯入郵件訊息、通訊錄項目、消息來源訂閱、偏好設定,以及篩選條件到 &brandShortName;。">
 <!ENTITY importDescription2.label "匯入成功後,您就能從 &brandShortName; 裡面存取之前的郵件或通訊錄等設定。">
 
 <!ENTITY selectDescription.label  "請選擇您想匯入的程式資料類型:">
 <!ENTITY selectDescriptionB.label "請選擇現有帳號或建立新帳號:">
 <!ENTITY selectDescription.accesskey "P">
 <!ENTITY acctName.label           "名稱:">
 <!ENTITY acctName.accesskey       "N">
+<!ENTITY noModulesFound.label     "沒有找到可匯入資料的應用程式或檔案。">
 
 <!ENTITY back.label               "&lt; 上一步">
 <!ENTITY forward.label            "下一步 &gt;">
 <!ENTITY finish.label             "結束">
 <!ENTITY cancel.label             "取消">
 
 <!ENTITY select.label             "選擇要匯入的資料類型:">
 
--- a/mail/chrome/messenger/migration/migration.dtd
+++ b/mail/chrome/messenger/migration/migration.dtd
@@ -2,16 +2,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!ENTITY migrationWizard.title          "匯入精靈">
 
 <!ENTITY importFromWin.label            "匯入選項、帳號設定、通訊錄、篩選器以及其它資料從:">
 <!ENTITY importFromNonWin.label         "匯入偏好設定、帳號設定、通訊錄、篩選條件以及其它資料從:">
+<!ENTITY importSourceNotFound.label     "沒有找到可匯入資料的應用程式。">
 
 <!ENTITY importFromNothing.label        "不要匯入任何東西">
 <!ENTITY importFromNothing.accesskey    "D">
 <!ENTITY importFromSeamonkey3.label     "SeaMonkey 2 或更新版本">
 <!ENTITY importFromSeamonkey3.accesskey "S">
 <!ENTITY importFromOExpress.label       "Outlook Express">
 <!ENTITY importFromOExpress.accesskey   "u">
 <!ENTITY importFromOutlook.label        "Outlook">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -14,16 +14,17 @@
 <!ENTITY dockOptions.label                "應用程式圖示選項…">
 <!ENTITY dockOptions.accesskey            "n">
 
 <!ENTITY newMessagesArrive.label          "當有新郵件時:">
 <!ENTITY playSound.label                  "播放音效">
 <!ENTITY playSound1.accesskey              "d">
 <!ENTITY showAnimatedAlert.label          "顯示警告視窗">
 <!ENTITY showAnimatedAlert.accesskey      "S">
+<!ENTITY notificationAlertSettings.label  "可在系統偏好設定的通知窗格中關閉警示。">
 <!ENTITY customizeMailAlert.label         "自訂…">
 <!ENTITY customizeMailAlert.accesskey     "C">
 
 <!ENTITY showTrayIcon.label               "顯示工具列圖示">
 <!ENTITY showTrayIcon.accesskey           "t">
 
 <!ENTITY play.label                       "播放">
 <!ENTITY play.accesskey                   "P">
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -39,20 +39,22 @@
 <!ENTITY firstrun_account_message "在您別的裝置上有 &brandShortName; 嗎?">
 
 <!ENTITY  onboard_start_restricted1 "透過這個簡單版的 &brandShortName; 保持安全與控制程度。">
 
 <!-- Localization note: These are used as the titles of different pages on the home screen.
      They are automatically converted to all caps by the Android platform. -->
 <!ENTITY  bookmarks_title "行動書籤">
 <!ENTITY  history_title "瀏覽紀錄">
-<!ENTITY  recent_tabs_title "最近開啟的分頁">
 
 <!ENTITY  switch_to_tab "切換到分頁">
 
+<!-- Localization note: Shown in a snackbar when tab is loaded from cache while device was offline. -->
+<!ENTITY  tab_offline_version "顯示離線版本">
+
 <!ENTITY  crash_reporter_title "&brandShortName; 錯誤回報員">
 <!ENTITY  crash_message2 "&brandShortName; 意外碰上問題而自行關閉。您的分頁將會在重新啟動後被列在 &brandShortName; 的開始頁。">
 <!ENTITY  crash_send_report_message3 "告訴 &vendorShortName; 這次錯誤的資訊,讓他們修正">
 <!ENTITY  crash_include_url2 "包含我所瀏覽的頁面網址">
 <!ENTITY  crash_sorry "很抱歉">
 <!ENTITY  crash_comment "加上附註(附註會是公開可見的)">
 <!ENTITY  crash_allow_contact2 "允許 &vendorShortName; 聯絡我關於此報告的進一步資訊">
 <!ENTITY  crash_email "您的電子郵件地址">
@@ -101,17 +103,17 @@
 <!ENTITY forward "下一頁">
 <!ENTITY menu "選單">
 <!ENTITY back "上一頁">
 <!ENTITY stop "停止">
 <!ENTITY site_security "網站安全">
 <!ENTITY edit_mode_cancel "取消">
 
 <!ENTITY close_tab "關閉分頁">
-<!ENTITY one_tab "一個分頁">
+<!ENTITY one_tab "1 個分頁">
 <!-- Localization note (num_tabs2) : Number of tabs is always more than one.
      We can't use android plural forms, sadly. See bug #753859. -->
 <!ENTITY num_tabs2 "&formatD; 個分頁">
 <!ENTITY new_tab_opened "已開啟新分頁">
 <!ENTITY new_private_tab_opened "已開啟新隱私分頁">
 <!-- Localization note (switch_button_message): This string should be as short
      as possible because it's shown as a label in a toast.  Ideally, this string
      is upper-case, to match Google and Android's convention. -->
@@ -265,16 +267,30 @@
 
 <!ENTITY pref_tracking_protection_enabled "啟用">
 <!ENTITY pref_tracking_protection_enabled_pb "在隱私瀏覽模式中使用">
 <!ENTITY pref_tracking_protection_disabled "停用">
 
 <!ENTITY pref_whats_new_notification "&brandShortName; 有什麼新鮮事">
 <!ENTITY pref_whats_new_notification_summary "在更新後了解有那些新功能">
 
+<!-- Localization note (pref_category_experimental): Title of a sub category in the 'advanced' category
+     for experimental features. -->
+<!ENTITY pref_category_experimental "實驗中功能">
+
+<!-- Custom Tabs is an Android API for allowing third-party apps to open URLs in a customized UI.
+     Instead of switching to the browser it appears as if the user stays in the third-party app.
+     For more see: https://developer.chrome.com/multidevice/android/customtabs -->
+<!ENTITY pref_custom_tabs "自訂分頁">
+<!ENTITY pref_custom_tabs_summary "允許第三方應用程式以自訂外觀與樣式開啟網址。">
+
+<!-- Localization note (pref_activity_stream): Experimental feature, see https://testpilot.firefox.com/experiments/activity-stream  -->
+<!ENTITY pref_activity_stream "Activity Stream">
+<!ENTITY pref_activity_stream_summary "將您的上網紀錄視覺化並重新發想首頁設計,讓您可以更簡單在 &brandShortName; 找到想找的東西。">
+
 <!ENTITY tracking_protection_prompt_title "現在開始提供追蹤保護功能">
 <!ENTITY tracking_protection_prompt_text "主動封鎖網頁中的追蹤元素,這樣您就不用再擔心了。">
 <!ENTITY tracking_protection_prompt_tip_text "前往隱私設定了解更多資訊">
 <!ENTITY tracking_protection_prompt_action_button "知道了!">
 
 <!ENTITY tab_queue_toast_message3 "儲存於 &brandShortName; 的分頁">
 <!ENTITY tab_queue_toast_action "立刻開啟">
 <!ENTITY tab_queue_prompt_title "開啟多個鏈結?">
@@ -377,16 +393,17 @@ size. -->
 <!ENTITY pref_private_data_passwords2 "已存密碼">
 <!ENTITY pref_private_data_cache "快取">
 <!ENTITY pref_private_data_offlineApps "網站離線資料">
 <!ENTITY pref_private_data_siteSettings2 "網站設定">
 <!ENTITY pref_private_data_downloadFiles2 "下載項目">
 <!ENTITY pref_private_data_syncedTabs "已同步的分頁">
 
 <!ENTITY pref_default_browser "設為預設瀏覽器">
+<!ENTITY pref_default_browser_mozilla_support_tablet "前往 Mozilla 技術支援站">
 <!ENTITY pref_about_firefox "關於 &brandShortName;">
 <!ENTITY pref_vendor_faqs "常見問題">
 <!ENTITY pref_vendor_feedback "提供意見回饋">
 
 <!ENTITY pref_dialog_set_default "設為預設">
 <!ENTITY pref_dialog_default "預設">
 <!ENTITY pref_dialog_remove "移除">
 
@@ -565,20 +582,22 @@ size. -->
 <!ENTITY home_synced_devices_smartfolder "已同步的裝置">
 <!ENTITY home_synced_devices_number "&formatD; 台裝置">
 <!-- Localization note (home_synced_devices_one_device): This is the singular version of home_synced_devices_number, referring to the number of devices a user has synced. -->
 <!ENTITY home_synced_devices_one "1 台裝置">
 <!ENTITY home_history_back_to2 "回到完整瀏覽紀錄">
 <!ENTITY home_clear_history_button "清除瀏覽紀錄">
 <!ENTITY home_clear_history_confirm "您確定要清除瀏覽紀錄?">
 <!ENTITY home_bookmarks_empty "您儲存的書籤將會顯示於此處。">
-<!ENTITY home_closed_tabs_title "最近關閉的分頁">
-<!ENTITY home_last_tabs_title "上次開啟的分頁">
+<!ENTITY home_closed_tabs_title2 "最近關閉">
 <!ENTITY home_last_tabs_empty "您最近的分頁將會顯示於此。">
-<!ENTITY home_open_all "開啟全部">
+<!ENTITY home_restore_all "全部還原">
+<!ENTITY home_closed_tabs_number "&formatD; 個分頁">
+<!-- Localization note (home_closed_tabs_one): This is the singular version of home_closed_tabs_number, referring to the number of recently closed tabs available. -->
+<!ENTITY home_closed_tabs_one "1 個分頁">
 <!ENTITY home_most_recent_empty "您最近瀏覽的網頁將會顯示於此。">
 <!-- Localization note (home_most_recent_emptyhint2): "Psst" is a sound that might be used to attract someone's attention unobtrusively, and intended to hint at Private Browsing to the user.
      The placeholders &formatS1; and &formatS2; are used to mark the location of text underlining. -->
 <!ENTITY home_most_recent_emptyhint2 "噓!&formatS1;開新隱私瀏覽分頁&formatS2; 後將不會儲存您的瀏覽紀錄。">
 
 <!-- Localization note (home_default_empty): This string is used as the default text when there
      is no data to show in an about:home panel that was created by an add-on. -->
 <!ENTITY home_default_empty "找不到此面板的內容。">
@@ -620,17 +639,16 @@ which is run by
 Example Enterprises, Inc.
 
 The layout of the identity dialog prevents combining this into a single string with
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity_connection_secure "安全連線">
 <!ENTITY identity_connection_insecure "不安全的連線">
-<!ENTITY identity_login_insecure "此頁面並不安全,您的登入資訊可能會有風險。">
 <!ENTITY identity_connection_chromeui "此頁面為安全的&brandShortName;頁面">
 
 <!-- Mixed content notifications in site identity popup -->
 <!ENTITY mixed_content_blocked_all1 "&brandShortName; 已封鎖此頁面不安全的內容。">
 <!ENTITY mixed_content_blocked_some1 "&brandShortName; 已封鎖此頁面中一些不安全的內容。">
 <!ENTITY mixed_content_display_loaded1 "本頁面中的部分內容(例如圖片)並不安全。">
 <!ENTITY mixed_content_protection_disabled1 "您已停用不安全內容的保護。">
 
@@ -764,17 +782,17 @@ just addresses the organization to follo
      a restricted profile (e.g. child). Used inside the Android settings UI. -->
 <!ENTITY restrictable_feature_addons_installation "附加元件">
 <!ENTITY restrictable_feature_addons_installation_description "新增功能到 Firefox。註: 附加元件可關閉某些限制。">
 <!ENTITY restrictable_feature_private_browsing "隱私瀏覽模式">
 <!ENTITY restrictable_feature_private_browsing_description "讓家人可在上網時不留下造訪過的網站資訊。">
 <!ENTITY restrictable_feature_clear_history "清除瀏覽記錄">
 <!ENTITY restrictable_feature_clear_history_description "讓家人可以刪除造訪過的網站資訊。">
 <!ENTITY restrictable_feature_advanced_settings "進階設定">
-<!ENTITY restrictable_feature_advanced_settings_description "包含匯入書籤、恢復分頁和自動更新。關閉此選項可簡化家人使用時需設定的內容。">
+<!ENTITY restrictable_feature_advanced_settings_description "包含匯入書籤、還原分頁和自動更新。關閉此選項可簡化家人使用時需設定的內容。">
 <!ENTITY restrictable_feature_camera_microphone "攝影機與麥克風">
 <!ENTITY restrictable_feature_camera_microphone_description "讓家人可以透過網站即時溝通。">
 <!ENTITY restrictable_feature_block_list "封鎖清單">
 <!ENTITY restrictable_feature_block_list_description "封鎖包含敏感內容的網站。">
 
 <!-- Default Bookmarks titles-->
 <!-- LOCALIZATION NOTE (bookmarks_about_browser): link title for about:fennec -->
 <!ENTITY bookmarks_about_browser "Firefox: 關於您的瀏覽器">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -23,17 +23,17 @@ alertDownloadsSize=下載檔案太大
 alertDownloadsNoSpace=儲存空間不足
 alertDownloadsToast=下載已開始…
 alertDownloadsPause=暫停
 alertDownloadsResume=繼續
 alertDownloadsCancel=取消
 # LOCALIZATION NOTE (alertDownloadSucceeded): This text is shown as a snackbar inside the app after a
 # successful download. %S will be replaced by the file name of the download.
 alertDownloadSucceeded=已下載 %S
-# LOCALIZATION NOTE (undoCloseToast.message): This message appears in a toast
+# LOCALIZATION NOTE (downloads.disabledInGuest): This message appears in a toast
 # when the user tries to download something in Guest mode.
 downloads.disabledInGuest=訪客瀏覽階段中無法下載檔案
 
 alertFullScreenToast=請按下 Back 離開全螢幕模式
 
 # LOCALIZATION NOTE (alertSearchEngineAddedToast, alertSearchEngineErrorToast, alertSearchEngineDuplicateToast)
 # %S will be replaced by the name of the search engine (exposed by the current page)
 # that has been added; for example, 'Google'.
@@ -353,16 +353,28 @@ remoteIncomingPromptAllow=允許
 # connection will be allowed assuming the scan succeeds.
 remoteIncomingPromptScan=掃描
 # LOCALIZATION NOTE (remoteIncomingPromptScanAndRemember): This button will
 # start a QR code scanner to authenticate an incoming remote debugger
 # connection.  The connection will be allowed assuming the scan succeeds, and
 # the other endpoint's certificate will be saved to skip future scans for this
 # client.
 remoteIncomingPromptScanAndRemember=掃描並記住
+# LOCALIZATION NOTE (remoteQRScanFailedPromptTitle): The title displayed in a
+# dialog when we are unable to complete the QR code scan for an incoming remote
+# debugging connection.
+remoteQRScanFailedPromptTitle=QR Code 掃描失敗
+# LOCALIZATION NOTE (remoteQRScanFailedPromptMessage): The message displayed in
+# a dialog when we are unable to complete the QR code scan for an incoming
+# remote debugging connection.
+remoteQRScanFailedPromptMessage=無法掃描 QR Code 進行遠端除錯,請確認您已安裝條碼掃描器後再試一次。
+# LOCALIZATION NOTE (remoteQRScanFailedPromptOK): This button dismisses the
+# dialog that appears when we are unable to complete the QR code scan for an
+# incoming remote debugging connection.
+remoteQRScanFailedPromptOK=確定
 
 # LOCALIZATION NOTE (remoteNotificationTitle): %S is the name of the app.
 remoteNotificationTitle=已啟用 %S 除錯
 # LOCALIZATION NOTE (remoteNotificationGenericName): a generic name to use
 # if the name of the app is not available.
 remoteNotificationGenericName=程式
 # LOCALIZATION NOTE (remoteNotificationMessage): %S is the port on which
 # the remote debugger server is listening.
@@ -417,19 +429,16 @@ getUserMedia.blockedCameraAndMicrophoneAccess = 已禁止使用攝影機及麥克風。
 # Tip shown to users the first time we hide the reader mode toolbar.
 readerMode.toolbarTip=點擊畫面以顯示閱讀器選項
 
 #Open in App
 openInApp.pageAction = 在應用程式中開啟
 openInApp.ok = 確定
 openInApp.cancel = 取消
 
-#Network Offline
-networkOffline.message2 = 顯示離線版本
-
 #Tab sharing
 tabshare.title = 「選擇要進行串流分享的分頁」
 #Tabs in context menus
 browser.menu.context.default = 鏈結
 browser.menu.context.img = 圖片
 browser.menu.context.video = 影片
 browser.menu.context.audio = 音訊
 browser.menu.context.tel = 電話
--- a/mobile/android/chrome/phishing.dtd
+++ b/mobile/android/chrome/phishing.dtd
@@ -1,28 +1,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY safeb.palm.accept.label "帶我離開這裡!">
 <!ENTITY safeb.palm.decline.label "忽略此警告">
 <!ENTITY safeb.palm.reportPage.label "為什麼要封鎖此網頁?">
-<!ENTITY safeb.palm.whyForbidden.label "為什麼要封鎖此網頁?">
 
 <!ENTITY safeb.blocked.malwarePage.title "已知的有害網頁!">
 <!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.malwarePage.shortDesc "這個在 <span id='malware_sitename'/> 的網頁已被回報為有害網頁,依據您所選擇的安全設定予以封鎖。">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>有害網頁會嘗試安裝能竊取隱私資訊、利用您的電腦攻擊他人或破壞作業系統等的惡意軟體到您的電腦上。</p><p>某些有害網頁會故意安裝有害軟體到電腦上,但更多網頁是在連網頁擁有者都不知情的情況下,成為有害軟體散佈的溫床。</p>">
 
 <!ENTITY safeb.blocked.phishingPage.title3 "詐騙網站!">
 <!-- Localization note (safeb.blocked.phishingPage.shortDesc3) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.phishingPage.shortDesc3 "位於 <span id='phishing_sitename'/> 的這張網頁已被回報為詐騙網站,並已依照您的安全性偏好設定封鎖。">
 <!ENTITY safeb.blocked.phishingPage.longDesc3 "<p>詐騙網站會設計來誤導您做某些危險的事情,例如安裝軟體或提供密碼、手機號碼、信用卡號等個人資訊。</p><p>在這些網頁中輸入任何資訊可能會導致個人身分被盜用,或其他詐騙事件。</p>">
 
 <!ENTITY safeb.blocked.unwantedPage.title "已回報為不安全的軟體網站!">
 <!-- Localization note (safeb.blocked.unwanted.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.unwantedPage.shortDesc "此網頁 <span id='unwanted_sitename'/> 已被回報為疑似提供不安全的軟體。依照您的安全性偏好設定已封鎖此網頁。">
 <!ENTITY safeb.blocked.unwantedPage.longDesc "提供不安全軟體的網站可能會嘗試安裝詐騙軟體,並以您預期外的方式影響系統。">
 
-<!ENTITY safeb.blocked.forbiddenPage.title2 "已封鎖網站">
-<!-- Localization note (safeb.blocked.forbiddenPage.shortDesc) - Please don't translate the contents of the <span id="forbidden_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.forbiddenPage.shortDesc2 "已依照您的管理設定封鎖 <span id='forbidden_sitename'/> 網頁。">
 
--- a/mobile/android/chrome/pippki.properties
+++ b/mobile/android/chrome/pippki.properties
@@ -14,27 +14,73 @@ downloadCert.trustEmail=信任用於識別電子郵件使用者。
 downloadCert.trustObjSign=信任用於識別軟體開發者。
 pkcs12.getpassword.title=密碼對話視窗
 pkcs12.getpassword.message=請輸入用來加密此憑證備份的密碼。
 clientAuthAsk.title=使用者識別需求
 clientAuthAsk.message1=此網站要求您提供可用來識別您自己的憑證:
 clientAuthAsk.message2=選擇一項憑證以做為識別:
 clientAuthAsk.message3=所選憑證細節:
 clientAuthAsk.remember.label=記住此決定
+# LOCALIZATION NOTE(clientAuthAsk.nickAndSerial): Represents a single cert when
+# the user is choosing from a list of certificates.
+# %1$S is the nickname of the cert.
+# %2$S is the serial number of the cert in AA:BB:CC hex format.
+clientAuthAsk.nickAndSerial=%1$S [%2$S]
+# LOCALIZATION NOTE(clientAuthAsk.hostnameAndPort):
+# %1$S is the hostname of the server.
+# %2$S is the port of the server.
+clientAuthAsk.hostnameAndPort=%1$S:%2$S
+# LOCALIZATION NOTE(clientAuthAsk.organization): %S is the Organization of the
+# server cert.
 clientAuthAsk.organization=組識:「%S」
+# LOCALIZATION NOTE(clientAuthAsk.issuer): %S is the Organization of the
+# issuer cert of the server cert.
 clientAuthAsk.issuer=簽發者:「%S」
+# LOCALIZATION NOTE(clientAuthAsk.issuedTo): %1$S is the Distinguished Name of
+# the currently selected client cert, such as "CN=John Doe,OU=Example" (without
+# quotes).
+clientAuthAsk.issuedTo=簽發給: %1$S
+# LOCALIZATION NOTE(clientAuthAsk.serial): %1$S is the serial number of the
+# selected cert in AA:BB:CC hex format.
+clientAuthAsk.serial=序號: %1$S
+# LOCALIZATION NOTE(clientAuthAsk.validityPeriod):
+# %1$S is the already localized notBefore date of the selected cert.
+# %2$S is the already localized notAfter date of the selected cert.
+clientAuthAsk.validityPeriod=有效期間: %1$S 至 %2$S
+# LOCALIZATION NOTE(clientAuthAsk.keyUsages): %1$S is a comma separated list of
+# already localized key usages the selected cert is valid for.
+clientAuthAsk.keyUsages=金鑰用途: %1$S
+# LOCALIZATION NOTE(clientAuthAsk.emailAddresses): %1$S is a comma separated
+# list of e-mail addresses the selected cert is valid for.
+clientAuthAsk.emailAddresses=電子郵件地址: %1$S
+# LOCALIZATION NOTE(clientAuthAsk.issuedBy): %1$S is the Distinguished Name of
+# the cert which issued the selected cert.
+clientAuthAsk.issuedBy=簽發者: %1$S
+# LOCALIZATION NOTE(clientAuthAsk.storedOn): %1$S is the name of the PKCS #11
+# token the selected cert is stored on.
+clientAuthAsk.storedOn=儲存於: %1$S
 clientAuthAsk.viewCert.label=檢視
 
 certmgr.title=憑證詳情
 # These strings are stolen from security/manager/locales/en-US/chrome/pippki/certManager.dtd
 certmgr.subjectinfo.label=簽發給
 certmgr.issuerinfo.label=簽發者
 certmgr.periodofvalidity.label=有效期間
 certmgr.fingerprints.label=指紋
-certmgr.certdetail.cn=一般名稱 (CN)
-certmgr.certdetail.o=組織 (O)
-certmgr.certdetail.ou=組織單位 (OU)
-certmgr.certdetail.serialnumber=序號
-certmgr.certdetail.sha256fingerprint=SHA-256 指紋
-certmgr.certdetail.sha1fingerprint=SHA1 指紋
-certmgr.begins=開始於
-certmgr.expires=過期於
+certdetail.cn=一般名稱 (CN): %1$S
+certdetail.o=組織 (O): %1$S
+certdetail.ou=組織單位 (OU): %1$S
+# LOCALIZATION NOTE(certdetail.serialnumber): %1$S is the serial number of the
+# cert being viewed in AA:BB:CC hex format.
+certdetail.serialnumber=序號: %1$S
+# LOCALIZATION NOTE(certdetail.sha256fingerprint): %1$S is the SHA-256
+# Fingerprint of the cert being viewed in AA:BB:CC hex format.
+certdetail.sha256fingerprint=SHA-256 指紋: %1$S
+# LOCALIZATION NOTE(certdetail.sha1fingerprint): %1$S is the SHA-1 Fingerprint
+# of the cert being viewed in AA:BB:CC hex format.
+certdetail.sha1fingerprint=SHA1 指紋: %1$S
+# LOCALIZATION NOTE(certdetail.notBefore): %1$S is the already localized
+# notBefore date of the cert being viewed.
+certdetail.notBefore=開始於: %1$S
+# LOCALIZATION NOTE(certdetail.notAfter): %1$S is the already localized notAfter
+# date of the cert being viewed.
+certdetail.notAfter=過期於: %1$S
 
--- a/mobile/overrides/appstrings.properties
+++ b/mobile/overrides/appstrings.properties
@@ -28,16 +28,15 @@ externalProtocolTitle=外部通訊協定要求
 externalProtocolPrompt=要處理 %1$S: 鏈結需要外部程式。\n\n\n要求鏈結:\n\n%2$S\n應用程式: %3$S\n\n\n若這不在您的預期之中,可能是有人在試圖利用其它程式入侵。除非您很確定這沒問題,不然請選取消。
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<未知>
 externalProtocolChkMsg=對於此類鏈結一律使用並記住我的選擇
 externalProtocolLaunchBtn=執行程式
 malwareBlocked=%S 這個網站被回報為有害網站,已依照您的安全性偏好設定予以封鎖。
 deceptiveBlocked=位於 %S 的這張網頁已被回報為詐騙網站,並已依照安全性偏好設定封鎖。
 unwantedBlocked=%S 這個網站被回報為提供不安全的軟體,已依照您的安全性偏好設定予以封鎖。
-forbiddenBlocked=已依您的瀏覽器設定封鎖 %S 網站。
 cspBlocked=這個頁面包含了內容安全政策以致於無法以這種方式被載入。
 corruptedContentErrorv2=網站 %S 發生了違反通訊協定的情況,無法修復。
 remoteXUL=這個頁面使用了已經預設不再於 Firefox 可用的未支援技術。
 sslv3Used=Firefox 無法保證您在 %S 的資料安全,因為此網站使用 SSLv3 通訊協定,這個協定已不再安全。
 weakCryptoUsed=%S 的網站管理員未正確設定好網站。為了確保您的資訊不會被盜走,Firefox 並未連線至該網站。
 inadequateSecurityError=此網站嘗試建立安全性不足的連線。
 
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -36,15 +36,15 @@ DirFileLabel=檔案:
 PhishingAuth=您正要檢視網站「%1$S」。此網站可能試圖假裝別的網站以盜取您的帳號密碼,請一定要小心。
 PhishingAuthAccept=我了解並會非常小心
 SuperfluousAuth=您正要以使用者「%2$S」的身分登入網站「%1$S」,但網站並不需要認證。可能有人想盜取您的帳號。\n\n「%1$S」真的是您要瀏覽的網站嗎?
 AutomaticAuth=您正要以使用者「%2$S」的身分登入網站「%1$S」。
 
 TrackingUriBlocked=因為啟用了追蹤保護,位於「%1$S」的資源已被封鎖。
 
 # LOCALIZATION NOTE (APIDeprecationWarning):
-# %1$S is the deprected API; %2$S is the API function that should be used.
+# %1$S is the deprecated API; %2$S is the API function that should be used.
 APIDeprecationWarning=警告: 已棄用「%1$S」,請改用「%2$S」
 
 # LOCALIZATION NOTE (nsICookieManagerDeprecated): don't localize originAttributes.
 # %1$S is the deprecated API; %2$S is the interface suffix that the given deprecated API belongs to.
 nsICookieManagerAPIDeprecated=「%1$S」已更新,請修改您的程式碼並傳送正確的 originAttributes。到 MDN 了解更多資訊: https://developer.mozilla.org/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookieManager%2$S
 
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -39,18 +39,16 @@ Fips140SlotDescription=FIPS 140 密碼編譯、金鑰及憑證服務
 InternalToken=軟體安全裝置
 # End of size restriction.
 VerifySSLClient=SSL 客戶端憑證
 VerifySSLServer=SSL 伺服器憑證
 VerifySSLCA=SSL 憑證機構
 VerifyEmailSigner=Email 簽署憑證
 VerifyEmailRecip=Email 接收憑證
 VerifyObjSign=物件簽署者
-VerifyCAVerifier=憑證機構確認者
-VerifyStatusResponder=狀態回應者憑證
 HighGrade=高等級
 MediumGrade=中等級
 # LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
 nick_template=%1$s 的 %2$s ID
 #These are the strings set for the ASN1 objects in a certificate.
 CertDumpCertificate=憑證
 CertDumpVersion=版本
 # LOCALIZATION NOTE (CertDumpVersionValue): %S is a version number (e.g. "3" in "Version 3")
@@ -233,24 +231,16 @@ CertDumpECsect233r1=SECG 橢圓曲線 sect233r1 (又稱 NIST B-233)
 CertDumpECsect239k1=SECG 橢圓曲線 sect239k1
 CertDumpECsect283k1=SECG 橢圓曲線 sect283k1 (又稱 NIST K-283)
 CertDumpECsect283r1=SECG 橢圓曲線 sect283r1 (又稱 NIST B-283)
 CertDumpECsect409k1=SECG 橢圓曲線 sect409k1 (又稱 NIST K-409)
 CertDumpECsect409r1=SECG 橢圓曲線 sect409r1 (又稱 NIST B-409)
 CertDumpECsect571k1=SECG 橢圓曲線 sect571k1 (又稱 NIST K-571)
 CertDumpECsect571r1=SECG 橢圓曲線 sect571r1 (又稱 NIST B-571)
 CertDumpRawBytesHeader=大小: %S Bytes / %S Bits
-VerifySSLClient_p=用戶端
-VerifySSLServer_p=伺服器
-VerifySSLCA_p=SSL CA
-VerifyEmailSigner_p=簽署
-VerifyEmailRecip_p=加密
-VerifyObjSign_p=物件簽署者
-VerifyCAVerifier_p=憑證機構確認者
-VerifyStatusResponder_p=狀態回應者
 PK11BadPassword=輸入的密碼不正確。
 SuccessfulP12Backup=已成功備份您的安全憑證與私密金鑰
 SuccessfulP12Restore=已成功回存您的安全憑證與私密金鑰
 PKCS12DecodeErr=無法解碼檔案。它可能不是 PKCS #12 格式、或檔案損毀,或是您輸入的密碼有誤。
 PKCS12UnknownErrRestore=因為未知的原因而無法回存 PKCS #12 檔案。
 PKCS12UnknownErrBackup=因為未知的原因而無法備份 PKCS #12 檔案。
 PKCS12UnknownErr=PKCS #12 因為不明原因失敗了。
 PKCS12InfoNoSmartcardBackup=無法從像智慧卡等硬體安全裝置中備份憑證資訊。
@@ -297,28 +287,16 @@ CertInfoIssuedFor=簽發給:
 CertInfoIssuedBy=簽發者:
 CertInfoValid=驗證成功
 CertInfoFrom=從
 CertInfoTo=到
 CertInfoPurposes=用途
 CertInfoEmail=電子郵件
 CertInfoStoredIn=存放於:
 P12DefaultNickname=已匯入憑證
-VerifyExpired=<已過期>
-VerifyRevoked=<已廢止>
-VerifyNotTrusted=<未信任>
-VerifyIssuerNotTrusted=<未信任的簽發者>
-VerifyIssuerUnknown=<未知的簽發者>
-VerifyInvalidCA=<憑證機構無效>
-VerifyDisabledAlgorithm=<簽章演算法不安全>
-VerifyUnknown=<未知>
-CertUser=您的憑證
-CertCA=CA(憑證機構)
-CertSSL=SSL 伺服器
-CertEmail=端點 S/MIME
 CertUnknown=未知
 CertNoNickname=(無暱稱)
 CertNoEmailAddress=(無 Email 地址)
 NicknameExpired=(已過期)
 NicknameNotYetValid=(尚未過期)
 CaCertExists=此憑證已安裝為憑證機構。
 NotACACert=這不是憑證機構的憑證,無法匯入到憑證機構清冊。
 NotImportingUnverifiedCert=此憑證無法驗證,所以不能匯入。憑證簽發者來源可能不明或不受信任、已過期或廢止或是未受認可。
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -42,17 +42,17 @@
 
 <!ENTITY certmgr.deletecert.title             "刪除憑證">
 
 <!ENTITY certmgr.certname                     "憑證名稱">
 <!ENTITY certmgr.certserver                   "伺服器">
 <!ENTITY certmgr.override_lifetime            "有效時間">
 <!ENTITY certmgr.tokenname                    "安全裝置">
 <!ENTITY certmgr.begins                       "開始於">
-<!ENTITY certmgr.expires                      "到期日">
+<!ENTITY certmgr.expires                      "過期於">
 <!ENTITY certmgr.email                        "E-Mail 地址">
 <!ENTITY certmgr.serial                       "序號">
 
 <!ENTITY certmgr.close.label                  "關閉">
 <!ENTITY certmgr.close.accesskey              "C">
 <!ENTITY certmgr.view2.label                  "檢視…">
 <!ENTITY certmgr.view2.accesskey              "V">
 <!ENTITY certmgr.edit3.label                  "編輯信任…">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -47,24 +47,61 @@ certNotVerified_CertExpired=無法驗證此憑證,因為憑證已過期。
 certNotVerified_CertNotTrusted=無法驗證此憑證,因為憑證未被信任。
 certNotVerified_IssuerNotTrusted=無法驗證此憑證,因為憑證發行者未被信任。
 certNotVerified_IssuerUnknown=無法驗證此憑證,因為憑證發行者不明。
 certNotVerified_CAInvalid=無法驗證此憑證,因為憑證機構憑證不正確。
 certNotVerified_AlgorithmDisabled=由於簽章所使用的演算法不安全被停用的緣故,無法驗證此憑證。
 certNotVerified_Unknown=無法驗證此憑證,原因不明。
 
 #Client auth
+clientAuthRemember=記住此決定
+# LOCALIZATION NOTE(clientAuthNickAndSerial): Represents a single cert when the
+# user is choosing from a list of certificates.
+# %1$S is the nickname of the cert.
+# %2$S is the serial number of the cert in AA:BB:CC hex format.
+clientAuthNickAndSerial=%1$S [%2$S]
+# LOCALIZATION NOTE(clientAuthHostnameAndPort):
+# %1$S is the hostname of the server.
+# %2$S is the port of the server.
+clientAuthHostnameAndPort=%1$S:%2$S
+# LOCALIZATION NOTE(clientAuthMessage1): %S is the Organization of the server
+# cert.
 clientAuthMessage1=組識:「%S」
+# LOCALIZATION NOTE(clientAuthMessage2): %S is the Organization of the issuer
+# cert of the server cert.
 clientAuthMessage2=簽發者:「%S」
+# LOCALIZATION NOTE(clientAuthIssuedTo): %1$S is the Distinguished Name of the
+# currently selected client cert, such as "CN=John Doe,OU=Example" (without
+# quotes).
+clientAuthIssuedTo=簽發給: %1$S
+# LOCALIZATION NOTE(clientAuthSerial): %1$S is the serial number of the selected
+# cert in AA:BB:CC hex format.
+clientAuthSerial=序號: %1$S
+# LOCALIZATION NOTE(clientAuthValidityPeriod):
+# %1$S is the already localized notBefore date of the selected cert.
+# %2$S is the already localized notAfter date of the selected cert.
+clientAuthValidityPeriod=有效期間: %1$S 至 %2$S
+# LOCALIZATION NOTE(clientAuthKeyUsages): %1$S is a comma separated list of
+# already localized key usages the selected cert is valid for.
+clientAuthKeyUsages=金鑰用途: %1$S
+# LOCALIZATION NOTE(clientAuthEmailAddresses): %1$S is a comma separated list of
+# e-mail addresses the selected cert is valid for.
+clientAuthEmailAddresses=電子郵件地址: %1$S
+# LOCALIZATION NOTE(clientAuthIssuedBy): %1$S is the Distinguished Name of the
+# cert which issued the selected cert.
+clientAuthIssuedBy=簽發者: %1$S
+# LOCALIZATION NOTE(clientAuthStoredOn): %1$S is the name of the PKCS #11 token
+# the selected cert is stored on.
+clientAuthStoredOn=儲存於: %1$S
 
 #Page Info
 pageInfo_NoEncryption=連線未加密
 pageInfo_Privacy_None1=網站 %S 不支援您正在瀏覽的網頁的加密方式。
 pageInfo_Privacy_None2=未加密就送至網路的資訊可能會在傳輸途中被其它人看到。
-pageInfo_Privacy_None3=您正在檢視的頁面未加密。
+pageInfo_Privacy_None4=您正在檢視的頁面傳輸資料到網路前並未加密。
 # LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
 # %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
 # %3$S is protocol version like "SSL 3" or "TLS 1.2"
 pageInfo_EncryptionWithBitsAndProtocol=連線已加密(%1$S、%2$S 位元金鑰、%3$S)
 pageInfo_BrokenEncryption=不安全的加密(%1$S、%2$S 位元金鑰、%3$S)
 pageInfo_Privacy_Encrypted1=您正在瀏覽的網頁在傳送前有經過加密。
 pageInfo_Privacy_Encrypted2=加密功能會讓未授權的使用者很難偷聽兩台電腦間傳輸的資訊,所以此頁面在網路上傳輸時很難會有人看到內容。
--- a/suite/chrome/browser/navigatorOverlay.dtd
+++ b/suite/chrome/browser/navigatorOverlay.dtd
@@ -117,23 +117,31 @@
 <!ENTITY cookieAllowImagesMsg.label "此網站可使用圖片">
 <!ENTITY cookieImagesDefaultCmd.label "使用預設的圖片權限">
 <!ENTITY cookieImagesDefaultCmd.accesskey "U">
 <!ENTITY cookieImagesDefaultMsg.label "此網站的圖片會依預設值來決定下載與否。">
 <!ENTITY cookieBlockImagesCmd.label "禁止此網頁使用圖片">
 <!ENTITY cookieBlockImagesCmd.accesskey "B">
 <!ENTITY cookieBlockImagesMsg.label "此網站不能使用圖片">
 
-<!ENTITY cookieAllowPopupsCmd.label "允許此網站開啟彈出型視窗 (Popup)">
-<!ENTITY cookieAllowPopupsCmd.accesskey "A">
-<!ENTITY cookieManagePopups.label "管理彈出型視窗 (Popup)">
-<!ENTITY cookieManagePopups.accesskey "M">
+<!ENTITY popupsMessageChangeTitle.label "彈出視窗權限已變更">
+<!ENTITY popupAllowCmd.label "允許來自此網站的彈出型視窗">
+<!ENTITY popupAllowCmd.accesskey "A">
+<!ENTITY popupAllowMsg.label "將總是顯示來自此網站的彈出視窗。">
+<!ENTITY popupDefaultCmd.label "使用預設彈出視窗權限">
+<!ENTITY popupDefaultCmd.accesskey "U">
+<!ENTITY popupDefaultMsg.label "將依照預設設定顯示來自此網站的彈出視窗。">
+<!ENTITY popupBlockCmd.label "封鎖此網站的彈出視窗">
+<!ENTITY popupBlockCmd.accesskey "B">
+<!ENTITY popupBlockMsg.label "將不顯示來自此網站的彈出視窗">
+<!ENTITY popupsManage.label "管理彈出型視窗">
+<!ENTITY popupsManage.accesskey "M">
 
 <!ENTITY cookieCookieManager.label "Cookie 管理員">
 <!ENTITY cookieCookieManager.accesskey "C">
 <!ENTITY cookieImageManager.label "圖片管理員">
 <!ENTITY cookieImageManager.accesskey "I">
-<!ENTITY cookiePopupManager.label "彈出型視窗管理員 (Popup)">
-<!ENTITY cookiePopupManager.accesskey "o">
+<!ENTITY popupsManager.label "彈出型視窗管理員">
+<!ENTITY popupsManager.accesskey "o">
 
 <!ENTITY clearPrivateDataCmd.label "清除隱私資料…">
 <!ENTITY clearPrivateDataCmd.accesskey "e">
 
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/console/console.dtd
@@ -0,0 +1,38 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY errorConsole.title "錯誤主控台">
+
+<!ENTITY errFile.label   "原始檔:">
+<!ENTITY errLine.label   "行號:">
+<!ENTITY errColumn.label "欄數:">
+
+<!ENTITY all.label          "全部">
+<!ENTITY all.accesskey      "A">
+<!ENTITY errors.label       "錯誤">
+<!ENTITY errors.accesskey   "E">
+<!ENTITY warnings.label     "警告">
+<!ENTITY warnings.accesskey "W">
+<!ENTITY messages.label     "訊息">
+<!ENTITY messages.accesskey "M">
+<!ENTITY clear.label        "清除">
+<!ENTITY clear.accesskey    "C">
+<!ENTITY codeEval.label     "程式碼:">
+<!ENTITY codeEval.accesskey "o">
+<!ENTITY evaluate.label     "執行">
+<!ENTITY evaluate.accesskey "v">
+<!ENTITY filter2.label      "篩選:">
+<!ENTITY filter2.accesskey  "F">
+
+<!ENTITY copyCmd.label       "複製">
+<!ENTITY copyCmd.accesskey   "C">
+<!ENTITY copyCmd.commandkey  "C">
+<!ENTITY sortFirst.label     "排序順序: 先 > 後">
+<!ENTITY sortFirst.accesskey "f">
+<!ENTITY sortLast.label      "排序順序: 後 > 先">
+<!ENTITY sortLast.accesskey  "l">
+<!ENTITY closeCmd.commandkey "w">
+<!ENTITY focus1.commandkey   "l">
+<!ENTITY focus2.commandkey   "d">
+
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/console/console.properties
@@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+typeError=錯誤:
+typeWarning=警告:
+typeMessage=訊息:
+errFile=原始檔: %S
+errLine=行: %S
+errLineCol=第 %S 行,第 %S 欄
+errCode=原始碼:
+errTime=時間戳記: %S
+
+# LOCALIZATION NOTE (evaluationContextChanged): The message displayed when the
+# browser console's evaluation context (window against which input is evaluated)
+# changes.
+evaluationContextChanged=主控台的評估環境已變更,可能是因為目標視窗已關閉,或您自瀏覽器的主控台開啟了主視窗。
+
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/helpviewer/help.dtd
@@ -0,0 +1,57 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY printCmd.commandkey            "p">
+
+<!ENTITY findOnCmd.commandkey           "F">
+<!ENTITY findAgainCmd.commandkey        "G">
+<!ENTITY findAgainCmd.commandkey2       "VK_F3">
+
+<!ENTITY backButton.label               "上一頁">
+<!ENTITY backButton.accesskey           "B">
+<!ENTITY backButton.tooltip             "回到上一頁">
+<!ENTITY forwardButton.label            "下一頁">
+<!ENTITY forwardButton.accesskey        "F">
+<!ENTITY forwardButton.tooltip          "前進下一頁">
+<!ENTITY copyCmd.label                  "複製">
+<!ENTITY copyCmd.accesskey              "C">
+<!ENTITY selectAllCmd.label             "全選">
+<!ENTITY selectAllCmd.accesskey         "A">
+<!ENTITY goBackCmd.commandkey           "[">
+<!ENTITY goForwardCmd.commandkey        "]">
+<!ENTITY homeButton.label               "首頁">
+<!ENTITY homeButton.tooltip             "跳回說明開始頁">
+<!ENTITY printButton.label              "列印">
+<!ENTITY printButton.tooltip            "列印此頁">
+<!ENTITY closeWindow.commandkey         "W">
+
+<!ENTITY search.emptytext               "搜尋">
+<!ENTITY searchHeader.label             "搜尋結果">
+<!ENTITY toctab.label                   "目錄">
+<!ENTITY toctab.accesskey               "C">
+
+<!-- LOCALIZATION NOTE :
+fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
+fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
+If shift key is needed with your locale popular keyboard for them,
+you can use these alternative items. Otherwise, their values should be empty.  -->
+
+<!ENTITY fullZoomReduceCmd.commandkey   "-">
+<!ENTITY fullZoomReduceCmd.commandkey2  "">
+<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
+<!ENTITY fullZoomResetCmd.commandkey    "0">
+<!ENTITY fullZoomResetCmd.commandkey2   "">
+
+<!ENTITY helpSearch.commandkey          "k">
+
+<!ENTITY zLevel.label                   "顯示於最上層">
+<!ENTITY zLevel.accesskey               "T">
+
+<!ENTITY fullZoomReduceBtn.label        "縮小">
+<!ENTITY fullZoomReduceBtn.accesskey    "O">
+<!ENTITY fullZoomEnlargeBtn.label       "放大">
+<!ENTITY fullZoomEnlargeBtn.accesskey   "I">
+
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/helpviewer/help.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+emptySearchText=找不到搜尋的項目。
+
--- a/suite/chrome/common/pref/pref-http.dtd
+++ b/suite/chrome/common/pref/pref-http.dtd
@@ -16,9 +16,12 @@
 <!ENTITY prefEnablePipelining.label          "使用 Pipelining">
 <!ENTITY prefEnablePipelining.accesskey      "P">
 <!ENTITY prefEnablePipeliningProxy.accesskey "N">
 <!ENTITY prefPara                            "可經由這些選項來微調 HTTP 連線的效能或相容性。像有些 Proxy 代理伺服器就需要使用 HTTP/1.0。(請看版本資訊以獲得進一步資訊)">
 <!ENTITY prefPipeWarning                     "警告: pipelining 是實驗中的功能,可用來增進網頁載入的性能,不過有些網頁伺服器或 Proxy 不支援此功能。">
 <!ENTITY prefUseragent.label                 "使用者代理字串">
 <!ENTITY prefFirefoxCompat.label             "宣告 Firefox 相容性">
 <!ENTITY prefFirefoxCompat.accesskey         "F">
+<!ENTITY prefLightningShow.label             "通知已安裝 Lightning">
+<!ENTITY prefLightningShow.accesskey         "L">
+<!ENTITY prefCompatWarning                   "警告: 關閉這些設定可能會造成網站或服務無法正常使用。">
 
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -144,15 +144,15 @@
 <!ENTITY customizeToolbar.useSmallIcons.accesskey "s">
 <!ENTITY customizeToolbar.labelAlignEnd.label     "在圖示旁顯示說明文字">
 <!ENTITY customizeToolbar.labelAlignEnd.accesskey "b">
 <!ENTITY customizeToolbar.useDefault.label        "使用預設設定值">
 <!ENTITY customizeToolbar.useDefault.accesskey    "U">
 
 <!-- Popup Blocked notification menu -->
 <!ENTITY allowPopups.accesskey        "p">
-<!ENTITY showPopupManager.label       "管理彈出型視窗 (Popup)">
+<!ENTITY showPopupManager.label       "管理彈出型視窗">
 <!ENTITY showPopupManager.accesskey   "M">
 <!ENTITY dontShowMessage.label        "在彈出型視窗被封鎖時不要顯示此訊息">
 <!ENTITY dontShowMessage.accesskey    "D">
 
 <!ENTITY syncToolbarButton.label "同步">
 
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -4,17 +4,17 @@
 
 <!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
 <!ENTITY msgComposeWindow.title "新信件:(未命名)">
 
 <!ENTITY fromAddr.label "寄件者:">
 <!ENTITY fromAddr.accesskey "r">
 <!ENTITY subject.label  "主旨:">
 <!ENTITY subject.accesskey "S">
-<!ENTITY attachments.label "附加檔案:">
+<!ENTITY attachments.label "附件:">
 <!ENTITY attachments.accesskey "c">
 
 <!-- menu items:  the . means that the menu item isn't implemented yet -->
 
 <!-- File menu items -->
 <!ENTITY saveCmd.label "儲存">
 <!ENTITY saveCmd.accesskey "S">
 <!ENTITY saveAsCmd.label "另存新檔">
--- a/suite/chrome/mailnews/importDialog.dtd
+++ b/suite/chrome/mailnews/importDialog.dtd
@@ -25,16 +25,17 @@
 <!ENTITY importDescription1.label "此精靈可以從其它程式匯入郵件訊息、通訊錄項目、消息來源訂閱、偏好設定,以及篩選條件到 &brandShortName;。">
 <!ENTITY importDescription2.label "匯入成功後,您就能從 &brandShortName; 裡面存取之前的郵件或通訊錄等設定。">
 
 <!ENTITY selectDescription.label  "請選擇您想匯入的程式資料類型:">
 <!ENTITY selectDescriptionB.label "請選擇現有帳號或建立新帳號:">
 <!ENTITY selectDescription.accesskey "P">
 <!ENTITY acctName.label           "名稱:">
 <!ENTITY acctName.accesskey       "N">
+<!ENTITY noModulesFound.label     "找不到可匯入資料的應用程式或檔案。">
 
 <!ENTITY back.label               "&lt; 上一步">
 <!ENTITY forward.label            "下一步 &gt;">
 <!ENTITY finish.label             "結束">
 <!ENTITY cancel.label             "取消">
 
 <!ENTITY select.label             "選擇要匯入的資料類型:">
 
--- a/suite/chrome/mailnews/msgHdrViewOverlay.dtd
+++ b/suite/chrome/mailnews/msgHdrViewOverlay.dtd
@@ -21,17 +21,17 @@
 <!ENTITY referencesField.label "參考資料: ">
 <!ENTITY messageIdField.label "郵件 ID: ">
 <!ENTITY inReplyToField.label "回覆給: ">
 <!ENTITY originalWebsite.label "網站: ">
 
 <!ENTITY editMessage.label                 "編輯草稿…">
 <!ENTITY editMessage.accesskey             "d">
 
-<!ENTITY attachmentsTree.label             "附加檔案:">
+<!ENTITY attachmentsTree.label             "附件:">
 <!ENTITY attachmentsTree.accesskey         "c">
 <!ENTITY openAttachmentCmd.label           "開啟">
 <!ENTITY openAttachmentCmd.accesskey       "O">
 <!ENTITY viewAttachmentCmd.label           "檢視原始碼">
 <!ENTITY viewAttachmentCmd.accesskey       "V">
 <!ENTITY saveAsAttachmentCmd.label         "另存新檔…">
 <!ENTITY saveAsAttachmentCmd.accesskey     "a">
 <!ENTITY detachAttachmentCmd.label         "取出…">
--- a/suite/chrome/mailnews/pref/pref-composing_messages.dtd
+++ b/suite/chrome/mailnews/pref/pref-composing_messages.dtd
@@ -28,16 +28,21 @@
 <!ENTITY font.label                           "字型:">
 <!ENTITY font.accesskey                       "F">
 <!ENTITY size.label                           "大小:">
 <!ENTITY size.accesskey                       "S">
 <!ENTITY fontColor.label                      "文字:">
 <!ENTITY fontColor.accesskey                  "T">
 <!ENTITY bgColor.label                        "背景:">
 <!ENTITY bgColor.accesskey                    "B">
+<!ENTITY defaultCompose.label                 "預設合成格式:">
+<!ENTITY defaultBodyText.label                "內容文字(Enter 鍵換新行)">
+<!ENTITY defaultBodyText.accesskey            "o">
+<!ENTITY defaultParagraph.label               "段落(Enter 鍵產生新段落)">
+<!ENTITY defaultParagraph.accesskey           "P">
 
 <!ENTITY selectHeaderType.label               "選擇回覆時的引文開頭類型:">
 <!ENTITY selectHeaderType.accesskey           "e">
 <!ENTITY noReplyOption.label                  "沒有回應檔頭">
 <!-- LOCALIZATION NOTE (authorWroteOption.label): this is tied to the
   mailnews.reply_header_authorwrotesingle preference. [Author] needs to be
   translated. -->
 <!ENTITY authorWroteOption.label              "[作者] 寫道:">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -45,37 +45,39 @@ tryNewerDriver = 因為您的顯示卡驅動程式版本過舊,已封鎖此功能。請試著更新您的顯示卡驅動程式到 %S 或更新版本。
 blockedGfxCard = 因為未解決的顯示卡驅動程式問題,已封鎖此功能。
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
 blockedOSVersion = 因為您的作業系統版本過舊,已封鎖此功能。
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
 blockedMismatchedVersion = 因為您的系統登錄檔與顯示卡驅動程式 DLL 檔案的版本不符,已封鎖此功能。
 
-# LOCALIZATION NOTE In the following strings, "Direct2D", "DirectWrite" and "ClearType" 
-# are proper nouns and should not be translated. Feel free to leave english strings if 
+# LOCALIZATION NOTE In the following strings, "Direct2D", "DirectWrite" and "ClearType"
+# are proper nouns and should not be translated. Feel free to leave english strings if
 # there are no good translations, these are only used in about:support
 clearTypeParameters = ClearType 參數
 
 compositing = 合成
 hardwareH264 = H264 硬體解碼
+audioBackend = 音效後端
 mainThreadNoOMTC = 主執行緒,無 OMTC
 yes = 是
 no = 否
 
 gpuDescription = 顯示卡名稱
 gpuVendorID = 銷售商 ID (Vendor ID)
 gpuDeviceID = 裝置 ID (Device ID)
 gpuSubsysID = Subsys ID
 gpuDrivers = 顯示卡驅動程式
 gpuRAM = 顯示卡記憶體大小
 gpuDriverVersion = 驅動程式版本
 gpuDriverDate = 驅動程式日期
 gpuActive = 啟用
 webglRenderer = WebGL Renderer
+webgl2Renderer = WebGL2 Renderer
 GPU1 = GPU #1
 GPU2 = GPU #2
 blocklistedBug = 因為有已知問題被封鎖
 # LOCALIZATION NOTE %1$S will be replaced with a bug number string.
 bugLink = bug %1$S
 # LOCALIZATION NOTE %1$S will be replaced with an arbitrary identifier
 # string that can be searched on DXR/MXR or grepped in the source tree.
 unknownFailure = 已封鎖,錯誤代碼 %1$S
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -47,16 +47,18 @@
 <!ENTITY aboutTelemetry.telemetryLogSection "Telemetry 紀錄">
 
 <!ENTITY aboutTelemetry.slowSqlSection "慢速的 SQL 陳述句">
 
 <!ENTITY aboutTelemetry.chromeHangsSection "瀏覽器停滯">
 
 <!ENTITY aboutTelemetry.threadHangStatsSection "執行緒遲滯">
 
+<!ENTITY aboutTelemetry.scalarsSection "Scalars">
+
 <!ENTITY aboutTelemetry.histogramsSection "柱狀圖">
 
 <!ENTITY aboutTelemetry.keyedHistogramsSection "Keyed Histograms">
 
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "簡易測量">
 
 <!ENTITY aboutTelemetry.addonDetailsSection "附加元件詳情">
 
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -59,16 +59,18 @@ histogramSamples = 取樣數
 histogramAverage = 平均
 
 histogramSum = 總數
 
 histogramCopy = 複製
 
 keysHeader = 屬性
 
+namesHeader = 名稱
+
 valuesHeader = 值
 
 addonTableID = 附加元件 ID
 
 addonTableDetails = 詳細資訊
 
 # Note to translators:
 # - The %1$S will be replaced with the name of an Add-on Provider (e.g. "XPI", "Plugin")
--- a/toolkit/chrome/global/commonDialogs.properties
+++ b/toolkit/chrome/global/commonDialogs.properties
@@ -15,18 +15,19 @@ Yes=是(&Y)
 No=否(&N)
 Save=儲存(&S)
 Revert=反向選擇(&R)
 DontSave=不儲存 (&n)
 ScriptDlgGenericHeading=[JavaScript 應用程式]
 ScriptDlgHeading=此頁於 %S 說:
 ScriptDialogLabel=避免此頁面產生更多對話框
 ScriptDialogPreventTitle=確認對話框偏好設定
-# LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy):
+# LOCALIZATION NOTE (EnterLoginForRealm2, EnterLoginForProxy2):
 # %1 is an untrusted string provided by a remote server. It could try to
 # take advantage of sentence structure in order to mislead the user (see
 # bug 244273). %1 should be integrated into the translated sentences as
 # little as possible. %2 is the url of the site being accessed.
-EnterLoginForRealm=%2$S 要求輸入帳號及密碼,該網站說: "%1$S"
-EnterLoginForProxy=Proxy %2$S 要求輸入帳號及密碼,該 Proxy 說: "%1$S"
-EnterUserPasswordFor=請輸入「%1$S」使用的帳號與密碼
+EnterLoginForRealm2=%2$S 要求您輸入帳號與密碼。\n\n網站說:「%1$S」
+EnterLoginForProxy2=代理伺服器 %2$S 要求您輸入帳號與密碼。\n\n網站說:「%1$S」
+EnterUserPasswordFor2=%1$S 要求您輸入帳號與密碼。
+EnterUserPasswordForCrossOrigin=%1$S 要求您輸入帳號與密碼。\n\n警告: 您的密碼不會送到您目前正在瀏覽的網站!
 EnterPasswordFor=請輸入「%1$S」在 %2$S 使用的密碼
 
--- a/toolkit/chrome/global/findbar.dtd
+++ b/toolkit/chrome/global/findbar.dtd
@@ -9,9 +9,12 @@
 <!ENTITY previous.tooltip "尋找文字前次出現的位置">
 <!ENTITY findCloseButton.tooltip "關閉尋找列">
 <!ENTITY highlightAll.label "強調全部">
 <!ENTITY highlightAll.accesskey "a">
 <!ENTITY highlightAll.tooltiptext "強調出全部字串出現的位置">
 <!ENTITY caseSensitive.label "符合大小寫">
 <!ENTITY caseSensitive.accesskey "c">
 <!ENTITY caseSensitive.tooltiptext "搜尋時將大小寫視為不同">
+<!ENTITY entireWord.label "整個文字">
+<!ENTITY entireWord.accesskey "w">
+<!ENTITY entireWord.tooltiptext "僅搜尋整個文字">
 
--- a/toolkit/chrome/global/findbar.properties
+++ b/toolkit/chrome/global/findbar.properties
@@ -5,16 +5,17 @@
 # strings used by the Find bar, split from browser.properties
 NotFound=找不到指定文字
 WrappedToTop=已達頁尾,從頁首重新搜尋
 WrappedToBottom=已達頁首,從頁尾重新搜尋
 NormalFind=在頁面中搜尋
 FastFind=快速尋找
 FastFindLinks=快速尋找 (僅鏈結)
 CaseSensitive=(區分大小寫)
+EntireWord=(僅整個字)
 # LOCALIZATION NOTE (FoundMatches): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is currently selected match and #2 the total amount of matches.
 FoundMatches=第 #1 筆符合,共符合 #2 筆
 # LOCALIZATION NOTE (FoundMatchesCountLimit): Semicolon-separated list of plural
 # forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the total amount of matches allowed before counting stops.
--- a/toolkit/chrome/global/videocontrols.dtd
+++ b/toolkit/chrome/global/videocontrols.dtd
@@ -4,16 +4,17 @@
 
 <!ENTITY playButton.playLabel "播放">
 <!ENTITY playButton.pauseLabel "暫停">
 <!ENTITY muteButton.muteLabel "靜音">
 <!ENTITY muteButton.unmuteLabel "取消靜音">
 <!ENTITY fullscreenButton.enterfullscreenlabel "全螢幕">
 <!ENTITY fullscreenButton.exitfullscreenlabel "離開全螢幕模式">
 <!ENTITY castingButton.castingLabel "投放至裝置">
+<!ENTITY closedCaption.off "關閉">
 
 <!ENTITY stats.media "媒體">
 <!ENTITY stats.size "大小">
 <!ENTITY stats.activity "狀態">
 <!ENTITY stats.activityPaused "已暫停">
 <!ENTITY stats.activityPlaying "播放中">
 <!ENTITY stats.activityEnded "已結束">
 <!ENTITY stats.activitySeeking "(搜尋中)">
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -32,20 +32,16 @@
 <!ENTITY warning.safemode.label                    "所有附加元件於安全模式中都已停用。">
 <!ENTITY warning.checkcompatibility.label          "已停止檢查附加元件相容性,您可能有不相容的附加元件。">
 <!ENTITY warning.checkcompatibility.enable.label   "啟用">
 <!ENTITY warning.checkcompatibility.enable.tooltip "啟用附加元件相容性檢查">
 <!ENTITY warning.updatesecurity.label              "已停止檢查附加元件安全性,更新程式可能不安全。">
 <!ENTITY warning.updatesecurity.enable.label       "啟用">
 <!ENTITY warning.updatesecurity.enable.tooltip     "啟用附加元件更新安全檢查">
 
-<!-- global informations -->
-<!ENTITY info.plugincheck.label                 "檢查您是否使用最新版本的外掛程式">
-<!ENTITY info.plugincheck.tooltip               "檢查您是否使用最新版本的外掛程式">
-
 <!-- categories / views -->
 <!ENTITY view.search.label                    "搜尋">
 <!ENTITY view.discover.label                  "取得元件">
 <!ENTITY view.recentUpdates.label             "最近的更新">
 <!ENTITY view.availableUpdates.label          "可用的更新">
 
 <!-- addon updates -->
 <!ENTITY updates.checkForUpdates.label        "檢查更新">
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -1,20 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY  updateWizard.title              "軟體更新">
 
 <!ENTITY  checking.title                  "正在檢查是否有更新檔">
 <!ENTITY  updateCheck.label               "正在尋找更新版的 &brandShortName;…">
 
-<!ENTITY  pluginupdatesfound.title        "找到外掛程式更新">
-<!ENTITY  pluginupdatesfound.label        "找到外掛程式的更新版本。">
-<!ENTITY  pluginupdateslink.label         "了解如何升級您使用的外掛程式。">
-
 <!ENTITY  noupdatesfound.title            "無任何更新">
 <!ENTITY  noupdatesautoenabled.intro      "目前沒有新的更新檔。 &brandShortName; 會定期檢查是否有更新。">
 <!ENTITY  noupdatesautodisabled.intro     "目前沒有新的更新檔。請在稍後再檢查或是啟用 &brandShortName; 的自動檢查更新功能。">
 
 <!ENTITY  manualUpdate.title              "無法更新">
 <!ENTITY  manualUpdate.desc               "找到一個新的安全與穩定性更新,但您沒有安裝更新所需的系統權限。請聯絡您的系統管理員,或是從具有安裝軟體權限的系統帳號再試一次。">
 <!ENTITY  manualUpdate.space.desc         "已有可用的安全性和穩定性更新,但
                                            您沒有足夠的空間可安裝。">