Merging upstream version 125.0.1.

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

4 files changed, 28 insertions, 5 deletions

diff --git a/l10n-pt-BR/devtools/client/debugger.properties b/l10n-pt-BR/devtools/client/debugger.properties
index 7700fccc5d..10f93633aa 100644
--- a/l10n-pt-BR/devtools/client/debugger.properties
+++ b/l10n-pt-BR/devtools/client/debugger.properties
@@ -647,6 +647,10 @@ original=original
 # input element
 expressions.placeholder=Adicionar expressão de monitoramento
 
+# LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
+# input element
+expressions.placeholder2=Adicionar expressão
+
 # 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=O mapeamento original de nomes de variáveis está desativado. Valores de expressões podem não ser precisos.
diff --git a/l10n-pt-BR/devtools/client/toolbox-options.ftl b/l10n-pt-BR/devtools/client/toolbox-options.ftl
index 9dfb7b41a7..70f3d83591 100644
--- a/l10n-pt-BR/devtools/client/toolbox-options.ftl
+++ b/l10n-pt-BR/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 = Nomes de cor
 
+## Web Console section
+
+# The heading
+options-webconsole-label = Console web
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = Ativar console dividido
+options-webconsole-split-console-tooltip =
+    .title = Abrir console dividido com a tecla Esc
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-pt-BR/devtools/client/toolbox.properties b/l10n-pt-BR/devtools/client/toolbox.properties
index 22a600a517..3271d07b02 100644
--- a/l10n-pt-BR/devtools/client/toolbox.properties
+++ b/l10n-pt-BR/devtools/client/toolbox.properties
@@ -14,14 +14,13 @@ toolbox.titleTemplate1=Ferramentas de desenvolvimento — %1$S
 toolbox.titleTemplate2=Ferramentas de desenvolvimento — %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=Ferramentas de multiprocessamento do navegador
 
 # 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=Ferramentas do navegador de processos superiores
 
@@ -161,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=Personalizar ferramentas de desenvolvimento
 toolbox.closebutton.tooltip=Fechar ferramentas de desenvolvimento
 
 # 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=Exibir console dividido
 
+# 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=Mostrar console
+
 # 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=Mostrar número de erros na página
diff --git a/l10n-pt-BR/devtools/client/tooltips.ftl b/l10n-pt-BR/devtools/client/tooltips.ftl
index 4321b17e70..9e09907fb1 100644
--- a/l10n-pt-BR/devtools/client/tooltips.ftl
+++ b/l10n-pt-BR/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = <strong>{ $property }</strong> não tem efeito nes
 inactive-scroll-padding-when-not-scroll-container = <strong>{ $property }</strong> não tem efeito neste elemento, pois não desliza (scroll).
 inactive-css-border-image = <strong>{ $property }</strong> não tem efeito sobre este elemento, pois não pode ser aplicado a elementos internos de tabela em que <strong>border-collapse</strong> esteja definido como <strong>collapse</strong> no elemento superior da tabela.
 inactive-css-ruby-element = <strong>{ $property }</strong> não tem efeito sobre este elemento, pois é um elemento ruby. Seu tamanho é determinado pelo tamanho da fonte do texto 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 = Não há suporte para <strong>{ $property }</strong> em pseudo-elementos de destaque.
 inactive-css-cue-pseudo-element-not-supported = Não há suporte para<strong>{ $property }</strong> em pseudo-elementos ::cue.
 # Variables:
@@ -51,9 +56,11 @@ inactive-css-text-wrap-balance-fragmented = <strong>{ $property }</strong> não
 
 ## 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 = Experimente adicionar <strong>display:grid</strong> ou <strong>display:flex</strong>. { learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = Experimente adicionar <strong>display:grid</strong>, <strong>display:flex</strong> ou <strong>display:block</strong>. { learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Experimente adicionar <strong>display:grid</strong>, <strong>display:flex</strong> ou <strong>columns:2</strong>. { learn-more }
 inactive-css-not-multicol-container-fix = Experimente adicionar <strong>column-count</strong> ou <strong>column-width</strong>. { learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = Experimente adicionar <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong> ou <strong>display:inline-flex</strong> ao pai do elemento. { learn-more }