Update strings for 33
authorPeter Pin-Guang Chen <petercpg@mail.moztw.org>
Wed, 23 Jul 2014 14:06:24 +0800
changeset 1048 5402ed555331ac8a6e61038380cbe94a274d91f4
parent 1047 c5333e78fa1dbee330a20ec1a1857ff6a3bd753d
child 1049 11eea76784813ff5c1e9d1b905bec6f27b7cbfe6
push id619
push userpetercpg@mail.moztw.org
push dateWed, 23 Jul 2014 06:31:11 +0000
Update strings for 33
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/app-manager.properties
browser/chrome/browser/devtools/canvasdebugger.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/projecteditor.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/shadereditor.properties
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webaudioeditor.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/translation.dtd
browser/chrome/browser/webrtcIndicator.properties
calendar/chrome/lightning/lightning.dtd
chat/xmpp.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
dom/chrome/plugins.properties
mail/chrome/messenger/chat.properties
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/privacy.dtd
mail/chrome/messenger/sanitize.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/browser.properties
mobile/profile/bookmarks.inc
security/manager/chrome/pippki/pippki.dtd
suite/chrome/browser/webDeveloper.dtd
suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
suite/chrome/common/notification.dtd
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-advanced.dtd
suite/chrome/common/pref/pref-history.dtd
suite/chrome/common/pref/pref-offlineapps.dtd
suite/chrome/common/pref/pref-security.dtd
suite/chrome/common/pref/prefutilities.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/compose/composeMsgs.properties
toolkit/chrome/formautofill/requestAutocomplete.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/devtools/csscoverage.dtd
toolkit/chrome/global/devtools/csscoverage.properties
toolkit/chrome/global/devtools/styleinspector.properties
toolkit/chrome/global/webapps.properties
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/preferences/ocsp.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -77,16 +77,23 @@ when there are no windows but Firefox is
 
 <!ENTITY menubarCmd.label "選單列">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "瀏覽工具列">
 <!ENTITY personalbarCmd.label "書籤工具列">
 <!ENTITY personalbarCmd.accesskey "B">
 <!ENTITY bookmarksToolbarItem.label "書籤工具列項目">
 
+<!ENTITY toolbarContextMenu.reloadAllTabs.label "重新載入所有分頁">
+<!ENTITY toolbarContextMenu.reloadAllTabs.accesskey "A">
+<!ENTITY toolbarContextMenu.bookmarkAllTabs.label "將所有分頁加入書籤…">
+<!ENTITY toolbarContextMenu.bookmarkAllTabs.accesskey "T">
+<!ENTITY toolbarContextMenu.undoCloseTab.label "復原已關閉分頁">
+<!ENTITY toolbarContextMenu.undoCloseTab.accesskey "U">
+
 <!ENTITY pageSourceCmd.label "頁面原始碼">
 <!ENTITY pageSourceCmd.accesskey "o">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "頁面資訊">
 <!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY pageInfoCmd.commandkey "i">
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
 These should match what Safari and other Apple applications use on OS X Lion. -->
@@ -254,16 +261,18 @@ These should match what Safari and other
 <!ENTITY browserToolboxMenu.label     "瀏覽器工具箱">
 <!ENTITY browserToolboxMenu.accesskey "e">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "關閉開發者工具列">
 <!ENTITY devToolbarMenu.label              "開發者工具列">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devAppMgrMenu.label               "應用程式管理員">
 <!ENTITY devAppMgrMenu.accesskey           "a">
+<!ENTITY webide.label                      "WebIDE">
+<!ENTITY webide.accesskey                  "W">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "網頁工具箱">
 <!ENTITY devToolboxMenuItem.accesskey      "T">
 <!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "切換開發者工具">
 <!ENTITY devToolbarOtherToolsButton.label  "其他工具">
@@ -695,22 +704,27 @@ just addresses the organization to follo
 
 <!ENTITY social.markpageMenu.accesskey "P">
 <!ENTITY social.markpageMenu.label "另存頁面至…">
 <!ENTITY social.marklinkMenu.accesskey "L">
 <!ENTITY social.marklinkMenu.label "另存鏈結至…">
 
 <!ENTITY getUserMedia.selectCamera.label "要分享的攝影機:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
+<!ENTITY getUserMedia.selectWindowOrScreen.label "要分享的視窗或畫面:">
+<!ENTITY getUserMedia.selectWindowOrScreen.accesskey "W">
 <!ENTITY getUserMedia.selectMicrophone.label "要分享的麥克風:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
+<!ENTITY getUserMedia.allWindowsShared.message "將分享您畫面上所有可見的視窗。">
 
 <!ENTITY webrtcIndicatorButton.label "存取攝影機 / 麥克風">
 <!ENTITY webrtcIndicatorButton.tooltip "顯示您目前正分享攝影機或麥克風給哪些網站">
 
+<!ENTITY loopCallButton.tooltip "邀請某人加入通話">
+
 <!ENTITY mixedContentBlocked.moreinfo "大部分的網站在此內容被封鎖時還是能正常使用。">
 
 <!ENTITY pointerLock.notification.message "隨時按下 ESC 以再次顯示游標。">
 
 <!ENTITY pluginNotification.showAll.label "全部顯示">
 <!ENTITY pluginNotification.showAll.accesskey "S">
 
 <!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -107,16 +107,27 @@ installPlugin.ignoreButton.accesskey=N
 
 crashedpluginsMessage.title=%S 外掛程式發生錯誤,已經關閉。
 crashedpluginsMessage.reloadButton.label=重新載入網頁
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=送出一份錯誤報告
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=更多資訊…
 
+# Keyword fixup messages
+# LOCALIZATION NOTE (keywordURIFixup.message): Used when the user tries to visit
+# a local host page, by the time the DNS request recognizes it, we have already
+# loaded a search page for the given word.  An infobar then asks to the user
+# whether he rather wanted to visit the host.  %S is the recognized host.
+keywordURIFixup.message=您是不是要去 %S?
+keywordURIFixup.goTo=是,請帶我到 %S
+keywordURIFixup.goTo.accesskey=Y
+keywordURIFixup.dismiss=不,謝了
+keywordURIFixup.dismiss.accesskey=N
+
 ## Plugin doorhanger strings
 # LOCALIZATION NOTE (pluginActivateNew.message): Used for newly-installed
 # plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
 # is the site domain.
 pluginActivateNew.message=允許 %2$S 執行「%1$S」?
 pluginActivateMultiple.message=允許 %S 執行外掛程式?
 pluginActivate.learnMore=更多資訊…
 # LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
@@ -287,18 +298,16 @@ identity.identified.state_and_country=%S
 
 identity.encrypted2=與此網站的連線是安全的。
 identity.mixed_display_loaded=因為頁面中包含了未加密的元素(例如圖片),與此網站的連線不完全安全。
 identity.mixed_active_loaded2=此網站包含了未加密的互動式內容(例如指令碼)。其他人可以檢視您的資訊或修改網站的行為。
 identity.unencrypted=您與此網站的連線並未加密。
 
 identity.unknown.tooltip=此網站沒有提供身分識別資訊。
 
-identity.ownerUnknown2=(未知)
-
 # LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
 identity.chrome=這是安全的 %S 頁面。
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=此頁已加入書籤
 editBookmarkPanel.pageBookmarkedDescription=%S 會永遠記住此網頁。
 editBookmarkPanel.bookmarkedRemovedTitle=書籤已移除
 editBookmarkPanel.editBookmarkTitle=編輯此書籤
@@ -481,37 +490,49 @@ identity.newIdentity.description = 請輸入您的電子郵件地址以登入至 %S
 identity.next.label = 下一步
 identity.next.accessKey = n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description = 已登入為: %S
 identity.loggedIn.signOut.label = 登出
 identity.loggedIn.signOut.accessKey = O
 
-# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message,
+#                    getUserMedia.shareScreen.message, getUserMedia.shareCameraAndMicrophone.message,
+#                    getUserMedia.shareScreenAndMicrophone.message):
+#  %S is the website origin (e.g. www.mozilla.org)
+getUserMedia.shareCamera.message = 您想要與 %S 分享您的攝影機嗎?
+getUserMedia.shareMicrophone.message = 您想要與 %S 分享您的麥克風嗎?
+getUserMedia.shareScreen.message = 您想與 %S 分享您的畫面嗎?
+getUserMedia.shareCameraAndMicrophone.message = 您想要與 %S 分享您的攝影機和麥克風嗎?
+getUserMedia.shareScreenAndMicrophone.message = 您想與 %S 分享您的麥克風或畫面嗎?
+getUserMedia.noVideo.label = 沒有視訊
+getUserMedia.noWindowOrScreen.label = 不分享視窗或畫面
+getUserMedia.noAudio.label = 沒有音訊
+getUserMedia.shareEntireScreen.label = 整個畫面
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
-getUserMedia.shareCamera.message = 您想要與 %S 分享您的攝影機嗎?
-getUserMedia.shareMicrophone.message = 您想要與 %S 分享您的麥克風嗎?
-getUserMedia.shareCameraAndMicrophone.message = 您想要與 %S 分享您的攝影機和麥克風嗎?
-getUserMedia.noVideo.label = 沒有視訊
-getUserMedia.noAudio.label = 沒有音訊
 getUserMedia.shareSelectedDevices.label = 分享選擇的裝置
 getUserMedia.shareSelectedDevices.accesskey = S
+getUserMedia.shareScreen.label = 分享畫面
+getUserMedia.shareWindow.label = 分享選擇的視窗
+getUserMedia.shareSelectedItems.label = 分享選擇的項目
 getUserMedia.always.label = 每次都透露
 getUserMedia.always.accesskey = A
 getUserMedia.denyRequest.label = 不要透露
 getUserMedia.denyRequest.accesskey = D
 getUserMedia.never.label = 永不透露
 getUserMedia.never.accesskey = N
 getUserMedia.sharingCamera.message2 = 您目前正在與這個頁面分享攝影機。
 getUserMedia.sharingMicrophone.message2 = 您目前正在與這個頁面分享麥克風。
 getUserMedia.sharingCameraAndMicrophone.message2 = 您目前正在與這個頁面分享麥克風與攝影機。
+getUserMedia.sharingScreen.message = 您正與此頁面分享您的畫面。
+getUserMedia.sharingWindow.message = 您正與此頁面分享某個視窗。
 getUserMedia.continueSharing.label = 繼續分享
 getUserMedia.continueSharing.accesskey = C
 getUserMedia.stopSharing.label = 停止分享
 getUserMedia.stopSharing.accesskey = S
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message = %S 封鎖了不安全的內容。
--- a/browser/chrome/browser/devtools/app-manager.properties
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -24,17 +24,17 @@ validator.noAccessManifestURL=無法讀取位於 %2$S 的安裝資訊檔: %1$S
 # LOCALIZATION NOTE (validator.invalidHostedManifestURL): %1$S is the URI of
 # the manifest, %2$S is the error message.
 validator.invalidHostedManifestURL=架設應用程式資訊網址「%1$S」無效: %2$S
 validator.invalidProjectType=未知的專案類型「%S」
 # LOCALIZATION NOTE (validator.missNameManifestProperty, validator.missIconsManifestProperty):
 # don't translate 'icons' and 'name'.
 validator.missNameManifestProperty=安裝資訊檔中缺少必要的「name」資訊。
 validator.missIconsManifestProperty=安裝資訊檔中缺少「icons」。
-validator.missIconMarketplace=要送交至 Marketplace 的應用程式至少要有一個 128px 的圖示
+validator.missIconMarketplace2=要送出到 Marketplace 的應用程式必須要有 128px 大小的圖示
 validator.invalidAppType=未知的應用程式類型:「%S」
 validator.invalidHostedPriviledges=架設的應用程式類型不得為「%S」。
 validator.noCertifiedSupport=應用程式管理員無法完整支援「已驗證」的應用程式。
 validator.nonAbsoluteLaunchPath=執行路徑必須是以「/」開頭的絕對路徑:「%S」
 validator.accessFailedLaunchPath=無法存取應用程式的啟動文件「%S」
 # LOCALIZATION NOTE (validator.accessFailedLaunchPathBadHttpCode): %1$S is the URI of
 # the launch document, %2$S is the http error code.
 validator.accessFailedLaunchPathBadHttpCode=無法存取應用程式的啟動文件「%1$S」,收到 HTTP 錯誤代碼 %2$S
--- a/browser/chrome/browser/devtools/canvasdebugger.properties
+++ b/browser/chrome/browser/devtools/canvasdebugger.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
 # This string is displayed in the title of the tab when the Shader Editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxCanvasDebugger.label=Canvas
 
+# LOCALIZATION NOTE (ToolboxCanvasDebugger.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxCanvasDebugger.panelLabel=Canvas 面板
+
 # LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
 # This string is displayed in the tooltip of the tab when the Shader Editor is
 # displayed inside the developer tools window.
 ToolboxCanvasDebugger.tooltip=用來檢測與除錯 <canvas> 內容的工具
 
 # LOCALIZATION NOTE (noSnapshotsText): The text to display in the snapshots menu
 # when there are no recorded snapshots yet.
 noSnapshotsText=目前沒有快照。
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -90,16 +90,22 @@
 <!ENTITY debuggerUI.showOnlyEnum.accesskey "P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
   -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
 <!ENTITY debuggerUI.showOriginalSource           "顯示原始碼">
 <!ENTITY debuggerUI.showOriginalSource.accesskey "O">
 
+<!-- LOCALIZATION NOTE (debuggerUI.autoBlackBox): This is the label for
+  -  the checkbox that toggles whether sources that we suspect are minified are
+  -  automatically black boxed or not. -->
+<!ENTITY debuggerUI.autoBlackBox           "自動將最小化過的原始碼放入黑盒子">
+<!ENTITY debuggerUI.autoBlackBox.accesskey "B">
+
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
   -  appears in the filter panel popup as a header for the operators part. -->
 <!ENTITY debuggerUI.searchPanelOperators    "運算子:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 <!ENTITY debuggerUI.searchFile           "過濾指令碼">
 <!ENTITY debuggerUI.searchFile.key       "P">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxDebugger.label):
 # 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
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -163,25 +163,29 @@ helpListNone=沒有指令以「%1$S」為首
 # LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
 # the 'help x' command wants to show the manual for the 'x' command, it needs
 # to be able to describe the parameters as either required or optional, or if
 # they have a default value.
 helpManRequired=必要的
 helpManOptional=非必要
 helpManDefault=非必填。預設值為 %1$S
 
-# LOCALIZATION NOTE (helpIntro): This forms part of the output from the 'help'
-# command. 'GCLI' is a project name and should be left untranslated.
+# LOCALIZATION NOTE: This forms part of the output from the 'help' command.
+# 'GCLI' is a project name and should be left untranslated.
 helpIntro=GCLI 是一套為網頁開發者提供好用的命令列的實驗功能。
 
 # LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
 # when the command in question has sub-commands, before a list of the matching
 # sub-commands.
 subCommands=子命令
 
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# cannot find a match for the parse types.
+commandParseError=命令列剖析錯誤
+
 # LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
 # strings are used to describe the 'context' command and its 'prefix'
 # parameter. See localization comment for 'connect' for an explanation about
 # 'prefix'.
 contextDesc=特別使用某組指令
 contextManual=為之後輸入的指令設定預設前綴字元。例如「context git」指令可讓您輸入「commit」就好,不需輸入「git commit」。
 contextPrefixDesc=命令前綴
 
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -123,16 +123,123 @@ screenshotErrorCopying=複製至剪貼簿時發生錯誤
 
 # LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
 # screenshot is successfully copied to the clipboard.
 screenshotCopied=已複製至剪貼簿。
 
 # LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
 screenshotTooltip=拍攝完整頁面擷圖
 
+# LOCALIZATION NOTE (highlightDesc) A very short description of the
+# 'highlight' command. See highlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+highlightDesc=強調節點
+
+# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
+# command, displayed when the user asks for help on what it does.
+highlightManual=強調頁面中符合選擇器的節點
+
+# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'highlight' command, which is displayed in
+# a dialog when the user is using this command.
+highlightSelectorDesc=CSS 選擇器
+
+# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
+# 'selector' parameter to the 'highlight' command, displayed when the user
+# asks for help on what it does.
+highlightSelectorManual=符合頁面中節點的 CSS 選擇器
+
+# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
+# the 'highlight' command, displayed as a heading to the list of option.
+highlightOptionsDesc=選項
+
+# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
+# the 'hideguides' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightHideGuidesDesc=隱藏導引
+
+# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
+# 'hideguides' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightHideGuidesManual=隱藏強調的節點周圍的導引
+
+# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
+# the 'showinfobar' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowInfoBarDesc=顯示節點資訊列
+
+# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
+# 'showinfobar' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowInfoBarManual=在強調的節點上方顯示資訊列(資訊列當中包含標籤名稱、屬性與尺寸)
+
+# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
+# the 'showall' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowAllDesc=顯示所有符合節點
+
+# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
+# 'showall' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowAllManual=若選擇器符合了太多節點,僅會顯示前 100 個節點,以避免拖慢頁面速度。使用此選項來顯示所有符合的節點
+
+# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
+# 'region' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightRegionDesc=Box model 範圍
+
+# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightRegionManual=應該如何強調 Box model:「content」、「padding」、「border」或「margin」
+
+# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
+# 'fill' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightFillDesc=填色樣式
+
+# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightFillManual=使用自訂色彩來蓋過預設的區域填色樣式
+
+# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
+# 'keep' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightKeepDesc=保留現有的強調色彩
+
+# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightKeepManual=預設情況下,現有的強調色彩將在執行指令時隱藏起來,設定此選項才會顯示
+
+# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and how
+# to turn highlighting off
+highlightOutputConfirm=已強調 %1$S 個節點
+
+# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and that
+# some nodes could not be highlighted due to the maximum number of nodes being
+# reached, and how to turn highlighting off
+highlightOutputMaxReached=符合 %1$S 個節點,但僅強調 %2$S 個節點。使用「--showall」來顯示全部節點
+
+# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
+# 'unhighlight' command. See unhighlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+unhighlightDesc=取消強調所有節點
+
+# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
+# command, displayed when the user asks for help on what it does.
+unhighlightManual=取消強調所有先前使用「highlight」指令強調的節點
+
 # LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
 # 'restart' command. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 # The argument (%1$S) is the browser name.
 restartBrowserDesc=重新啟動 %1$S
 
 # LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
 # describe the 'nocache' parameter to the 'restart' command, which is
@@ -1388,8 +1495,34 @@ listenNoInitOutput=DebuggerServer 未初始化
 # mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
 # the 'media' commands and all available parameters.
 mediaDesc=模擬 CSS 媒體類型
 mediaEmulateDesc=模擬指定的 CSS 媒體類型
 mediaEmulateManual=檢視文件在支援媒體類型設定的裝置上套用相對的 CSS 規則後會呈現的樣子。
 mediaEmulateType=要模擬的媒體類型
 mediaResetDesc=停止模擬 CSS 媒體類型
 
+# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
+# injectFailed) These strings describe the 'inject' commands and all available
+# parameters.
+injectDesc=注入常用程式庫至本頁面
+injectManual2=將常用程式庫注入頁面內容,也能在主控台中使用。
+injectLibraryDesc=選擇要注入的程式庫,或輸入有效的指令碼 URI
+injectLoaded=已載入 %1$S
+injectFailed=%1$S 載入失敗 - URI 無效
+
+# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
+# folderOpenProfileDesc) These strings describe the 'folder' commands and
+# all available parameters.
+folderDesc=開啟資料夾
+folderOpenDesc=開啟資料夾路徑
+folderOpenDir=資料夾路徑
+folderOpenProfileDesc=開啟設定檔目錄
+
+# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
+# of the 'folder open' command with an invalid folder path.
+folderInvalidPath=請輸入有效的路徑
+
+# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
+# describe the result of the 'folder open' command.
+# The argument (%1$S) is the folder path.
+folderOpenDirResult=已開啟 %1$S
+
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -11,19 +11,21 @@
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (netmonitorUI.perfNotice1/2): These are the labels displayed
   -  in the network table when empty to start performance analysis. -->
 <!ENTITY netmonitorUI.perfNotice1         "* 點擊">
 <!ENTITY netmonitorUI.perfNotice2         "按鈕以進行效能分析。">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice3): This is the label displayed
-  -  in the network table when empty. -->
-<!ENTITY netmonitorUI.emptyNotice3        "* 送出請求或重新載入頁面以檢視網路動態的詳細資訊。">
+<!-- LOCALIZATION NOTE (netmonitorUI.reload1/2/3): These are the labels displayed
+  -  in the network table when empty to start logging network requests. -->
+<!ENTITY netmonitorUI.reloadNotice1       "• 進行請求或">
+<!ENTITY netmonitorUI.reloadNotice2       "重新載入">
+<!ENTITY netmonitorUI.reloadNotice3       "頁面,以檢視網路活動的詳細資訊。">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
 <!ENTITY netmonitorUI.toolbar.status2     "✓">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 <!ENTITY netmonitorUI.toolbar.method      "方法">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (netmonitor.label):
 # This string is displayed in the title of the tab when the Network Monitor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 netmonitor.label=網路
 
+# LOCALIZATION NOTE (netmonitor.panelLabel):
+# This is used as the label for the toolbox panel.
+netmonitor.panelLabel=網路面板
+
 # LOCALIZATION NOTE (netmonitor.commandkey, netmonitor.accesskey)
 # Used for the menuitem in the tool menu
 netmonitor.commandkey=Q
 netmonitor.accesskey=N
 
 # LOCALIZATION NOTE (netmonitor.tooltip):
 # This string is displayed in the tooltip of the tab when the Network Monitor is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label=效能分析器
 
+# LOCALIZATION NOTE (profiler.panelLabel):
+# This is used as the label for the toolbox panel.
+profiler.panelLabel=效能分析器面板
+
 # LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
 profiler2.commandkey=VK_F5
 profiler.accesskey=P
 
 # LOCALIZATION NOTE (profiler.tooltip2):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/projecteditor.properties
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -8,43 +8,67 @@
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (projecteditor.deleteLabel):
 # This string is displayed as a context menu item for allowing the selected
-# file / folder to be deleted
+# file / folder to be deleted.
 projecteditor.deleteLabel=刪除
 
+# LOCALIZATION NOTE (projecteditor.deletePromptTitle):
+# This string is displayed as as the title of the confirm prompt that checks
+# to make sure if a file or folder should be removed.
+projecteditor.deletePromptTitle=刪除
+
+# LOCALIZATION NOTE (projecteditor.deleteFolderPromptMessage):
+# This string is displayed as as the message of the confirm prompt that checks
+# to make sure if a folder should be removed.
+projecteditor.deleteFolderPromptMessage=您確定要刪除此資料夾嗎?
+
+# LOCALIZATION NOTE (projecteditor.deleteFilePromptMessage):
+# This string is displayed as as the message of the confirm prompt that checks
+# to make sure if a file should be removed.
+projecteditor.deleteFilePromptMessage=您確定要刪除此檔案嗎?
+
 # LOCALIZATION NOTE (projecteditor.newLabel):
-# This string is displayed as a context menu item for adding a new file to
-# the directory
+# This string is displayed as a menu item for adding a new file to
+# the directory.
 projecteditor.newLabel=新增…
 
+# LOCALIZATION NOTE (projecteditor.saveLabel):
+# This string is displayed as a menu item for saving the current file.
+projecteditor.saveLabel=儲存
+
+# LOCALIZATION NOTE (projecteditor.saveAsLabel):
+# This string is displayed as a menu item for saving the current file
+# with a new name.
+projecteditor.saveAsLabel=另存新檔…
+
 # LOCALIZATION NOTE (projecteditor.selectFileLabel):
-# This string is displayed as the title on the file picker when saving a file
+# This string is displayed as the title on the file picker when saving a file.
 projecteditor.selectFileLabel=選擇檔案
 
 # LOCALIZATION NOTE (projecteditor.openFolderLabel):
-# This string is displayed as the title on the file picker when opening a folder
+# This string is displayed as the title on the file picker when opening a folder.
 projecteditor.openFolderLabel=選擇資料夾
 
 # LOCALIZATION NOTE (projecteditor.openFileLabel):
-# This string is displayed as the title on the file picker when opening a file
+# This string is displayed as the title on the file picker when opening a file.
 projecteditor.openFileLabel=開啟檔案
 
 # LOCALIZATION NOTE  (projecteditor.find.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to search
-# text in the files
+# text in the files.
 projecteditor.find.commandkey=F
 
 # LOCALIZATION NOTE  (projecteditor.save.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to
-# save the file.  It is used with accel+shift to "save as"
+# save the file.  It is used with accel+shift to "save as".
 projecteditor.save.commandkey=S
 
 # LOCALIZATION NOTE  (projecteditor.new.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to
-# create a new file
+# create a new file.
 projecteditor.new.commandkey=N
 
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -90,13 +90,17 @@ propertiesFilterPlaceholder=過濾屬性
 # fails to connect to the server due to a timeout.
 connectionTimeout=連線逾時,請檢查雙方的錯誤主控台以取得可能的錯誤訊息。請重新開啟速記本以再試一次。
 
 # LOCALIZATION NOTE (scratchpad.label): this string is displayed in the title of
 # the tab when the Scratchpad is displayed inside the developer tools window and
 # in the Developer Tools Menu.
 scratchpad.label=程式碼速記本
 
+# LOCALIZATION NOTE (scratchpad.panelLabel): this is used as the
+# label for the toolbox panel.
+scratchpad.panelLabel=速記本面板
+
 # LOCALIZATION NOTE (scratchpad.tooltip):  This string is displayed in the
 # tooltip of the tab when the Scratchpad is displayed inside the developer tools
 # window.
 scratchpad.tooltip=程式碼速記本
 
--- a/browser/chrome/browser/devtools/shadereditor.properties
+++ b/browser/chrome/browser/devtools/shadereditor.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxShaderEditor.label):
 # This string is displayed in the title of the tab when the Shader Editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxShaderEditor.label=著色器編輯器
 
+# LOCALIZATION NOTE (ToolboxShaderEditor.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxShaderEditor.panelLabel=著色器面板
+
 # LOCALIZATION NOTE (ToolboxShaderEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the Shader Editor is
 # displayed inside the developer tools window.
 ToolboxShaderEditor.tooltip=WebGL 的即時 GLSL 著色器語言編輯器
 
 # LOCALIZATION NOTE (shadersList.programLabel):
 # This string is displayed in the programs list of the Shader Editor,
 # identifying a set of linked GLSL shaders.
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -13,17 +13,17 @@
 # A good criteria is the language in which you'd find the best documentation
 # on web development on the web.
 
 # LOCALIZATION NOTE  (findCmd.promptTitle): This is the dialog title used
 # when the user wants to search for a string in the code. You can
 # access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
 findCmd.promptTitle=尋找…
 
-# LOCALIZATION NOTE  (gotoLineCmd.promptMessage): This is the message shown when
+# LOCALIZATION NOTE  (findCmd.promptMessage): This is the message shown when
 # the user wants to search for a string in the code. You can
 # access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
 findCmd.promptMessage=搜尋:
 
 # LOCALIZATION NOTE  (gotoLineCmd.promptTitle): This is the dialog title used
 # when the user wants to jump to a specific line number in the code. You can
 # access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
 gotoLineCmd.promptTitle=跳到某行…
@@ -44,16 +44,25 @@ annotation.breakpoint.title=中斷點: %S
 annotation.currentLine=目前行
 
 # LOCALIZATION NOTE  (annotation.debugLocation.title): This is the text shown in
 # a tooltip displayed in any of the editor gutters when the user hovers the
 # current debugger location. The debugger can pause the JavaScript execution at
 # user-defined lines.
 annotation.debugLocation.title=目前 step: %S
 
+# LOCALIZATION NOTE  (autocompletion.docsLink): This is the text shown on
+# the link inside of the documentation popup.  If you type 'document' in Scratchpad
+# then press Shift+Space you can see the popup.
+autocompletion.docsLink=文件
+
+# LOCALIZATION NOTE  (autocompletion.notFound): This is the text shown in
+# the documentation popup if Tern fails to find a type for the object.
+autocompletion.notFound=找不到
+
 # LOCALIZATION NOTE  (jumpToLine.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to jump to
 # a specific line in the editor.
 jumpToLine.commandkey=J
 
 # LOCALIZATION NOTE  (toggleComment.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to either
 # comment or uncomment selected lines in the editor.
@@ -82,12 +91,12 @@ moveLineUp.commandkey=Alt-Up
 # LOCALIZATION NOTE  (moveLineDown.commandkey): This is the key to use to move
 # the selected lines down.
 moveLineDown.commandkey=Alt-Down
 
 # LOCALIZATION NOTE  (autocomplete.commandkey): This is the key to use
 # in conjunction with Ctrl for autocompletion.
 autocompletion.commandkey=Space
 
-# LOCALIZATION NOTE  (showInformation.commandkey): This is the key to use to
+# LOCALIZATION NOTE  (showInformation2.commandkey): This is the key to use to
 # show more information, like type inference.
-showInformation.commandkey=Shift-Space
+showInformation2.commandkey=Shift-Ctrl-Space
 
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -68,16 +68,20 @@ open.accesskey=l
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the style editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label=樣式編輯器
 
+# LOCALIZATION NOTE (ToolboxStyleEditor.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxStyleEditor.panelLabel=樣式編輯器面板
+
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip2):
 # This string is displayed in the tooltip of the tab when the style editor is
 # displayed inside the developer tools window.
 ToolboxStyleEditor.tooltip2=樣式表編輯器 (CSS)
 
 # LOCALIZATION NOTE (confirmNavigationAway): Shown in a notification box when
 # the user tries to navigate away from a web page.
 confirmNavigationAway.message=若您離開此頁面將失去樣式編輯器中所有未儲存的變更。
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -78,21 +78,21 @@
 <!ENTITY options.enableRemote.tooltip   "開啟此選項將讓允許開發者工具對遠端的 Firefox 實例,如 Firefox OS 進行除錯">
 
 <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
 <!ENTITY options.disableJavaScript.label     "停用 JavaScript *">
 <!ENTITY options.disableJavaScript.tooltip   "開啟此選項後將停用目前分頁中的 JavaScript。當您關閉工具箱或分頁後此設定將會被遺忘。">
 
-<!-- LOCALIZATION NOTE (options.disableCache.label,
-  -  options.disableCache.tooltip): This is the options panel label and
+<!-- LOCALIZATION NOTE (options.disableCache.label2,
+  -  options.disableCache.tooltip2): This is the options panel label and
   -  tooltip for the checkbox that toggles the cache on or off. -->
-<!ENTITY options.disableCache.label     "停用快取 *">
-<!ENTITY options.disableCache.tooltip   "開啟此選項後將停用目前分頁中的快取。當您關閉工具箱或分頁後此設定將會被遺忘。">
+<!ENTITY options.disableCache.label2     "停用快取(當工具箱開啟時)">
+<!ENTITY options.disableCache.tooltip2   "開啟此選項將停用所有開啟工具箱的分頁的快取。">
 
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 <!ENTITY options.selectDefaultTools.label     "預設 Firefox 開發者工具">
 
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
@@ -160,8 +160,24 @@
 
 <!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
   -  in about:config, in the options panel. -->
 <!ENTITY options.showPlatformData.label    "顯示 Gecko 平台資料">
 <!ENTITY options.showPlatformData.tooltip  "若您啟用此選項,JavaScript 效能檢測報告將會包含 Gecko 平台符號">
 
+<!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor
+  -  section. -->
+
+<!ENTITY options.sourceeditor.label                     "編輯器偏好設定">
+<!ENTITY options.sourceeditor.detectindentation.label   "偵測縮排">
+<!ENTITY options.sourceeditor.detectindentation.tooltip "依照原始內容猜測縮排長度">
+<!ENTITY options.sourceeditor.autoclosebrackets.label   "自動關閉括號">
+<!ENTITY options.sourceeditor.autoclosebrackets.tooltip "自動插入結尾括號">
+<!ENTITY options.sourceeditor.expandtab.label           "使用空白縮排">
+<!ENTITY options.sourceeditor.expandtab.tooltip         "使用空白而不用 tab 符號縮排">
+<!ENTITY options.sourceeditor.tabsize.label             "Tab 大小">
+<!ENTITY options.sourceeditor.tabsize.accesskey         "T">
+<!ENTITY options.sourceeditor.keybinding.label          "Keybinding">
+<!ENTITY options.sourceeditor.keybinding.accesskey      "K">
+<!ENTITY options.sourceeditor.keybinding.default.label  "預設">
+
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -30,20 +30,28 @@ toolboxToggleButton.tooltip=%1$S、%2$S\n點選此處切換開發者工具。
 # The name of the selected tool: %1$S.
 # The url of the page being tooled: %2$S.
 toolbox.titleTemplate=%1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle=開發者工具
 
+# LOCALIZATION NOTE (toolbox.label): This is used as the label for the
+# toolbox as a whole
+toolbox.label=開發者工具
+
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
 # for the options panel tab.
 optionsButton.tooltip=工具箱選項
 
+# LOCALIZATION NOTE (options.panelLabel): This is used as the label for the
+# toolbox panel.
+options.panelLabel=工具箱選項面板
+
 # LOCALIZATION NOTE (options.toolNotSupported): This is the template
 # used to add a * marker to the label for the Options Panel tool checkbox for the
 # tool which is not supported for the current toolbox target.
 # The name of the tool: %1$S.
 options.toolNotSupportedMarker=%1$S *
 
 # LOCALIZATION NOTE (scratchpad.keycode)
 # Used for opening scratchpad from the detached toolbox window
--- a/browser/chrome/browser/devtools/webaudioeditor.properties
+++ b/browser/chrome/browser/devtools/webaudioeditor.properties
@@ -11,16 +11,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
 # This string is displayed in the title of the tab when the Web Audio Editor
 # is displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxWebAudioEditor1.label=Web Audio
 
+# LOCALIZATION NOTE (ToolboxWebAudioEditor1.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxWebAudioEditor1.panelLabel=Web Audio 面板
+
 # LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
 # This string is displayed in the tooltip of the tab when the Web Audio Editor is
 # displayed inside the developer tools window.
 ToolboxWebAudioEditor1.tooltip=Web Audio 圖形化檢視器與音訊節點檢測器
 
 # LOCALIZATION NOTE (collapseInspector): This is the tooltip for the button
 # that collapses the inspector in the web audio tool UI.
 collapseInspector=摺疊檢測器
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -162,16 +162,20 @@ listTabs.globalConsoleActor=* 全域主控台 *
 # LOCALIZATION NOTE (MenuWebconsole.label): the string displayed in the Tools
 # menu as a shortcut to open the devtools with the Web Console tab selected.
 MenuWebconsole.label=網頁主控台
 
 # LOCALIZATION NOTE (ToolboxTabWebconsole.label): the string displayed as the
 # label of the tab in the devtools window.
 ToolboxTabWebconsole.label=主控台
 
+# LOCALIZATION NOTE (ToolboxWebConsole.panelLabel): the string used as the
+# label for the toolbox panel.
+ToolboxWebConsole.panelLabel=主控台面板
+
 # LOCALIZATION NOTE (ToolboxWebconsole.tooltip): the string displayed in the
 # tooltip of the tab when the Web Console is displayed inside the developer
 # tools window.
 ToolboxWebconsole.tooltip=網頁主控台
 
 # LOCALIZATION NOTE (longStringEllipsis): the string displayed after a long
 # string. This string is clickable such that the rest of the string is
 # retrieved from the server.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/loop/loop.properties
@@ -0,0 +1,40 @@
+# 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/.
+
+# Panel Strings
+
+share_link_header_text=分享此鏈結以邀請某人加入聊天:
+
+# Status text
+display_name_dnd_status=勿干擾
+display_name_available_status=有空
+
+unable_retrieve_url=抱歉,我們無法取得呼叫網址。
+
+# Conversation Window Strings
+
+incoming_call_title=來電…
+incoming_call=來電
+incoming_call_answer_button=接聽
+incoming_call_decline_button=拒絕
+incoming_call_ignore_button=忽略
+incoming_call_block_button=封鎖
+hangup_button_title=掛斷
+mute_local_audio_button_title=靜音
+unmute_local_audio_button_title=取消靜音
+mute_local_video_button_title=關閉視訊
+unmute_local_video_button_title=開啟視訊
+
+peer_ended_conversation=對方已結束通話。
+call_has_ended=您的通話已結束。
+close_window=關閉此視窗
+
+cannot_start_call_session_not_ready=連線尚未就緒,無法啟動呼叫。
+network_disconnected=網路連線突然中斷。
+
+connection_error_see_console_notification=呼叫失敗,請看主控台以取得更多資訊。
+## LOCALIZATION NOTE (legal_text_and_links): In this item, don't translate the
+## part between {{..}}
+legal_text_and_links=使用此產品,代表您同意 <a target="_blank" href="{{terms_of_use_url}}">使用條款</a> 及 <a href="{{privacy_notice_url}}">隱私權保護政策</a>。
+
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -20,18 +20,16 @@
 <!ENTITY  generalMode           "繪製模式:">
 <!ENTITY  generalSize           "大小:">
 <!ENTITY  generalReferrer       "參照網址:">
 <!ENTITY  generalSource         "快取來源:">
 <!ENTITY  generalModified       "上次修改:">
 <!ENTITY  generalEncoding       "編碼:">
 <!ENTITY  generalMetaName       "名稱">
 <!ENTITY  generalMetaContent    "內容">
-<!ENTITY  generalSecurityDetails   "詳細資訊">
-<!ENTITY  generalSecurityDetails.accesskey "D">
 
 <!ENTITY  mediaTab              "媒體">
 <!ENTITY  mediaTab.accesskey    "M">
 <!ENTITY  mediaLocation         "網址:">
 <!ENTITY  mediaText             "關聯文字:">
 <!ENTITY  mediaAltHeader        "替代文字">
 <!ENTITY  mediaAddress          "位址">
 <!ENTITY  mediaType             "類型">
@@ -60,17 +58,16 @@
 <!ENTITY  permissionsFor        "此網站權限設定:">
 <!ENTITY  permPlugins           "啟用外掛程式">
 
 <!ENTITY  permClearStorage           "清除儲存空間">
 <!ENTITY  permClearStorage.accesskey "C">
 
 <!ENTITY  securityTab           "安全">
 <!ENTITY  securityTab.accesskey "S">
-<!ENTITY  securityHeader        "本頁面的安全資訊">
 <!ENTITY  securityView.certView "檢視憑證">
 <!ENTITY  securityView.accesskey "V">
 <!ENTITY  securityView.unknown   "未知">
 
 
 <!ENTITY  securityView.identity.header   "網站身分">
 <!ENTITY  securityView.identity.owner    "擁有者:">
 <!ENTITY  securityView.identity.domain   "網站:">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -33,17 +33,16 @@ mediaAnimatedImageType=%S 圖片 (動畫,%S 個畫格)
 mediaDimensions=%Spx \u00D7 %Spx
 mediaDimensionsScaled=%Spx \u00D7 %Spx (縮放為 %Spx \u00D7 %Spx)
 
 generalQuirksMode=Quirks 模式
 generalStrictMode=標準遵循模式
 generalSize=%S KB (%S 位元組)
 generalMetaTag=後設資料 (1 個標籤)
 generalMetaTags=後設資料 (%S 個標籤)
-generalSiteIdentity=此網站為 %S 擁有\n身分資訊已由 %S 認證
 
 feedRss=RSS
 feedAtom=Atom
 feedXML=XML
 
 securityNoOwner=這個網站沒有提供擁有者資訊。
 securityOneVisit=是,來過一次
 securityNVisits=是,來過 %S 次
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -123,15 +123,15 @@
 <!ENTITY offlineAppRemove.confirm        "移除離線資料">
 
 <!ENTITY certificateTab.label            "憑證">
 <!ENTITY certSelection.description       "當伺服器要求我的個人憑證時:">
 <!ENTITY certs.auto                      "自動選擇一組憑證">
 <!ENTITY certs.auto.accesskey            "l">
 <!ENTITY certs.ask                       "每次都詢問我">
 <!ENTITY certs.ask.accesskey             "i">
+<!ENTITY enableOCSP.label                "向 OCSP 回應伺服器查詢,以確認憑證有效性">
+<!ENTITY enableOCSP.accesskey            "Q">
 <!ENTITY viewCerts.label                 "檢視憑證清單">
 <!ENTITY viewCerts.accesskey             "s">
-<!ENTITY verify2.label                   "驗證">
-<!ENTITY verify2.accesskey               "V">
 <!ENTITY viewSecurityDevices.label       "安全裝置">
 <!ENTITY viewSecurityDevices.accesskey   "y">
 
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -28,8 +28,18 @@
 <!ENTITY chooseButton.label           "選擇…">
 <!ENTITY chooseButton.accesskey       "o">
 
 <!ENTITY translateWebPages.label      "翻譯網頁內容">
 <!ENTITY translateWebPages.accesskey  "T">
 <!ENTITY translateExceptions.label    "例外網站…">
 <!ENTITY translateExceptions.accesskey "x">
 
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -  The translations for these strings should match the translations in
+  -  browser/translation.dtd
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "翻譯服務由">
+<!ENTITY translation.options.attribution.afterLogo "提供">
+
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -1,14 +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  prefWindow.titleWin     "選項">
+<!ENTITY  prefWindow.title        "偏好設定">
+<!-- LOCALIZATION NOTE (prefWindow.titleGNOME): This is not used for in-content preferences -->
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; 偏好設定">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
 <!ENTITY  prefWinMinSize.styleWin2      "width: 42em; min-height: 37.5em;">
 <!ENTITY  prefWinMinSize.styleMac       "width: 47em; min-height: 40em;">
 <!ENTITY  prefWinMinSize.styleGNOME     "width: 45.5em; min-height: 40.5em;">
 
 <!ENTITY  paneGeneral.title       "一般">
--- a/browser/chrome/browser/translation.dtd
+++ b/browser/chrome/browser/translation.dtd
@@ -52,8 +52,16 @@
   -  The accesskey values used here should not clash with the value used for
   -  translation.options.neverForLanguage.accesskey in translation.properties
   -->
 <!ENTITY translation.options.neverForSite.label "永不翻譯此網站">
 <!ENTITY translation.options.neverForSite.accesskey "e">
 <!ENTITY translation.options.preferences.label  "翻譯偏好">
 <!ENTITY translation.options.preferences.accesskey "T">
 
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "翻譯服務由">
+<!ENTITY translation.options.attribution.afterLogo "提供">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/webrtcIndicator.properties
@@ -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/.
+
+# LOCALIZATION NOTE : FILE This file contains the webrtc global indicator strings
+
+# LOCALIZATION NOTE (webrtcIndicator.windowtitle): %S is the brand name (e.g. Firefox).
+# This string is used so that the window has a title in tools that enumerate/look for window
+# titles. It is not normally visible anywhere.
+webrtcIndicator.windowtitle = %S - 分享指示器
+
+webrtcIndicator.sharingCameraAndMicrophone.tooltip = 即將分享您的攝影機與麥克風。點擊此處來調整要分享的項目。
+webrtcIndicator.sharingCamera.tooltip              = 即將分享您的攝影機。點擊此處來調整要分享的項目。
+webrtcIndicator.sharingMicrophone.tooltip          = 即將分享您的麥克風。點擊此處來調整要分享的項目。
+webrtcIndicator.sharingScreen.tooltip = 即將分享您的畫面。點擊此處來調整要分享的項目。
+webrtcIndicator.sharingWindow.tooltip = 即將分享您的某個視窗。點擊此處來調整要分享的項目。
+
+
+# LOCALIZATION NOTE : The following strings are only used on Mac for
+# menus attached to icons near the clock on the mac menubar.
+
+# LOCALIZATION NOTE (webrtcIndicator.sharing*With.menuitem):
+# %S is the title of the tab using the share.
+webrtcIndicator.sharingCameraWith.menuitem = 與「%S」分享攝影機
+webrtcIndicator.sharingMicrophoneWith.menuitem = 與「%S」分享麥克風
+webrtcIndicator.sharingScreenWith.menuitem = 與「%S」分享畫面
+webrtcIndicator.sharingWindowWith.menuitem = 與「%S」分享視窗
+webrtcIndicator.controlSharing.menuitem = 調整分享的項目
+# LOCALIZATION NOTE (webrtcIndicator.sharing*WithNTabs.menuitem):
+# Semicolon-separated list of plural forms.
+webrtcIndicator.sharingCameraWithNTabs.menuitem = 與 #1 個分頁分享攝影機
+webrtcIndicator.sharingMicrophoneWithNTabs.menuitem = 與 #1 個分頁分享麥克風
+webrtcIndicator.sharingScreenWithNTabs.menuitem = 與 #1 個分頁分享畫面
+webrtcIndicator.sharingWindowWithNTabs.menuitem = 與 #1 個分頁分享視窗
+# LOCALIZATION NOTE (webrtcIndicator.controlSharingOn.menuitem):
+# %S is the title of the tab using the share.
+webrtcIndicator.controlSharingOn.menuitem = 調整與「%S」分享的項目
+
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -53,16 +53,18 @@
 <!ENTITY lightning.imipbar.btnDelete.label                                  "刪除">
 <!ENTITY lightning.imipbar.btnDelete.tooltiptext                            "自行事曆刪除">
 <!ENTITY lightning.imipbar.btnDetails.label                                 "詳細資訊…">
 <!ENTITY lightning.imipbar.btnDetails.tooltiptext                           "顯示活動詳情">
 <!ENTITY lightning.imipbar.btnMore.label                                    "更多">
 <!ENTITY lightning.imipbar.btnMore.tooltiptext                              "點擊此處顯示更多選項">
 <!ENTITY lightning.imipbar.btnReconfirm2.label                              "重新確認">
 <!ENTITY lightning.imipbar.btnReconfirm.tooltiptext                         "傳送重新確認通知給召集人">
+<!ENTITY lightning.imipbar.btnSaveCopy.label                                "儲存副本">
+<!ENTITY lightning.imipbar.btnSaveCopy.tooltiptext                          "將事件副本另外儲存於行事曆,而不直接回覆召集人,參與者清單將被清除。">
 <!ENTITY lightning.imipbar.btnTentative.label                               "暫定">
 <!ENTITY lightning.imipbar.btnTentative2.tooltiptext                        "暫時接受事件邀請">
 <!ENTITY lightning.imipbar.btnTentativeRecurrences.label                    "暫定接受參與所有活動">
 <!ENTITY lightning.imipbar.btnTentativeRecurrences2.tooltiptext             "暫時接受重複的事件當中所有事件的邀請">
 <!ENTITY lightning.imipbar.btnUpdate.label                                  "更新">
 <!ENTITY lightning.imipbar.btnUpdate.tooltiptext                            "更新行事曆中的活動">
 <!ENTITY lightning.imipbar.description                                      "此郵件包含事件的邀請。">
 
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -35,16 +35,20 @@ connection.error.notAuthorized=未被授權(您是不是打錯密碼了?)
 connection.error.failedToGetAResource=無法取得資源
 
 
 # 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
+#   fails.
+#   %S is the name of the MUC.
+conversation.error.joinFailed=無法加入: %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=狀態
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -152,9 +152,60 @@ Window_ContentWarning=window._content 已被棄用,請改用 window.content。
 SyncXMLHttpRequestWarning=因為會影響使用者的使用體驗,已棄用主執行緒中的同步 XMLHttpRequest。若需更多資訊請參考 http://xhr.spec.whatwg.org/
 ImplicitMetaViewportTagFallback=找不到 meta-viewport 標籤。請明確指定一個標籤以避免在未來版本中有未預期的行為變更發生。若需更多資訊請參考 https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
 DataContainerEventWarning=已棄用 DataContainerEvent。請改用 CustomEvent。
 # LOCALIZATION NOTE: Do not translate "sendAsBinary" or "send(Blob data)"
 SendAsBinaryWarning=非標準的 sendAsBinary 方法已被棄用,將被移除。請改用標準的 send(Blob data) 方法。
 # LOCALIZATION NOTE: Do not translate "window.controllers"
 Window_ControllersWarning=window.controllers 已被棄用,請不要用來判斷使用者字串。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Down" and "ArrowDown".
+KeyNameDownWarning=KeyboardEvent.key 的值「Down」已被棄用,將會被更名為「ArrowDown」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Left" and "ArrowLeft".
+KeyNameLeftWarning=KeyboardEvent.key 的值「Left」已被棄用,將會被更名為「ArrowLeft」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Right" and "ArrowRight".
+KeyNameRightWarning=KeyboardEvent.key 的值「Right」已被棄用,將會被更名為「ArrowRight」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Up" and "ArrowUp".
+KeyNameUpWarning=KeyboardEvent.key 的值「Up」已被棄用,將會被更名為「ArrowUp」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Crsel" and "CrSel".
+KeyNameCrselWarning=KeyboardEvent.key 的值「Crsel」已被棄用,將會被更名為「CrSel」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Del" and "Delete".
+KeyNameDelWarning=KeyboardEvent.key 的值「Del」已被棄用,將會被更名為「Delete」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Exsel" and "ExSel".
+KeyNameExselWarning=KeyboardEvent.key 的值「Exsel」已被棄用,將會被更名為「ExSel」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Menu" and "ContextMenu".
+KeyNameMenuWarning=KeyboardEvent.key 的值「Menu」已被棄用,將會被更名為「ContextMenu」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Esc" and "Escape".
+KeyNameEscWarning=KeyboardEvent.key 的值「Esc」已被棄用,將會被更名為「Escape」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Nonconvert" and "NonConvert".
+KeyNameNonconvertWarning=KeyboardEvent.key 的值「Nonconvert」已被棄用,將會被更名為「NonConvert」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "HalfWidth" and "Hankaku".
+KeyNameHalfWidthWarning=KeyboardEvent.key 的值「HalfWidth」已被棄用,將會被更名為「Hankaku」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "RomanCharacters", "Romaji" and "Eisu".
+KeyNameRomanCharactersWarning=KeyboardEvent.key 的值「RomanCharacters」已被棄用,將會被更名為「Romaj」或重新對應為「Eisu」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "FullWith" and "Zenkaku".
+KeyNameFullWidthWarning=KeyboardEvent.key 的值「FullWidth」已被棄用,將會被更名為「Zenkaku」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "SelectMedia" and "MediaSelect".
+KeyNameSelectMediaWarning=KeyboardEvent.key 的值「SelectMedia」已被棄用,將會被更名為「MediaSelect」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "MediaNextTrack" and "MediaTrackNext".
+KeyNameMediaNextTrackWarning=KeyboardEvent.key 的值「MediaNextTrack」已被棄用,將會被更名為「MediaTrackNext」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "MediaPreviousTrack" and "MediaTrackPrevious".
+KeyNameMediaPreviousTrackWarning=KeyboardEvent.key 的值「MediaPreviousTrack」已被棄用,將會被更名為「MediaTrackPrevious」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Red" and "ColorF0Red".
+KeyNameRedWarning=KeyboardEvent.key 的值「Red」已被棄用,將會被更名為「ColorF0Red」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Green" and "ColorF1Green".
+KeyNameGreenWarning=KeyboardEvent.key 的值「Green」已被棄用,將會被更名為「ColorF1Green」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Yellow" and "ColorF2Yellow".
+KeyNameYellowWarning=KeyboardEvent.key 的值「Yellow」已被棄用,將會被更名為「ColorF2Yellow」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Blue" and "ColorF3Blue".
+KeyNameBlueWarning=KeyboardEvent.key 的值「Blue」已被棄用,將會被更名為「ColorF3Blue」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Live".
+KeyNameLiveWarning=KeyboardEvent.key 的值「Live」已被棄用,將被移除。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Apps".
+KeyNameAppsWarning=KeyboardEvent.key 的值「Apps」已被棄用,將被移除。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "FastFwd" and "MediaFastForward".
+KeyNameFastFwdWarning=KeyboardEvent.key 的值「FastFwd」已被棄用,將會被更名為「MediaFastForward」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Zoom" and "ZoomToggle".
+KeyNameZoomWarning=KeyboardEvent.key 的值「Zoom」已被棄用,將會被更名為「ZoomToggle」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key" and "Dead".
+KeyNameDeadKeysWarning=KeyboardEvent.key 當中由「Dead」開頭的值皆已被棄用,將會被合併為單一的「Dead」。若需更多資訊請參考 https://developer.mozilla.org/zh-TW/docs/Web/API/KeyboardEvent.key。
+ImportXULIntoContentWarning=匯入 XUL 節點至內容文件的用法已被棄用,此功能將會被移除。
 
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -16,16 +16,18 @@ PERuleTrailing=預期規則結束卻出現「%1$S」。
 PESkipAtRuleEOF2=at-rule 結尾
 PEUnknownAtRule=分析 at-rule「%1$S」時找到無法辨識的規則或是錯誤。
 PECharsetRuleEOF=@charset 規則中的 charset 字串
 PECharsetRuleNotString=預期應有 charset 字串卻出現「%1$S」。
 PEGatherMediaEOF=在 @import 或 @media 規則的 media list 的結尾
 PEGatherMediaNotComma=媒體清單中應該要有「,」卻出現了「%1$S」。
 PEGatherMediaNotIdent=媒體清單中應該要有識別符卻出現了「%1$S」。
 PEGatherMediaReservedMediaType=尋找媒體類型時出現被保留的關鍵字「%1$S」。
+PEParseSourceSizeListEOF=符合的媒體條件的長度值
+PEParseSourceSizeListNotComma=在值的後面預期應為「,」,卻出現「%1$S」
 PEImportNotURI=@import 規則中預期應有網址,卻出現「%1$S」。
 PEImportBadURI=在 @import 規則中找到無效的 URI:「%1$S」。
 PEImportUnexpected=在 @import 中找到未預期的「%1$S」。
 PEGroupRuleEOF2=@media、@supports 或 @-moz-document 規則結尾
 PEGroupRuleNestedAtRule=%1$S 規則不被允許於 @media 或 @-moz-document 規則內出現。
 PEMozDocRuleBadFunc2=@-moz-document 規則中預期應有 url()、url-prefix()、domain() 或 regexp(),卻出現「%1$S」。
 PEMozDocRuleNotURI=應該在 @-moz-document 規則中有網址,卻出現「%1$S」。
 PEMozDocRuleNotString=在 @-moz-document 規則當中的 regexp() 函數預期要有字串,卻出現「%1$S」。
@@ -39,16 +41,24 @@ PEKeyframeBrace=@keyframes 規則預期要有開啟的 { 符號。
 PESkipDeclBraceEOF=宣告區塊的結尾 }
 PESkipRSBraceEOF=不正確規則組的結尾 }
 PEBadSelectorRSIgnored=由於有錯誤的選擇器所以略過規則組。
 PEBadSelectorKeyframeRuleIgnored=因為用了不好的選擇器,已忽略 Keyframe 規則。
 PESelectorListExtraEOF=「,」或「{」
 PESelectorListExtra=應該要有「,」或「{」卻出現了「%1$S」。
 PESelectorGroupNoSelector=應該要有選擇器。
 PESelectorGroupExtraCombinator=令人混淆的組合。
+PECounterStyleNotIdent=預期應有 @counter-style 規則名稱的指示符。
+PECounterStyleBadName=@counter-style 規則的名稱不能為「%1$S」。
+PECounterStyleBadBlockStart=預期應有「{」作為 @counter-style 規則的開始,卻出現「%1$S」。
+PECounterStyleEOF=@counter-style 區塊的結尾「}」
+PECounterDescExpected=預期應有 counter descriptor 卻出現「%1$S」。
+PEUnknownCounterDesc=@counter-style 規則中有未知的 descriptor「%1$S」。
+PECounterExtendsNotIdent=預期應有 extends system 的指示符,卻出現「%1$S」。
+PECounterASWeight=additive-symbols descriptor 中的每個權重必須小於上一個權重。
 PEClassSelEOF=Class 名稱
 PEClassSelNotIdent=類別選擇器應該要有識別符卻出現了「%1$S」。
 PETypeSelEOF=Element 類型
 PETypeSelNotType=預期應要有元素名稱或「*」,卻出現「%1$S」。
 PEUnknownNamespacePrefix=未知的 namespace 前置詞「%1$S」。
 PEAttributeNameEOF=Attribute 名稱
 PEAttributeNameExpected=預期應有屬性名稱識別符,卻出現「%1$S」。
 PEAttributeNameOrNamespaceExpected=應該要有 attribute 名稱或 namespace 卻出現了「%1$S」。
@@ -74,17 +84,17 @@ PENegationEOF=Negation 內的選擇器
 PENegationBadInner=錯誤的簡易選擇器做為 negation pseudo-class 參數「%1$S」。
 PENegationNoClose=Negation pseudo-class「%1$S」少了結束的「)」。
 PENegationBadArg=Negation pseudo-class「%1$S」內少了參數。
 PEPseudoClassArgEOF=pseudo-class 選擇器的參數
 PEPseudoClassArgNotIdent=Pseudo-class 的參數應為識別符或字串,卻出現了「%1$S」。
 PEPseudoClassArgNotNth=預期應有部分 pseudo-class 的參數,卻出現「%1$S」。
 PEPseudoClassNoClose=pseudo-class 中缺少結尾的「)」,卻出現「%1$S」。
 PEPseudoClassNoArg=pseudo-class「%1$S」內少了參數。
-PEPseudoClassNotUserAction=在 pseudo-element 後預期應為選擇器的結尾或 user action pseudo-class,卻找到 pseudo-class「%1$S」。
+PEPseudoClassNotUserAction=在 pseudo-element 後預期應為選擇器的結尾或 user action pseudo-class,卻出現 pseudo-class「%1$S」。
 PESelectorEOF=選擇器
 PEBadDeclBlockStart=應該要有「{」開始宣告區塊,卻出現「%1$S」。
 PEColorEOF=色彩
 PEColorNotColor=預期應有色彩,卻出現「%1$S」。
 PEColorComponentEOF=色彩元件
 PEExpectedPercent=應該要有百分號,卻出現「%1$S」。
 PEExpectedInt=預期應有整數,卻出現「%1$S」。
 PEColorBadRGBContents=rgb() 當中預期應為數字或百分號,卻出現「%1$S」。
@@ -140,17 +150,17 @@ PESupportsConditionExpectedStart2=剖析 supports 條件式時預期應有「not」、「(」或是函數,卻出現「%1$S」。
 PESupportsConditionExpectedNot=剖析 supports 條件式時預期應有「not」卻出現「%1$S」。
 PESupportsGroupRuleStart=@supports 規則預期應有「{」開頭卻出現「%1$S」。
 PEFilterEOF=濾鏡
 PEExpectedNoneOrURL=預期應為「none」或網址,卻出現「%1$S」。
 PEExpectedNoneOrURLOrFilterFunction=預期應為「none」、網址或濾鏡函式,卻出現「%1$S」。
 PEExpectedNonnegativeNP=預期應為非負值或百分比。
 PEFilterFunctionArgumentsParsingError=剖析濾鏡函式參數時發生錯誤。
 PEVariableEOF=變數
-PEVariableEmpty=預期應有變數值,卻找到「%1$S」。
+PEVariableEmpty=預期應有變數值,卻出現「%1$S」。
 PEValueWithVariablesParsingError=代換變數後剖析「%1$S」的值時發生錯誤。
 PEValueWithVariablesFallbackInherit=Fallback 為「inherit」。
 PEValueWithVariablesFallbackInitial=Fallback 為「initial」。
 PEInvalidVariableReference=屬性參照了無效變數。
 PEInvalidVariableTokenFallback=variable reference fallback 的頂層出現無效的 token「%1$S」。
 PEExpectedVariableNameEOF=變數名稱的指示符
 PEExpectedVariableName=預期應有變數名稱的指示符,卻出現「%1$S」。
 PEExpectedVariableFallback=在「,」後預期應為 variable reference fallback。
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -15,8 +15,11 @@ path_label=路徑:
 version_label=版本:
 state_label=狀態:
 state_enabled=已啟用
 state_disabled=已停用
 mimetype_label=MIME 型態:
 description_label=描述
 suffixes_label=副檔名
 
+openH264_name=由 Cisco Systems, Inc. 提供的 OpenH264 Video Codec
+openH264_description=播放網頁影片並進行視訊聊天。
+
--- a/mail/chrome/messenger/chat.properties
+++ b/mail/chrome/messenger/chat.properties
@@ -87,8 +87,10 @@ log.today=今天
 log.yesterday=昨天
 
 #LOCALIZATION NOTE
 # These are special groups in the log tree for the last 3-7 days and
 # the last 8-14 days.
 log.currentWeek=本週
 log.previousWeek=上週
 
+messagePreview=新增聊天訊息
+
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -527,21 +527,21 @@ copyToFolderAgainAccessKey=t
 alwaysLoadRemoteContentForSender2= 總是從 %1$S 載入遠端內容
 
 #LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
 mdnBarMessageNormal=%1$S 希望您在閱讀此訊息後傳送回條通知。
 #LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
 mdnBarMessageAddressDiffers=%1$S(%2$S)要求在您讀取這封郵件後被通知。
 
 # mailCommands.js
-emptyJunkTitle=確認
-emptyJunkMessage=您確定要刪除垃圾郵件匣裡的所有郵件和子資料夾嗎?
+emptyJunkFolderTitle=清空「%S」
+emptyJunkFolderMessage=刪除垃圾信件匣中的所有訊息與子資料夾?
 emptyJunkDontAsk=不要再詢問。
-emptyTrashTitle=確認
-emptyTrashMessage=您確定要刪除垃圾桶裡的所有郵件和子資料夾嗎?
+emptyTrashFolderTitle=清空「%S」
+emptyTrashFolderMessage=刪除垃圾桶中的所有訊息與子資料夾?
 emptyTrashDontAsk=不要再詢問。
 
 # junkCommands.js
 junkAnalysisPercentComplete=垃圾分析 %S 完成
 processingJunkMessages=篩選垃圾郵件中
 
 # Messenger bootstrapping messages
 fileNotFoundTitle = 找不到檔案
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -246,17 +246,19 @@ assemblingMailInformation=組合郵件資訊中…
 gatheringAttachment=正在附加 %S…
 creatingMailMessage=建立郵件中…
 
 ## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
 copyMessageStart=複製郵件到郵件匣 %S 中…
 copyMessageComplete=複製完成。
 copyMessageFailed=複製失敗。
 
-sendLargeMessageWarning=注意!您要寄的信有 %d 位元組。您確定要寄嗎?
+## LOCALIZATION NOTE (largeMessageSendWarning):
+## Do not translate %S. It is the size of the message in user-friendly notation.
+largeMessageSendWarning=警告!您將傳送一封大小為 %S 的訊息,可能超過郵件伺服器允許的限制。您確定要傳送嗎?
 
 sendingMessage=發送郵件中…
 sendMessageErrorTitle=訊息傳送錯誤
 postingMessage=寄送郵件中…
 
 sendLaterErrorTitle=延遲送出錯誤
 saveDraftErrorTitle=儲存草稿錯誤
 saveTemplateErrorTitle=儲存範本錯誤
--- a/mail/chrome/messenger/preferences/chat.dtd
+++ b/mail/chrome/messenger/preferences/chat.dtd
@@ -19,18 +19,21 @@ sentence. -->
 
 <!ENTITY  andSetStatusToAway.label      "並將我的狀態設定為不在電腦前,且加上此狀態訊息:">
 <!ENTITY  andSetStatusToAway.accesskey  "a">
 
 <!ENTITY  sendTyping.label              "在對話中傳送正在輸入的通知">
 <!ENTITY  sendTyping.accesskey          "t">
 
 <!ENTITY  chatNotifications.label             "收到只傳給您的私訊時:">
-<!ENTITY  desktopChatNotifications.label      "顯示通知">
+<!ENTITY  desktopChatNotifications.label      "顯示通知:">
 <!ENTITY  desktopChatNotifications.accesskey  "c">
+<!ENTITY  completeNotification.label          "包含寄件者名稱與訊息預覽">
+<!ENTITY  buddyInfoOnly.label                 "只有寄件者名稱">
+<!ENTITY  dummyNotification.label             "不顯示任何資訊">
 <!ENTITY  chatSound.accesskey                 "d">
 <!ENTITY  chatSound.label                     "播放音效">
 <!ENTITY  play.label                          "播放">
 <!ENTITY  play.accesskey                      "P">
 <!ENTITY  systemSound.label                   "系統預設音效">
 <!ENTITY  systemSound.accesskey               "D">
 <!ENTITY  customsound.label                   "使用下列音效檔案">
 <!ENTITY  customsound.accesskey               "U">
--- a/mail/chrome/messenger/preferences/privacy.dtd
+++ b/mail/chrome/messenger/preferences/privacy.dtd
@@ -9,16 +9,18 @@
 <!ENTITY acceptRemoteContent.accesskey "A">
 <!ENTITY remoteContentExceptions.label "例外網站…">
 <!ENTITY remoteContentExceptions.accesskey "x">
 <!ENTITY acceptRemoteContentInfo.label "了解更多遠端內容的隱私風險">
 
 <!-- Web Content -->
 <!ENTITY captionWebContent.label "網站內容">
 
+<!ENTITY keepHistory.label "記住我開啟過的網站與鏈結">
+<!ENTITY keepHistory.accesskey "R">
 <!ENTITY acceptCookies.label "允許網站設定 Cookie">
 <!ENTITY acceptCookies.accesskey "A">
 <!ENTITY acceptThirdParty.pre.label "接受來自第三方的 Cookies:">
 <!ENTITY acceptThirdParty.pre.accesskey "c">
 <!ENTITY acceptThirdParty.always.label "總是">
 <!ENTITY acceptThirdParty.never.label "永不">
 <!ENTITY acceptThirdParty.visited.label "造訪過的網站">
 <!ENTITY keepUntil.label "保留 Cookie 直到:">
--- a/mail/chrome/messenger/sanitize.dtd
+++ b/mail/chrome/messenger/sanitize.dtd
@@ -19,16 +19,18 @@ that require it.  -->
 <!ENTITY clearTimeDuration.suffix         "">
 
 <!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
      of the "Details" progressive disclosure button.  See UI mockup at bug
      480169 -->
 <!ENTITY detailsProgressiveDisclosure.label     "詳細資訊">
 <!ENTITY detailsProgressiveDisclosure.accesskey "e">
 
+<!ENTITY itemHistory.label                 "瀏覽記錄">
+<!ENTITY itemHistory.accesskey             "B">
 <!ENTITY itemCookies.label                 "Cookies">
 <!ENTITY itemCookies.accesskey             "C">
 <!ENTITY itemCache.label                   "快取">
 <!ENTITY itemCache.accesskey               "a">
 
 <!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
      that appears when "Time range to clear" is set to "Everything".  See UI
      mockup at bug 480169 -->
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -6,16 +6,17 @@
 <!ENTITY  no_space_to_start_error "空間不足,無法啟動 &brandShortName;。">
 <!ENTITY  error_loading_file "嘗試讀取 &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  reading_list_title "閱讀清單">
+<!ENTITY  recent_tabs_title "最近開啟的分頁">
 
 <!ENTITY  switch_to_tab "切換到分頁">
 
 <!ENTITY  crash_reporter_title "&brandShortName; 錯誤回報員">
 <!ENTITY  crash_message2 "&brandShortName; 意外碰上問題而自行關閉。您的分頁將會在重新啟動後被列在 &brandShortName; 的開始頁。">
 <!ENTITY  crash_send_report_message3 "告訴 &vendorShortName; 這次錯誤的資訊,讓他們修正">
 <!ENTITY  crash_include_url2 "包含我所瀏覽的頁面網址">
 <!ENTITY  crash_sorry "很抱歉">
@@ -38,18 +39,18 @@
 <!ENTITY bookmark "書籤">
 <!ENTITY bookmark_added "已加入書籤">
 <!ENTITY bookmark_removed "已移除書籤">
 <!ENTITY bookmark_updated "已更新書籤">
 <!ENTITY bookmark_options "選項">
 
 <!ENTITY history_today_section "今天">
 <!ENTITY history_yesterday_section "昨天">
-<!ENTITY history_week_section "7 天前">
-<!ENTITY history_older_section "早於 7 天前">
+<!ENTITY history_week_section2 "上週">
+<!ENTITY history_older_section2 "上個月">
 
 <!ENTITY go "衝">
 <!ENTITY search "搜尋">
 <!ENTITY reload "重新載入">
 <!ENTITY forward "下一頁">
 <!ENTITY menu "選單">
 <!ENTITY back "上一頁">
 <!ENTITY stop "停止">
@@ -98,23 +99,23 @@
 <!ENTITY pref_search_restore_defaults_summary "還原預設值">
 <!-- Localization note (pref_search_hint) : "TIP" as in "hint", "clue" etc. Displayed as an
      advisory message on the customise search providers settings page explaining how to add new
      search providers.
      The &formatI; in the string will be replaced by a small image of the icon described, and can be moved to wherever
      it is applicable. -->
 <!ENTITY pref_search_hint "秘訣: 長按網頁中的搜尋欄位,然後點擊 &formatI; 圖示來將任何網站新增至您的搜尋服務提供者清單。">
 <!ENTITY pref_category_devtools "開發者工具">
+<!ENTITY pref_developer_paint_flashing "閃爍描繪區域">
 <!ENTITY pref_developer_remotedebugging "遠端除錯">
 <!ENTITY pref_remember_signons "記住密碼">
 
 <!ENTITY pref_category_home "首頁">
 <!ENTITY pref_category_home_summary "自訂您的首頁">
 <!ENTITY pref_category_home_panels "面板">
-<!ENTITY pref_home_add_panel "新增面板">
 <!ENTITY home_add_panel_title "新增面板">
 <!ENTITY home_add_panel_empty "抱歉,我們無法為您加入任何面板。">
 <!-- Localization note (home_add_panel_installed):
      The &formatS; will be replaced with the name of the new panel the user just
      selected to be added to the home page. -->
 <!ENTITY home_add_panel_installed "已將「&formatS;」新增至首頁">
 <!ENTITY pref_category_home_content_settings "內容選項">
 <!ENTITY pref_home_updates "自動更新">
@@ -140,17 +141,21 @@
 <!ENTITY pref_donottrack_menu "追蹤">
 <!ENTITY pref_donottrack_disallow_tracking "告訴網站我不想被追蹤">
 <!ENTITY pref_donottrack_allow_tracking "告訴網站我想要被追蹤">
 <!ENTITY pref_donottrack_no_pref "不要告訴網站我的追蹤偏好">
 
 <!ENTITY pref_char_encoding "語言及字元編碼">
 <!ENTITY pref_char_encoding_on "顯示選單">
 <!ENTITY pref_char_encoding_off "不顯示選單">
-<!ENTITY pref_clear_private_data "清除隱私資料">
+<!ENTITY pref_clear_private_data2 "立刻清除">
+<!ENTITY pref_clear_private_data_category "清除隱私資料">
+<!ENTITY pref_clear_on_exit_title "總是在離開時清除">
+<!ENTITY pref_clear_on_exit_summary "&brandShortName; 將自動在您選擇主選單的「離開」時清除您的資料">
+<!ENTITY pref_clear_on_exit_dialog_title "選擇要清除的資料">
 <!ENTITY pref_plugins "外掛程式">
 <!ENTITY pref_plugins_enabled "啟用">
 <!ENTITY pref_plugins_tap_to_play "點一下播放">
 <!ENTITY pref_plugins_disabled "停用">
 <!ENTITY pref_text_size "文字大小">
 <!ENTITY pref_reflow_on_zoom4 "重排文字">
 <!ENTITY pref_restore "分頁">
 <!ENTITY pref_restore_always "總是還原">
@@ -252,16 +257,17 @@ size. -->
 <!ENTITY save_as_pdf "儲存為 PDF">
 <!ENTITY find_in_page "在頁面中搜尋">
 <!ENTITY desktop_mode "開啟桌面版網站">
 <!ENTITY page "頁面">
 <!ENTITY tools "工具">
 <!ENTITY new_tab "開新分頁">
 <!ENTITY new_private_tab "開新隱私瀏覽分頁">
 <!ENTITY close_all_tabs "關閉所有分頁">
+<!ENTITY close_private_tabs "關閉隱私分頁">
 <!ENTITY tabs_normal "分頁">
 <!ENTITY tabs_private "隱私">
 <!ENTITY tabs_synced "同步">
 <!ENTITY set_image_fail "無法設定圖片">
 <!ENTITY set_image_chooser_title "將圖片設為">
 
 <!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
      as alternate text for accessibility. They are not visible in the UI. -->
@@ -274,17 +280,16 @@ size. -->
      as alternate text for accessibility. They are not visible in the UI. -->
 <!ENTITY media_casting_to "播放至裝置">
 <!ENTITY media_play "播放">
 <!ENTITY media_pause "暫停">
 <!ENTITY media_stop "停止">
 
 <!ENTITY contextmenu_open_new_tab "用新分頁開啟">
 <!ENTITY contextmenu_open_private_tab "開啟於隱私分頁">
-<!ENTITY contextmenu_open_in_reader "在閱讀器中開啟">
 <!ENTITY contextmenu_remove "移除">
 <!ENTITY contextmenu_add_to_launcher "新增至裝置主畫面">
 <!ENTITY contextmenu_share "分享">
 <!ENTITY contextmenu_pasteandgo "貼上並瀏覽">
 <!ENTITY contextmenu_paste "貼上">
 <!ENTITY contextmenu_copyurl "複製地址">
 <!ENTITY contextmenu_edit_bookmark "編輯">
 <!ENTITY contextmenu_subscribe "訂閱此頁面">
@@ -344,20 +349,20 @@ size. -->
 <!-- Localization note (home_top_sites_add): This string is used as placeholder
      text underneath empty thumbnails in the Top Sites page on about:home. -->
 <!ENTITY home_top_sites_add "新增網站">
 
 <!ENTITY home_history_title "歷史記錄">
 <!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_last_tabs_open "打開上次開啟的所有分頁">
 <!ENTITY home_last_tabs_empty "您最近的分頁將會顯示於此。">
-<!ENTITY home_most_recent_title "最近開啟的分頁">
+<!ENTITY home_open_all "開啟全部">
 <!ENTITY home_most_recent_empty "您最近瀏覽的網頁將會顯示於此。">
 <!ENTITY home_reading_list_empty "您儲存稍後再讀的文件將會顯示於此。">
 <!-- Localization note (home_reading_list_hint): The "TIP" string is synonymous to "hint", "clue", etc. This string is displayed
      as an advisory message on how to add content to the reading list when the reading list empty.
      The placeholder &formatI; will be replaced by a small image of the icon described, and can be moved to wherever
      it is applicable. -->
 <!ENTITY home_reading_list_hint2 "秘訣: 在標題列出現 &formatI; 圖示時長按該圖示來將文章儲存至您的閱讀清單。">
 <!-- Localization note (home_reading_list_hint_accessible): This string is used
@@ -367,16 +372,20 @@ size. -->
 <!-- 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 "找不到此面板的內容。">
 
 <!-- Localization note (home_move_up_to_filter): The variable is replaced by the name of the
      previous location in the navigation, such as the previous folder -->
 <!ENTITY home_move_up_to_filter "&formatS; 的上面">
 
+<!ENTITY private_browsing_title "隱私瀏覽模式">
+<!ENTITY private_tabs_panel_empty_desc "您的隱私分頁將在此顯示,雖然我們不會保留您的瀏覽紀錄或 Cookie,但您建立的書籤與下載的檔案仍然會留在裝置中。">
+<!ENTITY private_tabs_panel_learn_more "想了解更多資訊?">
+
 <!ENTITY pin_site_dialog_hint "輸入搜尋關鍵字">
 
 <!ENTITY filepicker_title "選擇檔案">
 <!ENTITY filepicker_audio_title "選擇或錄製一段聲音檔">
 <!ENTITY filepicker_image_title "選擇或拍攝一張照片">
 <!ENTITY filepicker_video_title "選擇或錄製一段影片">
 
 <!-- Site identity popup -->
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -104,16 +104,19 @@
 <!ENTITY sync.text.redirect.to.set.up.sync.label '在您的裝置上設定 &syncBrand.fullName.label; 以將分頁標籤傳送至其他裝置。'>
 <!ENTITY sync.text.tab.sent.label '已送出您的分頁!'>
 <!ENTITY sync.text.tab.not.sent.label '傳送您的分頁時發生問題。'>
 
 <!-- Firefox Account strings. -->
 
 <!ENTITY fxaccount_full_label 'Firefox 帳號'>
 
+<!ENTITY fxaccount_custom_server_account_title '使用伺服器上的帳號'>
+<!ENTITY fxaccount_custom_server_sync_title '在伺服器上儲存同步資料'>
+
 <!-- Localization note: these are shown in all screens that query the
      user for an email address and password. Hide and show are button
      labels. -->
 <!ENTITY fxaccount_email_hint '電子郵件'>
 <!ENTITY fxaccount_password_hint '密碼'>
 <!ENTITY fxaccount_password_hide '隱藏'>
 <!ENTITY fxaccount_password_show '顯示'>
 
@@ -170,17 +173,19 @@
 <!ENTITY fxaccount_account_verified_description2 '您的資料將在稍後開始同步。'>
 
 <!ENTITY fxaccount_update_credentials_header '登入'>
 <!ENTITY fxaccount_update_credentials_button_label '登入'>
 <!ENTITY fxaccount_update_credentials_unknown_error '無法登入'>
 
 <!ENTITY fxaccount_status_header2 'Firefox 帳號'>
 <!ENTITY fxaccount_status_signed_in_as '已登入為'>
+<!ENTITY fxaccount_status_auth_server '帳號伺服器'>
 <!ENTITY fxaccount_status_device_name '裝置名稱'>
+<!ENTITY fxaccount_status_sync_server 'Sync 伺服器'>
 <!ENTITY fxaccount_status_sync '&syncBrand.shortName.label;'>
 <!ENTITY fxaccount_status_sync_enabled '&syncBrand.shortName.label;: 已啟用'>
 <!ENTITY fxaccount_status_needs_verification2 '需要驗證您的帳號,請點擊此處以重寄驗證郵件。'>
 <!ENTITY fxaccount_status_needs_credentials '無法連線,點擊以登入。'>
 <!ENTITY fxaccount_status_needs_upgrade '您需要升級 &brandShortName; 才能登入。'>
 <!ENTITY fxaccount_status_needs_master_sync_automatically_enabled '&syncBrand.shortName.label; 已設定完成,但不會自動進行同步。請到 Android 設定 &gt; 帳號與同步處理開啟「自動同步」。'>
 <!ENTITY fxaccount_status_needs_account_enabled '&syncBrand.shortName.label; 已設定完成,但不會自動進行同步。點擊此處開始同步。'>
 <!ENTITY fxaccount_status_bookmarks '書籤'>
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -2,11 +2,10 @@
    - 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 aboutApps.title2                          "應用程式">
 <!ENTITY aboutApps.header                          "您的應用程式">
 
 <!ENTITY aboutApps.browseMarketplace "瀏覽 Firefox Marketplace">
 <!ENTITY aboutApps.uninstall "移除">
-<!ENTITY aboutApps.addToHomescreen "新增至裝置主畫面">
 <!ENTITY aboutApps.checkForUpdates "檢查更新">
 
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -194,17 +194,17 @@ contextmenu.fullScreen=全螢幕
 contextmenu.copyImageLocation=複製圖片網址
 contextmenu.shareImage=分享圖片
 # LOCALIZATION NOTE (contextmenu.search):
 # The label of the contextmenu item which allows you to search with your default search engine for
 # the text you have selected. %S is the name of the search engine. For example, "Google".
 contextmenu.search=搜尋 %S
 contextmenu.saveImage=儲存圖片
 contextmenu.setImageAs=將圖片設為
-contextmenu.addSearchEngine=新增搜尋引擎
+contextmenu.addSearchEngine2=新增為搜尋引擎
 contextmenu.playMedia=播放
 contextmenu.pauseMedia=暫停
 contextmenu.shareMedia=分享影片
 contextmenu.showControls2=顯示控制按鈕
 contextmenu.mute=靜音
 contextmenu.unmute=取消靜音
 contextmenu.saveVideo=儲存視訊檔案
 contextmenu.saveAudio=儲存音訊檔案
@@ -237,26 +237,16 @@ stacktrace.anonymousFunction=<匿名>
 stacktrace.outputMessage=自 %S,函式 %S,行 %S,開始堆疊追蹤。
 timer.start=%S: 計時器已啟動
 
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
 timer.end=%1$S: %2$Sms
 
-# Webapps
-webapps.installTitle=安裝應用程式
-webapps.alertSuccess=已成功安裝
-# Shown when there is a generic problem installing an app
-webapps.installError=安裝應用程式時發生錯誤
-# Shown when there is something wrong with an apps manifest
-webapps.manifestInstallError=無效的應用程式資訊
-# Shown when a network error prevented installing an app
-webapps.networkInstallError=無法下載應用程式資訊檔
-
 # Click to play plugins
 clickToPlayPlugins.message2=%S 包含需要外掛程式播放的內容,要啟用外掛程式嗎?
 clickToPlayPlugins.activate=啟用
 clickToPlayPlugins.dontActivate=不要啟用
 # LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 clickToPlayPlugins.dontAskAgain=針對這個網站不要再問我
 # LOCALIZATION NOTE (clickToPlayPlugins.playPlugins): Label that
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -18,16 +18,16 @@
 # link title for about:fennec
 #define bookmarks_aboutBrowser Firefox: 關於您的瀏覽器
 
 # LOCALIZATION NOTE (bookmarks_addons):
 # link title for https://addons.mozilla.org/en-US/mobile
 #define bookmarks_addons Firefox: 使用附加元件
 
 # LOCALIZATION NOTE (bookmarks_support):
-# link title for https://support.mozilla.org/mobile
+# link title for https://support.mozilla.org/
 #define bookmarks_support Firefox: 技術支援
 
 # LOCALIZATION NOTE (bookmarks_marketplace):
 # link title for https://marketplace.firefox.com
 #define bookmarks_marketplace Firefox Marketplace
 
 #unfilter emptyLines
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -86,12 +86,8 @@
 <!ENTITY formSigning.cert "簽署憑證中">
 <!ENTITY formSigning.confirmPassword "為了確認您同意使用您選擇的憑證簽署此文字訊息,請輸入您的主控密碼:">
 
 <!-- Strings for protectedAuth dialog -->
 <!ENTITY protectedAuth.title "被保護的 Token 鑑別">
 <!ENTITY protectedAuth.msg "請鑑別此 Token,鑑別方法會隨 Token 類型而不同。">
 <!ENTITY protectedAuth.tokenName.label "Token:">
 
-<!ENTITY certErrorDlg.title "安全連線失敗">
-<!ENTITY certErrorDlg.info1 "這可能是伺服器設定錯誤造成的問題,也有可能是有人試圖假冒其身分。">
-<!ENTITY certErrorDlg.info2 "若您曾經成功連線到此伺服器,這個錯誤可能是暫時的,您可以稍候再試一次。">
-
--- a/suite/chrome/browser/webDeveloper.dtd
+++ b/suite/chrome/browser/webDeveloper.dtd
@@ -1,7 +1,9 @@
 <!-- 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 validatePage.label            "驗證此頁面">
 <!ENTITY validatePage.accesskey        "V">
+<!ENTITY allowRemoteDebugging.label     "允許遠端除錯">
+<!ENTITY allowRemoteDebugging.accesskey "A">
 
--- a/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
+++ b/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
@@ -17,15 +17,13 @@
 <!ENTITY editBookmarkOverlay.tags.label                      "標籤:">
 <!ENTITY editBookmarkOverlay.tags.accesskey                  "a">
 <!ENTITY editBookmarkOverlay.tagsEmptyDesc.label             "以逗號分隔每個標籤">
 <!ENTITY editBookmarkOverlay.description.label               "說明:">
 <!ENTITY editBookmarkOverlay.description.accesskey           "D">
 <!ENTITY editBookmarkOverlay.keyword.label                   "關鍵字:">
 <!ENTITY editBookmarkOverlay.keyword.accesskey               "K">
 <!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip        "顯示所有標籤">
-<!ENTITY editBookmarkOverlay.loadInSidebar.label             "在側邊欄載入此書籤">
-<!ENTITY editBookmarkOverlay.loadInSidebar.accesskey         "o">
 <!ENTITY editBookmarkOverlay.choose.label                    "在側邊欄載入此書籤">
 <!ENTITY editBookmarkOverlay.newFolderButton.label           "新增資料夾">
 <!ENTITY editBookmarkOverlay.newFolderButton.accesskey       "o">
 <!ENTITY editBookmarkOverlay.newFolderButton.tooltip         "建立新資料夾">
 
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/notification.dtd
@@ -0,0 +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 closeNotification.tooltip "關閉此訊息">
+
+<!-- LOCALIZATION NOTE (closeNotificationItem.label): This entity is used
+     to replace the Toolkit default closeNotificationItem.label ("Not Now")
+     which is ambiguous in some cases. Thus, make sure to select a phrase
+     that clearly relates to closing the current doorhanger. -->
+<!ENTITY closeNotificationItem.label "關閉通知">
+
+<!ENTITY checkForUpdates "檢查更新…">
+
+<!ENTITY learnMore "更多資訊…">
+
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -114,54 +114,59 @@ lwthemeInstallNotification.manageButton.
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=%S 將會在您重新啟動之後被安裝。
 lwthemeNeedsRestart.restartButton=立刻重新啟動
 lwthemeNeedsRestart.restartButton.accesskey=R
 
 # Geolocation UI
-# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare):
-#If you're having trouble with the word Share, please use Allow and Block in your language.
+# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareThisRequest geolocation.alwaysShareForSite geolocation.neverShareForSite):
+#shareLocation is always visible, other entries are contextually relative to it
+#if this doesn't work for your language, use explicit Share or Allow/Block.
 geolocation.shareLocation=透露地理位置
 geolocation.shareLocation.accesskey=a
-geolocation.dontShareLocation=不要透露
-geolocation.dontShareLocation.accesskey=o
-geolocation.alwaysShareLocation=每次都透露
-geolocation.alwaysShareLocation.accesskey=A
-geolocation.neverShareLocation=永不透露
-geolocation.neverShareLocation.accesskey=N
+geolocation.dontShareThisRequest=不允許此次請求
+geolocation.dontShareThisRequest.accesskey=o
+geolocation.alwaysShareForSite=總是允許此網站
+geolocation.alwaysShareForSite.accesskey=A
+geolocation.neverShareForSite=永不允許此網站
+geolocation.neverShareForSite.accesskey=N
 geolocation.siteWantsToKnow=此網站 (%S) 想要知道您目前所在的地理位置。
 geolocation.fileWantsToKnow=檔案 %S 想要知道您目前所在的地理位置。
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore=更多資訊…
 geolocation.remember=對此網站記住我的決定
 
 # Desktop Notifications
+# LOCALIZATION NOTE (webnotifications.showForSession webnotifications.dontShowThisSession webnotifications.alwaysShowForSite webnotifications.neverShowForSite):
+#showForSession is always visible, other entries are contextually relative to it
+#if this doesn't work for your language, use explicit Show or Allow/Block.
 webNotifications.showForSession=顯示通知
 webNotifications.showForSession.accesskey=w
-webNotifications.dontShowForSession=不要顯示
-webNotifications.dontShowForSession.accesskey=o
-webNotifications.alwaysShow=總是顯示
-webNotifications.alwaysShow.accesskey=A
-webNotifications.neverShow=永不顯示
-webNotifications.neverShow.accesskey=N
+webNotifications.dontShowThisSession=此次瀏覽階段均不允許
+webNotifications.dontShowThisSession.accesskey=o
+webNotifications.alwaysShowForSite=總是允許此網站
+webNotifications.alwaysShowForSite.accesskey=A
+webNotifications.neverShowForSite=永不允許此網站
+webNotifications.neverShowForSite.accesskey=N
 webNotifications.showFromSite=您想要顯示來自 %S 的通知嗎?
 webNotifications.remember=對此網站記住我的決定
 
 # IndexedDB
 offlineApps.permissions=此網站 (%S) 想要儲存資料在您的電腦中以供離線使用。
+offlineApps.private=您在隱私瀏覽模式當中,並未允許此網站 (%S) 在您的電腦上儲存資料供離線使用。
 offlineApps.quota=此網站(%1$S)正嘗試在您的電腦上儲存超過 %2$SMB 的資料以供離線使用。
-offlineApps.allow=允許
-offlineApps.allow.accesskey=A
+offlineApps.always=總是允許 
+offlineApps.always.accesskey=A
 offlineApps.later=現在不要
 offlineApps.later.accesskey=N
-offlineApps.deny=此網站永不存
-offlineApps.deny.accesskey=e
+offlineApps.never=此網站永不存
+offlineApps.never.accesskey=e
 
 # Block autorefresh
 refreshBlocked.goButton=允許
 refreshBlocked.goButton.accesskey=A
 refreshBlocked.refreshLabel=%S 已阻止本頁面自動重新載入。
 refreshBlocked.redirectLabel=%S 已阻止本頁面自動重新導向到其他網頁。
 
 # LOCALIZATION NOTE (lockPrompt.text)
--- a/suite/chrome/common/pref/pref-advanced.dtd
+++ b/suite/chrome/common/pref/pref-advanced.dtd
@@ -1,20 +1,30 @@
 <!-- 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 'Advanced' prefs settings -->
-<!ENTITY pref.advanced.title        "進階">
+<!ENTITY pref.advanced.title              "進階">
 
-<!ENTITY systemPref.caption         "系統設定">
-<!ENTITY systemPrefCheck.label      "使用系統的設定">
-<!ENTITY systemPrefCheck.accesskey  "U">
-<!ENTITY systemPref.desc            "勾選此項以使用系統設定取代 &brandShortName; 的設定">
+<!ENTITY systemPref.caption               "系統設定">
+<!ENTITY systemPrefCheck.label            "使用系統的設定">
+<!ENTITY systemPrefCheck.accesskey        "U">
+<!ENTITY systemPref.desc                  "勾選此項以使用系統設定取代 &brandShortName; 的設定">
 
-<!ENTITY prefCheckDefault.caption   "系統整合">
-<!ENTITY prefCheckDefaultClient.label "檢查啟動時的預設應用程式設定">
+<!ENTITY prefCheckDefault.caption         "系統整合">
+<!ENTITY prefCheckDefaultClient.label     "檢查啟動時的預設應用程式設定">
 <!ENTITY prefCheckDefaultClient.accesskey "C">
 
-<!ENTITY crashReports.caption       "程式錯誤回報員">
-<!ENTITY submitCrashes.label        "送出錯誤報告">
-<!ENTITY submitCrashes.accesskey    "S">
+<!ENTITY crashReports.caption             "程式錯誤回報員">
+<!ENTITY submitCrashes.label              "送出錯誤報告">
+<!ENTITY submitCrashes.accesskey          "S">
 
+<!ENTITY devTools.caption                 "開發者工具">
+<!ENTITY allowDebugger.label              "允許除錯器連線至 &brandShortName;">
+<!ENTITY allowDebugger.accesskey          "A">
+<!ENTITY allowRemoteConnections.label     "允許來自其他電腦的連線">
+<!ENTITY allowRemoteConnections.accesskey "o">
+<!ENTITY connectionPrompt.label           "連入連線提示">
+<!ENTITY connectionPrompt.accesskey       "P">
+<!ENTITY remoteDebuggerPort.label         "用來連線的埠號:">
+<!ENTITY remoteDebuggerPort.accesskey     "n">
+
--- a/suite/chrome/common/pref/pref-history.dtd
+++ b/suite/chrome/common/pref/pref-history.dtd
@@ -7,16 +7,18 @@
 <!ENTITY  pref.history.caption              "瀏覽記錄">
 <!ENTITY  historyPages.label                "歷史記錄是您先前造訪過的網頁清單。">
 <!ENTITY  enableHistory.label               "記住瀏覽過的網頁">
 <!ENTITY  enableHistory.accesskey           "R">
 <!ENTITY  clearHistory.label                "清除瀏覽記錄">
 <!ENTITY  clearHistory.accesskey            "s">
 
 <!ENTITY  locationBarHistory.caption        "網址列記錄">
+<!ENTITY  urlBarHistoryEnabled.caption      "啟用網址列記錄">
+<!ENTITY  urlBarHistoryEnabled.accesskey    "E">
 <!ENTITY  clearLocationBar.label            "清除網址列裡記錄的網站位址。">
 <!ENTITY  clearLocationBarButton.label      "清除網址列記錄">
 <!ENTITY  clearLocationBarButton.accesskey  "l">
 <!ENTITY  formfillHistory.caption           "網頁表單及搜尋紀錄">
 <!ENTITY  enableFormfill.label              "啟用表單及搜尋紀錄">
 <!ENTITY  enableFormfill.accesskey          "n">
 <!ENTITY  formfillExpire.label              "記得表單及搜尋紀錄至少">
 <!ENTITY  formfillExpire.accesskey          "f">
--- a/suite/chrome/common/pref/pref-offlineapps.dtd
+++ b/suite/chrome/common/pref/pref-offlineapps.dtd
@@ -5,17 +5,21 @@
 
 <!--LOCALIZATION NOTE : FILE Offline Apps prefs dialog -->
 <!ENTITY pref.offlineapps.title             "離線網頁應用程式">
 <!ENTITY pref.offlineCache.caption          "離線網頁內容與使用者資料">
 
 <!ENTITY clearOfflineAppCache.label         "清除">
 <!ENTITY clearOfflineAppCache.accesskey     "C">
 
-<!ENTITY offlineNotify.label                "若網站要求儲存資料以供離線使用時告訴我。">
-<!ENTITY offlineNotify.accesskey            "N">
+<!ENTITY offlineAlwaysAllow.label           "允許所有網站儲存資料供離線時使用">
+<!ENTITY offlineAlwaysAllow.accesskey       "A">
+<!ENTITY offlineExplicit.label              "只允許經明確允許的網站">
+<!ENTITY offlineExplicit.accesskey          "O">
+<!ENTITY offlineNotifyAsk.label             "在網站想要儲存資料供離線使用時通知我">
+<!ENTITY offlineNotifyAsk.accesskey         "N">
 <!ENTITY offlineNotifyPermissions.label     "管理權限">
 <!ENTITY offlineNotifyPermissions.accesskey "P">
 
-<!ENTITY offlineAppsList.label              "允許下列網站儲存資料供離線使用:">
+<!ENTITY offlineAppsUsage.label             "下列網站使用離線儲存空間:">
 <!ENTITY offlineAppsListRemove.label        "清除資料…">
 <!ENTITY offlineAppsListRemove.accesskey    "d">
 
--- a/suite/chrome/common/pref/pref-security.dtd
+++ b/suite/chrome/common/pref/pref-security.dtd
@@ -10,16 +10,23 @@
 
 <!ENTITY dntTellSites.label               "告訴網站我對追蹤行為的偏好">
 <!ENTITY dntTellSites.accesskey           "T">
 <!ENTITY dntTrackingNotOkay.label         "我不想被追蹤">
 <!ENTITY dntTrackingNotOkay.accesskey     "n">
 <!ENTITY dntTrackingOkay.label            "我同意被追蹤">
 <!ENTITY dntTrackingOkay.accesskey        "c">
 
+<!ENTITY geoLocation.label                "位置感知瀏覽">
+<!ENTITY geoIntro.label                   "網站可能會向您請求所在位置的準確資訊。">
+
+<!ENTITY geoEnabled.label                 "收到請求時向我確認">
+<!ENTITY geoEnabled.accesskey             "m">
+<!ENTITY geoDisabled.label                "停用此功能並拒絕所有請求">
+<!ENTITY geoDisabled.accesskey            "D">
 
 <!-- LOCALIZATION NOTE (safeBrowsing.label, blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics
   to a combination of both, so it's important that these strings convey the
   meaning "reported" (and not something like "known").
 -->
 <!ENTITY safeBrowsing.label               "安全瀏覽">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/prefutilities.dtd
@@ -0,0 +1,41 @@
+<!-- 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 FallbackCharset.auto         "目前語系的預設值">
+<!-- LOCALIZATION NOTE (FallbackCharset.arabic):
+     Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.arabic       "阿拉伯文">
+<!ENTITY FallbackCharset.baltic       "波羅的語系">
+<!ENTITY FallbackCharset.ceiso        "中歐語系,ISO">
+<!ENTITY FallbackCharset.cewindows    "中歐語系,Microsoft">
+<!-- LOCALIZATION NOTE (FallbackCharset.simplified):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.simplified   "簡體中文">
+<!-- LOCALIZATION NOTE (FallbackCharset.traditional):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.traditional  "正體中文">
+<!ENTITY FallbackCharset.cyrillic     "俄文/西里爾文字">
+<!-- LOCALIZATION NOTE (FallbackCharset.greek):
+     Translate "Greek" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.greek        "希臘文">
+<!-- LOCALIZATION NOTE (FallbackCharset.hebrew):
+     Translate "Hebrew" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.hebrew       "希伯來文">
+<!-- LOCALIZATION NOTE (FallbackCharset.japanese):
+     Translate "Japanese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.japanese     "日文">
+<!-- LOCALIZATION NOTE (FallbackCharset.korean):
+     Translate "Korean" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.korean       "韓文">
+<!-- LOCALIZATION NOTE (FallbackCharset.thai):
+     Translate "Thai" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.thai         "泰文">
+<!-- LOCALIZATION NOTE (FallbackCharset.turkish):
+     Translate "Turkish" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.turkish      "土耳其文">
+<!-- LOCALIZATION NOTE (FallbackCharset.vietnamese):
+     Translate "Vietnamese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.vietnamese   "越南文">
+<!ENTITY FallbackCharset.other        "其他(包含西歐語系)">
+
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -2,17 +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/.
 
 cachefolder=選擇快取 (Cache) 檔案夾
 #LOCALIZATION NOTE (%1$S) is the size and (%2$S) is the unit of disk space.
 cacheSizeInfo=您的快取使用了 %1$S %2$S 的磁碟空間。
 
 # Offline apps
-appCacheSizeInfo=您的應用程式快取使用了 %1$S %2$S 的磁碟空間。
+offlineAppSizeInfo=您的離線儲存空間目前使用 %1$S %2$S 的磁碟空間。
 offlineAppRemoveTitle=移除離線網站資料
 offlineAppRemovePrompt=資料移除後,%S 就無法於離線狀態下使用了。您確定要移除該網站的離線資料?
 offlineAppRemoveConfirm=移除離線資料
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
 # offline application
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -56,19 +56,20 @@ propertyBirthday=生日
 propertyCustom1=自訂 1
 propertyCustom2=自訂 2
 propertyCustom3=自訂 3
 propertyCustom4=自訂 4
 
 ## LOCALIZATION NOTE (dateformat)
 ## Only used if the year isn't present and should be in the format used by Date.toLocaleFormat
 ## see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
-## %B is the month's localized name and %e is the day of the month [1-31]
+## %B is the month's localized name and %d is the day of the month [1-31].
+## Don't go using %e here, since it breaks things on Windows!
 ## Separators (a space, dash, etc.) can be used
-dateformat=%B %e
+dateFormatMonthDay=%B %d 日
 
 ## LOCALIZATION NOTE (cityAndStateAndZip): 
 ## %1$S is city, %2$S is state, %3$S is zip
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -245,17 +245,19 @@ assemblingMailInformation=組合郵件資訊中…
 gatheringAttachment=正在附加 %S…
 creatingMailMessage=建立郵件中…
 
 ## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
 copyMessageStart=複製郵件到郵件匣 %S 中…
 copyMessageComplete=複製完成。
 copyMessageFailed=複製失敗。
 
-sendLargeMessageWarning=注意!您要寄的信有 %d 位元組。您確定要寄嗎?
+## LOCALIZATION NOTE (largeMessageSendWarning):
+## %S is the message size in user-friendly notation. Do not translate.
+largeMessageSendWarning=警告!您將傳送一封大小為 %S 的訊息,可能超過郵件伺服器允許的限制。您確定要傳送嗎?
 
 sendingMessage=發送郵件中…
 sendMessageErrorTitle=訊息傳送錯誤
 postingMessage=寄送郵件中…
 
 sendLaterErrorTitle=延遲送出錯誤
 saveDraftErrorTitle=儲存草稿錯誤
 saveTemplateErrorTitle=儲存範本錯誤
new file mode 100644
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -47,16 +47,18 @@ This is the Windows- and Mac-specific va
 Windows/Mac use the term "Folder" instead of "Directory" -->
 <!ENTITY aboutSupport.appBasicsProfileDirWinMac "設定檔目錄">
 
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "已啟用的外掛程式">
 <!ENTITY aboutSupport.appBasicsBuildConfig "編譯組態">
 <!ENTITY aboutSupport.appBasicsUserAgent "使用者代理字串(User Agent)">
 <!ENTITY aboutSupport.appBasicsMemoryUse "記憶體使用量">
 
+<!ENTITY aboutSupport.appBasicsMultiProcessSupport "多程序視窗">
+
 <!ENTITY aboutSupport.showDir.label "開啟資料夾">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
 <!ENTITY aboutSupport.showMac.label "顯示於 Finder">
 <!-- LOCALIZATION NOTE (aboutSupport.showWin.label): This is the Windows-specific
 variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.showWin.label "開啟資料夾">
@@ -64,16 +66,20 @@ variant of aboutSupport.showDir.label. -
 <!ENTITY aboutSupport.modifiedKeyPrefsTitle "已修改的重要偏好設定">
 <!ENTITY aboutSupport.modifiedPrefsName "名稱">
 <!ENTITY aboutSupport.modifiedPrefsValue "值">
 
 <!-- LOCALIZATION NOTE (aboutSupport.userJSTitle, aboutSupport.userJSDescription): user.js is the name of the preference override file being checked. -->
 <!ENTITY aboutSupport.userJSTitle "user.js 偏好設定">
 <!ENTITY aboutSupport.userJSDescription "您的設定檔資料夾中有一個 <a id='prefs-user-js-link'>user.js 檔案</a>,當中包含不是由 &brandShortName; 所建立的偏好設定。">
 
+<!ENTITY aboutSupport.lockedKeyPrefsTitle "被鎖定的重要偏好設定">
+<!ENTITY aboutSupport.lockedPrefsName "名稱">
+<!ENTITY aboutSupport.lockedPrefsValue "值">
+
 <!ENTITY aboutSupport.graphicsTitle "圖形">
 
 <!ENTITY aboutSupport.jsTitle "JavaScript">
 <!ENTITY aboutSupport.jsIncrementalGC "Incremental GC">
 
 <!ENTITY aboutSupport.a11yTitle "輔助功能">
 <!ENTITY aboutSupport.a11yActivated "已啟用">
 <!ENTITY aboutSupport.a11yForceDisabled "已強迫停用輔助功能">
--- a/toolkit/chrome/global/devtools/csscoverage.dtd
+++ b/toolkit/chrome/global/devtools/csscoverage.dtd
@@ -32,16 +32,17 @@
 <!ENTITY csscoverage.optimize.body1 "某些情況下,您可以將標籤移動到">
 <!ENTITY csscoverage.optimize.body2 "頁面的底部,並建立包含頂端「load」事件之前需要的樣式的新行內元素來加速載入">
 <!ENTITY csscoverage.optimize.body3 "以下是您需要的樣式區塊:">
 
 <!-- LOCALIZATION NOTE (csscoverage.optimize.bodyX):
   -  This is what we say when we have no optimization suggestions -->
 <!ENTITY csscoverage.optimize.bodyX "所有規則皆已位於行內。">
 
-<!-- LOCALIZATION NOTE (csscoverage.footer1, csscoverage.footer2, csscoverage.footer3):
-  -  The text displayed at the bottom of the page, with 2 being the URL opened
-  -  when the link text in 3 is clicked -->
+<!-- LOCALIZATION NOTE (csscoverage.footer1, csscoverage.footer2a,
+  -  csscoverage.footer3, csscoverage.footer4): The text displayed at the
+  -  bottom of the page, with 2a being the URL opened when the link text in 3
+  -  is clicked -->
 <!ENTITY csscoverage.footer1 "請參考">
-<!ENTITY csscoverage.footer2 "https://developer.mozilla.org/zh-TW/docs/Tools/CSS_Coverage">
+<!ENTITY csscoverage.footer2a "https://developer.mozilla.org/zh-TW/docs/Tools/CSS_Coverage">
 <!ENTITY csscoverage.footer3 "CSS 涵蓋範圍工具的 MDN 文件">
 <!ENTITY csscoverage.footer4 "以了解此報告中的內容。">
 
--- a/toolkit/chrome/global/devtools/csscoverage.properties
+++ b/toolkit/chrome/global/devtools/csscoverage.properties
@@ -1,30 +1,33 @@
 # 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 These strings are used in the 'csscoverage' command and in
 # the user interface that this command creates.
 
-# LOCALIZATION NOTE (csscoverageDesc, csscoverageStartDesc, csscoverageStopDesc,
-# csscoverageOneShotDesc, csscoverageToggleDesc, csscoverageReportDesc): Short
-# descriptions of the csscoverage commands
+# LOCALIZATION NOTE (csscoverageDesc, csscoverageStartDesc2,
+# csscoverageStopDesc2, csscoverageOneShotDesc2, csscoverageToggleDesc2,
+# csscoverageReportDesc2): Short descriptions of the csscoverage commands
 csscoverageDesc=控制 CSS 涵蓋範圍分析
-csscoverageStartDesc=開始收集 CSS 涵蓋範圍分析資料
-csscoverageStopDesc=停止收集 CSS 涵蓋範圍分析資料
-csscoverageOneShotDesc=停止收集 CSS 涵蓋範圍分析資料
-csscoverageToggleDesc=切換收集 CSS 涵蓋範圍分析資料
-csscoverageReportDesc=顯示 CSS 涵蓋範圍分析報告
+csscoverageStartDesc2=開始收集 CSS 涵蓋範圍資料
+csscoverageStopDesc2=停止收集 CSS 涵蓋範圍資料
+csscoverageOneShotDesc2=收集即時的 CSS 涵蓋範圍資料
+csscoverageToggleDesc2=切換收集 CSS 涵蓋範圍資料
+csscoverageReportDesc2=顯示 CSS 涵蓋範圍報告
+csscoverageStartNoReloadDesc=開啟時不要重新載入頁面
+csscoverageStartNoReloadManual=開啟時最好可以重新載入頁面,因為這樣才可以從已知的地方開始進行測試。但仍然可能會有不想要重新載入的理由(例如網頁上的某些東西會在重新載入後消失)
 
 # LOCALIZATION NOTE (csscoverageRunningReply, csscoverageDoneReply): Text that
 # describes the current state of the css coverage system
 csscoverageRunningReply=正在分析 CSS 涵蓋範圍
 csscoverageDoneReply=CSS 涵蓋範圍分析已完成
 
 # LOCALIZATION NOTE (csscoverageRunningError, csscoverageNotRunningError,
 # csscoverageNotRunError): Error message that describe things that can go wrong
 # with the css coverage system
 csscoverageRunningError=正在分析 CSS 涵蓋範圍
 csscoverageNotRunningError=未進行 CSS 涵蓋範圍分析
 csscoverageNotRunError=未分析過 CSS 涵蓋範圍
 csscoverageNoRemoteError=目標不支援 CSS 涵蓋範圍工具
+csscoverageOneShotReportError=「oneshot」資料無法取得 CSS 涵蓋範圍報告,請使用 start 或 stop。
 
--- a/toolkit/chrome/global/devtools/styleinspector.properties
+++ b/toolkit/chrome/global/devtools/styleinspector.properties
@@ -30,16 +30,20 @@ rule.sourceInline=行內
 rule.sourceElement=元素
 
 # LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
 # that were inherited from a parent node. Will be passed a node
 # identifier of the parent node.
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom=繼承自 %S
 
+# LOCALIZATION NOTE (rule.keyframe): Shown for CSS Rules keyframe header.
+# Will be passed an identifier of the keyframe animation name.
+rule.keyframe=關鍵影格 %S
+
 # LOCALIZATION NOTE (rule.userAgentStyles): Shown next to the style sheet
 # link for CSS rules that were loaded from a user agent style sheet.
 # These styles will not be editable, and will only be visible if the
 # devtools.inspector.showUserAgentStyles pref is true.
 rule.userAgentStyles=(user agent)
 
 # LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
 # pseudo element header
@@ -75,32 +79,48 @@ ruleView.contextmenu.selectAll.accessKey
 # LOCALIZATION NOTE (ruleView.contextmenu.copy): Text displayed in the rule view
 # context menu.
 ruleView.contextmenu.copy=複製
 
 # LOCALIZATION NOTE (ruleView.contextmenu.copy.accessKey): Access key for
 # the rule view context menu "Select all" entry.
 ruleView.contextmenu.copy.accessKey=C
 
+# LOCALIZATION NOTE (ruleView.contextmenu.copyColor): Text displayed in the rule
+# and computed view context menu when a color value was clicked.
+ruleView.contextmenu.copyColor=複製色彩
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copyColor.accessKey): Access key for
+# the rule and computed view context menu "Copy Color" entry.
+ruleView.contextmenu.copyColor.accessKey=L
+
 # LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources): Text displayed in the rule view
 # context menu.
 ruleView.contextmenu.showOrigSources=顯示原始碼
 
 # LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources.accessKey): Access key for
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=O
 
 # LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources): Text displayed in the rule view
 # context menu.
 ruleView.contextmenu.showCSSSources=顯示 CSS 原始碼
 
 # LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources.accessKey): Access key for
 # the rule view context menu "Show CSS sources" entry.
 ruleView.contextmenu.showCSSSources.accessKey=S
 
+# LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
+# rule view context menu for adding a new rule to the element.
+ruleView.contextmenu.addRule=新增規則
+
+# LOCALIZATION NOTE (ruleView.contextmenu.addRule.accessKey): Access key for
+# the rule view context menu "Add rule" entry.
+ruleView.contextmenu.addRule.accessKey=R
+
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
 # computed view context menu.
 computedView.contextmenu.selectAll=全部選擇
 
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll.accessKey): Access key for
 # the computed view context menu "Select all" entry.
 computedView.contextmenu.selectAll.accessKey=A
 
--- a/toolkit/chrome/global/webapps.properties
+++ b/toolkit/chrome/global/webapps.properties
@@ -1,8 +1,8 @@
-# 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 (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
+# 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 (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
 uninstall.notification = 已自您的電腦移除 %S。
 uninstall.label = 移除應用程式
 
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -51,16 +51,18 @@ notification.upgrade=%1$S 將會在您重新啟動 %2$S 後被更新。
 #LOCALIZATION NOTE (notification.downloadError) %1$S is the add-on name.
 notification.downloadError=下載 %1$S 時發生錯誤。
 notification.downloadError.retry=重試
 notification.downloadError.retry.tooltip=嘗試再下載一次此附加元件
 #LOCALIZATION NOTE (notification.installError) %1$S is the add-on name.
 notification.installError=安裝 %1$S 時發生錯誤。
 notification.installError.retry=重試
 notification.installError.retry.tooltip=嘗試再下載並安裝此附加元件一次
+#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
+notification.openH264Pending=很快就會安裝完成。
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=建議捐助: %S
 
 installDownloading=下載中
 installDownloaded=已下載
 installDownloadFailed=下載時發生錯誤
 installVerifying=驗證中
@@ -92,16 +94,18 @@ details.notification.enable=%1$S 將會在您重新啟動 %2$S 後被啟用。
 #LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name
 details.notification.disable=%1$S 將會在您重新啟動 %2$S 後被停用。
 #LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name
 details.notification.install=%1$S 將會在您重新啟動 %2$S 後被安裝。
 #LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name
 details.notification.uninstall=%1$S 將會在您重新啟動 %2$S 後被移除。
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S 將會在您重新啟動 %2$S 後被更新。
+#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
+details.notification.openH264Pending=很快就會安裝完成。
 
 # LOCALIZATION NOTE (details.experiment.time.daysRemaining):
 # Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days from now that the experiment will remain active (detail view).
 details.experiment.time.daysRemaining=剩下 #1 天
 #LOCALIZATION NOTE (details.experiment.time.endsToday) The experiment will end in less than a day (detail view).
 details.experiment.time.endsToday=剩下不到一天
deleted file mode 100644
--- a/toolkit/chrome/mozapps/preferences/ocsp.dtd
+++ /dev/null
@@ -1,10 +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/. -->
-
-<!ENTITY ocspDialog.title             "憑證驗證">
-<!ENTITY enableOCSP.label             "使用線上憑證狀態協定 (OCSP) 來檢查目前憑證的有效性">
-<!ENTITY enableOCSP.accesskey         "U">
-<!ENTITY requireOCSP.label            "當 OCSP 伺服器連線失敗時,將憑證視為無效">
-<!ENTITY requireOCSP.accesskey        "W">
-