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-sk/devtools/client/toolbox-options.ftl b/l10n-sk/devtools/client/toolbox-options.ftl
index 806849029a..097ff19740 100644
--- a/l10n-sk/devtools/client/toolbox-options.ftl
+++ b/l10n-sk/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 = Názov farby
 
+## Web Console section
+
+# The heading
+options-webconsole-label = Webová konzola
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = Povoliť rozdelenú konzolu
+options-webconsole-split-console-tooltip =
+    .title = Otvárať rozdelenú konzolu pomocou klávesu Escape
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-sk/devtools/client/toolbox.properties b/l10n-sk/devtools/client/toolbox.properties
index 8f73e21276..c03c3dc0fd 100644
--- a/l10n-sk/devtools/client/toolbox.properties
+++ b/l10n-sk/devtools/client/toolbox.properties
@@ -160,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=Prispôsobenie nástrojov a získanie pomoci
 toolbox.closebutton.tooltip=Zavrieť vývojárske nástroje
 
 # 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=Zobraziť rozdelenú konzolu
 
+# 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=Zobraziť konzolu
+
 # 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=Zobraziť počet chýb na stránke
diff --git a/l10n-sk/devtools/client/tooltips.ftl b/l10n-sk/devtools/client/tooltips.ftl
index 3534347ae0..5937a82183 100644
--- a/l10n-sk/devtools/client/tooltips.ftl
+++ b/l10n-sk/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = Vlastnosť <strong>{ $property }</strong> nemá na
 inactive-scroll-padding-when-not-scroll-container = Vlastnosť <strong>{ $property }</strong> nemá na tento prvok žiadny vplyv, pretože prvok nie je rolovateľný.
 inactive-css-border-image = Vlastnosť <strong>{ $property }</strong> nemá žiadny vplyv na tento prvok, pretože ju nemožno použiť na interné prvky tabuľky, kde je vlastnosť <strong>border-collapse</strong> na nadradenom prvku tabuľky nastavená na hodnotu <strong>collapse</strong>.
 inactive-css-ruby-element = Vlastnosť <strong>{ $property }</strong> nemá žiadny vplyv na tento prvok, pretože je to prvok ruby. Jeho veľkosť je určená veľkosťou písma textu prvku 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 = <strong>{ $property }</strong> nie je podporované na zvýraznených pseudoprvkoch.
 inactive-css-cue-pseudo-element-not-supported = Vlastnosť <strong>{ $property }</strong> nie je podporovaná na pseudoprvkoch ::cue.
 # Variables:
@@ -53,9 +58,11 @@ inactive-css-text-wrap-balance-fragmented = Vlastnosť <strong>{ $property }</st
 
 ## 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 = Skúste pridať <strong>display:grid</strong> alebo <strong>display:flex</strong>. { learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = Skúste pridať <strong>display:grid</strong>, <strong>display:flex</strong> alebo <strong>display:block</strong>. { learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Skúste pridať <strong>display:grid</strong>, <strong>display:flex</strong> alebo <strong>columns:2</strong>. { learn-more }
 inactive-css-not-multicol-container-fix = Skúste pridať <strong>column-count</strong> alebo <strong>column-width</strong>. { learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = Skúste definovať <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong> alebo <strong>display:inline-flex</strong> pre rodiča tohto prvku. { learn-more }