Merging upstream version 126.0.

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

3 files changed, 17 insertions, 4 deletions

diff --git a/l10n-eo/devtools/client/toolbox-options.ftl b/l10n-eo/devtools/client/toolbox-options.ftl
index 183919bf46..6af96ccfb4 100644
--- a/l10n-eo/devtools/client/toolbox-options.ftl
+++ b/l10n-eo/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 = Nomoj de koloroj
 
+## Web Console section
+
+# The heading
+options-webconsole-label = Teksaĵa konzolo
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = Aktivigi apartigitan konzolon
+options-webconsole-split-console-tooltip =
+    .title = Malfermi apartigitan konzolon per la eskapa klavo
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-eo/devtools/client/toolbox.properties b/l10n-eo/devtools/client/toolbox.properties
index 373726492f..595c7266b0 100644
--- a/l10n-eo/devtools/client/toolbox.properties
+++ b/l10n-eo/devtools/client/toolbox.properties
@@ -14,14 +14,13 @@ toolbox.titleTemplate1=Programistaj iloj - %1$S
 toolbox.titleTemplate2=Programistaj iloj - %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=Ilarujo de plurproceza retumilo
 
 # 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=Retumila ilaro por la gepatra procezo
 
@@ -161,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=Personecigi iloj por programistoj kaj ricevi
 toolbox.closebutton.tooltip=Fermi la ilojn por programistoj
 
 # 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=Montri apartigitan konzolon
 
+# 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=Montri konzolon
+
 # 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=Montri nombron de eraroj de la paĝo
diff --git a/l10n-eo/devtools/client/tooltips.ftl b/l10n-eo/devtools/client/tooltips.ftl
index 413862644f..25af8f7d74 100644
--- a/l10n-eo/devtools/client/tooltips.ftl
+++ b/l10n-eo/devtools/client/tooltips.ftl
@@ -60,6 +60,7 @@ inactive-css-text-wrap-balance-fragmented = <strong>{ $property }</strong> ne ef
 ## not be translated.
 
 inactive-css-not-grid-or-flex-container-fix = Provu aldoni <strong>display:grid</strong> aŭ <strong>display:flex</strong>. { learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = Provu aldoni <strong>display:grid</strong>, <strong>display:flex</strong> aŭ<strong>display:block</strong>. { learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Provu aldoni ĉu <strong>display:grid</strong>, <strong>display:flex</strong>, ĉu <strong>columns:2</strong>. { learn-more }
 inactive-css-not-multicol-container-fix = Provu aldoni ĉu <strong>column-count</strong> ĉu <strong>column-width</strong>. { learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = Klopodu aldoni <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong>, aŭ <strong>display:inline-flex</strong> al la gepatra elmento. { learn-more }