Update strings for 35
authorPeter Pin-Guang Chen <petercpg@mail.moztw.org>
Thu, 16 Oct 2014 12:57:27 +0800
changeset 1065 7cbb999e5a437d231ac21f4d416795c033562429
parent 1064 c2ac0ff6e9ad1ef3ed3bb115a754e0dd6b17154c
child 1066 18117a782b7a49d066e9f34b9ce447475e083c28
push id630
push userpetercpg@mail.moztw.org
push dateThu, 16 Oct 2014 04:58:11 +0000
Update strings for 35
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/app-manager.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/webide.dtd
browser/chrome/browser/devtools/webide.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/places/places.properties
browser/chrome/browser/safeMode.dtd
browser/pdfviewer/viewer.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/layout/css.properties
dom/chrome/layout/xbl.properties
dom/chrome/security/csp.properties
dom/chrome/security/security.properties
mail/chrome/messenger/messenger.properties
mobile/android/base/android_strings.dtd
mobile/android/chrome/about.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutFeedback.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/handling.properties
mobile/android/chrome/webapp.properties
mobile/overrides/netError.dtd
netwerk/necko.properties
security/manager/chrome/pipnss/nsserrors.properties
suite/chrome/common/utilityOverlay.dtd
toolkit/chrome/global/autocomplete.properties
toolkit/chrome/global/charsetMenu.properties
toolkit/chrome/global/devtools/styleinspector.properties
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/resetProfile.properties
toolkit/chrome/global/xpinstall/xpinstall.properties
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/plugins/plugins.properties
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -18,18 +18,34 @@
 <!ENTITY restorepage.close.access   "C">
 
 <!ENTITY restorepage.restoreHeader  "回復">
 <!ENTITY restorepage.listHeader     "視窗與分頁">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "視窗 &#37;S">
 
 
-<!-- LOCALIZATION NOTE: The following 'welcomeback' strings are for about:welcomeback,
+<!-- LOCALIZATION NOTE: The following 'welcomeback2' strings are for about:welcomeback,
      not for about:sessionstore -->
-<!ENTITY welcomeback.tabtitle       "歡迎回來!">
+
+<!ENTITY welcomeback2.restoreButton  "出發吧!">
+<!ENTITY welcomeback2.restoreButton.access "L">
+
+<!ENTITY welcomeback2.tabtitle      "成功!">
+
+<!ENTITY welcomeback2.pageTitle     "成功!">
+<!ENTITY welcomeback2.pageInfo1     "已經準備好可以使用 &brandShortName;。">
 
-<!-- LOCALIZATION NOTE: The title is intended to be welcoming and congratulatory,
-     expressing joy that the user has successfully migrated their stuff and hope
-     that now they have a better experience.  -->
-<!ENTITY welcomeback.pageTitle      "歡迎回來!">
-<!ENTITY welcomeback.pageInfo       "&brandShortName; 成功地重設了您的設定檔。下面是您先前開啟的視窗與分頁的清單,您可以還原他們或是以全新的狀態開始使用。">
+<!ENTITY welcomeback2.label.restoreAll  "還原所有視窗與分頁">
+<!ENTITY welcomeback2.label.restoreSome "只還原您想要的視窗與分頁">
+
 
+<!-- LOCALIZATION NOTE (welcomeback2.beforelink.pageInfo2,
+welcomeback2.afterlink.pageInfo2): these two string are used respectively
+before and after the the "learn more" link (welcomeback2.link.pageInfo2).
+Localizers can use one of them, or both, to better adapt this sentence to
+their language.
+-->
+<!ENTITY welcomeback2.beforelink.pageInfo2  "已移除您的附加元件與自訂調整,並將瀏覽器設定恢復成預設值。若這樣還無法解決您的問題,">
+<!ENTITY welcomeback2.afterlink.pageInfo2   "">
+
+<!ENTITY welcomeback2.link.pageInfo2        "瞭解您還可以做什麼。">
+
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -135,27 +135,32 @@ These should match what Safari and other
 <!ENTITY closeWindow.accesskey "d">
 
 <!ENTITY bookmarksMenu.label "書籤">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "將本頁加入書籤">
 <!ENTITY editThisBookmarkCmd.label "編輯此書籤">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY markPageCmd.commandkey "l">
+<!-- LOCALIZATION NOTE (findShareServices.label):
+  -  Use the unicode ellipsis char, \u2026,
+  -  or use "..." if \u2026 doesn't suit traditions in your locale. -->
+<!ENTITY findShareServices.label "尋找更多分享服務…">
 <!ENTITY sharePageCmd.label "分享此頁面">
 <!ENTITY sharePageCmd.commandkey "S">
 <!ENTITY sharePageCmd.accesskey "s">
-<!ENTITY shareLinkCmd.label "分享此鏈結">
-<!ENTITY shareLinkCmd.accesskey "s">
-<!ENTITY shareImageCmd.label "分享此圖片">
-<!ENTITY shareImageCmd.accesskey "s">
-<!ENTITY shareSelectCmd.label "分享選擇項目">
-<!ENTITY shareSelectCmd.accesskey "s">
-<!ENTITY shareVideoCmd.label "分享此影片">
-<!ENTITY shareVideoCmd.accesskey "s">
+<!-- LOCALIZATION NOTE (shareLink.accesskey): must be different than the following share access keys -->
+<!ENTITY shareLink.label "分享此鏈結">
+<!ENTITY shareLink.accesskey "h">
+<!ENTITY shareImage.label "分享此圖片">
+<!ENTITY shareImage.accesskey "r">
+<!ENTITY shareSelect.label "分享選擇項目">
+<!ENTITY shareSelect.accesskey "r">
+<!ENTITY shareVideo.label "分享此影片">
+<!ENTITY shareVideo.accesskey "r">
 <!ENTITY feedsMenu.label "訂閱">
 <!ENTITY subscribeToPageMenupopup.label "訂閱此頁面">
 <!ENTITY subscribeToPageMenuitem.label "訂閱此頁面…">
 <!ENTITY addCurPagesCmd.label "將所有分頁加入書籤…">
 <!ENTITY showAllBookmarks2.label "顯示所有書籤">
 <!ENTITY unsortedBookmarksCmd.label "未排序書籤">
 <!ENTITY bookmarksToolbarChevron.tooltip "顯示更多書籤">
 
@@ -207,16 +212,18 @@ These should match what Safari and other
 
 <!ENTITY downloads.label              "下載">
 <!ENTITY downloads.accesskey          "D">
 <!ENTITY downloads.commandkey         "j">
 <!ENTITY downloadsUnix.commandkey     "y">
 <!ENTITY addons.label                 "附加元件">
 <!ENTITY addons.accesskey             "A">
 <!ENTITY addons.commandkey            "A">
+<!ENTITY webapps.label                "應用程式">
+<!ENTITY webapps.accesskey            "p">
 
 <!ENTITY webDeveloperMenu.label       "網頁開發者">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
 <!ENTITY devToolsCmd.keycode          "VK_F12">
 <!ENTITY devToolsCmd.keytext          "F12">
 
 <!ENTITY devtoolsConnect.label        "連線…">
@@ -685,32 +692,37 @@ just addresses the organization to follo
 
 <!ENTITY social.activated.description "已啟用來自 <label/> 的服務。您可以在 <label class='text-link'>附加元件管理員中</label> 修改服務選項。">
 <!ENTITY social.activated.undo.label "喔喔,我要還原!">
 <!ENTITY social.activated.undo.accesskey "U">
 <!ENTITY social.learnMore.label "更多資訊…">
 <!ENTITY social.learnMore.accesskey "l">
 <!ENTITY social.closeNotificationItem.label "現在不要">
 
-
+<!ENTITY social.directory.label "可啟用項目的目錄">
+<!ENTITY social.directory.text "您可於目錄中啟用分享服務。">
+<!ENTITY social.directory.button "帶我到那邊去!">
+<!ENTITY social.directory.introText "點擊任一個服務以將其新增到 &brandShortName;。">
+<!ENTITY social.directory.viewmore.text "檢視更多">
 
 <!ENTITY customizeMode.tabTitle "自訂 &brandShortName;">
 <!ENTITY customizeMode.menuAndToolbars.header2 "其他工具與功能">
 <!ENTITY customizeMode.menuAndToolbars.empty "想要更多工具?">
 <!ENTITY customizeMode.menuAndToolbars.emptyLink "自數以千計的附加元件中挑選">
 <!ENTITY customizeMode.restoreDefaults "回復為預設值">
 <!ENTITY customizeMode.toolbars "顯示 / 隱藏工具列">
 <!ENTITY customizeMode.titlebar "標題列">
 <!ENTITY customizeMode.lwthemes "佈景主題">
 <!ENTITY customizeMode.lwthemes.myThemes "我的佈景主題">
 <!ENTITY customizeMode.lwthemes.recommended "推薦">
 <!ENTITY customizeMode.lwthemes.menuManage "管理">
 <!ENTITY customizeMode.lwthemes.menuManage.accessKey "M">
 <!ENTITY customizeMode.lwthemes.menuGetMore "下載更多佈景主題">
 <!ENTITY customizeMode.lwthemes.menuGetMore.accessKey "G">
+<!ENTITY customizeMode.deveditionTheme.label "使用 &brandShortName; 佈景主題">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "聊天焦點">
 <!ENTITY social.chatBar.accesskey "c">
 
 <!ENTITY social.markpageMenu.accesskey "P">
 <!ENTITY social.markpageMenu.label "另存頁面至…">
 <!ENTITY social.marklinkMenu.accesskey "L">
@@ -734,18 +746,20 @@ just addresses the organization to follo
 <!ENTITY mixedContentBlocked2.block.label "啟用保護">
 <!ENTITY mixedContentBlocked2.block.accesskey "B">
 <!ENTITY mixedContentBlocked2.disabled.message "已停止保護">
 
 <!ENTITY trackingContentBlocked.message "追蹤">
 <!ENTITY trackingContentBlocked.moreinfo "此網頁上某些追蹤您的線上行為的部分已被封鎖。">
 <!ENTITY trackingContentBlocked.learnMore "更多資訊">
 <!ENTITY trackingContentBlocked.options "選項">
-<!ENTITY trackingContentBlocked.unblock.label2 "為此網站停用保護">
+<!ENTITY trackingContentBlocked.unblock2.label "為此網站停用保護">
+<!ENTITY trackingContentBlocked.unblock2.accesskey "D">
 <!ENTITY trackingContentBlocked.block.label "啟用保護">
+<!ENTITY trackingContentBlocked.block.accesskey "E">
 <!ENTITY trackingContentBlocked.disabled.message "已停止追蹤保護">
 
 <!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 -->
@@ -769,17 +783,17 @@ just addresses the organization to follo
 
 <!ENTITY appMenuSidebars.label         "側邊欄">
 
 <!ENTITY switchToMetroCmd2.label       "以 &brandShortName; for Windows 8 觸控模式重新啟動">
 
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
      The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
      Please ensure that this remains the case in the translation. -->
-<!ENTITY panicButton.view.mainTimeframeDesc       "忘掉先前:">
+<!ENTITY panicButton.view.mainTimeframeDesc       "忘掉先前的瀏覽紀錄:">
 <!ENTITY panicButton.view.5min                    "5 分鐘">
 <!ENTITY panicButton.view.2hr                     "2 小時">
 <!ENTITY panicButton.view.day                     "24 小時">
 
 <!-- LOCALIZATION NOTE: (panicButton.view.mainLabel, panicButton.view.deleteCookies, panicButton.view.deleteHistory, panicButton.view.deleteTabsAndWindows, panicButton.view.openNewWindow):
      The .mainActionDesc string combined with any of the 4 others is meant to form a complete sentence, e.g. "Proceeding will: Delete Recent Cookies".
      Note also that the deleteCookies, deleteHistory and deleteTabsAndWindows strings include <html:strong> tags for emphasis on the words "Cookies", "History", "Tabs" and "Windows".
      The translation should do the same. -->
@@ -787,13 +801,13 @@ just addresses the organization to follo
 <!ENTITY panicButton.view.deleteCookies           "刪除近期的 <html:strong>Cookie</html:strong>">
 <!ENTITY panicButton.view.deleteHistory           "刪除近期的<html:strong>瀏覽紀錄</html:strong>">
 <!ENTITY panicButton.view.deleteTabsAndWindows    "關閉所有<html:strong>分頁</html:strong>與<html:strong>視窗</html:strong>">
 <!ENTITY panicButton.view.openNewWindow           "再重新開啟乾淨的視窗">
 
 <!ENTITY panicButton.view.undoWarning             "此動作無法復原。">
 <!ENTITY panicButton.view.forgetButton            "忘掉吧!">
 
-<!ENTITY panicButton.thankyou.msg1                "已清除您最近的瀏覽紀錄">
+<!ENTITY panicButton.thankyou.msg1                "已清除您最近的瀏覽紀錄。">
 <!ENTITY panicButton.thankyou.msg2                "安全地瀏覽吧!">
 <!ENTITY panicButton.thankyou.buttonlabel         "謝啦!">
 
 
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -98,23 +98,16 @@ popupWarningDontShowFromMessage=擋下彈出型視窗時不顯示此訊息
 popupWarningDontShowFromLocationbar=阻擋彈出型視窗時不要顯示資訊列
 popupShowPopupPrefix=顯示「%S」
 
 # Bad Content Blocker Doorhanger Notification
 # %S is brandShortName
 badContentBlocked.blocked.message=%S 封鎖了此頁面中的某些內容。
 badContentBlocked.notblocked.message=%S 並未封鎖此頁面中的任何內容。
 
-# missing plugin installer
-installPlugin.message = 您想要安裝外掛程式以顯示此頁面中的媒體內容嗎?
-installPlugin.button.label=安裝 %S
-installPlugin.button.accesskey=I
-installPlugin.ignoreButton.label=不要再問我
-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
@@ -557,36 +550,44 @@ getUserMedia.sharingScreen.message = 您正與此頁面分享您的畫面。
 getUserMedia.sharingWindow.message = 您正與此頁面分享某個視窗。
 getUserMedia.continueSharing.label = 繼續分享
 getUserMedia.continueSharing.accesskey = C
 getUserMedia.stopSharing.label = 停止分享
 getUserMedia.stopSharing.accesskey = S
 
 getUserMedia.sharingMenu.label = 正在分享裝置的分頁
 getUserMedia.sharingMenu.accesskey = d
-# LOCALIZATION NOTE (getUserMedia.sharingMenuCamera, getUserMedia.sharingMenuCamera,
-#                    getUserMedia.sharingMenuMicrophone, getUserMedia.sharingMenuApplication,
-#                    getUserMedia.sharingMenuScreen, getUserMedia.sharingMenuWindow,
+# LOCALIZATION NOTE (getUserMedia.sharingMenuCamera
+#                    getUserMedia.sharingMenuMicrophone,
+#                    getUserMedia.sharingMenuApplication,
+#                    getUserMedia.sharingMenuScreen,
+#                    getUserMedia.sharingMenuWindow,
 #                    getUserMedia.sharingMenuCameraMicrophone,
 #                    getUserMedia.sharingMenuCameraMicrophoneApplication,
 #                    getUserMedia.sharingMenuCameraMicrophoneScreen,
 #                    getUserMedia.sharingMenuCameraMicrophoneWindow,
+#                    getUserMedia.sharingMenuCameraApplication,
+#                    getUserMedia.sharingMenuCameraScreen,
+#                    getUserMedia.sharingMenuCameraWindow,
 #                    getUserMedia.sharingMenuMicrophoneApplication,
 #                    getUserMedia.sharingMenuMicrophoneScreen,
 #                    getUserMedia.sharingMenuMicrophoneWindow):
 # %S is the website origin (e.g. www.mozilla.org)
 getUserMedia.sharingMenuCamera = %S(攝影機)
 getUserMedia.sharingMenuMicrophone = %S(麥克風)
 getUserMedia.sharingMenuApplication = %S(應用程式)
 getUserMedia.sharingMenuScreen = %S(畫面)
 getUserMedia.sharingMenuWindow = %S(視窗)
 getUserMedia.sharingMenuCameraMicrophone = %S(攝影機與麥克風)
 getUserMedia.sharingMenuCameraMicrophoneApplication = %S(攝影機、麥克風與應用程式)
 getUserMedia.sharingMenuCameraMicrophoneScreen = %S(攝影機、麥克風與畫面)
 getUserMedia.sharingMenuCameraMicrophoneWindow = %S(攝影機、麥克風與視窗)
+getUserMedia.sharingMenuCameraApplication = %S(攝影機與應用程式)
+getUserMedia.sharingMenuCameraScreen = %S(攝影機與畫面)
+getUserMedia.sharingMenuCameraWindow = %S(攝影機與視窗)
 getUserMedia.sharingMenuMicrophoneApplication = %S(麥克風與應用程式)
 getUserMedia.sharingMenuMicrophoneScreen = %S(麥克風與畫面)
 getUserMedia.sharingMenuMicrophoneWindow = %S(麥克風與視窗)
 # LOCALIZATION NOTE(getUserMedia.sharingMenuUnknownHost): this is used for the website
 # origin for the sharing menu if no readable origin could be deduced from the URL.
 getUserMedia.sharingMenuUnknownHost = 未知來源
 
 # LOCALIZATION NOTE - %S is brandShortName
@@ -599,8 +600,17 @@ slowStartup.disableNotificationButton.ac
 
 # LOCALIZATION NOTE(customizeTips.tip0): %1$S will be replaced with the text defined
 # in customizeTips.tip0.hint, %2$S will be replaced with brandShortName, %3$S will
 # be replaced with a hyperlink containing the text defined in customizeTips.tip0.learnMore.
 customizeTips.tip0 = %1$S: 您可以拖曳上面的任何項目至選單或工具列來將 %2$S 調整成您最喜歡的樣子。了解自訂 %2$S 的%3$S。
 customizeTips.tip0.hint = 提示
 customizeTips.tip0.learnMore = 詳細資訊
 
+# LOCALIZATION NOTE(appmenu.*.description, appmenu.*.label): these are used for
+# the appmenu labels and buttons that appear when an update is staged for
+# installation or a background update has failed and a manual download is required.
+# %S is brandShortName
+appmenu.restartNeeded.description = 重新啟用 %S 以套用更新
+appmenu.updateFailed.description = 背景更新失敗,請下載完整更新
+appmenu.restartBrowserButton.label = 重新啟動 %S
+appmenu.downloadUpdateButton.label = 下載更新
+
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -92,14 +92,25 @@ email-link-button.tooltiptext3 = 寄出本頁面的鏈結
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.linux2 = 離開 %1$S (%2$S)
 # LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.mac = 離開 %1$S (%2$S)
 
+loop-call-button2.label = 開啟一個對話
+loop-call-button2.tooltiptext = 開啟一個對話
+
+social-share-button.label = 分享此頁面
+social-share-button.tooltiptext = 分享此頁面
+
 panic-button.label = 忘記
 panic-button.tooltiptext = 忘掉一些瀏覽紀錄
 
-loop-call-button.label = 邀請某人加入通話
-loop-call-button.tooltiptext = 邀請某人加入通話
+web-apps-button.label = 應用程式
+web-apps-button.tooltiptext = 探索應用程式
 
+# LOCALIZATION NOTE(devtools-webide-button.label, devtools-webide-button.tooltiptext):
+# widget is only visible after WebIDE has been started once (Tools > Web Developers > WebIDE)
+devtools-webide-button.label = WebIDE
+devtools-webide-button.tooltiptext = 開啟 WebIDE
+
--- a/browser/chrome/browser/devtools/app-manager.properties
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -1,12 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+index.deprecationNotice=未來版本中將會移除應用程式管理員,您的專案已移轉至 WebIDE。
+index.launchWebIDE=啟動 WebIDE
+index.readMoreAboutWebIDE=了解更多資訊
 # LOCALIZATION NOTE (device.deviceSize): %1$S is the device's width, %2$S is
 # the device's height, %3$S is the device's pixel density.
 # Example: 800x480 (86 DPI).
 device.deviceSize=裝置大小: %1$Sx%2$S (%3$S DPI)
 # LOCALIZATION NOTE (connection.connectedToDevice, connection.connectTo):
 # %1$S is the host name, %2$S is the port number.
 connection.connectedToDevice=已連線至 %1$S
 connection.connectTo=連線至 %1$S:%2$S
--- a/browser/chrome/browser/devtools/inspector.dtd
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -18,8 +18,10 @@
 
 <!ENTITY inspector.selectButton.tooltip     "使用滑鼠選取元素">
 
 <!ENTITY inspectorSearchHTML.label          "搜尋 HTML">
 <!ENTITY inspectorSearchHTML.key            "F">
 
 <!ENTITY inspectorCopyImageDataUri.label       "複製圖片的 Data URL">
 
+<!ENTITY inspectorShowDOMProperties.label       "顯示 DOM 屬性">
+
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -226,16 +226,29 @@
   -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
 <!ENTITY netmonitorUI.summary.editAndResend "編輯並重新傳送">
 
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.summary.editAndResend.accesskey "R">
 
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders): This is the label displayed
+  -  on the button in the headers tab that toggle view for raw request/response headers
+     from the currently displayed request -->
+<!ENTITY netmonitorUI.summary.rawHeaders "原始檔頭">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.requestHeaders): This is the label displayed
+  -  in the network details headers tab identifying the raw request headers textarea -->
+<!ENTITY netmonitorUI.summary.rawHeaders.requestHeaders "請求檔頭:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.responseHeaders): This is the label displayed
+  -  in the network details headers tab identifying the raw response headers textarea -->
+<!ENTITY netmonitorUI.summary.rawHeaders.responseHeaders "回應檔頭:">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container  -->
 <!ENTITY netmonitorUI.context.newTab      "用新分頁開啟">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container -->
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -34,17 +34,19 @@
 <!ENTITY profilerUI.importButton "匯入…">
 
 <!-- LOCALIZATION NOTE (profilerUI.clearButton): This string is displayed
   -  on a button that remvoes all the recordings. -->
 <!ENTITY profilerUI.clearButton "清除">
 
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
-<!ENTITY profilerUI.table.duration    "時間 (ms)">
-<!ENTITY profilerUI.table.percentage  "成本">
-<!ENTITY profilerUI.table.invocations "呼叫">
-<!ENTITY profilerUI.table.function    "函數">
+<!ENTITY profilerUI.table.totalDuration   "總計時間 (ms)">
+<!ENTITY profilerUI.table.selfDuration    "自己的時間 (ms)">
+<!ENTITY profilerUI.table.totalPercentage "總成本">
+<!ENTITY profilerUI.table.selfPercentage  "自己的成本">
+<!ENTITY profilerUI.table.samples         "範本">
+<!ENTITY profilerUI.table.function        "函數">
 
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
 <!ENTITY profilerUI.newtab.tooltiptext "以新分頁開啟選擇範圍">
 
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -27,16 +27,20 @@ scratchpadContext.invalid=程式碼速記本無法在目前模式下執行此操作。
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
 openFile.title=開啟檔案
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
 openFile.failed=檔案讀取失敗。
 
+# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
+# open fails.
+importFromFile.convert.failed=無法將檔案自 %1$S 轉換為 Unicode。
+
 # LOCALIZATION NOTE (clearRecentMenuItems.label): This is the label for the
 # menuitem in the 'Open Recent'-menu which clears all recent files.
 clearRecentMenuItems.label=清除項目
 
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
 # a file in Scratchpad.
 saveFileAs=另存新檔
 
@@ -73,16 +77,21 @@ scratchpad.noargs=未使用參數建立速記本。
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=這個速記本將會在瀏覽器環境當中執行。
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
 
+# LOCALIZATION NOTE (scratchpad.statusBarLineCol): Line, Column
+# information displayed in statusbar when selection is made in
+# Scratchpad.
+scratchpad.statusBarLineCol  = 第 %1$S 行,第 %2$S 欄
+
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=此檔案不再存在。
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
 propertiesFilterPlaceholder=過濾屬性
 
--- a/browser/chrome/browser/devtools/webide.dtd
+++ b/browser/chrome/browser/devtools/webide.dtd
@@ -57,16 +57,17 @@
 <!ENTITY key_play "R">
 <!-- show toolbox -->
 <!ENTITY key_toggleToolbox "VK_F12">
 <!-- toggle sidebar -->
 <!ENTITY key_toggleEditor "B">
 
 <!ENTITY projectPanel_myProjects "我的專案">
 <!ENTITY projectPanel_runtimeApps "Runtime 應用程式">
+<!ENTITY projectPanel_tabs "標籤">
 <!ENTITY runtimePanel_USBDevices "USB 裝置">
 <!ENTITY runtimePanel_WiFiDevices "Wi-Fi 裝置">
 <!ENTITY runtimePanel_simulators "模擬器">
 <!ENTITY runtimePanel_custom "自訂">
 <!ENTITY runtimePanel_installsimulator "安裝模擬器">
 <!ENTITY runtimePanel_noadbhelper "安裝 ADB Helper">
 <!ENTITY runtimePanel_nousbdevice "看不到您的裝置?">
 
--- a/browser/chrome/browser/devtools/webide.properties
+++ b/browser/chrome/browser/devtools/webide.properties
@@ -17,16 +17,20 @@ remote_runtime_promptMessage=主機名稱:埠號
 
 importPackagedApp_title=選擇目錄
 importHostedApp_title=開啟架設的應用程式
 importHostedApp_header=輸入安裝資訊檔網址
 
 notification_showTroubleShooting_label=疑難排解
 notification_showTroubleShooting_accesskey=t
 
+# LOCALIZATION NOTE (project_tab_loading): This is shown as a temporary tab
+# title for browser tab projects when the tab is still loading.
+project_tab_loading=載入中…
+
 # These messages appear in a notification box when an error occur.
 
 error_cantInstallNotFullyConnected=未完整連線,無法安裝專案。
 error_cantInstallValidationErrors=驗證錯誤,無法安裝專案。
 error_listRunningApps=無法自裝置取得應用程式清單
 
 # Variable: name of the operation (in english)
 error_operationTimeout=操作逾時: %1$S
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -61,16 +61,43 @@
 <!ENTITY cmd.copyDownloadLink.label       "複製下載鏈結">
 <!ENTITY cmd.copyDownloadLink.accesskey   "l">
 <!ENTITY cmd.removeFromHistory.label      "自下載記錄移除">
 <!ENTITY cmd.removeFromHistory.accesskey  "e">
 <!ENTITY cmd.clearList.label              "清空下載清單">
 <!ENTITY cmd.clearList.accesskey          "a">
 <!ENTITY cmd.clearDownloads.label         "清空下載清單">
 <!ENTITY cmd.clearDownloads.accesskey     "D">
+<!-- LOCALIZATION NOTE (cmd.unblock.label):
+     This command may be shown in the context menu, as a menu button item, or as
+     a text link when malware or potentially unwanted downloads are blocked.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
+<!ENTITY cmd.unblock.label                "解除封鎖">
+<!ENTITY cmd.unblock.accesskey            "U">
+<!-- LOCALIZATION NOTE (cmd.removeFile.label):
+     This command may be shown in the context menu or as a menu button label
+     when malware or potentially unwanted downloads are blocked.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
+<!ENTITY cmd.removeFile.label             "移除檔案">
+<!ENTITY cmd.removeFile.accesskey         "m">
+
+<!-- LOCALIZATION NOTE (blocked.label):
+     Shown as a tag before the file name for some types of blocked downloads.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
+<!ENTITY blocked.label                    "已封鎖">
+
+<!-- LOCALIZATION NOTE (learnMore.label):
+     Shown as a text link for some types of blocked downloads, for example
+     malware, when there is an associated explanation page on the Mozilla site.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
+<!ENTITY learnMore.label                  "更多資訊">
 
 <!-- LOCALIZATION NOTE (downloadsHistory.label, downloadsHistory.accesskey):
      This string is shown at the bottom of the Downloads Panel when all the
      downloads fit in the available space, or when there are no downloads in
      the panel at all.
      -->
 <!ENTITY downloadsHistory.label           "顯示所有下載">
 <!ENTITY downloadsHistory.accesskey       "S">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -33,23 +33,50 @@ stateBlockedParentalControls=已依「家長監護」的設定封鎖
 # provide a reference for the translation of "security zone" in various
 # languages:
 # http://support.microsoft.com/kb/174360
 stateBlockedPolicy=已依您的「安全性區域原則」封鎖
 # LOCALIZATION NOTE (stateDirty):
 # Indicates that the download was blocked after scanning.
 stateDirty=已封鎖: 可能包含病毒或間諜軟體。
 
+# LOCALIZATION NOTE (blockedMalware, blockedPotentiallyUnwanted,
+#                    blockedUncommon):
+# These strings are shown in the panel for some types of blocked downloads, and
+# are immediately followed by the "Learn More" link, thus they must end with a
+# period.  You may need to adjust "downloadDetails.width" in "downloads.dtd" if
+# this turns out to be longer than the other existing status strings.
+# Note: These strings don't exist in the UI yet.  See bug 1053890.
+blockedMalware=這個檔案含有病毒或惡意程式。
+blockedPotentiallyUnwanted=這個檔案可能會傷害您的電腦。
+blockedUncommon=這可能是不安全的檔案。
+
+# LOCALIZATION NOTE (unblockHeader, unblockTypeMalware,
+#                    unblockTypePotentiallyUnwanted, unblockTypeUncommon,
+#                    unblockTip, unblockButtonContinue, unblockButtonCancel):
+# These strings are displayed in the dialog shown when the user asks a blocked
+# download to be unblocked.  The severity of the threat is expressed in
+# descending order by the unblockType strings, it is higher for files detected
+# as malware and lower for uncommon downloads.
+# Note: These strings don't exist in the UI yet.  See bug 1053890.
+unblockHeader=您確定要解除封鎖此檔案?
+unblockTypeMalware=這個檔案含有病毒或是會傷害您的電腦的惡意程式。
+unblockTypePotentiallyUnwanted=這個檔案偽裝成正常的下載檔案,會對您的電腦與程式做出未預期的更改。
+unblockTypeUncommon=這是從未知來源下載的檔案,可能不安全。
+unblockTip=您可以搜尋不同的下載來源,或是稍後再下載一次。
+unblockButtonContinue=還是解除封鎖
+unblockButtonCancel=保護我的安全
+
 # LOCALIZATION NOTE (sizeWithUnits):
 # %1$S is replaced with the size number, and %2$S with the measurement unit.
 sizeWithUnits=%1$S %2$S
 sizeUnknown=檔案大小未知
 
 # LOCALIZATION NOTE (shortTimeLeftSeconds, shortTimeLeftMinutes,
-# shortTimeLeftHours, shortTimeLeftDays):
+#                    shortTimeLeftHours, shortTimeLeftDays):
 # These values are displayed in the downloads indicator in the main browser
 # window, where space is available for three characters maximum.  %1$S is
 # replaced with the time left for the given measurement unit.  Even for days,
 # the value is never longer than two digits.
 shortTimeLeftSeconds=%1$S 秒
 shortTimeLeftMinutes=%1$S 分
 shortTimeLeftHours=%1$S 時
 shortTimeLeftDays=%1$S 天
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -1,15 +1,25 @@
 # 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
 
+## LOCALIZATION NOTE(clientShortname2): This should not be localized and
+## should remain "Firefox Hello" for all locales.
+clientShortname2=Firefox Hello
+
+## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
+## replaced by the brand name
+first_time_experience_title={{clientShortname}} — 加入通話
+first_time_experience_button_label=開始使用
+
 share_link_header_text=分享此鏈結以邀請某人加入聊天:
+invite_header_text=邀請某人加入對話
 
 ## LOCALIZATION NOTE(invitee_name_label): Displayed when obtaining a url.
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#precall-firstrun
 ## Click the label icon at the end of the url field.
 invitee_name_label=您想邀請誰?
 ## LOCALIZATION NOTE(invitee_expire_days_label): Allows the user to adjust
 ## the expiry time. Click the label icon at the end of the url field to see where
 ## this is:
@@ -47,22 +57,24 @@ login_expired=您的登入階段已過期
 service_not_available=服務目前無法使用
 problem_accessing_account=存取您的帳號時發生錯誤
 
 ## LOCALIZATION NOTE(retry_button): Displayed when there is an error to retry
 ## the appropriate action.
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error for location
 retry_button=重試
 
-share_email_subject3=您已被邀請加入通話
-## LOCALIZATION NOTE (share_email_body3): In this item, don't translate the
+share_email_subject4={{clientShortname}} — 加入通話
+## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
 ## part between {{..}} and leave the \r\n\r\n part alone
-share_email_body3=要接受此邀請,請複製或點擊此鏈結以啟動通話:\r\n\r\n{{callUrl}}
+share_email_body4=嗨!\r\n\r\n使用 {{clientShortname}} 與我進行視訊通話:\r\n\r\n您不需要下載安裝任何軟體,只需要在瀏覽器開啟下列鏈結:\r\n\r\n{{callUrl}}\r\n\r\n若您想知道的話,可以到 {{learnMoreUrl}} 瞭解關於 {{clientShortname}} 的更多資訊
 share_button=電子郵件
+share_button2=寄送鏈結
 copy_url_button=複製
+copy_url_button2=複製鏈結
 copied_url_button=已複製!
 
 panel_footer_signin_or_signup_link=註冊或登入
 
 settings_menu_item_account=帳號
 settings_menu_item_settings=設定
 settings_menu_item_signout=登出
 settings_menu_item_signin=登入
@@ -80,16 +92,20 @@ contacts_search_placesholder=搜尋…
 ## for where this appears on the UI
 new_contact_button=新連絡人
 ## LOCALIZATION NOTE (new_contact_name_placeholder, new_contact_email_placeholder):
 ## These are the placeholders for the fields for entering a new contact
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 ## and click the 'New Contact' button to see the fields.
 new_contact_name_placeholder=姓名
 new_contact_email_placeholder=電子郵件
+new_contact_phone_placeholder=Firefox OS 手機
+
+contacts_blocked_contacts=已封鎖的聯絡人
+
 ## LOCALIZATION NOTE (add_contact_button):
 ## This is the button to actually add the new contact
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 ## and click the 'New Contact' button to see the fields.
 add_contact_button=新增聯絡人
 ### LOCALIZATION NOTE (valid_email_text_description): This is displayed when
 ### the user enters an invalid email address, preventing the addition of the
 ### contact.
@@ -169,16 +185,17 @@ audio_call_menu_button=語音通話
 video_call_menu_button=視訊通話
 
 # Conversation Window Strings
 
 initiate_call_button_label2=準備好要開始通話了嗎?
 incoming_call_title2=通話請求
 incoming_call_accept_button=接受
 incoming_call_accept_audio_only_tooltip=進行語音通話
+incoming_call_accept_audio_video_tooltip=進行視訊通話
 incoming_call_cancel_button=取消
 incoming_call_cancel_and_block_button=取消並封鎖
 incoming_call_block_button=封鎖
 hangup_button_title=掛斷
 hangup_button_caption2=結束
 mute_local_audio_button_title=靜音
 unmute_local_audio_button_title=取消靜音
 mute_local_video_button_title=關閉視訊
@@ -233,21 +250,26 @@ cancel_button=取消
 
 cannot_start_call_session_not_ready=連線尚未就緒,無法啟動呼叫。
 network_disconnected=網路連線突然中斷。
 connection_error_see_console_notification=呼叫失敗,請看主控台以取得更多資訊。
 
 ## LOCALIZATION NOTE (legal_text_and_links3): In this item, don't translate the
 ## parts between {{..}} because these will be replaced with links with the labels
 ## from legal_text_tos and legal_text_privacy. clientShortname will be replaced
-## by the brand name, or fall back to client_shortname_fallback
+## by the brand name.
 legal_text_and_links3=使用 {{clientShortname}} 代表您同意 {{terms_of_use}} 及 {{privacy_notice}}。
 legal_text_tos = 使用條款
 legal_text_privacy = 隱私權保護政策
-client_shortname_fallback=此產品
+
+## LOCALIZATION NOTE (powered_by_beforeLogo, powered_by_afterLogo):
+## These 2 strings are displayed before and after a 'Telefonica'
+## logo.
+powered_by_beforeLogo=是由
+powered_by_afterLogo=
 
 feedback_call_experience_heading2=您的通話品質如何?
 feedback_what_makes_you_sad=什麼東西讓您不滿意?
 feedback_thank_you_heading=感謝您的意見!
 feedback_category_audio_quality=音訊品質
 feedback_category_video_quality=視訊品質
 feedback_category_was_disconnected=中途斷線
 feedback_category_confusing=聲音/畫面混亂
@@ -263,8 +285,35 @@ feedback_window_will_close_in2=此視窗將在 {{countdown}} 秒後關閉
 ## LOCALIZATION_NOTE (feedback_rejoin_button): Displayed on the feedback form after
 ## a signed-in to signed-in user call.
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#feedback
 feedback_rejoin_button=重新加入
 ## LOCALIZATION NOTE (feedback_report_user_button): Used to report a user in the case of
 ## an abusive user.
 feedback_report_user_button=回報使用者
 
+help_label=說明
+tour_label=導覽
+
+## LOCALIZATION NOTE(rooms_default_room_name_template): {{conversationLabel}}
+## will be replaced by a number. For example "Conversation 1" or "Conversation 12".
+rooms_default_room_name_template=通話 {{conversationLabel}}
+rooms_leave_button_label=離開此處
+rooms_list_copy_url_tooltip=複製鏈結
+## LOCALIZATION NOTE (rooms_list_current_conversations):
+## Semicolon-separated list of plural forms. See:
+## http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## We prefer to have no number in the string, but if you need it for your
+## language please use {{num}}.
+rooms_list_current_conversations=目前的通話
+rooms_list_delete_tooltip=刪除通話
+rooms_list_deleteConfirmation_label=您確定嗎?
+rooms_list_no_current_conversations=目前沒有通話
+rooms_name_this_room_label=命名此通話
+rooms_new_room_button_label=開啟一個對話
+rooms_only_occupant_label=您是第一個來的。
+rooms_panel_title=選擇對話,或進行一場新對話
+rooms_room_full_label=此對話中已經有兩個人。
+rooms_room_full_call_to_action_nonFx_label=下載 {{brandShortname}} 開始您的對話
+rooms_room_full_call_to_action_label=了解 {{clientShortname}} 的更多資訊 »
+rooms_room_joined_label=某人加入了通話!
+rooms_room_join_label=加入通話
+
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -70,26 +70,27 @@ mostVisitedTitle=最常瀏覽
 recentlyBookmarkedTitle=最近加入的書籤
 recentTagsTitle=最近新增的標籤
 
 OrganizerQueryHistory=歷史記錄
 OrganizerQueryDownloads=下載項目
 OrganizerQueryAllBookmarks=所有書籤
 OrganizerQueryTags=標籤
 
-# LOCALIZATION NOTE (tagResultLabel) :
+# LOCALIZATION NOTE (tagResultLabel, bookmarkResultLabel, switchtabResultLabel,
+# keywordResultLabel, searchengineResultLabel)
 # Noun used to describe the location bar autocomplete result type
 # to users with screen readers
-# See createResultLabel() in urlbarBindings.xml 
+# See createResultLabel() in urlbarBindings.xml
 tagResultLabel=標籤
-# LOCALIZATION NOTE (bookmarkResultLabel) :
-# Noun used to describe the location bar autocomplete result type
-# to users with screen readers
-# See createResultLabel() in urlbarBindings.xml 
 bookmarkResultLabel=書籤
+switchtabResultLabel=分頁標籤
+keywordResultLabel=關鍵字
+searchengineResultLabel=搜尋
+
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.title=瀏覽器啟動錯誤
 lockPrompt.text=因為 %S 的檔案被其他程式鎖定,書籤與瀏覽記錄將無法使用。某些安全軟體會導致這個問題。
 lockPromptInfoButton.label=更多資訊
 lockPromptInfoButton.accessKey=L
 
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -1,20 +1,18 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY safeModeDialog.title         "&brandShortName; 安全模式">
 <!ENTITY window.maxWidth              "400">
 
 <!ENTITY startSafeMode.label          "以安全模式啟動">
-<!ENTITY resetProfile.label           "還原 &brandShortName; 至出廠狀態">
+<!ENTITY refreshProfile.label         "重新整理 &brandShortName;">
 
 <!ENTITY safeModeDescription3.label   "您可以透過安全模式來排除 &brandShortName; 的問題。">
 <!ENTITY safeModeDescription4.label   "您的附加元件與自訂設定值將會暫時被停用。">
 
-<!ENTITY resetProfileInstead.label    "您也可以將 &brandShortName; 的設定值還原到出廠時的狀態。">
+<!ENTITY refreshProfileInstead.label  "您也可以略過安全模式的程序,試試看重新整理 &brandShortName;。">
 
-<!-- LOCALIZATION NOTE (autoSafeModeDescription2.label safeModeInstead.label resetProfileFooter.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
-<!ENTITY autoSafeModeDescription2.label "&brandShortName; 在啟動時未預期地關閉了。這個問題可能是由附加元件或其他問題所造成的。您可以透過將 &brandShortName; 重設回出廠狀態,或是進入安全模式來排除問題。">
-<!ENTITY resetProfileFooter.label       "其他的東西都將會被還原回出廠時的預設值。">
-<!ENTITY safeModeInstead.label          "若您不想這樣,您也可以繼續在暫時停用附加元件與自訂設定值的安全模式當中使用,並自行排除問題。">
+<!-- LOCALIZATION NOTE (autoSafeModeDescription3.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
+<!ENTITY autoSafeModeDescription3.label "&brandShortName; 在啟動時未預期地關閉了。這可能是由附加元件或其他問題所造成的,您可以試著以安全模式啟動來排除這個問題。">
 
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -141,16 +141,17 @@ page_scale_fit=縮放至頁面大小
 page_scale_auto=自動縮放
 page_scale_actual=實際大小
 
 # Loading indicator messages
 loading_error_indicator=錯誤
 loading_error=載入 PDF 時發生錯誤。
 invalid_file_error=無效或毀損的 PDF 檔案。
 missing_file_error=找不到 PDF 檔案。
+unexpected_response_error=伺服器回應未預期的內容。
 
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type.alt=[{{type}} 註解]
 password_label=請輸入用來開啟此 PDF 檔案的密碼。
 password_invalid=密碼不正確,請再試一次。
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -152,16 +152,17 @@ tabReload      =      正在重新載入
 # Object states
 stateChecked     =    已勾選
 stateNotChecked  =    未勾選
 statePressed     =    已點擊
 # No string for a not pressed toggle button
 stateExpanded    =    已展開
 stateCollapsed   =    已摺疊
 stateUnavailable =    無法使用
+stateReadonly    =    唯讀
 stateRequired    =    必要的
 stateTraversed   =    開啟過
 stateHasPopup    =    已彈出
 stateSelected    =    已選擇
 
 # App modes
 editingMode    =      編輯中
 navigationMode =      網頁瀏覽中
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -51,16 +51,17 @@ 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」。
+PECoordinatePair=預期應有座標對,卻出現「%1$S」。
 PETypeSelEOF=Element 類型
 PETypeSelNotType=預期應要有元素名稱或「*」,卻出現「%1$S」。
 PEUnknownNamespacePrefix=未知的 namespace 前置詞「%1$S」。
 PEAttributeNameEOF=Attribute 名稱
 PEAttributeNameExpected=預期應有屬性名稱識別符,卻出現「%1$S」。
 PEAttributeNameOrNamespaceExpected=應該要有 attribute 名稱或 namespace 卻出現了「%1$S」。
 PEAttSelNoBar=預期應有「|」卻出現「%1$S」。
 PEAttSelInnerEOF=屬性選擇器的部份
--- a/dom/chrome/layout/xbl.properties
+++ b/dom/chrome/layout/xbl.properties
@@ -5,12 +5,12 @@
 UnexpectedElement=不該出現 <%1$S> 元素。
 # LOCALIZATION NOTE: do not localize key="%S" modifiers="%S"
 GTK2Conflict=按鍵事件於 GTK2 上無法使用: key="%S" modifiers="%S"
 WinConflict=按鍵事件於某些鍵盤配置上無法使用: key="%S" modifiers="%S"
 TooDeepBindingRecursion=XBL 繫結「%S」已經用於太多的祖先元素 (Ancestor element) 上;為了避免產生無限遞迴 (Infinite recursion) 錯誤已禁止套用。
 CircularExtendsBinding=將 XBL 繫結「%S」以「%S」延伸時會產生自我延伸錯誤
 # LOCALIZATION NOTE: do not localize <handler command="…">
 CommandNotInChrome=<handler command="…"> 不允許在 chrome 外使用。
-MalformedXBL = 發現一個不正確的 XBL 檔案。您是不是忘記了 bindings 標籤內的 XBL 命名空間?
+MalformedXBL = 發現一個不正常的 XBL 檔案。您是不是忘記了 bindings 標籤內的 XBL 命名空間?
 InvalidExtendsBinding=延伸「%S」無效。一般來說,請勿延伸標籤名稱。
 MissingIdAttr = 繫結標籤當中缺少了「id」屬性。
 
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -15,49 +15,34 @@ CSPViolationWithURI = 頁面的設定阻擋了 %2$S 的資源載入:(「%1$S」)。
 CSPROViolation = report-only 的 CSP 政策 ("%1$S") 發生了違規。行為已被允許,且已送出 CSP 報告。
 # LOCALIZATION NOTE (CSPROViolationWithURI):
 # %1$S is the directive that has been violated.
 # %2$S is the URI of the resource which violated the directive.
 CSPROViolationWithURI = 根據 %2$S 的頁面設定觀察到載入資源 ("%1$S")。將送出 CSP 回報。
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport = 嘗試傳送報表至無效 URI:「%1$S」
-# LOCALIZATION NOTE (errorWas):
-# %1$S is the error resulting from attempting to send the report
-errorWas = 錯誤為:「%1$S」
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = 無法剖析回報 URI: %1$S
 # LOCALIZATION NOTE (couldNotProcessUnknownDirective):
 # %1$S is the unknown directive
 couldNotProcessUnknownDirective = 無法處理未知指示「%1$S」
 # LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
 ignoringUnknownOption = 忽略未知的選項 %1$S
 # LOCALIZATION NOTE (reportURInotHttpsOrHttp2):
 # %1$S is the ETLD of the report URI that is not HTTP or HTTPS
 reportURInotHttpsOrHttp2 = 回報網址 (%1$S) 應為 HTTP 或 HTTPS 網址。
 # LOCALIZATION NOTE (reportURInotInReportOnlyHeader):
 # %1$S is the ETLD of the page with the policy
 reportURInotInReportOnlyHeader = 此網站 (%1$S) 含有 Report-Only 政策卻沒有回報網址。CSP 將不會封鎖,且無法回報此政策違反。
-# LOCALIZATION NOTE (pageCannotSendReportsTo):
-# %1$S is the URI of the page with the policy
-# %2$S is the report URI that could not be used
-pageCannotSendReportsTo = %1$S 這個頁面無法傳送報表到 %2$S
-allowOrDefaultSrcRequired = 必須要有 'allow' 或 'default-src' 指示,但不存在。已還原為「default-src 'none'」
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = 無法剖析未知的來源 %1$S
-# LOCALIZATION NOTE (reportPostRedirect):
-# %1$S is the specified report URI before redirect
-reportPostRedirect = 無法將違規報表回報至 %1$S,發生了重導
-# LOCALIZATION NOTE (allowDirectiveIsDeprecated):
-# Don't translate "allow" and "default-src" as they are keywords and part of
-# the CSP protocol syntax.
-allowDirectiveIsDeprecated = 已棄用 allow 指示,請改用相同的 default-src 指示
 # LOCALIZATION NOTE (inlineScriptBlocked):
 # inline script refers to JavaScript code that is embedded into the HTML document.
 inlineScriptBlocked = 已阻擋執行行內指令碼
 # LOCALIZATION NOTE (inlineStyleBlocked):
 # inline style refers to CSS code that is embedded into the HTML document.
 inlineStyleBlocked = 已阻擋套用行內樣式
 # LOCALIZATION NOTE (scriptFromStringBlocked):
 # eval is a name and should not be localized.
@@ -65,69 +50,24 @@ scriptFromStringBlocked = 已阻擋將字串透過函數轉換為 JavaScript(如 eval)的呼叫
 # LOCALIZATION NOTE (hostNameMightBeKeyword):
 # %1$S is the hostname in question and %2$S is the keyword
 hostNameMightBeKeyword = 將 %1$S 解譯為主機名稱而非關鍵字。若您刻意要將其設為關鍵字,請改用 '%2$S'(用單引號包起來)。
 # LOCALIZATION NOTE (notSupportingDirective):
 # directive is not supported (e.g. 'reflected-xss')
 notSupportingDirective = 不支援指示「%1$S」,將忽略該指示與指示值。
 
 # CSP Errors:
-policyURINotAlone = policy-uri 指示只能自己出現
-noParentRequest = policy-uri 不能在沒有父請求與 CSP 的情況下被取回。
-# LOCALIZATION NOTE (policyURIParseError):
-# %1$S is the URI that could not be parsed
-policyURIParseError = 無法剖析 policy-uri 中的 URI: %1$S
-# LOCALIZATION NOTE (nonMatchingHost):
-# %1$S is the URI host that does not match
-nonMatchingHost = 無法自不符合的主機名稱取回政策 URI: %1$S
-# LOCALIZATION NOTE (nonMatchingPort):
-# %1$S is the URI port that does not match
-nonMatchingPort = 無法自不符合的埠號取回政策 URI: %1$S
-# LOCALIZATION NOTE (nonMatchingScheme):
-# %1$S is the URI scheme that does not match
-nonMatchingScheme = 無法自不符合的格式取回政策 URI: %1$S
-# LOCALIZATION NOTE (errorFetchingPolicy):
-# %1$S is the error that caused fetching to fail
-errorFetchingPolicy = 取回 policy-uri 時發生錯誤: %1$S
-cspSourceNotURI = 提供的參數並非 nsIURI
-argumentIsNotString = 提供的參數並非字串
-selfDataNotProvided = 若未提供 self 的資料則無法使用 'self'
-# LOCALIZATION NOTE (uriWithoutScheme):
-# %1$S is the URI without a scheme
-uriWithoutScheme = 無法剖析不含格式的 URI: %1$S
-selfKeywordNoSelfData = 使用了 self 關鍵字,但並未指定 self 資料
 # LOCALIZATION NOTE (couldntParseInvalidSource):
 # %1$S is the source that could not be parsed
 couldntParseInvalidSource = 無法剖析無效來源 %1$S
-# LOCALIZATION NOTE (hostSourceWithoutData):
-# %1$S is the source
-hostSourceWithoutData = 沒有 'self' 的資料時無法建立只有 host 的來源 %1$S
-# LOCALIZATION NOTE (sourceWithoutData):
-# %1$S is the source
-sourceWithoutData = 沒有 'self' 的資料時無法建立來源 %1$S
 # LOCALIZATION NOTE (couldntParseInvalidHost):
 # %1$S is the host that's invalid
 couldntParseInvalidHost = 無法剖析無效主機 %1$S
 # LOCALIZATION NOTE (couldntParseScheme):
 # %1$S is the string source
 couldntParseScheme = 無法剖析  %1$S 中的格式
 # LOCALIZATION NOTE (couldntParsePort):
 # %1$S is the string source
 couldntParsePort = 無法剖析 %1$S 當中的埠號
-# LOCALIZATION NOTE (notIntersectPort):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectPort = 因為埠號問題,無法交錯 %1$S 與 %2$S。
-# LOCALIZATION NOTE (notIntersectScheme):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectScheme = 因為格式問題,無法交錯 %1$S 與 %2$S。
-# LOCALIZATION NOTE (intersectingSourceWithUndefinedHost):
-# %1$S is the source
-intersectingSourceWithUndefinedHost = 來源與未定義的主機交錯: %1$S
-# LOCALIZATION NOTE (intersectingSourcesWithUndefinedHosts):
-# %1$S is the first source
-# %2$S is the second source
-intersectingSourcesWithUndefinedHosts = 透過未定義主機交錯兩個來源: %1$S 與 %2$S
 # LOCALIZATION NOTE (duplicateDirective):
 # %1$S is the name of the duplicate directive
 duplicateDirective = 偵測到重複的 %1$S 指示。將忽略第一個以外的指示。
 
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -3,14 +3,18 @@
 BlockMixedDisplayContent = 已封鎖載入混和的顯示內容「%1$S」
 BlockMixedActiveContent = 已封鎖載入混和的主動內容「%1$S」
 
 # CORS
 CrossSiteRequestBlocked=已封鎖跨來源請求: Same Origin Policy 不允許您讀取位於 %1$S 的遠端資源。可以透過將該資源移動至相同網域下,或啟用 CORS 來修正此問題。
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=此網站指定了無效的 Strict-Transport-Security 檔頭。
+# LOCALIZATION NOTE: Do not translate "Public-Key-Pins or HPKP"
+InvalidPKPHeaders=網站提供了無效的 Public-Key-Pins 檔頭。
 InsecurePasswordsPresentOnPage=不安全 (http://) 的頁面中包含了密碼欄位,這可能會是個讓帳號密碼被盜取的安全性風險。
 InsecureFormActionPasswordsPresent=不安全 (http://) 的表單發送行為中包含了密碼欄位,這可能會是個讓帳號密碼被盜取的安全性風險。
 InsecurePasswordsPresentOnIframe=不安全 (http://) 的 iframe 中包含了密碼欄位,這可能會是個讓帳號密碼被盜取的安全性風險。
 LoadingMixedActiveContent=在加密頁面「%1$S」載入混合的(不安全)主動式內容。
 LoadingMixedDisplayContent=在加密頁面「%1$S」載入混合的(不安全)顯示內容。
+# LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
+BothAllowScriptsAndSameOriginPresent=同時包含 allow-scripts 與 allow-same-origin 兩個 sandbox 屬性的 iframe 的 sandbox 功能會被移除。
 
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -714,20 +714,16 @@ safeModeRestartButton=重新啟動
 # LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
 # version of the update: "Update to 28.0".
 update.downloadAndInstallButton.label=更新至 %S
 update.downloadAndInstallButton.accesskey=U
 
 websearch.setDefault=將此搜尋引擎設為預設值
 websearch.isDefault=這是目前的預設搜尋引擎
 
-# missing plugin installer
-missingpluginsMessage.title=顯示此頁面全部的多媒體與資訊需要安裝其它的外掛程式。
-missingpluginsMessage.button.label=安裝缺少的外掛程式…
-missingpluginsMessage.button.accesskey=I
 outdatedpluginsMessage.title=用於此頁面的外掛程式不是最新版本。
 outdatedpluginsMessage.updateButton.label=更新外掛程式…
 outdatedpluginsMessage.updateButton.accesskey=U
 blockedpluginsMessage.title=為了保護您的電腦,此頁面所需要的某些外掛程式已被封鎖。
 blockedpluginsMessage.infoButton.label=詳細資訊…
 blockedpluginsMessage.infoButton.accesskey=D
 blockedpluginsMessage.searchButton.label=更新外掛程式…
 blockedpluginsMessage.searchButton.accesskey=U
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -73,21 +73,23 @@
      as possible because it's shown as a label in a toast.  Ideally, this string
      is upper-case, to match Google and Android's convention. -->
 <!ENTITY switch_button_message "切換">
 
 <!ENTITY settings "設定">
 <!ENTITY settings_title "設定">
 <!ENTITY pref_category_advanced "進階">
 <!ENTITY pref_category_customize "自訂">
+<!ENTITY pref_category_customize_summary "首頁、搜尋、分頁、匯入">
 
 <!-- Localization note (pref_category_language) : This is the preferences
      section in which the user picks the locale in which to display Firefox
      UI. The locale includes both language and region concepts. -->
 <!ENTITY pref_category_language "語言">
+<!ENTITY pref_category_language_summary "調整您的瀏覽器語言">
 <!ENTITY pref_browser_locale "瀏覽器語言">
 
 <!-- Localization note (locale_system_default) : This string indicates that
      Firefox will use the locale currently selected in Android's settings
      to display browser chrome. -->
 <!ENTITY locale_system_default "系統預設">
 
 <!-- Localization note (overlay_share_label) : This is the label that appears
@@ -95,46 +97,52 @@
      send to another device, or add to Reading List. -->
 <!ENTITY overlay_share_label "安裝到 &brandShortName;">
 
 <!-- Localization note (overlay_share_bookmark_btn_label) : This string is
      used in the share overlay menu to select an action. It is the verb
      "to bookmark", not the noun "a bookmark". -->
 <!ENTITY overlay_share_bookmark_btn_label "書籤">
 <!ENTITY overlay_share_reading_list_btn_label "新增至閱讀清單">
+<!ENTITY overlay_share_bookmark_btn_label_already "已經加入書籤">
+<!ENTITY overlay_share_reading_list_btn_label_already "已在閱讀清單當中">
 <!ENTITY overlay_share_send_other "傳送至其他裝置">
 
 <!-- Localization note (overlay_share_send_tab_btn_label) : Used on the
      share overlay menu to represent the "Send Tab" action when the user
      either has not set up Sync, or has no other devices to send a tab
      to. -->
 <!ENTITY overlay_share_send_tab_btn_label "傳送至另一台裝置">
 <!ENTITY overlay_share_no_url "這個分享中找不到鏈結">
 <!ENTITY overlay_share_retry "重試">
 <!ENTITY overlay_share_select_device "選擇裝置">
 
 <!ENTITY pref_category_search3 "搜尋">
 <!ENTITY pref_category_search_summary "自訂您的搜尋引擎">
 <!ENTITY pref_category_display "顯示">
+<!ENTITY pref_category_display_summary "字體大小、標題列、全螢幕瀏覽">
 <!ENTITY pref_category_privacy_short "個人隱私">
+<!ENTITY pref_category_privacy_summary "主控密碼、Cookies、追蹤、數據回傳">
 <!ENTITY pref_category_vendor "&vendorShortName;">
+<!ENTITY pref_category_vendor_summary "關於 &brandShortName;、常見問題、資料選擇">
 <!ENTITY pref_category_datareporting "資料選擇">
 <!ENTITY pref_learn_more "詳細資訊">
 <!ENTITY pref_category_installed_search_engines "已安裝的搜尋引擎">
 <!ENTITY pref_category_add_search_providers "新增更多搜尋引擎">
 <!ENTITY pref_category_search_restore_defaults "還原搜尋引擎">
 <!ENTITY pref_search_restore_defaults "還原預設值">
 <!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_category_devtools_summary "遠端除錯、閃爍描繪區域">
 <!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 home_add_panel_title "新增面板">
@@ -169,17 +177,17 @@
 <!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_data2 "立刻清除">
 <!ENTITY pref_clear_private_data_category "清除隱私資料">
-<!ENTITY pref_clear_on_exit_title "總是在離開時清除">
+<!ENTITY pref_clear_on_exit_title2 "離開時清除">
 <!ENTITY pref_clear_on_exit_summary2 "&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 "重排文字">
@@ -200,18 +208,20 @@ size. -->
 <!ENTITY pref_font_size_adjust_char "字">
 
 <!-- Localization note (pref_font_size_preview_text): This paragraph is used as an example to
     demonstrate the font size setting.  It is meant to be whimsical and fun. -->
 <!ENTITY pref_font_size_preview_text "The quick orange fox jumps over your expectations with more speed, more flexibility and more security. 作為非營利組織,我們站在您的立場進行創新,不向任何壓力妥協。您將能夠有更好的上網體驗,並讓網路有個更光明的未來。">
 
 <!ENTITY pref_use_master_password "使用主控密碼">
 <!ENTITY pref_sync "同步">
+<!ENTITY pref_sync_summary "同步您的分頁、書籤、密碼、瀏覽紀錄">
 <!ENTITY pref_search_suggestions "顯示搜尋建議">
 <!ENTITY pref_import_android "自 Android 匯入">
+<!ENTITY pref_import_android_summary "自內建瀏覽器匯入書籤與瀏覽紀錄">
 <!ENTITY pref_private_data_history2 "瀏覽歷史紀錄">
 <!ENTITY pref_private_data_formdata "表單與搜尋紀錄">
 <!ENTITY pref_private_data_cookies2 "Cookie 與目前的登入狀況">
 <!ENTITY pref_private_data_passwords "已存密碼">
 <!ENTITY pref_private_data_cache "快取">
 <!ENTITY pref_private_data_offlineApps "網站離線資料">
 <!ENTITY pref_private_data_siteSettings2 "網站設定">
 <!ENTITY pref_private_data_downloadFiles2 "下載項目">
@@ -251,18 +261,17 @@ size. -->
 <!ENTITY datareporting_abouthr_title "檢視我的健康檢查報告">
 <!ENTITY datareporting_telemetry_title "Telemetry">
 <!ENTITY datareporting_telemetry_summary "分享您瀏覽器的效能、使用方式、硬體設備、與自訂功能的資料給 &vendorShortName; 以幫助我們讓 &brandShortName; 變得更好">
 <!ENTITY datareporting_crashreporter_summary "&brandShortName; 將會傳送錯誤報告,以幫助 &vendorShortName; 讓您的瀏覽器變得更穩定、更安全">
 <!-- Localization note (datareporting_crashreporter_title_short) : This string matches
      (crashReporterSection.label) in en-US/chrome/browser/preferences/advanced.dtd.-->
 <!ENTITY datareporting_crashreporter_title_short "程式錯誤回報員">
 <!ENTITY datareporting_wifi_title2 "&vendorShortName; Location Service">
-<!ENTITY datareporting_wifi_geolocation_summary "在背景執行時接收 Wi-Fi 與基地台位置資料,並分享到 &vendorShortName; 以幫助改善我們的定位服務">
-
+<!ENTITY datareporting_wifi_geolocation_summary2 "與 &vendorShortName; 分享您裝置的準確所在位置的 Wi-Fi 與行動基地台資訊以改善我們的地理定位服務">
 <!-- Localization note (pref_update_autodownload2) : This should mention downloading
      specifically, since the pref only prevents automatic downloads and not the
      actual notification that an update is available. -->
 <!ENTITY pref_update_autodownload2 "自動下載更新">
 <!ENTITY pref_update_autodownload_wifi "僅透過 Wi-Fi 連線">
 <!ENTITY pref_update_autodownload_never "永不">
 <!ENTITY pref_update_autodownload_always "總是">
 
@@ -287,16 +296,17 @@ size. -->
 <!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_path_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. -->
 <!ENTITY find_text "在頁面中搜尋">
 <!ENTITY find_prev "上一個">
 <!ENTITY find_next "下一個">
 <!ENTITY find_close "關閉">
@@ -398,20 +408,44 @@ 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 home_remote_tabs_title "已同步的分頁">
+<!ENTITY home_remote_tabs_empty "您在其他裝置開啟的書籤將在此顯示。">
+<!ENTITY home_remote_tabs_unable_to_connect "連線失敗">
+<!ENTITY home_remote_tabs_need_to_sign_in "請登入以重新連結至您的 Firefox 帳號並繼續同步。">
+<!ENTITY home_remote_tabs_trouble_verifying "驗證您的帳號時發生問題?">
+<!ENTITY home_remote_tabs_need_to_verify "請驗證您的 Firefox 帳號以進行同步。">
+
+<!ENTITY home_remote_tabs_one_hidden_device "已隱藏 1 個裝置">
+<!-- Localization note (home_remote_tabs_many_hidden_devices) : The
+     formatD is replaced with the number of hidden devices.  The
+     number of hidden devices is always more than one.  We can't use
+     Android plural forms, sadly. See Bug #753859. -->
+<!ENTITY home_remote_tabs_many_hidden_devices "已隱藏 &formatD; 個裝置">
+<!-- Localization note (home_remote_tabs_hidden_devices_title) : This is the
+     title of a dialog; we expect more than one device. -->
+<!ENTITY home_remote_tabs_hidden_devices_title "已隱藏的裝置">
+<!-- Localization note (home_remote_tabs_unhide_selected_devices) : This is
+     the text of a button; we expect more than one device. -->
+<!ENTITY home_remote_tabs_unhide_selected_devices "取消隱藏選擇的裝置">
+
 <!ENTITY private_browsing_title "隱私瀏覽模式">
 <!ENTITY private_tabs_panel_empty_desc "您的隱私分頁將在此顯示,雖然我們不會保留您的瀏覽紀錄或 Cookie,但您建立的書籤與下載的檔案仍然會留在裝置中。">
 <!ENTITY private_tabs_panel_learn_more "想了解更多資訊?">
 
+<!ENTITY remote_tabs_panel_moved_title "我的分頁跑去哪了?">
+<!ENTITY remote_tabs_panel_moved_desc "我們將您其他裝置中開啟的分頁移到首頁中的面板,這樣您可以在開啟新分頁後快速開啟那些分頁。">
+<!ENTITY remote_tabs_panel_moved_link "帶我到我的新面板那兒去。">
+
 <!ENTITY pin_site_dialog_hint "輸入搜尋關鍵字">
 
 <!ENTITY filepicker_title "選擇檔案">
 <!ENTITY filepicker_audio_title "選擇或錄製一段聲音檔">
 <!ENTITY filepicker_image_title "選擇或拍攝一張照片">
 <!ENTITY filepicker_video_title "選擇或錄製一段影片">
 
 <!-- Site identity popup -->
@@ -467,23 +501,31 @@ just addresses the organization to follo
 <!ENTITY updater_downloading_title2 "正在下載 &brandShortName;">
 <!ENTITY updater_downloading_title_failed2 "下載失敗">
 <!ENTITY updater_downloading_select2 "點選此處在下載完成後套用更新">
 <!ENTITY updater_downloading_retry2 "點選此處以重試">
 
 <!ENTITY updater_apply_title2 "有可用的 &brandShortName; 更新">
 <!ENTITY updater_apply_select2 "選擇此處套用">
 
+<!-- New tablet UI -->
+
+<!-- LOCALIZATION NOTE (new_tablet_restart): Notification displayed after the user toggles the new tablet UI in the settings screen.-->
+<!ENTITY new_tablet_restart "重開瀏覽器讓變更生效">
+<!ENTITY new_tablet_pref "啟用全新的平板介面">
+
 <!-- Guest mode -->
 <!ENTITY new_guest_session "進入訪客瀏覽階段">
 <!ENTITY exit_guest_session "結束訪客瀏覽階段">
 <!ENTITY guest_session_dialog_continue "繼續">
 <!ENTITY guest_session_dialog_cancel "取消">
 <!ENTITY new_guest_session_title "&brandShortName; 現在將會重新啟動">
 <!ENTITY new_guest_session_text "進入訪客模式後使用者將無法看到您任何的私人瀏覽資料(諸如已存的密碼、歷史紀錄或書籤)。\n\n當您的訪客用完之後,他們的瀏覽資料也會被清除,然後您的瀏覽階段將會被還原。">
+<!ENTITY guest_browsing_notification_title "已進入訪客瀏覽階段">
+<!ENTITY guest_browsing_notification_text "點擊此處結束">
 
 <!ENTITY exit_guest_session_title "&brandShortName; 現在將會重新啟動">
 <!ENTITY exit_guest_session_text "此瀏覽階段中的瀏覽資料將會被清除。">
 
 <!-- Miscellaneous -->
 <!-- LOCALIZATION NOTE (ellipsis): This text is appended to a piece of text that does not fit in the
      designated space. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit
      traditions in your locale. -->
--- a/mobile/android/chrome/about.dtd
+++ b/mobile/android/chrome/about.dtd
@@ -15,8 +15,11 @@
 <!ENTITY aboutPage.faq.label                    "常見問題集">
 <!ENTITY aboutPage.support.label                "技術支援">
 <!ENTITY aboutPage.privacyPolicy.label          "隱私權保護政策">
 <!ENTITY aboutPage.rights.label                 "瞭解您的權利">
 <!ENTITY aboutPage.relNotes.label               "版本資訊">
 <!ENTITY aboutPage.credits.label                "感謝">
 <!ENTITY aboutPage.license.label                "授權資訊">
 
+<!-- LOCALIZATION NOTE (aboutPage.logoTrademark): The message is explicitly about the word "Firefox" being trademarked, that's why we use it, instead of brandShortName. -->
+<!ENTITY aboutPage.logoTrademark                "Firefox 字樣與 Firefox 標誌為 Mozilla 基金會之註冊商標。">
+
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -1,14 +1,13 @@
 <!-- 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 aboutAddons.title2                     "附加元件">
 <!ENTITY aboutAddons.header2                    "您的附加元件">
 <!ENTITY aboutAddons.options                    "選項">
-<!ENTITY aboutAddons.browseAll                  "瀏覽所有 Firefox 附加元件">
 
 <!ENTITY addonAction.enable                     "啟用">
 <!ENTITY addonAction.disable                    "停用">
 <!ENTITY addonAction.uninstall                  "移除">
 <!ENTITY addonAction.undo                       "復原">
 
--- a/mobile/android/chrome/aboutFeedback.dtd
+++ b/mobile/android/chrome/aboutFeedback.dtd
@@ -12,46 +12,47 @@
 <!ENTITY intro.message             "請告訴我們您使用 Android 版 &brandShortName; 到現在有什麼感想。">
 <!ENTITY intro.happyLink           "我愛它">
 <!ENTITY intro.sadLink             "我遇到一些問題">
 <!ENTITY intro.maybeLater          "之後再說">
 
 <!-- LOCALIZATION NOTE (support.pre): Include a trailing space as needed. -->
 <!-- LOCALIZATION NOTE (support.link): Avoid leading/trailing spaces, this text is a link. -->
 <!-- LOCALIZATION NOTE (support.post): Include a starting space as needed. -->
-<!ENTITY support.pre2              "您也可以參考">
-<!ENTITY support.link              "&brandShortName; 技術支援">
-<!ENTITY support.post2             "以取得更多資訊。">
+<!ENTITY support.pre3              "前往我們的">
+<!ENTITY support.link2             "技術支援網站">
+<!ENTITY support.post3             "瞭解常見問題的解決方式。">
 
 <!ENTITY happy.header              "很高興您能提供意見給我們!">
 
 <!-- LOCALIZATION NOTE (happy.message): "share the love" — This feels purposely exaggerated in English,
      but essentially it means that we want you to let others know how much you love Firefox. -->
 <!ENTITY happy.message             "方便在 Google Play 上給我們五顆星的評價嗎?">
 
 <!-- LOCALIZATION NOTE (happy.finePrint): "feels great" — Another exaggeration where we're trying to
      get people to rate us by playfully telling them there's a benefit in it for them as well. -->
 <!ENTITY happy.finePrint           "這花不到您一分鐘就可以完成。">
 
 <!ENTITY happy.ratingLink          "是,請帶我到 Google Play">
 <!ENTITY happy.maybeLater2         "之後再說">
 <!ENTITY happy.noThanks            "不,謝了">
 
+<!ENTITY sad.header                "喔不!">
 <!ENTITY sad.message               "我們對於您在使用 &brandShortName; 的時候遇到問題感到相當抱歉。請告訴我們發生了什麼事,讓我們來修復它。">
 <!ENTITY sad.placeholder           "請在此輸入您的意見">
-<!ENTITY sad.lastSite              "最近開啟的網站(非必要)">
+<!ENTITY sad.lastSite2             "包含最後開啟的網站">
 
 <!-- LOCALIZATION NOTE (sad.urlPlaceholder): Placeholder text that appears in "Last visited site" input box when there is no text. -->
 <!ENTITY sad.urlPlaceholder        "http://">
-<!ENTITY sad.thanksHeader          "感謝您讓我們知道這個問題">
+<!ENTITY sad.thanksHeader2         "感謝您。">
 
 <!-- LOCALIZATION NOTE (sad.thanksMessageTop): "real people" — We're stating that an actual human will look at the feedback
      and that it doesn't just go to some automated system that looks for keywords, or something like that. -->
 <!ENTITY sad.thanksMessageTop      "我們努力讓 &brandShortName; 變得更好。請放心,會有人負責收集您的意見回饋,並竭盡所能解決您的問題。">
 
 <!-- LOCALIZATION NOTE (sad.thanksMessageBottom): We're suggesting that there will be consequences for the people working
      on Firefox if they don't resolve the user's problem, like "or if they don't fix it, we'll fire them." If this doesn't
      work in your language, you can change it to something like "no matter what" or just remove it entirely. -->
 <!ENTITY sad.thanksMessageBottom   "或者,">
 
-<!ENTITY feedback.privacy          "為了您的隱私安全,請勿在回饋內容中包含任何可認出您的個人資訊。">
+<!ENTITY feedback.privacy2         "為了您的隱私安全,請不要在意見回饋中加入任何個人資訊。">
 <!ENTITY feedback.send             "傳送意見回饋">
 
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -317,16 +317,20 @@ remoteIncomingPromptCancel=取消
 # LOCALIZATION NOTE (remoteNotificationTitle): %S is the name of the app.
 remoteNotificationTitle=已啟用 %S 除錯
 # LOCALIZATION NOTE (remoteNotificationGenericName): a generic name to use
 # if the name of the app is not available.
 remoteNotificationGenericName=程式
 # LOCALIZATION NOTE (remoteNotificationMessage): %S is the port on which
 # the remote debugger server is listening.
 remoteNotificationMessage=正在監聽 %S 埠
+# LOCALIZATION NOTE (remoteStartNotificationTitle): %S is the name of the app.
+remoteStartNotificationTitle=啟用 %S 除錯
+# LOCALIZATION NOTE (remoteStartNotificationMessage):
+remoteStartNotificationMessage=點擊開啟遠端除錯器
 
 # Helper apps
 helperapps.open=開啟
 helperapps.ignore=忽略
 helperapps.dontAskAgain=針對這個網站不要再問我
 helperapps.openWithApp2=使用 %S 開啟
 helperapps.openWithList2=使用應用程式開啟
 helperapps.always=總是
--- a/mobile/android/chrome/handling.properties
+++ b/mobile/android/chrome/handling.properties
@@ -1,8 +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/.
 
+download.blocked=無法下載檔案
 protocol.failed=找不到能開啟此鏈結的應用程式
 # A very short string shown in the button toast when no application can open the url
 protocol.toast.search=搜尋
 
--- a/mobile/android/chrome/webapp.properties
+++ b/mobile/android/chrome/webapp.properties
@@ -51,10 +51,10 @@ installUpdateMessage2=點擊此處以安裝 %1$S 的更新
 retrievalFailedTitle=#1 更新失敗
 
 # LOCALIZATION NOTE (retrievalFailedMessage): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # %1$S is a comma-separated list of apps for which retrieval failed.
 # example: Failed to retrieve updates for Foo, Bar, Baz
 retrievalFailedMessage=%1$S 的更新下載失敗
 
-webappsDisabledInGuest=訪客瀏覽階段中無法安裝應用程式
+webappsDisabled=被禁止安裝程式
 
--- a/mobile/overrides/netError.dtd
+++ b/mobile/overrides/netError.dtd
@@ -12,53 +12,70 @@
 
 <!ENTITY connectionFailure.title "連線失敗">
 <!ENTITY connectionFailure.longDesc2 "&sharedLongDesc3;">
 
 <!ENTITY deniedPortAccess.title "此網址已被限制">
 <!ENTITY deniedPortAccess.longDesc "">
 
 <!ENTITY dnsNotFound.title "找不到伺服器">
-<!ENTITY dnsNotFound.longDesc3 "<ul>
+<!-- LOCALIZATION NOTE (dnsNotFound.longDesc4) This string contains markup including widgets for searching
+     or enabling wifi connections. The text inside tags should be localized.  Do not change the ids. -->
+<!ENTITY dnsNotFound.longDesc4 "<ul>
   <li>請檢查有沒有打錯網址,像是不小心把
     <strong>www</strong>.example.com 打成
     <strong>ww</strong>.example.com</li>
-  <li>若您還是無法載入任何頁面,請檢查您裝置的數據或 Wi-Fi 連線。</li>
-</ul>">
+    <div id='searchbox'>
+      <input id='searchtext' type='search'></input>
+      <button id='searchbutton'>搜尋</button>
+    </div>
+  <li>若您還是無法載入任何頁面,請檢查您裝置的數據或 Wi-Fi 連線。
+    <button id='wifi'>開啟 Wi-Fi</button>
+  </li>
+</ul>
+">
 
 <!ENTITY fileNotFound.title "找不到檔案">
 <!ENTITY fileNotFound.longDesc "
 <ul>
   <li>請檢查檔名是否有大小寫錯誤、拼錯字。</li>
   <li>請檢查檔案是否已被移動、改名或刪除。</li>
 </ul>
 ">
 
 
 <!ENTITY generic.title "噢!">
 <!ENTITY generic.longDesc "
 <p>&brandShortName; 因為某些原因無法載入此網頁。</p>
 ">
 
 <!ENTITY malformedURI.title "不正確的網址">
-<!ENTITY malformedURI.longDesc "<ul>
+<!-- LOCALIZATION NOTE (malformedURI.longDesc2) This string contains markup including widgets for searching
+     or enabling wifi connections. The text inside the tags should be localized. Do not touch the ids. -->
+<!ENTITY malformedURI.longDesc2 "<ul>
    <li>網址通常長的像
-      <strong>http://www.example.com/</strong>。</li>
+      <strong>http://www.example.com/</strong></li>
+    <div id='searchbox'>
+      <input id='searchtext' type='search'></input>
+      <button id='searchbutton'>搜尋</button>
+    </div>
    <li>請確定您用的是斜線 (例:
       <strong>/</strong>)。</li>
 </ul>
-                ">
+">
 
 <!ENTITY netInterrupt.title "資料傳輸中斷">
 <!ENTITY netInterrupt.longDesc2 "&sharedLongDesc3;">
 
 <!ENTITY notCached.title "文件已過期">
 <!ENTITY notCached.longDesc "<p>您所請求的文件已不存在於 &brandShortName; 的快取當中。</p><ul><li>為了您的安全,&brandShortName; 將不會自動重新請求敏感文件。</li><li>請點下重試以重新向網站請求取得文件。</li></ul>">
 
 <!ENTITY netOffline.title "離線模式">
+<!-- LOCALIZATION NOTE (netOffline.longDesc3) This string contains markup including widgets enabling wifi connections.
+     The text inside the tags should be localized. Do not touch the ids. -->
 <!ENTITY netOffline.longDesc3 "<ul>
   <li>再試一次。&brandShortName; 會試圖建立連線且重新載入頁面。
     <button id='wifi'>開啟 Wi-Fi</button>
   </li>
 </ul>">
 
 <!ENTITY contentEncodingError.title "內容編碼錯誤">
 <!ENTITY contentEncodingError.longDesc "
@@ -87,16 +104,18 @@
 <!ENTITY proxyConnectFailure.longDesc "
 <ul>
   <li>請檢查 Proxy 設定是否正確。</li>
   <li>與您的網路管理員聯絡,確定 Proxy 伺服器正常運作。</li>
 </ul>
 ">
 
 <!ENTITY proxyResolveFailure.title "找不到 Proxy 伺服器">
+<!-- LOCALIZATION NOTE (proxyResolveFailure.longDesc3) This string contains markup including widgets for enabling wifi connections.
+     The text inside the tags should be localized. Do not touch the ids. -->
 <!ENTITY proxyResolveFailure.longDesc3 "<ul>
   <li>請檢查 Proxy 設定是否正確。</li>
   <li>請確定您的裝置有可用的數據或 Wi-Fi 連線。
     <button id='wifi'>開啟 Wi-Fi</button>
   </li>
 </ul>">
 
 <!ENTITY redirectLoop.title "頁面重新導向不正確">
@@ -123,16 +142,18 @@
 <!ENTITY nssBadCert.title "安全連線失敗">
 <!ENTITY nssBadCert.longDesc2 "
 <ul>
   <li>這可能是伺服器上的組態設定造成的,或是有人嘗試假造該伺服器。</li>
   <li>若您以前可以與該伺服器正常連線,那麼這個錯誤可能只是暫時的,您可以稍候再試試看。</li>
 </ul>
 ">
 
+<!-- LOCALIZATION NOTE (sharedLongDesc3) This string contains markup including widgets for enabling wifi connections.
+     The text inside the tags should be localized. Do not touch the ids. -->
 <!ENTITY sharedLongDesc3 "<ul>
   <li>網站可能太忙碌或暫時無法使用。請稍候再試一次。</li>
   <li>若您無法載入任何頁面,請檢查您的數據或 Wi-Fi 連線。
     <button id='wifi'>開啟 Wi-Fi</button>
   </li>
 </ul>">
 
 <!ENTITY cspFrameAncestorBlocked.title "已依內容安全政策封鎖">
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -33,8 +33,10 @@ DirColSize=大小
 DirColMTime=最後修改日期
 DirFileLabel=檔案:
 
 PhishingAuth=您正要檢視網站「%1$S」。此網站可能試圖假裝別的網站以盜取您的帳號密碼,請一定要小心。
 PhishingAuthAccept=我了解並會非常小心
 SuperfluousAuth=您正要以使用者「%2$S」的身分登入網站「%1$S」,但網站並不需要認證。可能有人想盜取您的帳號。\n\n「%1$S」真的是您要瀏覽的網站嗎?
 AutomaticAuth=您正要以使用者「%2$S」的身分登入網站「%1$S」。
 
+TrackingUriBlocked=因為啟用了追蹤保護,位於「%1$S」的資源已被封鎖。
+
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -24,40 +24,40 @@ SSL_ERROR_REVOKED_CERT_ALERT=由於您的憑證已廢止,SSL 節點拒絕接收。
 SSL_ERROR_EXPIRED_CERT_ALERT=由於您的憑證已過期,SSL 節點拒絕接收。
 SSL_ERROR_SSL_DISABLED=無法連線: SSL 已停用。
 SSL_ERROR_FORTEZZA_PQG=無法連線: SSL 節點位於其他的 FORTEZZA 網域。
 SSL_ERROR_UNKNOWN_CIPHER_SUITE=請求了未知的 SSL 密文組。
 SSL_ERROR_NO_CIPHERS_SUPPORTED=此程式目前沒有啟用任何密文組。
 SSL_ERROR_BAD_BLOCK_PADDING=SSL 收到含損壞區塊填充的記錄。
 SSL_ERROR_RX_RECORD_TOO_LONG=SSL 收到含超出最大允許字串長度的記錄。
 SSL_ERROR_TX_RECORD_TOO_LONG=SSL 試圖傳送超出最大允許字串長度的記錄。
-SSL_ERROR_RX_MALFORMED_HELLO_REQUEST=SSL 收到變形的 Hello 請求交握訊息。
-SSL_ERROR_RX_MALFORMED_CLIENT_HELLO=SSL 收到變形的用戶端 Hello 交握訊息。
-SSL_ERROR_RX_MALFORMED_SERVER_HELLO=SSL 收到變形的伺服器 Hello 交握訊息。
-SSL_ERROR_RX_MALFORMED_CERTIFICATE=SSL 收到變形的憑證交握訊息。
-SSL_ERROR_RX_MALFORMED_SERVER_KEY_EXCH=SSL 收到變形的伺服器金鑰交換交握訊息。
-SSL_ERROR_RX_MALFORMED_CERT_REQUEST=SSL 收到變形的憑證請求交握訊息。
-SSL_ERROR_RX_MALFORMED_HELLO_DONE=SSL 收到變形的伺服器 Hello 完成交握訊息。
-SSL_ERROR_RX_MALFORMED_CERT_VERIFY=SSL 收到變形的憑證驗證交握訊息。
-SSL_ERROR_RX_MALFORMED_CLIENT_KEY_EXCH=SSL 收到變形的用戶端金鑰交換交握訊息。
-SSL_ERROR_RX_MALFORMED_FINISHED=SSL 收到變形的已完成交握訊息。
-SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER=SSL 收到變形的變更密文規格記錄。
-SSL_ERROR_RX_MALFORMED_ALERT=SSL 收到變形的警告記錄。
-SSL_ERROR_RX_MALFORMED_HANDSHAKE=SSL 收到變形的交握記錄。
-SSL_ERROR_RX_MALFORMED_APPLICATION_DATA=SSL 收到變形的程式資料記錄。
+SSL_ERROR_RX_MALFORMED_HELLO_REQUEST=SSL 收到不正常的 Hello Request 交握訊息。
+SSL_ERROR_RX_MALFORMED_CLIENT_HELLO=SSL 收到不正常的 Client Hello 交握訊息。
+SSL_ERROR_RX_MALFORMED_SERVER_HELLO=SSL 收到不正常的 Server Hello 交握訊息。
+SSL_ERROR_RX_MALFORMED_CERTIFICATE=SSL 收到不正常的 Certificate 交握訊息。
+SSL_ERROR_RX_MALFORMED_SERVER_KEY_EXCH=SSL 收到不正常的 Server Key Exchange 交握訊息。
+SSL_ERROR_RX_MALFORMED_CERT_REQUEST=SSL 收到不正常的 Certificate Request 交握訊息。
+SSL_ERROR_RX_MALFORMED_HELLO_DONE=SSL 收到不正常的 Server Hello Done 交握訊息。
+SSL_ERROR_RX_MALFORMED_CERT_VERIFY=SSL 收到不正常的 Certificate Verify 交握訊息。
+SSL_ERROR_RX_MALFORMED_CLIENT_KEY_EXCH=SSL 收到不正常的 Client Key Exchange 交握訊息。
+SSL_ERROR_RX_MALFORMED_FINISHED=SSL 收到不正常的 Finished 交握訊息。
+SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER=SSL 收到不正常的 Change Cipher Spec 記錄。
+SSL_ERROR_RX_MALFORMED_ALERT=SSL 收到不正常的 Alert 記錄。
+SSL_ERROR_RX_MALFORMED_HANDSHAKE=SSL 收到不正常的交握記錄。
+SSL_ERROR_RX_MALFORMED_APPLICATION_DATA=SSL 收到不正常的程式資料記錄。
 SSL_ERROR_RX_UNEXPECTED_HELLO_REQUEST=SSL 收到未預期的 Hello 請求交握訊息。
-SSL_ERROR_RX_UNEXPECTED_CLIENT_HELLO=SSL 收到未預期的用戶端 Hello 交握訊息。
-SSL_ERROR_RX_UNEXPECTED_SERVER_HELLO=SSL 收到未預期的伺服器 Hello 交握訊息。
-SSL_ERROR_RX_UNEXPECTED_CERTIFICATE=SSL 收到未預期的憑證交握訊息。
-SSL_ERROR_RX_UNEXPECTED_SERVER_KEY_EXCH=SSL 收到未預期的伺服器金鑰交換交握訊息。
-SSL_ERROR_RX_UNEXPECTED_CERT_REQUEST=SSL 收到未預期的憑證請求交握訊息。
+SSL_ERROR_RX_UNEXPECTED_CLIENT_HELLO=SSL 收到未預期的 Client Hello 交握訊息。
+SSL_ERROR_RX_UNEXPECTED_SERVER_HELLO=SSL 收到未預期的 Server Hello 交握訊息。
+SSL_ERROR_RX_UNEXPECTED_CERTIFICATE=SSL 收到未預期的 Certificate 交握訊息。
+SSL_ERROR_RX_UNEXPECTED_SERVER_KEY_EXCH=SSL 收到未預期的 Server Key Exchange 交握訊息。
+SSL_ERROR_RX_UNEXPECTED_CERT_REQUEST=SSL 收到未預期的 Certificate Request 交握訊息。
 SSL_ERROR_RX_UNEXPECTED_HELLO_DONE=SSL 收到未預期的伺服器 Hello 完成交握訊息。
-SSL_ERROR_RX_UNEXPECTED_CERT_VERIFY=SSL 收到未預期的憑證驗證交握訊息。
-SSL_ERROR_RX_UNEXPECTED_CLIENT_KEY_EXCH=SSL 收到未預期的用戶端金鑰交換交握訊息。
-SSL_ERROR_RX_UNEXPECTED_FINISHED=SSL received 收到未預期的已完成交握訊息。
+SSL_ERROR_RX_UNEXPECTED_CERT_VERIFY=SSL 收到未預期的 Certificate Verify 交握訊息。
+SSL_ERROR_RX_UNEXPECTED_CLIENT_KEY_EXCH=SSL 收到未預期的 Client Key Exchange 交握訊息。
+SSL_ERROR_RX_UNEXPECTED_FINISHED=SSL 收到未預期的已完成交握訊息。
 SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER=SSL 收到未預期的變更密文格式記錄。
 SSL_ERROR_RX_UNEXPECTED_ALERT=SSL 收到未預期的警告記錄。
 SSL_ERROR_RX_UNEXPECTED_HANDSHAKE=SSL 收到未預期的交握記錄。
 SSL_ERROR_RX_UNEXPECTED_APPLICATION_DATA=SSL 收到未預期的程式資料記錄。
 SSL_ERROR_RX_UNKNOWN_RECORD_TYPE=SSL 收到含未知內容類型的記錄。
 SSL_ERROR_RX_UNKNOWN_HANDSHAKE=SSL 收到含未知訊息類型的交握訊息。
 SSL_ERROR_RX_UNKNOWN_ALERT=SSL 收到含未知警告敘述的警告記錄。
 SSL_ERROR_CLOSE_NOTIFY_ALERT=此連線的 SSL 節點已關閉。
@@ -106,27 +106,39 @@ SSL_ERROR_INTERNAL_ERROR_ALERT=節點回報發生內部錯誤。
 SSL_ERROR_USER_CANCELED_ALERT=節點的使用者已取消交握。
 SSL_ERROR_NO_RENEGOTIATION_ALERT=節點不允許重新協議 SSL 安全參數。
 SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED=SSL 伺服器快取未組態且未於此 socket 停用。
 SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT=SSL 節點不支援請求的 TLS hello 擴充欄位。
 SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT=SSL 節點無法從您給的網址取得憑證。
 SSL_ERROR_UNRECOGNIZED_NAME_ALERT=SSL 節點沒有請求 DNS 名稱的憑證。
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=SSL 節點無法從其憑證中取得 OCSP 回應。
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=SSL 節點回報了損壞的憑證雜湊值。
-SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL 接收到了一個未預期的新連線要求(New Session Ticket)握手訊息。
-SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL 接收到了一個不正常的新連線要求(New Session Ticket)握手訊息。
+SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL 收到一個未預期的 New Session Ticket 交握訊息。
+SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL 收到不正常的 New Session Ticket 交握訊息。
 SSL_ERROR_DECOMPRESSION_FAILURE=SSL 接收到了一個無法被解壓縮的壓縮記錄。
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=SSL 連線端口不允許重新交涉。
-SSL_ERROR_UNSAFE_NEGOTIATION=對方電腦用了較舊的(可能是容易遭攻擊的)握手方式要求連線。
+SSL_ERROR_UNSAFE_NEGOTIATION=對方電腦用了較舊的(可能是容易遭攻擊的)交握方式要求連線。
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL 收到了一個未預期的未壓縮記錄。
-SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL 在伺服器金鑰交換的握手訊息當中收到了一個短暫的 Diffie-Hellman 金鑰
+SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL 在 Server Key Exchange 的交握訊息當中收到一個短暫的弱強度 Diffie-Hellman 金鑰。
 SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID=SSL 收到了無效的 NPN 擴充欄位資料。
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=SSL 2.0 連線當中不支援的 SSL 功能。
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=伺服器不支援的 SSL 功能。
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=客戶端不支援的 SSL 功能。
+SSL_ERROR_INVALID_VERSION_RANGE=SSL 版本範圍無效。
+SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION=SSL 節點選用了在指定的通訊協定版本中不被允許使用的密文組。
+SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL 收到不正常的 Hello Verify Request 交握訊息。
+SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST=SSL 收到未預期的 Hello Verify Request 交握訊息。
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION=該通訊協定版本不支援 SSL 功能。
+SSL_ERROR_RX_UNEXPECTED_CERT_STATUS=SSL 收到未預期的 Certificate Status 交握訊息。
+SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM=TLS 節點使用了未支援的雜湊演算法。
+SSL_ERROR_DIGEST_FAILURE=Digest 函數失敗。
+SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM=數位簽署元素中指定了不正確的簽章演算法。
+SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK=啟用了 Next protocol negotiation 擴充功能,但 callback 在需要用到之前就被清除。
+SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL=伺服器不支援任何客戶端接受的 ALPN 擴充功能當中的通訊協定。
+SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT=因為客戶端降級至比伺服器支援還更低的 TLS 版本,伺服器拒絕交握。
 SEC_ERROR_IO=在安全鑑別時發生 I/O 錯誤。
 SEC_ERROR_LIBRARY_FAILURE=安全函式庫失效。
 SEC_ERROR_BAD_DATA=安全函式庫: 已收到損壞資料。
 SEC_ERROR_OUTPUT_LEN=安全函式庫: 輸出長度錯誤。
 SEC_ERROR_INPUT_LEN=安全函式庫遇到輸入長度錯誤。
 SEC_ERROR_INVALID_ARGS=安全函式庫: 無效的參數。
 SEC_ERROR_INVALID_ALGORITHM=安全函式庫: 無效的演算法。
 SEC_ERROR_INVALID_AVA=安全函式庫: 無效的 AVA。
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -69,17 +69,16 @@
 <!ENTITY preferencesCmd.label				"偏好設定…">
 <!ENTITY preferencesCmd.key					"E">  
 <!ENTITY preferencesCmd.accesskey			"e"> 
 <!ENTITY findBarCmd.key "F">
 <!-- LOCALIZATION NOTE (findBarCmd.accesskey): This accesskey should be within
      findBarCmd.label found in editorOverlay.dtd, findCmd.label in messenger.dtd
      and messengercompose.dtd and findOnCmd.label found in navigatorOverlay.dtd -->
 <!ENTITY findBarCmd.accesskey "F">
-<!ENTITY findReplaceCmd.key "H">
 <!ENTITY findReplaceCmd.accesskey "l">
 <!ENTITY findAgainCmd.label "找下一個">
 <!ENTITY findAgainCmd.key "G">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.label "找前一個">
 <!ENTITY findPrevCmd.key "G">
 <!ENTITY findPrevCmd.key2 "VK_F3">
--- a/toolkit/chrome/global/autocomplete.properties
+++ b/toolkit/chrome/global/autocomplete.properties
@@ -1,9 +1,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (searchWithEngine): %S will be replaced with
 # the search engine provider's name. This format was chosen because
 # the provider can also end with "Search" (e.g.: MSN Search).
 searchWithEngine = 使用 %S 進行搜尋
-switchToTab = 切換到分頁
\ No newline at end of file
+# LOCALIZATION NOTE (searchWithEngineForQuery):
+# %1$S is the search engine's name, %2$S is the search query.
+# This format was chosen because the provider can also end with "Search"
+# (e.g.: MSN Search).
+searchWithEngineForQuery = %2$S — 使用 %1$S 搜尋
+switchToTab = 切換到分頁
+# LOCALIZATION NOTE (visitURL):
+# %S is the URL to visit.
+visitURL = 前往 %S
+
--- a/toolkit/chrome/global/charsetMenu.properties
+++ b/toolkit/chrome/global/charsetMenu.properties
@@ -59,25 +59,18 @@ ISO-8859-4       = 波羅的語系 (ISO)
 
 # Central European
 windows-1250.key =         E
 windows-1250     = 中歐語系 (Windows)
 ISO-8859-2.key   =       l
 ISO-8859-2       = 中歐語系 (ISO)
 
 # Chinese, Simplified
-# LOCALIZATION NOTE (gbk.bis.key):
-# gbk.bis.key never appears together with gbk.key and, hence, can be the same.
 gbk.bis.key      =          S
 gbk.bis          = 簡體中文
-# The strings gbk.key, gbk and gb18030 are no longer used but are retained
-# in order to enable backout after string freeze, just in case.
-gbk.key          =          S
-gbk              = 簡體中文 (GBK)
-gb18030          = 簡體中文 (GB18030)
 
 # Chinese, Traditional
 Big5.key         =          T
 Big5             = 正體中文
 
 # Cyrillic
 windows-1251.key = C
 windows-1251     = 俄文/斯拉夫語系 (Windows)
--- a/toolkit/chrome/global/devtools/styleinspector.properties
+++ b/toolkit/chrome/global/devtools/styleinspector.properties
@@ -95,24 +95,16 @@ ruleView.contextmenu.copyColor.accessKey
 # 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
 
--- a/toolkit/chrome/global/resetProfile.dtd
+++ b/toolkit/chrome/global/resetProfile.dtd
@@ -1,16 +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 resetProfile.dialog.title        "還原 &brandShortName; 至出廠狀態">
-<!ENTITY resetProfile.dialog.description  "您確定要把 &brandShortName; 還原到出廠時的狀態嗎?">
-<!ENTITY resetProfile.dialog.items2.label "&brandShortName; 將會試著保留您的:">
-<!ENTITY resetProfile.dialog.footer.label "&brandShortName; 將會重新啟動,其他的東西將會被還原。">
-<!ENTITY resetProfile.dialog.button.label "還原 &brandShortName; 至出廠狀態">
+<!ENTITY refreshProfile.dialog.title         "重新整理 &brandShortName;">
+<!ENTITY refreshProfile.dialog.description1  "進行重整以修正問題並恢復效能。">
+<!ENTITY refreshProfile.dialog.description2  "這將會:">
+<!ENTITY refreshProfile.dialog.items.label1  "移除您的附加元件與自訂調整">
+<!ENTITY refreshProfile.dialog.items.label2  "將您的瀏覽器選項還原成預設值">
+<!ENTITY refreshProfile.dialog.button.label  "重新整理 &brandShortName;">
 
-<!ENTITY resetProfile.title               "還原 &brandShortName; 至出廠狀態">
-<!ENTITY resetProfile.description         "若您遇到了一些沒有辦法解決的問題,您可以保留您最重要的資訊,然後將其他東西還原為出廠時的狀態。">
-<!ENTITY resetProfile.button.label2       "重設 &brandShortName;…">
+<!ENTITY refreshProfile.title                "保養一下 &brandShortName;">
+<!ENTITY refreshProfile.button.label         "重新整理 &brandShortName;…">
 
-<!ENTITY resetProfile.cleaning.description "&brandShortName; 正在清除您的舊資料…">
+<!ENTITY refreshProfile.cleaning.description "快完成了…">
 
--- a/toolkit/chrome/global/resetProfile.properties
+++ b/toolkit/chrome/global/resetProfile.properties
@@ -2,12 +2,12 @@
 # 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 for profile reset.
 
 # LOCALIZATION NOTE (resetUnusedProfile.message): %S is brandShortName.
 resetUnusedProfile.message=歡迎回來!看來您好一陣子沒有開啟 %S 了,您想要清理一下設定檔,讓您能有彷彿全新安裝一般的的體驗嗎?
 
-# LOCALIZATION NOTE (resetProfile.resetButton.label): %S is brandShortName.
-resetProfile.resetButton.label=重設 %S…
-resetProfile.resetButton.accesskey=e
+# LOCALIZATION NOTE (refreshProfile.resetButton.label): %S is brandShortName.
+refreshProfile.resetButton.label=重新整理 %S…
+refreshProfile.resetButton.accesskey=e
 
deleted file mode 100644
--- a/toolkit/chrome/global/xpinstall/xpinstall.properties
+++ /dev/null
@@ -1,96 +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/.
-
-#--------------------------------------------------------------------
-#   Install Actions
-#--------------------------------------------------------------------
-InstallFile=安裝中: %s
-InstallSharedFile=安裝共享檔案: %s
-ReplaceFile=替換中: %s
-ReplaceSharedFile=取代共享檔案: %s
-SkipFile=略過: %s
-SkipSharedFile=跳過共享檔案: %s
-
-DeleteFile=刪除檔案: %s
-DeleteComponent=刪除元件: %s
-
-Execute=執行中: %s
-ExecuteWithArgs=執行「%s」,參數「%s」
-
-CopyFile=複製檔案:由 %s 到 %s
-ExecuteFile=執行檔案: %s
-ExecuteFileWithArgs=執行檔案「%s」,參數「%s」
-MoveFile=移動檔案: 由 %s 到 %s
-RenameFile=改變檔名: 由 %s 改為 %s
-CreateFolder=建立檔案夾: %s
-RemoveFolder=移除資料夾: %s
-RenameFolder=重新命名資料夾: 由「%s」改為「%s」
-WindowsShortcut=Windows 捷徑: %s
-MacAlias=Mac 替身: %s
-WindowsRegisterServer=Windows Register 伺服器:%s
-UnknownFileOpCommand=未知的檔案操作命令!
-
-Patch=修正中: %s
-
-Uninstall=移除中: %s
-
-RegSkin=註冊佈景主題: %s
-RegLocale=註冊語言套件: %s
-RegContent=註冊程式內容: %s
-RegPackage=註冊套件: %s
-
-#--------------------------------------------------------------------
-#   Dialog Messages
-#--------------------------------------------------------------------
-
-ApplyNowSkin=使用此佈景主題
-ApplyNowLocale=使用此語言套件
-
-ConfirmSkin=由 %2$S 安裝佈景主題「%1$S」?
-ConfirmLocale=由 %2$S 安裝語言套件「%1$S」?
-
-OK=安裝
-
-progress.queued=已進佇列
-progress.downloading=下載中…
-progress.downloaded=已下載
-progress.installing=安裝中…
-
-Unsigned=未簽署
-
-#--------------------------------------------------------------------
-#   Miscellaneous
-#--------------------------------------------------------------------
-ERROR=錯誤
-
-error0=成功
-error999=重新啟動以完成
-error-202=權限不足
-error-203=安裝錯誤\n請檢視錯誤主控台以獲得詳細錯誤資訊。
-error-204=找不到安裝程序檔
-error-207=不是正確的安裝檔
-error-208=錯誤的參數
-error-210=使用者中斷
-error-214=需要的檔案不存在
-error-215=唯讀
-error-218=AppleSingle 解壓縮失敗
-error-219=路徑錯誤
-error-225=EXTRACTION_FAILED
-error-227=已取消
-error-228=下載錯誤
-error-229=Script 檔錯誤
-error-230=已存在
-error-235=磁碟空間不足
-error-239=Chrome 註冊失敗
-error-240=未安裝完成
-error-244=不支援的包裝
-error-260=無法確認簽章。
-error-261=無效的檔案雜湊 (可能是下載檔案損毀)
-error-262=未知或無效的檔案雜湊類型
-error-299=記憶體不足
-
-# there are other error codes, either rare or obsolete,
-# that are not worth translating at this time.
-unknown.error=未預期的錯誤 %S
-
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -1,32 +1,11 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY pluginWizard.title                                  "外掛程式尋找服務">
-<!ENTITY pluginWizard.firstPage.title                        "歡迎使用 &pluginWizard.title;">
-
-<!ENTITY pluginWizard.checkingForPlugins.description.label   "&brandShortName; 目前正在檢查是否有可用的外掛程式…">
-
-<!ENTITY pluginWizard.availablePluginsPage.title             "可用的外掛程式下載">
-<!ENTITY pluginWizard.availablePluginsPage.description.label "找到下列外掛程式:">
-<!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "請按下一步以安裝這些外掛程式。">
-<!ENTITY pluginWizard.availablePluginsPage.installerUI       "有些外掛程式安裝時需要您提供額外的資訊。">
-
-<!ENTITY pluginWizard.licensePage.title                      "外掛程式授權條款">
-<!ENTITY pluginWizard.licensePage.accept.label               "我同意。">
-<!ENTITY pluginWizard.licensePage.deny.label                 "我不同意 (不會安裝外掛程式) 。">
-
-<!ENTITY pluginWizard.installPluginsPage.title               "安裝外掛程式中">
-<!ENTITY pluginWizard.installPluginsPage.description.label   "&brandShortName; 正在安裝外掛程式…">
-
-<!ENTITY pluginWizard.finalPage.description.label            "&brandShortName; 已完成安裝下列的外掛程式:">
-
-<!ENTITY pluginWizard.finalPage.moreInfo.label               "關於外掛程式的進一步訊息或手動尋找所需的外掛程式。">
-<!ENTITY pluginWizard.finalPage.restart.label                "&brandShortName; 重新啟動後才能使用這些外掛程式。">
 
 <!-- LOCALIZATION NOTE (unsupportedPlatform.pre): Mobile only. Flash (the only plugin available on mobile)
      is not supported on some devices. Include a trailing space as needed. -->
 <!ENTITY unsupportedPlatform.pre                             "很抱歉,&brandShortName; 無法於此裝置播放 Flash 內容。 ">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.learnMore): Mobile only. This text is used to link to a SUMO page explaining why Flash is not
      supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -->
 <!ENTITY unsupportedPlatform.learnMore                       "更多資訊…">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
@@ -35,17 +14,16 @@
 <!ENTITY missingPlugin                                       "需要安裝某個外掛程式才能檢視此內容。">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "點此處啟用外掛程式。">
 <!ENTITY clickToActivatePlugin                               "啟用外掛程式。">
 <!ENTITY checkForUpdates                                     "檢查更新…">
 <!ENTITY disabledPlugin                                      "此外掛程式已被停用。">
 <!ENTITY blockedPlugin.label                                 "已阻擋此外掛以保護您的電腦。">
 <!ENTITY hidePluginBtn.label                                 "隱藏外掛程式">
-<!ENTITY installPlugin                                       "安裝外掛程式…">
 <!ENTITY managePlugins                                       "管理外掛程式…">
 
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
 <!ENTITY reloadPlugin.pre                                    "">
 <!ENTITY reloadPlugin.middle                                 "重新載入網頁">
 <!ENTITY reloadPlugin.post                                   "以再試一次。">
deleted file mode 100644
--- a/toolkit/chrome/mozapps/plugins/plugins.properties
+++ /dev/null
@@ -1,31 +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/.
-
-pluginLicenseAgreement.label=要安裝 %S,您必須同意下列事項:
-
-pluginInstallation.download.start=下載 %S 中…
-pluginInstallation.download.finish=已完成 %S 的下載。
-
-pluginInstallation.install.start=安裝 %S 中…
-pluginInstallation.install.finish=成功安裝 %S。
-pluginInstallation.install.error=無法安裝 %S (%S)。
-
-pluginInstallation.complete=外掛程式安裝完成。
-
-pluginInstallationSummary.success=已安裝
-pluginInstallationSummary.failed=失敗
-pluginInstallationSummary.licenseNotAccepted=不接受授權協議
-pluginInstallationSummary.notAvailable=找不到可用的版本
-pluginInstallationSummary.manualInstall.label=手動安裝
-pluginInstallationSummary.manualInstall.tooltip=手動安裝外掛程式。
-
-pluginInstallation.noPluginsFound=找不到適合的外掛程式。
-pluginInstallation.noPluginsInstalled=未安裝任何外掛程式。
-pluginInstallation.unknownPlugin=未知的外掛程式 (%S)
-
-pluginInstallation.restart.label=重新啟動 %S
-pluginInstallation.restart.accesskey=R
-pluginInstallation.close.label=關閉
-pluginInstallation.close.accesskey=C
-