Merging upstream version 125.0.1.

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

4 files changed, 26 insertions, 2 deletions

diff --git a/l10n-cy/devtools/client/debugger.properties b/l10n-cy/devtools/client/debugger.properties
index 432017ef34..8d2051d4ac 100644
--- a/l10n-cy/devtools/client/debugger.properties
+++ b/l10n-cy/devtools/client/debugger.properties
@@ -647,6 +647,10 @@ original=gwreiddiol
 # input element
 expressions.placeholder=Ychwanegu mynegiant gwylio
 
+# LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
+# input element
+expressions.placeholder2=Ychwanegu mynegiant
+
 # 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=Mae mapio enw newidynnau gwreiddiol wedi'i ddiffodd. Efallai nad yw'r gwerthoedd mynegiant yn gywir.
diff --git a/l10n-cy/devtools/client/toolbox-options.ftl b/l10n-cy/devtools/client/toolbox-options.ftl
index 8d55f18504..12a5077d57 100644
--- a/l10n-cy/devtools/client/toolbox-options.ftl
+++ b/l10n-cy/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 = Enw Lliwiau
 
+## Web Console section
+
+# The heading
+options-webconsole-label = Consol Gwe
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = Galluogi Consol Hollt
+options-webconsole-split-console-tooltip =
+    .title = Agor Consol Hollt gyda'r Fysell Escape
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-cy/devtools/client/toolbox.properties b/l10n-cy/devtools/client/toolbox.properties
index 6280101125..64894b084e 100644
--- a/l10n-cy/devtools/client/toolbox.properties
+++ b/l10n-cy/devtools/client/toolbox.properties
@@ -160,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=Cyfaddasu Offer Datblygwyr a chael cymorth
 toolbox.closebutton.tooltip=Cau'r Bar Offer Datblygwyr
 
 # 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=Dangos Consol Hollt
 
+# 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=Dangos y Consol
+
 # 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=Dangos nifer y gwallau ar y dudalen
diff --git a/l10n-cy/devtools/client/tooltips.ftl b/l10n-cy/devtools/client/tooltips.ftl
index cccaa5ae02..7b05eda1b2 100644
--- a/l10n-cy/devtools/client/tooltips.ftl
+++ b/l10n-cy/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = Nid yw <strong>{ $property }</strong> yn cael unrh
 inactive-scroll-padding-when-not-scroll-container = Nid yw <strong>{ $property }</strong> yn cael unrhyw effaith ar yr elfen hon gan nad yw'n sgrolio.
 inactive-css-border-image = Nid yw <strong>{ $property }</strong> yn cael unrhyw effaith ar yr elfen hon gan nad oes modd ei gymhwyso i elfennau tabl mewnol lle mae <strong>cwymp-ffiniol</strong> wedi'i osod i <strong>gwympo</strong> ar y elfen tabl rhiant.
 inactive-css-ruby-element = Nid yw <strong>{ $property }</strong> yn effeithio ar yr elfen hon gan ei bod yn elfen ruby. Mae ei faint yn cael ei bennu gan faint ffont y testun 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 = Nid yw <strong>{ $property }</strong> yn cael ei gefnogi ar amlygu ffug-elfennau.
 inactive-css-cue-pseudo-element-not-supported = Nid yw <strong>{ $property }</strong> yn cael ei gefnogi ar  ::cue pseudo-elements.
 # Variables:
@@ -55,9 +60,11 @@ inactive-css-text-wrap-balance-fragmented = Nid yw <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 = Ceisiwch ychwanegu <strong>display:grid</strong> neu <strong>display:flex</strong>. { learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = Ceisiwch ychwanegu <strong>display:grid</strong>, <strong>display:flex</strong> neu <strong>display:block</strong>. { learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Ceisiwch ychwanegu naill ai <strong>display:grid</strong>, <strong>display:flex</strong>, neu <strong>columns:2</strong>. { learn-more }
 inactive-css-not-multicol-container-fix = Ceisiwch ychwanegu <strong>column-count</strong> neu <strong>column-width</strong>. { learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = Ceisiwch ychwanegu <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong> neu <strong>display:inline-flex</strong> i riant yr elfen. { learn-more }