Merging upstream version 125.0.1.

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

5 files changed, 53 insertions, 0 deletions

diff --git a/l10n-sat/browser/browser/aboutDialog.ftl b/l10n-sat/browser/browser/aboutDialog.ftl
index ad93c8df9f..aa10e7e8dd 100644
--- a/l10n-sat/browser/browser/aboutDialog.ftl
+++ b/l10n-sat/browser/browser/aboutDialog.ftl
@@ -25,6 +25,7 @@ update-applying = ᱦᱟᱹᱞᱤ ᱵᱚᱦᱟᱞᱮᱫ ᱟ  …
 update-failed = ᱦᱟᱹᱞᱤ ᱰᱤᱜᱟᱹᱣᱮᱱᱟ ᱾ <label data-l10n-name="failed-link">ᱱᱟᱶᱟᱱᱟᱜ ᱵᱷᱟᱹᱨᱥᱚᱱ ᱰᱟᱣᱱᱞᱚᱰᱭ ᱢᱮ</label>
 update-failed-main = ᱦᱟᱹᱞᱤ ᱰᱤᱜᱟᱹᱣᱮᱱᱟ <a data-l10n-name="failed-link-main">ᱱᱟᱶᱟᱱᱟᱜ ᱵᱷᱟᱹᱨᱥᱚᱱ ᱰᱟᱣᱱᱞᱚᱰᱭ ᱢᱮ</a>
 update-adminDisabled = ᱟᱢᱟᱜ ᱥᱭᱥᱴᱮᱢ ᱥᱟᱥᱚᱱᱤᱡ ᱫᱟᱥᱟᱸᱭ ᱛᱮ ᱵᱟᱝ ᱦᱟᱞᱤ ᱦᱚᱪᱚ ᱦᱩᱭ ᱟᱠᱟᱱᱟ ᱾
+update-policy-disabled = ᱟᱢᱟᱜ ᱜᱟᱶᱛᱟ ᱦᱚᱛᱮᱛᱮ ᱚᱯᱰᱮᱴ ᱠᱚ ᱵᱚᱫᱚᱞ ᱟᱠᱟᱱᱟ
 update-noUpdatesFound = { -brand-short-name } ᱫᱚ ᱟᱹᱯ ᱴᱩ ᱰᱮᱴ ᱟᱠᱟᱱᱟ
 aboutdialog-update-checking-failed = ᱦᱟᱹᱞᱤᱭᱟᱹᱠ ᱧᱮᱞ ᱨᱮ ᱦᱩᱰᱟᱹᱜ ᱾
 update-otherInstanceHandlingUpdates = { -brand-short-name } ᱮᱴᱟᱜᱤᱡ ᱡᱮᱞᱠᱟ ᱫᱟᱨᱟᱭ ᱛᱮ ᱦᱟᱹᱞᱤ ᱟᱠᱟᱱᱟ
diff --git a/l10n-sat/browser/browser/aboutLogins.ftl b/l10n-sat/browser/browser/aboutLogins.ftl
index 8829dde76a..112154fb99 100644
--- a/l10n-sat/browser/browser/aboutLogins.ftl
+++ b/l10n-sat/browser/browser/aboutLogins.ftl
@@ -112,6 +112,7 @@ about-logins-login-intro-heading-logged-in = ᱥᱭᱝᱠ ᱠᱟᱱ ᱵᱚᱞᱚ
 login-intro-description = ᱟᱢ ᱡᱩᱫᱤ ᱵᱷᱮᱜᱟᱨ ᱥᱟᱫᱷᱚᱱ ᱨᱮ ᱟᱢᱟᱜ ᱵᱚᱞᱚ ᱠᱚ { -brand-product-name } ᱨᱮ ᱥᱟᱺᱪᱟᱣ ᱟᱠᱟᱫᱟᱢ ᱢᱮᱱᱠᱷᱟᱱ, ᱱᱚᱰᱮ ᱧᱮᱞ ᱢᱮ ᱪᱮᱞᱠᱟ ᱠᱚ ᱟᱹᱜᱩ ᱦᱚᱭᱟ:
 login-intro-instructions-fxa = ᱡᱟᱦᱟᱸ ᱥᱟᱫᱷᱚᱱ ᱨᱮ ᱟᱢᱟᱜ ᱵᱚᱞᱚ ᱠᱚ ᱥᱟᱧᱪᱟᱣ ᱠᱟᱱᱟ { -fxaccount-brand-name }  ᱨᱮ ᱛᱮᱭᱟᱨ ᱟᱨ ᱵᱟᱝ ᱥᱩᱦᱤ ᱮᱢ ᱠᱟᱜ ᱢᱮ ᱾
 about-logins-login-intro-heading-message = ᱢᱤᱫᱴᱟᱹᱝ ᱨᱩᱠᱷᱤᱭᱟᱹ ᱡᱟᱭᱜᱟ ᱨᱮ ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱥᱟᱺᱪᱟᱣ ᱢᱮ
+login-intro-description2 = ᱡᱟᱦᱟᱸ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱢ { -brand-product-name } ᱨᱮᱢ ᱥᱟᱧᱪᱟᱣ ᱟ ᱚᱱᱟ ᱫᱚ ᱫᱟᱱᱟᱝ ᱨᱮ ᱛᱟᱦᱮᱸᱱᱟ ᱾ ᱥᱟᱶᱛᱮ, ᱡᱩᱫᱤ ᱟᱢ ᱯᱨᱚᱵᱷᱟᱵᱤᱛᱚᱜ ᱠᱷᱟᱱ ᱟᱞᱮ ᱵᱟᱲᱟᱭ ᱪᱷᱚ ᱢᱮᱭᱟ ᱞᱮ ᱾<a data-l10n-name="breach-alert-link">ᱰᱷᱮᱨ ᱥᱮᱬᱟᱭ ᱢᱮ</a>
 login-intro-instructions-fxa2 = ᱡᱟᱦᱟᱸ ᱥᱟᱫᱷᱚᱱ ᱨᱮ ᱟᱢᱟᱜ ᱵᱚᱞᱚ ᱠᱚ ᱥᱟᱸᱪᱟᱣ ᱠᱟᱱᱟ ᱟᱢᱟᱜ ᱠᱷᱟᱛᱟ ᱨᱮ ᱛᱮᱭᱟᱨ ᱟᱨ ᱵᱟᱝ ᱥᱩᱦᱤ ᱮᱢ ᱠᱟᱜ ᱢᱮ
 login-intro-instructions-fxa-settings = ᱥᱟᱡᱟᱣ ᱥᱮᱫ ᱪᱟᱞᱟᱜ ᱢᱮ > ᱥᱭᱝᱠ >ᱥᱭᱝᱠᱤᱝ ᱮᱢ ᱦᱚᱪᱚᱭ ᱢᱮ … ᱵᱚᱞᱚ ᱠᱚ ᱟᱨ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱪᱤᱱᱦᱟᱹᱯ ᱵᱟᱠᱚᱥ ᱵᱟᱪᱷᱟᱣ ᱡᱮ ᱾
 login-intro-instructions-fxa-passwords-help = ᱟᱨᱦᱚᱸ ᱜᱚᱲᱚ ᱧᱚᱢ ᱞᱟᱹᱜᱤᱫᱽ </a> <a data-l10n-name="passwords-help-link"> ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱜᱚᱲᱚ ᱪᱟᱞᱟᱜ ᱢᱮ ᱾
diff --git a/l10n-sat/browser/browser/preferences/preferences.ftl b/l10n-sat/browser/browser/preferences/preferences.ftl
index 2bb7d817bc..a6049d9658 100644
--- a/l10n-sat/browser/browser/preferences/preferences.ftl
+++ b/l10n-sat/browser/browser/preferences/preferences.ftl
@@ -683,6 +683,9 @@ sync-mobile-promo = ᱟᱢᱟᱜ ᱢᱚᱵᱟᱭᱤᱞ ᱥᱟᱫᱷᱚᱱ ᱨᱮ
 
 sync-profile-picture =
     .tooltiptext = ᱯᱨᱚᱯᱷᱟᱭᱤᱞ ᱢᱚᱦᱚᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱫᱚᱞ ᱢᱮ
+sync-profile-picture-with-alt =
+    .tooltiptext = ᱯᱨᱚᱯᱷᱟᱭᱤᱞ ᱢᱚᱦᱚᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱫᱚᱞ ᱢᱮ
+    .alt = ᱯᱨᱚᱯᱷᱟᱭᱤᱞ ᱢᱚᱦᱚᱨ ᱪᱤᱛᱟᱹᱨ ᱵᱚᱫᱚᱞ ᱢᱮ
 sync-sign-out =
     .label = ᱵᱟᱦᱨᱮ ᱚᱰᱚᱠ…
     .accesskey = g
@@ -1175,6 +1178,8 @@ addon-recommendations-link = ᱰᱷᱮᱨ ᱥᱮᱬᱟᱭ ᱢᱮ
 collection-health-report-disabled = ᱱᱚᱶᱟ ᱵᱮᱱᱟᱣ ᱥᱟᱯᱲᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱰᱟᱴᱟ ᱠᱷᱚᱵᱚᱨ ᱫᱚ ᱵᱚᱸᱫ ᱠᱟᱱᱟ
 collection-backlogged-crash-reports-with-link = { -brand-short-name } ᱟᱢᱟᱜ ᱧᱩᱛᱩᱢ ᱛᱮ ᱵᱮᱠᱞᱚᱜᱽ ᱟᱠᱟᱱ ᱠᱨᱟᱥ ᱠᱷᱚᱵᱚᱨ ᱠᱚ ᱚᱰᱚᱠ ᱞᱟᱹᱜᱤᱫ ᱦᱮᱠ ᱮᱢᱟᱭ ᱢᱮ <a data-l10n-name="crash-reports-link">ᱰᱷᱮᱨ ᱥᱮᱬᱟᱭ ᱢᱮ</a>
     .accesskey = c
+collection-backlogged-crash-reports = { -brand-short-name } ᱟᱢᱟᱜ ᱧᱩᱛᱩᱢ ᱛᱮ ᱵᱮᱠᱞᱚᱜᱽ ᱟᱠᱟᱱ ᱠᱨᱟᱥ ᱠᱷᱚᱵᱚᱨ ᱠᱚ ᱚᱰᱚᱠ ᱞᱟᱹᱜᱤᱫ ᱦᱮᱠ ᱮᱢᱟᱭ ᱢᱮ
+    .accesskey = c
 privacy-segmentation-section-header = ᱱᱟᱣᱟ ᱯᱷᱤᱪᱚᱨ ᱡᱟᱦᱟᱸᱭ ᱟᱢᱟᱜ ᱵᱽᱨᱟᱣᱡᱤᱝ ᱥᱩᱫᱽᱨᱟᱹᱣ ᱪᱷᱚᱭ ᱟ
 privacy-segmentation-section-description = ᱡᱩᱫᱤ ᱟᱢᱟᱜ ᱰᱟᱴᱟ ᱵᱮᱵᱷᱟᱨ ᱠᱟᱛᱮ ᱟᱢᱟᱜ ᱵᱮᱥ ᱠᱟᱹᱢᱤᱦᱚᱨᱟ ᱠᱚ ᱦᱩᱦᱩᱜ ᱞᱟᱹᱜᱤᱫ ᱯᱷᱤᱪᱚᱨ ᱞᱮ ᱮᱢᱚᱜᱼᱟ :
 privacy-segmentation-radio-off =
diff --git a/l10n-sat/toolkit/crashreporter/crashreporter.ftl b/l10n-sat/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..3fcef0c007
--- /dev/null
+++ b/l10n-sat/toolkit/crashreporter/crashreporter.ftl
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+crashreporter-title = ᱨᱟᱹᱯᱩᱫ ᱞᱟᱭ-ᱟᱜ
+crashreporter-crash-message = { -brand-short-name } ᱢᱤᱫ ᱫᱤᱜᱜᱷᱟᱹ ᱟᱨ ᱨᱟᱹᱯᱩᱫ ᱛᱟᱦᱮᱸ ᱞᱮᱱ ᱛᱟᱦᱮᱸᱱᱟ᱾
+crashreporter-plea = ᱛᱩᱱᱩᱢ ᱵᱟᱪᱷᱟᱣ ᱟᱨ ᱫᱤᱜᱫᱷᱟᱹ ᱥᱟᱹᱛ ᱠᱮ ᱟᱞᱮ ᱜᱚᱲᱚ ᱞᱟᱹᱜᱤᱫ, ᱟᱢ ᱟᱞᱮ ᱢᱤᱫ ᱨᱟᱹᱯᱩᱫ ᱨᱤᱯᱚᱨᱴ ᱮᱢ ᱠᱩᱞ ᱫᱟᱲᱮᱭᱟᱞᱮ ᱭᱟ ᱾
+# $details (String) - the reason that a crash report cannot be submitted
+crashreporter-error-details = ᱯᱩᱨᱟᱹ ᱵᱤᱵᱨᱚᱱ ᱠᱚ : { $details }
+crashreporter-no-run-message = ᱱᱚᱣᱟ ᱮᱯᱞᱤᱠᱮᱥᱚᱱ ᱫᱚ ᱮᱯᱞᱤᱠᱮᱥᱚᱱ ᱟᱠᱷᱨᱤᱧᱤᱡ ᱞᱟᱹᱜᱤᱫ ᱫᱤᱜᱫᱷᱟᱹ ᱨᱤᱯᱚᱨᱴ ᱨᱮ ᱢᱤᱫ ᱨᱟᱹᱯᱩᱛ ᱛᱟᱭᱚᱢ ᱪᱟᱞᱟᱣ᱾ ᱱᱚᱣᱟ ᱫᱚ ᱥᱚᱡᱷᱮ ᱵᱟᱝ ᱪᱟᱞᱟᱱ ᱞᱟᱹᱠᱛᱤ ᱾
+crashreporter-button-details = ᱯᱩᱨᱟᱹ ᱵᱤᱵᱨᱚᱱ…
+crashreporter-view-report-title = ᱵᱤᱥᱚᱭ ᱠᱚ ᱨᱤᱯᱚᱨᱴ
+crashreporter-comment-prompt = ᱢᱤᱫ ᱳᱠᱛᱟ ᱥᱮᱞᱮᱫ ᱢᱮ (ᱳᱠᱛᱟ ᱠᱚᱫᱚ ᱦᱚᱲᱠᱚ ᱧᱮᱞᱚᱜᱟᱜ ᱠᱟᱱᱟ )
+crashreporter-report-info = ᱱᱚᱣᱟ ᱨᱤᱯᱚᱨᱴ ᱨᱮ ᱥᱟᱸᱲᱮᱥ ᱞᱟᱹᱭ ᱥᱚᱫᱚᱨ ᱦᱚᱸ ᱛᱟᱦᱮᱸᱱᱟ ᱮᱯᱞᱤᱠᱮᱥᱚᱱ ᱨᱮᱭᱟᱜ ᱫᱚᱥᱟ ᱵᱟᱵᱚᱛᱮ ᱛᱤᱱ ᱨᱮ ᱱᱚᱣᱟ ᱨᱟᱹᱯᱩᱫᱚᱜ ᱟ ᱾
+crashreporter-submit-status = ᱟᱢᱟᱜ ᱨᱟᱹᱯᱩᱫ ᱨᱤᱯᱚᱨᱴ ᱫᱚ ᱟᱢ ᱵᱚᱱᱫᱚ ᱟᱨ ᱵᱟᱝ ᱫᱚᱦᱲᱟ ᱮᱦᱚᱵ ᱢᱟᱲᱟᱝ ᱡᱚᱢᱟ ᱮᱢᱟ ᱾
+crashreporter-submit-in-progress = ᱟᱢᱟᱜ ᱨᱤᱯᱚᱨᱴ ᱡᱚᱢᱟᱭᱮᱫ ᱟ …
+crashreporter-submit-success = ᱨᱤᱯᱚᱨᱴ ᱨᱟᱹᱥ ᱞᱮᱠᱟ ᱛᱮ ᱡᱚᱢᱟ ᱭᱮᱱᱟ !
+crashreporter-submit-failure = ᱟᱢᱟᱜ ᱨᱤᱯᱚᱨᱴ ᱡᱚᱢᱟ ᱮᱢ ᱨᱮ ᱢᱤᱫ ᱫᱤᱜᱜᱷᱟ ᱛᱟᱦᱮᱸ ᱞᱮᱱ ᱛᱟᱦᱮᱸᱱᱟ ᱾
+crashreporter-resubmit-status = ᱨᱤᱯᱚᱨᱴ ᱠᱚ ᱫᱚᱦᱲᱟ ᱠᱩᱞ ᱳᱠᱟ ᱯᱟᱹᱦᱤᱞ ᱛᱮ ᱠᱩᱞ ᱰᱤᱜᱟᱹᱣ ᱞᱮᱱᱟ …
+crashreporter-button-quit = ᱵᱚᱱᱫᱚ { -brand-short-name }
+crashreporter-button-restart = ᱫᱚᱦᱲᱟ ᱮᱦᱚᱵ { -brand-short-name }
+crashreporter-button-ok = ᱴᱷᱤᱠ
+crashreporter-button-close = ᱵᱚᱸᱫᱚᱭ ᱢᱮ
+# $id (String) - the crash id from the server, typically a UUID
+crashreporter-crash-identifier = ᱨᱟᱹᱯᱩᱫ ID: { $id }
+
+# Error strings
+
diff --git a/l10n-sat/toolkit/toolkit/formautofill/formautofill.ftl b/l10n-sat/toolkit/toolkit/formautofill/formautofill.ftl
index b942a00c29..4014c5a312 100644
--- a/l10n-sat/toolkit/toolkit/formautofill/formautofill.ftl
+++ b/l10n-sat/toolkit/toolkit/formautofill/formautofill.ftl
@@ -14,6 +14,8 @@ autofill-options-link-osx = ᱯᱷᱚᱨᱢ ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱡ ᱠᱩ
 
 # Used on the doorhanger when an credit card change is detected.
 
+# Label for the button in the dropdown menu used to clear the populated form.
+autofill-clear-form-label = ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱡ ᱯᱷᱚᱨᱢ ᱥᱟᱯᱷᱟᱭ ᱢᱮ
 
 ## These are brand names and should only be translated when a locale-specific name for that brand is in common use
 
@@ -26,3 +28,19 @@ autofill-card-network-mastercard = MasterCard
 autofill-card-network-mir = MIR
 autofill-card-network-unionpay = Union Pay
 autofill-card-network-visa = Visa
+# The warning text that is displayed for informing users what categories are
+# about to be filled.  The text would be, for example,
+#   Also autofills organization, phone, email.
+# Variables:
+#   $categories - one or more of the categories, see autofill-category-X below
+autofill-phishing-warningmessage-extracategory = { $categories } ᱦᱚᱸ ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱨᱡᱟᱭ
+# Variation when all are in the same category.
+# Variables:
+#   $categories - one or more of the categories
+autofill-phishing-warningmessage = { $categories } ᱟᱡ ᱛᱮ ᱯᱮᱨᱮᱡᱟᱭ
+# Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
+autofill-category-address = ᱴᱷᱤᱠᱬᱟᱹ
+autofill-category-name = ᱧᱩᱛᱩᱢ
+autofill-category-organization = ᱜᱟᱶᱛᱟ
+autofill-category-tel = ᱯᱷᱚᱱ
+autofill-category-email = ᱤᱼᱢᱮᱞ