Merging upstream version 126.0.

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

3 files changed, 88 insertions, 4 deletions

diff --git a/l10n-zh-TW/toolkit/toolkit/about/aboutReader.ftl b/l10n-zh-TW/toolkit/toolkit/about/aboutReader.ftl
index 346e1ed5b9..3f98d5485c 100644
--- a/l10n-zh-TW/toolkit/toolkit/about/aboutReader.ftl
+++ b/l10n-zh-TW/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-TW/toolkit/toolkit/contentanalysis/contentanalysis.ftl b/l10n-zh-TW/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index b6fcc25b87..2c265e83a2 100644
--- a/l10n-zh-TW/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-zh-TW/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 = 此內容可能不安全
@@ -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-TW/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-zh-TW/toolkit/toolkit/global/arrowscrollbox.ftl
index ad7f9701da..483d2c4c9e 100644
--- a/l10n-zh-TW/toolkit/toolkit/global/arrowscrollbox.ftl
+++ b/l10n-zh-TW/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 = 向後捲動