Merging upstream version 125.0.1.

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

4 files changed, 32 insertions, 9 deletions

diff --git a/l10n-fy-NL/devtools/client/debugger.properties b/l10n-fy-NL/devtools/client/debugger.properties
index 4585172cf4..1afc7a5e74 100644
--- a/l10n-fy-NL/devtools/client/debugger.properties
+++ b/l10n-fy-NL/devtools/client/debugger.properties
@@ -647,14 +647,18 @@ original=orizjineel
 # input element
 expressions.placeholder=Kontrôle-ekspresje tafoegje
 
-# LOCALIZATION NOTE (expressions.noOriginalScopes): Expressions right sidebar pane message
-# for when the`map variable names`is off and the debugger is paused in an original source
-expressions.noOriginalScopes=Oarspronklike tawizing fan fariabelenammen útskeakele is. Ekspresjewearden binne mooglik net sekuer.
-
 # LOCALIZATION NOTE (expressions.errorMsg): Error text for expression
 # input element
 expressions.errorMsg=Unjildige ekspresje…
 
+# LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
+# input element
+expressions.placeholder2=Ekspresje tafoegje
+
+# LOCALIZATION NOTE (expressions.noOriginalScopes): Expressions right sidebar pane message
+# for when the`map variable names`is off and the debugger is paused in an original source
+expressions.noOriginalScopes=Oarspronklike tawizing fan fariabelenammen útskeakele is. Ekspresjewearden binne mooglik net sekuer.
+
 # LOCALIZATION NOTE (expressions.label): For the "Add watch expression" context menu item in the editor
 expressions.label=Kontrôle-ekspresje tafoegje
 expressions.accesskey=e
diff --git a/l10n-fy-NL/devtools/client/toolbox-options.ftl b/l10n-fy-NL/devtools/client/toolbox-options.ftl
index 65090680df..cd31f2a4ca 100644
--- a/l10n-fy-NL/devtools/client/toolbox-options.ftl
+++ b/l10n-fy-NL/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 = Kleurmammen
 
+## Web Console section
+
+# The heading
+options-webconsole-label = Webkonsole
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = Splitste console ynskeakelje
+options-webconsole-split-console-tooltip =
+    .title = Splitste console iepenje mei de Escape-toets
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-fy-NL/devtools/client/toolbox.properties b/l10n-fy-NL/devtools/client/toolbox.properties
index 00697cd7b0..b9ec74498b 100644
--- a/l10n-fy-NL/devtools/client/toolbox.properties
+++ b/l10n-fy-NL/devtools/client/toolbox.properties
@@ -14,14 +14,13 @@ toolbox.titleTemplate1=Untwikkelersark - %1$S
 toolbox.titleTemplate2=Untwikkelersark - %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=Multiproses-browserarkset
 
 # 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=Parentprocess-browserwurkset
 
@@ -161,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=Developer Tools oanpasse en help krije
 toolbox.closebutton.tooltip=Untwikkelark slute
 
 # 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=Splitste console toane
 
+# 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=Console toane
+
 # 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=Oantal flaters op de side toane
diff --git a/l10n-fy-NL/devtools/client/tooltips.ftl b/l10n-fy-NL/devtools/client/tooltips.ftl
index 163fe7a36e..a95b40af6e 100644
--- a/l10n-fy-NL/devtools/client/tooltips.ftl
+++ b/l10n-fy-NL/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = <strong>{ $property }</strong> hat gjin effekt op
 inactive-scroll-padding-when-not-scroll-container = <strong>{ $property }</strong> hat gjin effekt op dit elemint omdat it net skowt.
 inactive-css-border-image = <strong>{ $property }</strong> hat gjin effekt op dit elemint, omdat it net tapast wurde kin op ynterne tabeleleminten wêr <strong>border-collapse</strong> ynsteld is op <strong>collapse</strong> op it boppelizzende tabelelemint.
 inactive-css-ruby-element = <strong>{ $property }</strong> hat gjin effekt op dit elemint, omdat it in ruby-elemint is. De grutte wurdt bepaald troch de lettertypegrutte fan de rubytekst.
+
+## 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> wurdt net stipe op markearre pseudo-eleminten.
 inactive-css-cue-pseudo-element-not-supported = <strong>{ $property }</strong> wurdt net stipe op ::cue-pseudo-elementen.
 # Variables:
@@ -51,9 +56,11 @@ inactive-css-text-wrap-balance-fragmented = <strong>{ $property }</strong> hat g
 
 ## 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 = Probearje <strong>display:grid</strong> of <strong>display:flex</strong> ta te foegjen. { learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = Probearje <strong>display:grid</strong>, <strong>display:flex</strong> of <strong>display:block</strong> ta te foegjen. { learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Probearje <strong>display:grid</strong>, of <strong>display:flex</strong>, of <strong>colums:2</strong> ta te foegjen. { learn-more }
 inactive-css-not-multicol-container-fix = Probearje <strong>column-count</strong> of <strong>column-width</strong> ta te foegjen. { learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = Probearje <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong> of <strong>display:inline-flex</strong> oan it boppelizzende nivo fan it elemint ta te foegjen. { learn-more }