Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 174 insertions, 7 deletions

diff --git a/l10n-zh-CN/toolkit/chrome/global/narrate.properties b/l10n-zh-CN/toolkit/chrome/global/narrate.properties
index 7719c1240c..081b9a190c 100644
--- a/l10n-zh-CN/toolkit/chrome/global/narrate.properties
+++ b/l10n-zh-CN/toolkit/chrome/global/narrate.properties
@@ -8,6 +8,12 @@
 # %S is the keyboard shortcut for the listen command
 listen-label = 聆听（%S）
 back = 后退
+
+# "Listen, which allows users to listen to Firefox reading the text,
+# instead of having to read it themselves." This is the name
+# of the feature and it is the label for the popup button.
+# %S is the keyboard shortcut for the listen command
+read-aloud-label = 朗读 (%S)
 # %S is the keyboard shortcut for the skip back command
 previous-label = 返回（%S）
 # %S is the keyboard shortcut for the start command
diff --git a/l10n-zh-CN/toolkit/chrome/mozapps/downloads/unknownContentType.properties b/l10n-zh-CN/toolkit/chrome/mozapps/downloads/unknownContentType.properties
index 2bcd26b6c1..9fdb35d388 100755
--- a/l10n-zh-CN/toolkit/chrome/mozapps/downloads/unknownContentType.properties
+++ b/l10n-zh-CN/toolkit/chrome/mozapps/downloads/unknownContentType.properties
@@ -6,7 +6,7 @@
 title=正在打开 %S
 saveDialogTitle=请输入要保存的文件名…
 defaultApp=%S (默认)
-chooseAppFilePickerTitle=选择助手应用程序
+chooseAppFilePickerTitle=选择对应应用程序
 badApp=无法找到您选择的应用程序 ("%S")。请检查文件名或者选择其他应用程序。
 badApp.title=找不到应用程序
 badPermissions=无法保存文件，因为您没有相应的权限。请另选保存目录。
diff --git a/l10n-zh-CN/toolkit/chrome/passwordmgr/passwordmgr.properties b/l10n-zh-CN/toolkit/chrome/passwordmgr/passwordmgr.properties
index fe8164bf26..10f2bb5cf7 100755
--- a/l10n-zh-CN/toolkit/chrome/passwordmgr/passwordmgr.properties
+++ b/l10n-zh-CN/toolkit/chrome/passwordmgr/passwordmgr.properties
@@ -46,6 +46,7 @@ passwordChangeTitle = 确认更改密码
 updatePasswordMsg = 您想要更新已保存的“%S”的密码吗？
 updatePasswordMsgNoUser = 您想要更新已保存的密码吗？
 userSelectText2 = 选择要更新的登录信息：
+
 loginsDescriptionAll2=您的计算机上存储了下列网站的登录信息
 
 # LOCALIZATION NOTE (useASecurelyGeneratedPassword):
@@ -67,7 +68,7 @@ displaySameOrigin=匹配此网站
 
 # LOCALIZATION NOTE (insecureFieldWarningDescription2):
 # %1$S will contain insecureFieldWarningLearnMore and look like a link to indicate that clicking will open a tab with support information.
-insecureFieldWarningDescription2 = 此连接不安全。在此页面输入的登录信息可以被窃取。%1$S
+insecureFieldWarningDescription2 = 此连接不安全。在此处输入的登录信息可被窃取。%1$S
 insecureFieldWarningLearnMore = 详细了解
 
 # LOCALIZATION NOTE (viewSavedLogins.label):
diff --git a/l10n-zh-CN/toolkit/crashreporter/crashreporter.ftl b/l10n-zh-CN/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..ac9e925f69
--- /dev/null
+++ b/l10n-zh-CN/toolkit/crashreporter/crashreporter.ftl
@@ -0,0 +1,48 @@
+# 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/.
+
+crashreporter-branded-title = { -brand-short-name } 崩溃报告器
+crashreporter-apology = 很抱歉
+crashreporter-crashed-and-restore = { -brand-short-name } 遇到问题并崩溃了。我们将尝试在它重新启动时恢复您的标签页和窗口。
+crashreporter-plea = 您可以发送给我们一个崩溃报告，以协助我们诊断并修正该问题。
+crashreporter-information = 此应用程序会在发生崩溃后运行并向 { -vendor-short-name } 报告相应问题，无法被直接运行。
+crashreporter-error = { -brand-short-name } 碰到一个问题而崩溃了，且崩溃报告器无法提交相应的崩溃报告。
+# $details (String) - the reason that a crash report cannot be submitted
+crashreporter-error-details = 详细信息：{ $details }
+crashreporter-no-run-message = 此应用程序在崩溃后运行并向程序发行商报告相应问题。无法被直接运行。
+crashreporter-button-details = 详细信息…
+crashreporter-loading-details = 正在加载…
+crashreporter-view-report-title = 报告内容
+crashreporter-comment-prompt = 附上说明（说明公开可见）
+crashreporter-report-info = 此报告同时包含了应用程序崩溃时状态的技术信息。
+crashreporter-send-report = 告知 { -vendor-short-name } 有关此次崩溃的情况，以便修复此问题。
+crashreporter-include-url = 附上我当时所浏览页面的地址。
+crashreporter-submit-status = 您的崩溃报告将在您退出或重启浏览器时提交。
+crashreporter-submit-in-progress = 正在提交您的报告…
+crashreporter-submit-success = 报告提交成功！
+crashreporter-submit-failure = 提交报告时出错。
+crashreporter-resubmit-status = 重新发送之前失败的报告…
+crashreporter-button-quit = 退出 { -brand-short-name }
+crashreporter-button-restart = 重启 { -brand-short-name }
+crashreporter-button-ok = 确定
+crashreporter-button-close = 关闭
+# $id (String) - the crash id from the server, typically a UUID
+crashreporter-crash-identifier = 崩溃 ID: { $id }
+# $url (String) - the url which the user can use to view the submitted crash report
+crashreporter-crash-details = 您可到 { $url } 查看此次崩溃的详细信息。
+
+# Error strings
+
+crashreporter-error-minidump-analyzer = 运行 minidump-analyzer 失败
+# $path (String) - the file path
+crashreporter-error-opening-file = 打开文件失败（{ $path }）
+# $path (String) - the file path
+crashreporter-error-loading-file = 加载文件失败（{ $path }）
+# $path (String) - the path
+crashreporter-error-creating-dir = 创建目录失败（{ $path }）
+crashreporter-error-no-home-dir = 缺少主目录
+# $from (String) - the source path
+# $to (String) - the destination path
+crashreporter-error-moving-path = 将 { $from } 移动到 { $to } 时失败
+crashreporter-error-version-eol = 版本生命周期已结束，不再接受崩溃报告。
diff --git a/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl b/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl
index 13a09fb91f..2f5e2e6a4b 100644
--- a/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl
@@ -4,7 +4,6 @@
 
 about-reader-loading = 正在加载…
 about-reader-load-error = 从页面加载文章失败
-
 about-reader-color-scheme-light = 浅色
     .title = 浅色模式
 about-reader-color-scheme-dark = 深色
@@ -13,7 +12,20 @@ about-reader-color-scheme-sepia = 纸墨
     .title = 纸墨模式
 about-reader-color-scheme-auto = 自动
     .title = 自动颜色模式
-
+about-reader-color-theme-light = 明亮
+    .title = 明亮颜色主题
+about-reader-color-theme-dark = 深邃
+    .title = 深邃颜色主题
+about-reader-color-theme-sepia = 纸墨
+    .title = 纸墨颜色主题
+about-reader-color-theme-auto = 自动
+    .title = 自动颜色主题
+about-reader-color-theme-gray = 灰暗
+    .title = 灰暗颜色主题
+about-reader-color-theme-contrast = 对比度
+    .title = 对比度颜色主题
+about-reader-color-theme-custom = 自定义颜色
+    .title = 自定义颜色主题
 # An estimate for how long it takes to read an article,
 # expressed as a range covering both slow and fast readers.
 # Variables:
@@ -45,4 +57,27 @@ about-reader-font-type-sans-serif = 无衬线
 
 about-reader-toolbar-close = 关闭阅读模式
 about-reader-toolbar-type-controls = 字体调整
+about-reader-toolbar-color-controls = 颜色
 about-reader-toolbar-savetopocket = 保存到 { -pocket-brand-name }
+
+## Reader View colors menu
+
+about-reader-colors-menu-header = 主题
+about-reader-fxtheme-tab = 默认
+about-reader-customtheme-tab = 自定义
+
+## These are used as labels for the custom theme color pickers.
+## The .title element is used to make the editing functionality
+## clear and give context for screen reader users.
+
+about-reader-custom-colors-foreground = 文本
+    .title = 编辑颜色
+about-reader-custom-colors-background = 背景
+    .title = 编辑颜色
+about-reader-custom-colors-unvisited-links = 未访问过的链接
+    .title = 编辑颜色
+about-reader-custom-colors-visited-links = 访问过的链接
+    .title = 编辑颜色
+about-reader-custom-colors-selection-highlight = 朗读功能的高亮标示
+    .title = 编辑颜色
+about-reader-custom-colors-reset-button = 重置为默认设置
diff --git a/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl b/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl
index 65783c6f53..d83d1687bf 100644
--- a/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl
@@ -411,3 +411,15 @@ pointing-device-mouse = 鼠标
 pointing-device-touchscreen = 触摸屏
 pointing-device-pen-digitizer = 数位板
 pointing-device-none = 无定点设备
+
+## Content Analysis (DLP)
+
+# DLP stands for Data Loss Prevention, an industry term for external software
+# that enterprises can set up to prevent sensitive data from being transferred
+# to external websites.
+content-analysis-title = 内容分析（DLP）
+content-analysis-active = 已启用
+content-analysis-connected-to-agent = 已与程序连接
+content-analysis-agent-path = 程序路径
+content-analysis-agent-failed-signature-verification = 程序签名验证失败
+content-analysis-request-count = 请求数量
diff --git a/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl b/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index 127fb3354b..f4e54d6d83 100644
--- a/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
@@ -29,7 +29,7 @@ contentanalysis-customdisplaystring-description = 上传“{ $filename }”
 contentanalysis-warndialogtitle = 此内容可能不安全
 # Variables:
 #   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
-contentanalysis-warndialogtext = 您的组织使用的数据丢失防护软件将此内容标记为不安全：{ $content }。仍要使用吗？
+contentanalysis-warndialogtext = 您的组织使用的数据泄露防护软件将此内容标记为不安全：{ $content }。仍要使用吗？
 contentanalysis-warndialog-response-allow = 使用内容
 contentanalysis-warndialog-response-deny = 取消
 contentanalysis-notification-title = 内容分析
@@ -39,10 +39,22 @@ contentanalysis-notification-title = 内容分析
 contentanalysis-genericresponse-message = 内容分析对以下资源作出 { $response } 响应：{ $content }
 # Variables:
 #   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
-contentanalysis-block-message = 您的组织使用的数据丢失防护软件拦截了此内容：{ $content }。
+contentanalysis-block-message = 您的组织使用的数据泄露防护软件拦截了此内容：{ $content }。
 # Variables:
 #   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
-contentanalysis-error-message = 与数据丢失防护软件通信时发生错误。对以下资源的传输被拒绝：{ $content }。
+contentanalysis-error-message = 与数据泄露防护软件通信时发生错误。对以下资源的传输被拒绝：{ $content }。
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
+contentanalysis-unspecified-error-message = 与“{ $agent }”通信时出错。以下资源的传输被拒绝：{ $content }。
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
+contentanalysis-no-agent-connected-message = 无法连接“{ $agent }”。以下资源的传输被拒绝：{ $content }。
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
+contentanalysis-invalid-agent-signature-message = 验证“{ $agent }”的签名失败。以下资源的传输被拒绝：{ $content }。
 contentanalysis-inprogress-quit-title = 确定退出 { -brand-shorter-name } 吗？
 contentanalysis-inprogress-quit-message = 有几项操作正在进行。若退出 { -brand-shorter-name }，这些操作将无法完成。
 contentanalysis-inprogress-quit-yesbutton = 是，退出
diff --git a/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl
index dc6e9f9c08..05c4cbf5c4 100644
--- a/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -47,6 +47,8 @@ credit-card-capture-save-new-button =
 credit-card-capture-update-button =
     .label = 更新现有卡片
     .accessKey = U
+# Label for the button in the dropdown menu used to clear the populated form.
+autofill-clear-form-label = 清除自动填写表单
 # Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
 autofill-manage-addresses-label = 管理地址
 # Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
@@ -63,3 +65,19 @@ autofill-card-network-mastercard = 万事达（MasterCard）
 autofill-card-network-mir = MIR
 autofill-card-network-unionpay = 银联（Union Pay）
 autofill-card-network-visa = Visa
+# The warning text that is displayed for informing users what categories are
+# about to be filled.  The text would be, for example,
+#   Also autofills organization, phone, email.
+# Variables:
+#   $categories - one or more of the categories, see autofill-category-X below
+autofill-phishing-warningmessage-extracategory = 还将自动填写 { $categories } 栏
+# Variation when all are in the same category.
+# Variables:
+#   $categories - one or more of the categories
+autofill-phishing-warningmessage = 自动填写 { $categories }
+# Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
+autofill-category-address = 地址
+autofill-category-name = 姓名
+autofill-category-organization = 组织
+autofill-category-tel = 电话号码
+autofill-category-email = 电子邮箱
diff --git a/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl
index 6fbe8159b2..5b12f93499 100644
--- a/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl
@@ -1,3 +1,21 @@
 # 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/.
+
+
+### This file contains the entities needed to use the Arrowscrollbox component.
+### For example, Arrowscrollboxes are used in Tabs Toolbar when there are
+### multiple tabs opened and in the overflowing menus.
+
+# This button is shown at the beginning of the overflowing list of elements.
+# For example, in LTR language like English, on the Tabs Toolbar it would look
+# like "<" and scroll the tab list to the left, and in the overflowing menu it
+# would look like "^" and scroll the list of menuitems up.
+overflow-scroll-button-up =
+    .tooltiptext = 向上滚动
+# This button is shown at the end of the overflowing list of elements. For
+# example, in LTR language like English, on the Tabs Toolbar it would look like
+# ">" and scroll the tab list to the right, and in the overflowing menu it
+# would look like "v" and scroll the list of menuitems down.
+overflow-scroll-button-down =
+    .tooltiptext = 向下滚动
diff --git a/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl b/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl
index 45d3b5a27c..009e07c3b7 100644
--- a/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl
@@ -17,6 +17,8 @@ process-type-privilegedmozilla = Mozilla 特权内容
 process-type-extension = 扩展
 # process used to open file:// URLs
 process-type-file = 本地文件
+# process used to instantiate new child processes
+process-type-forkserver = Fork 服务器
 # process used to isolate a webpage from other web pages
 # to improve security
 process-type-webisolated = 隔离的 Web 内容
diff --git a/l10n-zh-CN/toolkit/toolkit/global/textActions.ftl b/l10n-zh-CN/toolkit/toolkit/global/textActions.ftl
index 89e7c3ff97..70c9d05fa6 100644
--- a/l10n-zh-CN/toolkit/toolkit/global/textActions.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/global/textActions.ftl
@@ -62,3 +62,5 @@ text-action-spell-dictionaries =
     .accesskey = L
 text-action-search-text-box-clear =
     .title = 清空
+text-action-highlight-selection =
+    .label = 高亮选中部分
diff --git a/l10n-zh-CN/toolkit/toolkit/pdfviewer/viewer.ftl b/l10n-zh-CN/toolkit/toolkit/pdfviewer/viewer.ftl
index 49bcf1b45f..872948a478 100644
--- a/l10n-zh-CN/toolkit/toolkit/pdfviewer/viewer.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/pdfviewer/viewer.ftl
@@ -296,6 +296,12 @@ pdfjs-editor-stamp-button-label = 添加或编辑图像
 pdfjs-editor-highlight-button =
     .title = 高亮
 pdfjs-editor-highlight-button-label = 高亮
+pdfjs-highlight-floating-button =
+    .title = 高亮
+pdfjs-highlight-floating-button1 =
+    .title = 高亮
+    .aria-label = 高亮
+pdfjs-highlight-floating-button-label = 高亮
 
 ## Remove button for the various kind of editor.
 
@@ -379,3 +385,10 @@ pdfjs-editor-colorpicker-pink =
     .title = 粉色
 pdfjs-editor-colorpicker-red =
     .title = 红色
+
+## Show all highlights
+## This is a toggle button to show/hide all the highlights.
+
+pdfjs-editor-highlight-show-all-button-label = 显示全部
+pdfjs-editor-highlight-show-all-button =
+    .title = 显示全部