From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:34:50 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 l10n-sat/browser/browser/screenshots.ftl  | 12 ++++++++++++
 l10n-sat/browser/browser/translations.ftl | 31 +++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 6 deletions(-)

(limited to 'l10n-sat/browser')

diff --git a/l10n-sat/browser/browser/screenshots.ftl b/l10n-sat/browser/browser/screenshots.ftl
index e71987224b..01a18bcfa3 100644
--- a/l10n-sat/browser/browser/screenshots.ftl
+++ b/l10n-sat/browser/browser/screenshots.ftl
@@ -46,3 +46,15 @@ screenshots-generic-error-title = ᱴᱤᱜ ᱴᱚᱲᱚᱜ! { -screenshots-bran
 screenshots-generic-error-details = ᱪᱮᱫ ᱦᱩᱭ ᱞᱮᱱᱟ ᱚᱱᱟ ᱵᱟᱞᱮ ᱵᱟᱲᱟᱭ ᱫᱟᱲᱮᱭᱟᱫ ᱟ ᱾ ᱫᱩᱦᱲᱟᱹ ᱠᱚᱨᱟᱣ ᱵᱤᱲᱟᱹᱣ ᱢᱮ ᱟᱨ ᱟᱵᱝ ᱮᱴᱟᱜ ᱥᱟᱦᱴᱟ ᱥᱟᱦᱴᱟ ᱨᱮᱭᱟᱜ ᱥᱚᱴ ᱤᱫᱤ ᱢᱮ ?
 screenshots-too-large-error-title = ᱟᱢᱟᱜ ᱥᱠᱨᱤᱱᱥᱚᱴ ᱫᱚ ᱟᱹᱰᱤ ᱢᱟᱨᱟᱝ ᱠᱷᱟᱹᱛᱤᱨ ᱠᱷᱟᱴᱚ ᱟᱠᱟᱱᱟ
 screenshots-too-large-error-details = ᱱᱚᱠᱟ ᱡᱟᱭᱜᱟ ᱵᱟᱪᱷᱟᱣ ᱠᱟᱛᱮ ᱧᱮᱞ ᱢᱮ ᱡᱟᱦᱟᱸ ᱫᱚ 32,700 ᱯᱤᱠᱥᱟᱹᱞ ᱠᱷᱚᱱ ᱦᱩᱰᱤᱧ ᱛᱟᱦᱮᱸᱱᱟ ᱡᱤᱞᱤᱧ ᱯᱟᱦᱴᱟ ᱨᱮ ᱟᱨ 124,900,000 ᱯᱤᱠᱥᱟᱹᱞᱥ ᱢᱩᱴ ᱡᱟᱭᱜᱟ ᱛᱟᱦᱮᱱᱟ ᱾
+screenshots-component-retry-button =
+    .title = ᱥᱠᱨᱤᱱᱥᱚᱴ ᱫᱩᱦᱲᱟᱹ ᱤᱫᱤ ᱵᱤᱲᱟᱹᱣ ᱢᱮ
+    .aria-label = ᱥᱠᱨᱤᱱᱥᱚᱴ ᱫᱩᱦᱲᱟᱹ ᱤᱫᱤ ᱵᱤᱲᱟᱹᱣ ᱢᱮ
+screenshots-component-copy-button-label = ᱱᱚᱠᱚᱞ
+screenshots-component-download-button-label = ᱰᱟᱣᱱᱞᱚᱰ
+
+## The below strings are used to capture keydown events so the strings should
+## not be changed unless the keyboard layout in the locale requires it.
+
+
+##
+
diff --git a/l10n-sat/browser/browser/translations.ftl b/l10n-sat/browser/browser/translations.ftl
index 0673be0cd5..8703c28bba 100644
--- a/l10n-sat/browser/browser/translations.ftl
+++ b/l10n-sat/browser/browser/translations.ftl
@@ -126,6 +126,12 @@ translations-manage-description = ᱚᱯᱷᱞᱟᱭᱤᱱ ᱛᱚᱨᱡᱚᱢᱟ
 translations-manage-all-language = ᱡᱷᱚᱛᱚ ᱯᱟᱹᱨᱥᱤᱠᱚ
 translations-manage-download-button = ᱰᱟᱣᱱᱞᱚᱰ
 translations-manage-delete-button = ᱢᱮᱴᱟᱣ ᱢᱮ
+translations-manage-language-remove-button =
+    .label = ᱚᱪᱚᱜᱽ ᱢᱮ
+translations-manage-language-remove-all-button =
+    .label = ᱡᱷᱚᱛᱚ ᱚᱪᱚᱜᱽ ᱢᱮ
+    .accesskey = e
+translations-manage-error-install = ᱯᱟᱹᱨᱥᱤ ᱨᱚᱫᱽᱠᱚ ᱵᱚᱦᱟᱞ ᱡᱷᱚᱜ ᱵᱷᱩᱞ ᱦᱩᱭ ᱞᱮᱱᱟ ᱾ ᱫᱟᱭᱟᱠᱟᱛᱮ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ ᱾
 translations-manage-error-download = ᱯᱟᱹᱨᱥᱤ ᱨᱚᱫᱽᱠᱚ ᱰᱟᱣᱱᱞᱚᱰ ᱨᱮ ᱵᱷᱩᱞ ᱦᱩᱭ ᱞᱮᱱᱟ ᱾ ᱫᱟᱭᱟᱠᱟᱛᱮ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ ᱾
 translations-manage-error-delete = ᱯᱟᱹᱨᱥᱤ ᱨᱚᱫᱽᱠᱚ ᱢᱮᱴᱟᱣᱨᱮ ᱵᱷᱩᱞ ᱦᱩᱭ ᱞᱮᱱᱟ ᱾ ᱫᱟᱭᱟᱠᱟᱛᱮ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ ᱾
 translations-manage-intro = ᱚᱯᱷᱞᱟᱭᱤᱱ ᱛᱚᱨᱡᱚᱢᱟ ᱞᱟᱹᱜᱤᱫ ᱟᱢᱟᱜ ᱯᱟᱹᱨᱥᱤ ᱟᱨ ᱥᱟᱭᱤᱴ ᱛᱚᱨᱡᱚᱢᱟᱠᱚ ᱥᱮᱴ ᱢᱮ ᱟᱨ ᱵᱚᱦᱟᱞ ᱠᱟᱱ ᱯᱟᱹᱨᱥᱤᱠᱚ ᱢᱮᱱᱮᱡᱽ ᱢᱮ ᱾
@@ -135,12 +141,6 @@ translations-manage-language-install-button =
 translations-manage-language-install-all-button =
     .label = ᱡᱷᱚᱛᱚ ᱵᱚᱦᱟᱞᱢᱮ
     .accesskey = I
-translations-manage-language-remove-button =
-    .label = ᱚᱪᱚᱜᱽ ᱢᱮ
-translations-manage-language-remove-all-button =
-    .label = ᱡᱷᱚᱛᱚ ᱚᱪᱚᱜᱽ ᱢᱮ
-    .accesskey = e
-translations-manage-error-install = ᱯᱟᱹᱨᱥᱤ ᱨᱚᱫᱽᱠᱚ ᱵᱚᱦᱟᱞ ᱡᱷᱚᱜ ᱵᱷᱩᱞ ᱦᱩᱭ ᱞᱮᱱᱟ ᱾ ᱫᱟᱭᱟᱠᱟᱛᱮ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ ᱾
 translations-manage-error-remove = ᱯᱟᱹᱨᱥᱤ ᱨᱚᱫᱽᱠᱚ ᱚᱪᱚᱜ ᱨᱮ ᱢᱤᱫᱴᱟᱹᱝ ᱵᱷᱩᱞ ᱦᱩᱭ ᱞᱮᱱᱟ ᱾ ᱫᱟᱭᱟᱠᱟᱛᱮ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ ᱾
 translations-manage-error-list = ᱛᱚᱨᱡᱚᱢᱟ ᱞᱟᱹᱜᱤᱫ ᱯᱟᱹᱨᱥᱤᱠᱚ ᱨᱮᱱᱟᱜ ᱞᱤᱥᱴᱤ ᱧᱟᱢᱚᱜᱨᱮ ᱵᱷᱩᱞ ᱦᱩᱭᱮᱱᱟ ᱾ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟ ᱞᱟᱹᱜᱤᱫ ᱥᱟᱦᱴᱟ ᱟᱨ ᱢᱤᱫ ᱡᱮᱠᱷᱟ ᱫᱩᱦᱲᱟᱹ ᱟᱹᱨᱩᱭ ᱢᱮ ᱾
 translations-settings-title =
@@ -170,3 +170,22 @@ translations-settings-remove-all-sites-button =
 translations-settings-close-dialog =
     .buttonlabelaccept = ᱵᱚᱸᱫᱚᱭ ᱢᱮ
     .buttonaccesskeyaccept = C
+select-translations-panel-cancel-button =
+    .label = ᱵᱟᱹᱰᱨᱟᱹ
+select-translations-panel-translate-button =
+    .label = ᱛᱚᱨᱡᱚᱢᱟ
+select-translations-panel-try-again-button =
+    .label = ᱫᱩᱦᱲᱟᱹ ᱠᱩᱨᱩᱢᱩᱴᱩᱭ ᱢᱮ
+# Text displayed when the translation fails to complete.
+select-translations-panel-translation-failure-message =
+    .message = ᱛᱚᱨᱡᱚᱢᱟ ᱡᱷᱚᱜ ᱵᱷᱩᱞ ᱮᱴᱠᱮᱴᱚᱬᱮ ᱦᱩᱭᱮᱱᱟ ᱾ ᱫᱟᱭᱟᱠᱟᱛᱮ ᱫᱩᱦᱲᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ ᱾
+# If your language requires declining the language name, a possible solution
+# is to adapt the structure of the phrase, or use a support noun, e.g.
+# `Sorry, we don't support the language yet: { $language }
+#
+# Variables:
+#   $language (string) - The language of the document.
+select-translations-panel-unsupported-language-message-known =
+    .message = ᱠᱠᱟᱹ, ᱟᱞᱮ { $language } ᱯᱟᱹᱨᱥᱤ ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱵᱟᱞᱮ ᱥᱚᱦᱚᱫ ᱠᱟᱫᱟ ᱾
+select-translations-panel-unsupported-language-message-unknown =
+    .message = ᱠᱠᱟᱹ, ᱟᱞᱮ { $language } ᱯᱟᱹᱨᱥᱤ ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱵᱟᱞᱮ ᱥᱚᱦᱚᱫ ᱠᱟᱫᱟ ᱾
-- 
cgit v1.2.3