Merging upstream version 125.0.1.

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

3 files changed, 22 insertions, 2 deletions

diff --git a/l10n-zh-CN/devtools/client/toolbox-options.ftl b/l10n-zh-CN/devtools/client/toolbox-options.ftl
index 6aaacb6cf1..5fe2fdc11a 100644
--- a/l10n-zh-CN/devtools/client/toolbox-options.ftl
+++ b/l10n-zh-CN/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 = Web 控制台
+# 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-CN/devtools/client/toolbox.properties b/l10n-zh-CN/devtools/client/toolbox.properties
index 1bb4153c87..fb8124af91 100755
--- a/l10n-zh-CN/devtools/client/toolbox.properties
+++ b/l10n-zh-CN/devtools/client/toolbox.properties
@@ -160,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-CN/devtools/client/tooltips.ftl b/l10n-zh-CN/devtools/client/tooltips.ftl
index 768d179709..e6130dee8f 100644
--- a/l10n-zh-CN/devtools/client/tooltips.ftl
+++ b/l10n-zh-CN/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = 由于不是单元格，<strong>{ $property }</str
 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 = <strong>{ $property }</strong> 对此 ruby 元素无效。此元素大小由 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 = 强调（highlight）目的的伪元素上不支持 <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 = <strong>{ $property }</strong> 对�
 
 ## 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 }