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-nb-NO/devtools/client/toolbox-options.ftl b/l10n-nb-NO/devtools/client/toolbox-options.ftl
index 7a37666f90..015b350e31 100644
--- a/l10n-nb-NO/devtools/client/toolbox-options.ftl
+++ b/l10n-nb-NO/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 = Color Names
 
+## Web Console section
+
+# The heading
+options-webconsole-label = Web Console
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = Enable Split Console
+options-webconsole-split-console-tooltip =
+    .title = Open Split Console with the Escape Key
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-nb-NO/devtools/client/toolbox.properties b/l10n-nb-NO/devtools/client/toolbox.properties
index 059aaef1e8..c48e2ca15a 100644
--- a/l10n-nb-NO/devtools/client/toolbox.properties
+++ b/l10n-nb-NO/devtools/client/toolbox.properties
@@ -14,14 +14,13 @@ toolbox.titleTemplate1=Developer Tools - %1$S
 toolbox.titleTemplate2=Developer Tools - %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=Multiprocess Browser Toolbox
 
 # 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=Parent process Browser Toolbox
 
@@ -161,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=Customize Developer Tools and get help
 toolbox.closebutton.tooltip=Close Developer Tools
 
 # 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=Show Split Console
 
+# 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=Show Console
+
 # 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=Show the number of errors on the page
diff --git a/l10n-nb-NO/devtools/client/tooltips.ftl b/l10n-nb-NO/devtools/client/tooltips.ftl
index 349f700859..d167c900d9 100644
--- a/l10n-nb-NO/devtools/client/tooltips.ftl
+++ b/l10n-nb-NO/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = <strong>{ $property }</strong> has no effect on th
 inactive-scroll-padding-when-not-scroll-container = <strong>{ $property }</strong> has no effect on this element since it doesn’t scroll.
 inactive-css-border-image = <strong>{ $property }</strong> has no effect on this element since it cannot be applied to internal table elements where <strong>border-collapse</strong> is set to <strong>collapse</strong> on the parent table element.
 inactive-css-ruby-element = <strong>{ $property }</strong> has no effect on this element since it is a ruby element. Its size is determined by the font size of the ruby text.
+
+## 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 = <strong>{ $property }</strong> is not supported on highlight pseudo-elements.
 inactive-css-cue-pseudo-element-not-supported = <strong>{ $property }</strong> is not supported on ::cue pseudo-elements.
 # Variables:
@@ -51,9 +56,11 @@ inactive-css-text-wrap-balance-fragmented = <strong>{ $property }</strong> has n
 
 ## 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 = Try adding <strong>display:grid</strong> or <strong>display:flex</strong>. { learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = Try adding <strong>display:grid</strong>, <strong>display:flex</strong> or <strong>display:block</strong>. { learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Try adding either <strong>display:grid</strong>, <strong>display:flex</strong>, or <strong>columns:2</strong>. { learn-more }
 inactive-css-not-multicol-container-fix = Try adding either <strong>column-count</strong> or <strong>column-width</strong>. { learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = Try adding <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong>, or <strong>display:inline-flex</strong> to the element’s parent. { learn-more }