Merging upstream version 125.0.1.

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

3 files changed, 24 insertions, 5 deletions

diff --git a/l10n-zh-TW/devtools/client/toolbox-options.ftl b/l10n-zh-TW/devtools/client/toolbox-options.ftl
index 4c2baa7016..831a8548d0 100644
--- a/l10n-zh-TW/devtools/client/toolbox-options.ftl
+++ b/l10n-zh-TW/devtools/client/toolbox-options.ftl
@@ -59,6 +59,15 @@ options-default-color-unit-rgb = RGB(A)
 options-default-color-unit-hwb = HWB
 options-default-color-unit-name = 色彩名稱
 
+## Web Console section
+
+# The heading
+options-webconsole-label = 網頁主控台
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = 啟用分割主控台
+options-webconsole-split-console-tooltip =
+    .title = 使用 Esc 鍵開啟分割主控台
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-zh-TW/devtools/client/toolbox.properties b/l10n-zh-TW/devtools/client/toolbox.properties
index 892ffbf2a0..32112c637e 100644
--- a/l10n-zh-TW/devtools/client/toolbox.properties
+++ b/l10n-zh-TW/devtools/client/toolbox.properties
@@ -14,14 +14,13 @@ toolbox.titleTemplate1=開發者工具 — %1$S
 toolbox.titleTemplate2=開發者工具 — %1$S — %2$S
 
 # LOCALIZATION NOTE (toolbox.multiProcessBrowserToolboxTitle): Title used for
-# the Browser Toolbox when the pref `devtools.browsertoolbox.fission` is true.
+# the Browser Toolbox when the pref `devtools.browsertoolbox.scope` is set to "everything".
 # This Browser Toolbox allows to debug the parent process as well as the content
 # processes in the same toolbox.
 toolbox.multiProcessBrowserToolboxTitle=多處理程序瀏覽器工具箱
 
 # LOCALIZATION NOTE (toolbox.parentProcessBrowserToolboxTitle): Title used for
-# the Browser Toolbox when the pref `devtools.browsertoolbox.fission` and
-# `devtools.browsertoolbox.scope` is set to "parent-process".
+# the Browser Toolbox when the pref `devtools.browsertoolbox.scope` is set to "parent-process".
 # This Browser Toolbox allows to debug only the parent process resources.
 toolbox.parentProcessBrowserToolboxTitle=父處理程序瀏覽器工具箱
 
@@ -161,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=自訂開發者工具並取得説明
 toolbox.closebutton.tooltip=關閉開發者工具
 
 # LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
-# the error count button displayed in the developer tools toolbox.
+# the error count button displayed in the developer tools toolbox if the "Enable Split Console" setting is checked.
 toolbox.errorCountButton.tooltip=顯示分割主控台
 
+# LOCALIZATION NOTE (toolbox.errorCountButtonConsoleTab.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox if the "Enable Split Console" setting is unchecked.
+toolbox.errorCountButtonConsoleTab.tooltip=顯示主控台
+
 # LOCALIZATION NOTE (toolbox.errorCountButton.description): This is the description that
 # will be used for the error count button in the devTools settings panel.
 toolbox.errorCountButton.description=顯示頁面中的錯誤數量
diff --git a/l10n-zh-TW/devtools/client/tooltips.ftl b/l10n-zh-TW/devtools/client/tooltips.ftl
index 4a212500c5..e074e4cb81 100644
--- a/l10n-zh-TW/devtools/client/tooltips.ftl
+++ b/l10n-zh-TW/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = 由於不是表格欄位，<strong>{ $property }</
 inactive-scroll-padding-when-not-scroll-container = 由於不會捲動，<strong>{ $property }</strong> 對此元素沒有影響。
 inactive-css-border-image = 由於父階層表格元素的 <strong>border-collapse</strong> 設定為 <strong>collapse</strong>，無法套用到內部的表格元素，<strong>{ $property }</strong> 對此元素無效。
 inactive-css-ruby-element = 由於此元素是 ruby 元素，<strong>{ $property }</strong> 無效。此元素大小是由 ruby 文字的大小所決定的。
+
+## In the Rule View when a CSS property cannot be successfully applied we display
+## an icon. When this icon is hovered this message is displayed to explain how
+## the problem can be solved.
+
 inactive-css-highlight-pseudo-elements-not-supported = 強調的 pseudo-elements 不支援 <strong>{ $property }</strong>。
 inactive-css-cue-pseudo-element-not-supported = ::cue 偽元素不支援 <strong>{ $property }</strong>。
 # Variables:
@@ -47,9 +52,11 @@ inactive-css-text-wrap-balance-fragmented = 由於是分段的元素（內容拆
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
-## the problem can be solved.
+## the problem can be solved. CSS properties and values in <strong> tags should
+## not be translated.
 
 inactive-css-not-grid-or-flex-container-fix = 請嘗試加入 <strong>display:grid</strong> 或 <strong>display:flex</strong>。{ learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = 請嘗試加入 <strong>display:grid</strong>、<strong>display:flex</strong> 或 <strong>display:block</strong>。{ learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = 請嘗試加入 <strong>display:grid</strong>、<strong>display:flex</strong> 或 <strong>columns:2</strong>。{ learn-more }
 inactive-css-not-multicol-container-fix = 請嘗試加入 <strong>column-count</strong> 或 <strong>column-width</strong>。{ learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = 請嘗試為元素的父元素加入 <strong>display:grid</strong>、<strong>display:flex</strong>、<strong>display:inline-grid</strong> 或 <strong>display:inline-flex</strong>。{ learn-more }