Merging upstream version 126.0.

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

3 files changed, 89 insertions, 5 deletions

diff --git a/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl b/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl
index 2f5e2e6a4b..a2bce15d13 100644
--- a/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/about/aboutReader.ftl
@@ -26,6 +26,18 @@ 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:
@@ -58,6 +70,8 @@ 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
@@ -81,3 +95,28 @@ about-reader-custom-colors-visited-links = 访问过的链接
 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/contentanalysis/contentanalysis.ftl b/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index f4e54d6d83..98e620707c 100644
--- a/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/contentanalysis/contentanalysis.ftl
@@ -6,10 +6,6 @@ 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 = 正在分析内容
-# Variables:
-#   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
-contentanalysis-slow-agent-dialog-body = 内容分析正在分析资源“{ $content }”
 contentanalysis-slow-agent-dialog-header = 正在扫描
 # Variables:
 #   $agent - The name of the DLP agent doing the analysis
@@ -22,8 +18,12 @@ contentanalysis-slow-agent-dialog-body-clipboard = { $agent } 正在审核您粘
 # 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 = 此内容可能不安全
@@ -46,7 +46,7 @@ contentanalysis-error-message = 与数据泄露防护软件通信时发生错误
 # 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 }。
+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"
@@ -55,6 +55,34 @@ contentanalysis-no-agent-connected-message = 无法连接“{ $agent }”。以�
 #   $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/global/arrowscrollbox.ftl b/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl
index 5b12f93499..bb3cf57c77 100644
--- a/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl
+++ b/l10n-zh-CN/toolkit/toolkit/global/arrowscrollbox.ftl
@@ -19,3 +19,20 @@ overflow-scroll-button-up =
 # 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 = 向前滚动