Merging upstream version 115.11.0esr.

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

19 files changed, 411 insertions, 39 deletions

diff --git a/l10n-zh-CN/toolkit/chrome/global/narrate.properties b/l10n-zh-CN/toolkit/chrome/global/narrate.properties
index 55ac0ef226..d562fd3d77 100644
--- a/l10n-zh-CN/toolkit/chrome/global/narrate.properties
+++ b/l10n-zh-CN/toolkit/chrome/global/narrate.properties
@@ -8,6 +8,14 @@
 # %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
 start-label = 开始（%S）
 # %S is the keyboard shortcut for the stop command
@@ -15,6 +23,8 @@ stop-label = 结束（%S）
 # Keyboard shortcut to toggle the narrate feature
 narrate-key-shortcut = N
 forward = 前进
+# %S is the keyboard shortcut for the skip forward command
+next-label = 前进（%S）
 speed = 速度
 selectvoicelabel = 语音：
 # Default voice is determined by the language of the document.
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/aboutAddons.ftl b/l10n-zh-CN/toolkit/toolkit/about/aboutAddons.ftl
index d7aea16174..6887ad9ddd 100644
--- a/l10n-zh-CN/toolkit/toolkit/about/aboutAddons.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/about/aboutAddons.ftl
@@ -61,7 +61,7 @@ detail-update-manual =
 detail-private-browsing-label = 在隐私窗口中运行
 # Some add-ons may elect to not run in private windows by setting incognito: not_allowed in the manifest.  This
 # cannot be overridden by the user.
-detail-private-disallowed-label = 不支持隐私窗口
+detail-private-disallowed-label = 不允许在隐私窗口中运行
 detail-private-disallowed-description2 = 隐私浏览时不会运行此扩展。<a data-l10n-name="learn-more">详细了解</a>
 # Some special add-ons are privileged, run in private windows automatically, and this permission can't be revoked
 detail-private-required-label = 会自动于隐私浏览窗口中运作
@@ -217,6 +217,9 @@ shortcuts-no-addons = 您没有启用任何扩展。
 shortcuts-no-commands = 下列扩展没有快捷键：
 shortcuts-input =
     .placeholder = 输入一个快捷键
+# Accessible name for a trashcan icon button that removes an existent shortcut
+shortcuts-remove-button =
+    .aria-label = 移除快捷方式
 shortcuts-browserAction2 = 激活工具栏按钮
 shortcuts-pageAction = 激活页面动作
 shortcuts-sidebarAction = 切换侧栏
@@ -438,7 +441,7 @@ discover-heading = 让 { -brand-short-name } 有您的个性
 shortcuts-heading = 管理扩展快捷键
 default-heading-search-label = 寻找更多附加组件
 addons-heading-search-input =
-    .placeholder = 在 addons.mozilla.org 搜索
+    .placeholder = 搜索 addons.mozilla.org
 addon-page-options-button =
     .title = 用于所有附加组件的工具
 
diff --git a/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl b/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl
index 13a09fb91f..a2bce15d13 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,32 @@ 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 = 自定义颜色主题
+about-reader-color-light-theme = 明亮
+    .title = 明亮主题
+about-reader-color-dark-theme = 深邃
+    .title = 深邃主题
+about-reader-color-sepia-theme = 纸墨
+    .title = 纸墨主题
+about-reader-color-auto-theme = 自动
+    .title = 自动主题
+about-reader-color-gray-theme = 灰暗
+    .title = 灰暗主题
+about-reader-color-contrast-theme = 对比度
+    .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 +69,54 @@ about-reader-font-type-sans-serif = 无衬线
 
 about-reader-toolbar-close = 关闭阅读模式
 about-reader-toolbar-type-controls = 字体调整
+about-reader-toolbar-color-controls = 颜色
+about-reader-toolbar-text-layout-controls = 文本和布局
+about-reader-toolbar-theme-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 = 重置为默认设置
+
+## Reader View improved text and layout menu
+
+about-reader-layout-header = 布局
+about-reader-advanced-layout-header = 高级
+about-reader-slider-label-width-narrow = 缩窄
+about-reader-slider-label-width-wide = 加宽
+about-reader-slider-label-spacing-narrow = 缩窄
+about-reader-slider-label-spacing-standard = 标准
+about-reader-slider-label-spacing-wide = 加宽
+about-reader-content-width-label =
+    .label = 内容宽度
+about-reader-line-spacing-label =
+    .label = 行距
+about-reader-character-spacing-label =
+    .label = 字符间距
+about-reader-word-spacing-label =
+    .label = 词间距
+about-reader-text-alignment-label = 文本对齐方式
+about-reader-text-alignment-left =
+    .title = 文本左对齐
+about-reader-text-alignment-center =
+    .title = 文本居中对齐
+about-reader-text-alignment-right =
+    .title = 文本右对齐
diff --git a/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl b/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl
index 263530f679..d83d1687bf 100644
--- a/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/about/aboutSupport.ftl
@@ -203,6 +203,9 @@ media-cdm-capabilities = 功能
 # are not encrypted. It allows playback to start without having to wait for
 # license response, improving video start time and user experience.
 media-cdm-clear-lead = 不加密的前导段
+# We choose 2.2 as this is the version which the video provider usually want to have in order to stream 4K video securely
+# HDCP version https://w3c.github.io/encrypted-media/#idl-def-hdcpversion
+media-hdcp-22-compatible = 兼容 HDCP 2.2
 
 ##
 
@@ -262,6 +265,7 @@ try-newer-driver = 因您的显卡驱动版本而无法启用。请尝试更新�
 # there are no good translations, these are only used in about:support
 clear-type-parameters = ClearType 参数
 compositing = 合成
+support-font-determination = 字体可见性调试信息
 hardware-h264 = H264 硬件解码
 main-thread-no-omtc = 主线程，无 OMTC
 yes = 是
@@ -407,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/about/aboutWebauthn.ftl b/l10n-zh-CN/toolkit/toolkit/about/aboutWebauthn.ftl
index a89d630678..dc8ca5b364 100644
--- a/l10n-zh-CN/toolkit/toolkit/about/aboutWebauthn.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/about/aboutWebauthn.ftl
@@ -18,6 +18,8 @@ about-webauthn-pin-section-title = PIN 管理
 about-webauthn-credential-management-section-title = 管理凭据
 about-webauthn-pin-required-section-title = 需输入 PIN
 about-webauthn-confirm-deletion-section-title = 确认删除
+# Registered biometric features for authentication. Mostly, but not exclusively, fingerprints.
+about-webauthn-bio-enrollment-section-title = 生物特征注册
 
 ## Info field texts
 
@@ -27,6 +29,8 @@ about-webauthn-text-select-device = 请轻触设备来选择要使用的安全�
 # CTAP2 refers to Client to Authenticator Protocol version 2
 about-webauthn-text-non-ctap2-device = 无法管理选项，因为您的安全令牌不支持 CTAP2。
 about-webauthn-text-not-available = 无法在此平台上使用。
+about-webauthn-bio-enrollment-list-subsection-title = 注册信息：
+about-webauthn-add-bio-enrollment-section-title = 添加新注册信息
 
 ## Results label
 
@@ -40,6 +44,7 @@ about-webauthn-results-pin-invalid-error =
        *[other] 错误：PIN 错误，请重试。您还有 { $retriesLeft } 次机会。
     }
 about-webauthn-results-pin-blocked-error = 错误：尝试机会已用完。由于 PIN 输入错误次数过多，此设备已被锁定，需进行重置。
+about-webauthn-results-pin-not-set-error = 错误：未设置 PIN。此操作需要 PIN 保护。
 about-webauthn-results-pin-too-short-error = 错误：输入的 PIN 过短。
 about-webauthn-results-pin-too-long-error = 错误：输入的 PIN 过长。
 about-webauthn-results-pin-auth-blocked-error = 错误：因连续尝试失败次数过多，已暂时禁止 PIN 身份验证。您需要重新上电设备（拔下重插）。
@@ -52,6 +57,8 @@ about-webauthn-repeat-pin-label = 再次输入新 PIN：
 about-webauthn-current-pin-label = 当前 PIN：
 about-webauthn-pin-required-label = 请输入您的 PIN：
 about-webauthn-credential-list-subsection-title = 凭据：
+about-webauthn-enrollment-name-label = 注册信息名称（可选）：
+about-webauthn-enrollment-list-empty = 此设备上没有找到注册信息。
 about-webauthn-credential-list-empty = 在设备上找不到凭据。
 about-webauthn-confirm-deletion-label = 您将要删除：
 
@@ -61,9 +68,14 @@ about-webauthn-current-set-pin-button = 设置 PIN
 about-webauthn-current-change-pin-button = 更改 PIN
 # List is a verb, as in "Show list of credentials"
 about-webauthn-list-credentials-button = 列出凭据
+# List is a verb, as in "Show list of all enrollments"
+about-webauthn-list-bio-enrollments-button = 列出注册信息
+about-webauthn-add-bio-enrollment-button = 添加注册信息
 about-webauthn-cancel-button = 取消
 about-webauthn-send-pin-button = 确定
 about-webauthn-delete-button = 删除
+about-webauthn-start-enrollment-button = 开始注册
+about-webauthn-update-button = 更新
 
 ## Authenticator options fields
 ## Option fields correspond to the CTAP2 option IDs and definitions found in https://fidoalliance.org/specs/fido-v2.1-ps-20210615/fido-client-to-authenticator-protocol-v2.1-ps-20210615.html#option-id
@@ -71,7 +83,7 @@ about-webauthn-delete-button = 删除
 about-webauthn-auth-option-uv = 用户验证
 about-webauthn-auth-option-up = 用户存在
 about-webauthn-auth-option-clientpin = 客户端 PIN
-about-webauthn-auth-option-rk = Resident key
+about-webauthn-auth-option-rk = 常驻密钥
 about-webauthn-auth-option-plat = 平台设备
 # pinUvAuthToken should not be translated.
 about-webauthn-auth-option-pinuvauthtoken = 命令权限（pinUvAuthToken）
@@ -79,7 +91,7 @@ about-webauthn-auth-option-pinuvauthtoken = 命令权限（pinUvAuthToken）
 about-webauthn-auth-option-nomcgapermissionswithclientpin = 客户端 PIN 没有 MakeCredential / GetAssertion 权限
 about-webauthn-auth-option-largeblobs = 大型 blob
 about-webauthn-auth-option-ep = 企业认证
-about-webauthn-auth-option-bioenroll = 录入生物特征
+about-webauthn-auth-option-bioenroll = 生物特征注册
 # FIDO_2_1_PRE should not be translated.
 about-webauthn-auth-option-userverificationmgmtpreview = 生物特征录入原型（FIDO_2_1_PRE）
 about-webauthn-auth-option-uvbioenroll = 生物特征录入权限
@@ -127,3 +139,37 @@ about-webauthn-auth-info-true = True
 # Shows when boolean value for an info field is False. False should not be translated.
 about-webauthn-auth-info-false = False
 about-webauthn-auth-info-null = 不支持
+
+## Bio enrollment sample feedbacks
+
+# To register a new enrollment (e.g. fingerprint) usually
+# multiple scans of the same finger have to be sampled.
+# This shows how many the user still has to do.
+# Variables:
+#  $repeatCount (Number): number of tries left
+about-webauthn-samples-still-needed = 还需进行 { $repeatCount } 次采集。
+# Scan (e.g. of fingerprint) was successful.
+about-webauthn-ctap2-enroll-feedback-good = 样本质量良好。
+
+## Scan (e.g. of fingerprint) was off-center (e.g. too high, too left, etc.).
+
+about-webauthn-ctap2-enroll-feedback-too-high = 样本位置偏上。
+about-webauthn-ctap2-enroll-feedback-too-low = 样本位置偏下。
+about-webauthn-ctap2-enroll-feedback-too-left = 样本位置偏左。
+about-webauthn-ctap2-enroll-feedback-too-right = 样本位置偏右。
+
+##
+
+about-webauthn-ctap2-enroll-feedback-too-fast = 采集时动作过快。
+about-webauthn-ctap2-enroll-feedback-too-slow = 采集时动作过慢。
+about-webauthn-ctap2-enroll-feedback-poor-quality = 样本质量不佳。
+# Skewed in the sense of fingerprint/iris scan was too distorted
+about-webauthn-ctap2-enroll-feedback-too-skewed = 样本过于偏斜。
+about-webauthn-ctap2-enroll-feedback-too-short = 采集时停留时间过短。
+# Scan (e.g. of fingerprint) couldn't be merged with previous samples.
+about-webauthn-ctap2-enroll-feedback-merge-failure = 样本合并失败。
+# Scan (e.g. of fingerprint) is somehow identical to an existing sample.
+about-webauthn-ctap2-enroll-feedback-exists = 样本已存在。
+about-webauthn-ctap2-enroll-feedback-no-user-activity = 没有来自用户的活动。
+about-webauthn-ctap2-enroll-feedback-no-user-presence-transition = 用户未按预期完成采集。
+about-webauthn-ctap2-enroll-feedback-other = 采样错误。
diff --git a/l10n-zh-CN/toolkit/toolkit/about/abuseReports.ftl b/l10n-zh-CN/toolkit/toolkit/about/abuseReports.ftl
index 4bcee90b8d..3faae9a024 100644
--- a/l10n-zh-CN/toolkit/toolkit/about/abuseReports.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/about/abuseReports.ftl
@@ -49,7 +49,7 @@ abuse-report-messagebar-aborted2 =
 abuse-report-messagebar-submitting2 =
     .message = 正在发送 { $addon-name } 的举报。
 abuse-report-messagebar-submitted2 =
-    .message = 感谢您提交举报。您想要移除 { $addon-name } 吗？
+    .message = 感谢您提交举报。您想要移除“{ $addon-name }”吗？
 abuse-report-messagebar-submitted-noremove2 =
     .message = 感谢您提交举报！
 abuse-report-messagebar-removed-extension2 =
diff --git a/l10n-zh-CN/toolkit/toolkit/branding/brandings.ftl b/l10n-zh-CN/toolkit/toolkit/branding/brandings.ftl
index 9af7d4a154..c122b1505a 100644
--- a/l10n-zh-CN/toolkit/toolkit/branding/brandings.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/branding/brandings.ftl
@@ -20,6 +20,7 @@
 -lockwise-brand-short-name = Lockwise
 -monitor-brand-name = Firefox Monitor
 -monitor-brand-short-name = Monitor
+-mozmonitor-brand-name = Mozilla Monitor
 -pocket-brand-name = Pocket
 -send-brand-name = Firefox Send
 -screenshots-brand-name = Firefox Screenshots
diff --git a/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl b/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index cc9e3bb63f..98e620707c 100644
--- a/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
@@ -6,12 +6,32 @@ contentanalysis-alert-title = 内容分析
 # Variables:
 #   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
 contentanalysis-slow-agent-notification = 内容分析工具用于响应资源“{ $content }”的时间过长
-contentanalysis-slow-agent-dialog-title = 正在分析内容
+contentanalysis-slow-agent-dialog-header = 正在扫描
 # Variables:
-#   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
-contentanalysis-slow-agent-dialog-body = 内容分析正在分析资源“{ $content }”
+#   $agent - The name of the DLP agent doing the analysis
+#   $filename - Name of the file being analyzed, such as "aFile.txt"
+contentanalysis-slow-agent-dialog-body-file = { $agent } 正在审核“{ $filename }”是否符合您组织的数据策略，这可能需要一些时间。
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+contentanalysis-slow-agent-dialog-body-clipboard = { $agent } 正在审核您粘贴的内容是否符合您组织的数据策略，这可能需要一些时间。
+# Note that this is shown when the user drag and drops text into the browser.
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+contentanalysis-slow-agent-dialog-body-dropped-text = { $agent } 正在审核您拖放的文本是否符合您组织的数据策略，这可能需要一些时间。
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+contentanalysis-slow-agent-dialog-body-print = “{ $agent }”正在审核您打印的内容是否符合您组织的数据政策。这可能需要一些时间。
 contentanalysis-operationtype-clipboard = 剪贴板
 contentanalysis-operationtype-dropped-text = 拖放的文本
+contentanalysis-operationtype-print = 打印
+#   $filename - The filename associated with the request, such as "aFile.txt"
+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-warndialog-response-allow = 使用内容
+contentanalysis-warndialog-response-deny = 取消
 contentanalysis-notification-title = 内容分析
 # Variables:
 #   $content - Description of the content being reported, such as "clipboard" or "aFile.txt"
@@ -19,7 +39,50 @@ 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 }。
 # 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-error-message = 与数据丢失防护软件通信时发生错误。对以下资源的传输被拒绝：{ $content }。
+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 }。
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Localized text describing the content being blocked, such as "Paste denied."
+contentanalysis-unspecified-error-message-content = 与“{ $agent }”通信时发生错误。{ $content }
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Localized text describing the content being blocked, such as "Paste denied."
+contentanalysis-no-agent-connected-message-content = 无法连接“{ $agent }”。{ $content }
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Localized text describing the content being blocked, such as "Paste denied."
+contentanalysis-invalid-agent-signature-message-content = 验证“{ $agent }”的签名失败。{ $content }
+# Variables:
+#   $filename - Name of the file that was blocked, such as "aFile.txt"
+contentanalysis-error-message-upload-file = “{ $filename }”的上传被拒绝。
+contentanalysis-error-message-dropped-text = 拖放内容被拒绝。
+contentanalysis-error-message-clipboard = 粘贴内容被拒绝。
+contentanalysis-error-message-print = 打印内容被拒绝。
+contentanalysis-block-dialog-title-upload-file = 您无权上传此文件
+# Variables:
+#   $filename - Name of the file that was blocked, such as "aFile.txt"
+contentanalysis-block-dialog-body-upload-file = 根据您组织的数据保护政策，您无权上传文件“{ $filename }”。请联系您的管理员了解更多信息。
+contentanalysis-block-dialog-title-clipboard = 您无权粘贴此内容
+contentanalysis-block-dialog-body-clipboard = 根据您组织的数据保护政策，您不无权粘贴此内容。请联系您的管理员了解更多信息。
+contentanalysis-block-dialog-title-dropped-text = 您无权放置此内容
+contentanalysis-block-dialog-body-dropped-text = 根据您组织的数据保护政策，您不被允许拖放此内容。请联系您的管理员了解更多信息。
+contentanalysis-block-dialog-title-print = 您无权打印此文档
+contentanalysis-block-dialog-body-print = 根据您组织的数据保护政策，您无权打印此文档。请联系您的管理员了解更多信息。
+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/downloads/downloadUI.ftl b/l10n-zh-CN/toolkit/toolkit/downloads/downloadUI.ftl
index de98541d74..827e038de8 100644
--- a/l10n-zh-CN/toolkit/toolkit/downloads/downloadUI.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/downloads/downloadUI.ftl
@@ -22,21 +22,18 @@ download-ui-dont-quit-button =
         [mac] 不退出
        *[other] 不退出
     }
-
 download-ui-confirm-offline-cancel-downloads =
     { $downloadsCount ->
         [1] 如果您现在脱机，将有 1 项下载被迫取消。您确定要脱机吗？
        *[other] 如果您现在脱机，将有 { $downloadsCount } 项下载被迫取消。您确定要脱机吗？
     }
 download-ui-dont-go-offline-button = 保持在线
-
 download-ui-confirm-leave-private-browsing-windows-cancel-downloads =
     { $downloadsCount ->
-        [1] 如果您现在关闭所有的隐私浏览窗口，1 项下载将被取消。您仍确定要离开隐私浏览模式吗？
-       *[other] 如果您现在关闭所有的隐私浏览窗口，{ $downloadsCount } 项下载将被取消。您仍确定要离开隐私浏览模式吗？
+        [1] 如果现在关闭所有隐私浏览窗口，1 项下载将被取消。您仍确定要离开隐私浏览模式吗？
+       *[other] 如果现在关闭所有隐私浏览窗口，{ $downloadsCount } 项下载将被取消。您仍确定要离开隐私浏览模式吗？
     }
 download-ui-dont-leave-private-browsing-button = 留在隐私浏览模式
-
 download-ui-cancel-downloads-ok =
     { $downloadsCount ->
         [1] 取消 1 项下载
diff --git a/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl
index 0e4f8a4eed..05c4cbf5c4 100644
--- a/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -8,15 +8,76 @@
 # The macos string is preceded by the operating system (macOS) with "Firefox is trying to ",
 # and has a period added to its end. Make sure to test in your locale.
 autofill-use-payment-method-os-prompt-macos = 使用存储的付款方式信息
+autofill-use-payment-method-os-prompt-windows = { -brand-short-name } 正尝试使用存储的付款方式，请在下方登录此 Windows 账户确认。
+autofill-use-payment-method-os-prompt-other = { -brand-short-name } 正尝试使用存储的付款方式。
 # In macOS, this string is preceded by the operating system with "Firefox is trying to ",
 # and has a period added to its end. Make sure to test in your locale.
 autofill-edit-payment-method-os-prompt-macos = 显示存储的付款方式信息
+autofill-edit-payment-method-os-prompt-windows = { -brand-short-name } 正尝试显示存储的付款方式信息，请在下方登录此 Windows 账户确认。
+autofill-edit-payment-method-os-prompt-other = { -brand-short-name } 正尝试显示存储的付款方式信息。
 # The links lead users to Form Autofill browser preferences.
 autofill-options-link = 表单自动填写选项
 autofill-options-link-osx = 表单自动填写偏好设置
 
 ## The credit card capture doorhanger
 
+# If Sync is enabled and credit card sync is available,
+# this checkbox is displayed on the doorhanger shown when saving credit card.
+credit-card-doorhanger-credit-cards-sync-checkbox = 在我的设备间同步所有保存的卡片
+# Used on the doorhanger when users submit payment with credit card.
+credit-card-save-doorhanger-header = 要安全地保存此卡片吗？
+credit-card-save-doorhanger-description = { -brand-short-name } 会将卡号加密保存。安全码不会被保存。
+credit-card-capture-save-button =
+    .label = 保存
+    .accessKey = S
+credit-card-capture-cancel-button =
+    .label = 暂时不要
+    .accessKey = W
+credit-card-capture-never-save-button =
+    .label = 永不保存卡片
+    .accessKey = N
 
 # Used on the doorhanger when an credit card change is detected.
 
+credit-card-update-doorhanger-header = 要更新卡片吗？
+credit-card-update-doorhanger-description = 要更新的卡片：
+credit-card-capture-save-new-button =
+    .label = 另存为新卡片
+    .accessKey = C
+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.
+autofill-manage-payment-methods-label = 管理付款方式
+
+## These are brand names and should only be translated when a locale-specific name for that brand is in common use
+
+autofill-card-network-amex = 美国运通（American Express）
+autofill-card-network-cartebancaire = Carte Bancaire
+autofill-card-network-diners = 大来卡（Diners Club）
+autofill-card-network-discover = 发现卡（Discover）
+autofill-card-network-jcb = 吉士美（JCB）
+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
new file mode 100644
index 0000000000..bb3cf57c77
--- /dev/null
+++ b/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl
@@ -0,0 +1,38 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+### 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 = 向下滚动
+
+### 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 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-backwards =
+    .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-forwards =
+    .tooltiptext = 向前滚动
diff --git a/l10n-zh-CN/toolkit/toolkit/global/extensionPermissions.ftl b/l10n-zh-CN/toolkit/toolkit/global/extensionPermissions.ftl
index 4fa4e0038a..d638bee682 100644
--- a/l10n-zh-CN/toolkit/toolkit/global/extensionPermissions.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/global/extensionPermissions.ftl
@@ -9,11 +9,11 @@
 
 webext-perms-description-bookmarks = 读取和修改书签
 webext-perms-description-browserSettings = 读取和修改浏览器设置
-webext-perms-description-browsingData = 清除最近的浏览记录、Cookie 及有关数据
+webext-perms-description-browsingData = 清除最近的浏览历史、Cookie 及有关数据
 webext-perms-description-clipboardRead = 获取剪贴板数据
 webext-perms-description-clipboardWrite = 录入数据到剪贴板
 webext-perms-description-declarativeNetRequest = 拦截任何页面上的内容
-webext-perms-description-declarativeNetRequestFeedback = 读取您的浏览记录
+webext-perms-description-declarativeNetRequestFeedback = 读取您的浏览历史
 webext-perms-description-devtools = 让开发者工具可以存取您打开的标签页中的数据
 webext-perms-description-downloads = 下载文件和读写浏览器的下载历史
 webext-perms-description-downloads-open = 打开已下载至您的计算机的文件
diff --git a/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl b/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl
index 11ef656e08..009e07c3b7 100644
--- a/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/global/processTypes.ftl
@@ -8,28 +8,23 @@
 ##
 
 process-type-web = 网页内容
-
 # process used to run privileged about pages,
 # such as about:home
 process-type-privilegedabout = About 特权页
-
 # process used to run privileged mozilla pages,
 # such as accounts.firefox.com
 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 内容
-
 # process used to isolate a ServiceWorker to improve
 # performance
 process-type-webserviceworker = 隔离 Service Worker
-
 # process preallocated; may change to other types
 process-type-prealloc = 预分配
 
@@ -39,19 +34,22 @@ process-type-prealloc = 预分配
 
 process-type-default = 主要
 process-type-tab = 标签页
-
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
-
 # process used to perform network operations
 process-type-socket = 套接字
-
 # process used to decode media
 process-type-rdd = RDD
-
 # process used to run some IPC actor in their own sandbox
 process-type-utility = 沙盒化 IPC 角色
+process-type-utility-actor-audio-decoder-generic = 实用工具“通用音频解码器”
+process-type-utility-actor-audio-decoder-applemedia = 实用工具“AppleMedia”
+process-type-utility-actor-audio-decoder-wmf = 实用工具“Windows Media Foundation”
+process-type-utility-actor-mf-media-engine = 实用工具”Media Foundation Engine“
+process-type-utility-actor-js-oracle = 实用工具”JavaScript Oracle“
+process-type-utility-actor-windows-utils = 实用工具”Windows Utils“
+process-type-utility-actor-windows-file-dialog = 实用工具”Windows File Dialog“
 
 ##
 ## Other
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 b204a83ee6..872948a478 100644
--- a/l10n-zh-CN/toolkit/toolkit/pdfviewer/viewer.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/pdfviewer/viewer.ftl
@@ -293,8 +293,15 @@ pdfjs-editor-ink-button-label = 绘图
 pdfjs-editor-stamp-button =
     .title = 添加或编辑图像
 pdfjs-editor-stamp-button-label = 添加或编辑图像
-pdfjs-editor-remove-button =
-    .title = 移除
+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.
 
@@ -318,6 +325,10 @@ pdfjs-editor-ink-opacity-input = 不透明度
 pdfjs-editor-stamp-add-image-button =
     .title = 添加图像
 pdfjs-editor-stamp-add-image-button-label = 添加图像
+# This refers to the thickness of the line used for free highlighting (not bound to text)
+pdfjs-editor-free-highlight-thickness-input = 粗细
+pdfjs-editor-free-highlight-thickness-title =
+    .title = 更改高亮粗细（用于文本以外项目）
 pdfjs-free-text =
     .aria-label = 文本编辑器
 pdfjs-free-text-default-content = 开始输入…
@@ -374,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 = 显示全部
diff --git a/l10n-zh-CN/toolkit/toolkit/preferences/preferences.ftl b/l10n-zh-CN/toolkit/toolkit/preferences/preferences.ftl
index 9857156727..ea6a18fc80 100644
--- a/l10n-zh-CN/toolkit/toolkit/preferences/preferences.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/preferences/preferences.ftl
@@ -4,20 +4,16 @@
 
 password-not-set =
     .value = （未设定）
-
 failed-pp-change = 无法更改主密码。
 incorrect-pp = 您未输入正确的主密码，请重试。
 pp-change-ok = 已成功更改主密码。
-
 settings-pp-erased-ok = 您已删除主密码。由 { -brand-short-name } 管理的密码和证书私钥将不再受到保护。
 settings-pp-not-wanted = 警告！您决定不使用主密码。由 { -brand-short-name } 管理的密码和证书私钥将不受保护。
-
 pp-change2empty-in-fips-mode = 您正处于 FIPS 模式。该模式需要一个非空的主密码。
 pw-change-success-title = 密码修改成功
 pw-change-failed-title = 密码修改失败
 pw-remove-button =
     .label = 移除
-
 primary-password-dialog =
     .title = 主密码
 set-password-old-password = 当前密码：
@@ -26,9 +22,9 @@ set-password-reenter-password = 重新输入密码：
 set-password-meter = 密码强度
 set-password-meter-loading = 正在加载
 primary-password-admin = 您的管理员要求设置“主密码”才可保存账号和密码。
+primary-password-required-by-policy = 您的组织要求设置主密码才可保存登录信息和密码。
 primary-password-description = 主密码用于保护敏感信息（如登录信息和密码）。创建主密码后， { -brand-short-name } 每次检索被该密码保护的信息前都将要求您再次输入主密码。
 primary-password-warning = 请您一定要记住刚才设置的主密码。如果您忘记了主密码，您将再也不能访问此设备上所有被主密码保护的信息。
-
 remove-primary-password =
     .title = 移除主密码
 remove-info =