Merging upstream version 125.0.1.

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

2 files changed, 68 insertions, 1 deletions

diff --git a/devtools/client/locales/en-US/debugger.properties b/devtools/client/locales/en-US/debugger.properties
index 2c6cdeb5a9..0d7b347722 100644
--- a/devtools/client/locales/en-US/debugger.properties
+++ b/devtools/client/locales/en-US/debugger.properties
@@ -636,7 +636,7 @@ original=original
 
 # LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
 # input element
-expressions.placeholder=Add watch expression
+expressions.placeholder2=Add expression
 
 # 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
@@ -751,6 +751,71 @@ sourceFooter.unignore=Unignore source
 # with the ignore source button when the selected source is on the ignore list
 sourceFooter.ignoreList=This source is on the ignore list. Please turn off the `Ignore Known Third-party Scripts` option to enable it.
 
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.disabled): Label displayed next to the
+# Source Map icon displayed in editor footer.
+# Displayed when Source Maps are disabled.
+sourceFooter.sourceMapButton.disabled = Source Maps disabled
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.sourceNotMapped): Label displayed next to the
+# Source Map icon displayed in editor footer.
+# Displayed when the selected source is a regular source, without any source map.
+sourceFooter.sourceMapButton.sourceNotMapped = No source map found
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.isOriginalSource): Label displayed next to the
+# Source Map icon displayed in editor footer.
+# Displayed when the selected source is an original source.
+# i.e. a file which may not be in JavaScript and isn't being executed by Firefox.
+# This file is transpiled by the web developer into a "bundle" JavaScript file, which is executed by the page.
+sourceFooter.sourceMapButton.isOriginalSource = original file
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.isBundleSource): Label displayed next to the
+# Source Map icon displayed in editor footer.
+# Displayed when the selected source is a bundle. i.e. a file referring to a source map file,
+# which will be mapped to one or many original sources.
+sourceFooter.sourceMapButton.isBundleSource = bundle file
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.enable): Label displayed in the menu opened
+# from the Source Map icon displayed in editor footer.
+# This allows to toggle Source Map support.
+sourceFooter.sourceMapButton.enable = Enable Source Maps
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.showOriginalSourceByDefault): Label displayed in the menu opened
+# from the Source Map icon displayed in editor footer.
+# This controls the settings which will make the debugger automatically show and open original source by default.
+# This typically happens when you pause or hit a breakpoint.
+sourceFooter.sourceMapButton.showOriginalSourceByDefault = Show and open original location by default
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.jumpToGeneratedSource): Label displayed in the menu opened
+# from the Source Map icon displayed in editor footer.
+# This allows to select the related bundle source, when we are currently selecting an original one.
+sourceFooter.sourceMapButton.jumpToGeneratedSource = Jump to the related bundle source
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.jumpToOriginalSource): Label displayed in the menu opened
+# from the Source Map icon displayed in editor footer.
+# This allows to select the related original source, when we are currently selecting a bundle.
+sourceFooter.sourceMapButton.jumpToOriginalSource = Jump to the related original source
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.openSourceMapInNewTab): Label displayed in the menu opened
+# from the Source Map icon displayed in editor footer.
+# When selecting a bundle with a valid source map, link to open the source map in a new tab.
+sourceFooter.sourceMapButton.openSourceMapInNewTab = Open the Source Map file in a new tab
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.title): Tooltip displayed on
+# the Source Map icon displayed in editor footer.
+# This is the default title.
+sourceFooter.sourceMapButton.title = Source Map status
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.loadingTitle): Tooltip displayed on
+# the Source Map icon displayed in editor footer.
+# This title is displayed when the source map is still loading.
+sourceFooter.sourceMapButton.loadingTitle = Source Map is loading
+
+# LOCALIZATION NOTE (sourceFooter.sourceMapButton.errorTitle): Tooltip displayed on
+# the Source Map icon displayed in editor footer.
+# This title is displayed when the source map has an error.
+# %S will be the error string.
+sourceFooter.sourceMapButton.errorTitle = Source Map error: %S
+
 # LOCALIZATION NOTE (editorNotificationFooter.noOriginalScopes): The notification message displayed in the editor notification footer
 # when paused in an original file and original variable mapping is turned off
 # %S is text from the label for checkbox to show original scopes
diff --git a/devtools/client/locales/en-US/tooltips.ftl b/devtools/client/locales/en-US/tooltips.ftl
index 0639d95434..df6170f5a3 100644
--- a/devtools/client/locales/en-US/tooltips.ftl
+++ b/devtools/client/locales/en-US/tooltips.ftl
@@ -82,6 +82,8 @@ inactive-css-text-wrap-balance-fragmented = <strong>{ $property }</strong> has n
 
 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 }