Merging upstream version 125.0.1.

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

3 files changed, 24 insertions, 5 deletions

diff --git a/l10n-ko/devtools/client/toolbox-options.ftl b/l10n-ko/devtools/client/toolbox-options.ftl
index 783238115f..aa197db899 100644
--- a/l10n-ko/devtools/client/toolbox-options.ftl
+++ b/l10n-ko/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 = 색상 이름
 
+## Web Console section
+
+# The heading
+options-webconsole-label = 웹 콘솔
+# The label for the checkbox that toggle whether the Split console is enabled
+options-webconsole-split-console-label = 분할 콘솔 사용
+options-webconsole-split-console-tooltip =
+    .title = Esc 키로 분할 콘솔 열기
+
 ## Style Editor section
 
 # The heading
diff --git a/l10n-ko/devtools/client/toolbox.properties b/l10n-ko/devtools/client/toolbox.properties
index edf8b2a872..0e0c7a44b3 100644
--- a/l10n-ko/devtools/client/toolbox.properties
+++ b/l10n-ko/devtools/client/toolbox.properties
@@ -14,14 +14,13 @@ toolbox.titleTemplate1=개발자 도구 - %1$S
 toolbox.titleTemplate2=개발자 도구 - %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=다중 프로세스 브라우저 도구상자
 
 # 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=부모 프로세스 브라우저 도구상자
 
@@ -161,9 +160,13 @@ toolbox.meatballMenu.button.tooltip=개발자 도구 사용자 지정 및 도움
 toolbox.closebutton.tooltip=개발자 도구 닫기
 
 # 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=콘솔 분할 보기
 
+# 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=콘솔 표시
+
 # 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=페이지의 오류 갯수 표시
diff --git a/l10n-ko/devtools/client/tooltips.ftl b/l10n-ko/devtools/client/tooltips.ftl
index 691e4d11c3..d32b7c860b 100644
--- a/l10n-ko/devtools/client/tooltips.ftl
+++ b/l10n-ko/devtools/client/tooltips.ftl
@@ -38,6 +38,11 @@ inactive-css-not-table-cell = 테이블 셀이 아니기 때문에 <strong>{ $pr
 inactive-scroll-padding-when-not-scroll-container = 스크롤하지 않으므로 <strong>{ $property }</strong> 속성이 이 요소에 영향을 미치지 않습니다.
 inactive-css-border-image = <strong>{ $property }</strong>는 부모 테이블 요소에서 <strong>border-collapse</strong>가 <strong>collapse</strong>로 설정된 내부 테이블 요소에 적용할 수 없으므로 이 요소에 영향을 미치지 않습니다.
 inactive-css-ruby-element = <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.
+
 inactive-css-highlight-pseudo-elements-not-supported = <strong>{ $property }</strong>는 하이라이트 가상 요소에서 지원되지 않습니다.
 inactive-css-cue-pseudo-element-not-supported = <strong>{ $property }</strong>는 ::cue 가상 요소에서 지원되지 않습니다.
 # Variables:
@@ -47,9 +52,11 @@ inactive-css-text-wrap-balance-fragmented = <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 = <strong>display:grid</strong> 또는 <strong>display:flex</strong>를 추가해보세요. { learn-more }
+inactive-css-not-grid-or-flex-or-block-container-fix = <strong>display:grid</strong>, <strong>display:flex</strong> 또는 <strong>display:block</strong>을 추가해 보세요. { learn-more }
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = <strong>display:grid</strong>나 <strong>display:flex</strong>, <strong>columns:2</strong>를 추가해보세요. { learn-more }
 inactive-css-not-multicol-container-fix = <strong>column-count</strong> 또는 <strong>column-width</strong>를 추가해보세요. { learn-more }
 inactive-css-not-grid-or-flex-item-fix-3 = <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong>, 또는 <strong>display:inline-flex</strong>를 요소의 부모에 추가해보세요. { learn-more }