Merging upstream version 115.11.0esr.

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

5 files changed, 75 insertions, 16 deletions

diff --git a/l10n-sco/toolkit/crashreporter/crashreporter.ftl b/l10n-sco/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..fdc739237f
--- /dev/null
+++ b/l10n-sco/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 = Crash Reporter
+crashreporter-crash-message = { -brand-short-name } had a problem and crashed.
+crashreporter-plea = Tae help us airt-oot and sort the problem, ye can send us a crash report.
+# $details (String) - the reason that a crash report cannot be submitted
+crashreporter-error-details = Details: { $details }
+crashreporter-no-run-message = This application is rin efter a crash fur tae report the problem tae the application dealer.  It shouldnae be rin direct.
+crashreporter-button-details = Details…
+crashreporter-view-report-title = Report Contents
+crashreporter-comment-prompt = Eik on a comment (comments can be seen by oniebodie)
+crashreporter-report-info = Forby, this report conteens technical information aboot the state o the application when it crashed.
+crashreporter-submit-status = Yer crash report will be submittit afore ye quit or restert.
+crashreporter-submit-in-progress = Submittin yer report…
+crashreporter-submit-success = Report submittit wi nae problems!
+crashreporter-submit-failure = There wis a problem wi submittin yer report.
+crashreporter-resubmit-status = Resendin reports that didnae send richt last time…
+crashreporter-button-quit = Quit { -brand-short-name }
+crashreporter-button-restart = Restert { -brand-short-name }
+crashreporter-button-ok = OK
+crashreporter-button-close = Sneck
+# $id (String) - the crash id from the server, typically a UUID
+crashreporter-crash-identifier = Crash ID: { $id }
+
+# Error strings
+
diff --git a/l10n-sco/toolkit/toolkit/branding/brandings.ftl b/l10n-sco/toolkit/toolkit/branding/brandings.ftl
index 6dca505828..4d708cb6cb 100644
--- a/l10n-sco/toolkit/toolkit/branding/brandings.ftl
+++ b/l10n-sco/toolkit/toolkit/branding/brandings.ftl
@@ -46,3 +46,4 @@
 -firefox-suggest-brand-name = Firefox Suggest
 
 
+-mozmonitor-brand-name = Mozilla Monitor
diff --git a/l10n-sco/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-sco/toolkit/toolkit/formautofill/formAutofill.ftl
new file mode 100644
index 0000000000..b6e500994a
--- /dev/null
+++ b/l10n-sco/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -0,0 +1,43 @@
+# 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/.
+
+
+## OS Prompt Dialog
+
+
+## The credit card capture doorhanger
+
+
+# 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 = Dicht Autofeenish Form
+
+## These are brand names and should only be translated when a locale-specific name for that brand is in common use
+
+autofill-card-network-amex = American Express
+autofill-card-network-cartebancaire = Carte Bancaire
+autofill-card-network-diners = Diners Club
+autofill-card-network-discover = Discover
+autofill-card-network-jcb = JCB
+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 = Autofeenishes { $categories } as weel
+# Variation when all are in the same category.
+# Variables:
+#   $categories - one or more of the categories
+autofill-phishing-warningmessage = Autofeenishes { $categories }
+# Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
+autofill-category-address = address
+autofill-category-name = nemme
+autofill-category-organization = organisation
+autofill-category-tel = phone
+autofill-category-email = email
diff --git a/l10n-sco/toolkit/toolkit/formautofill/formautofill.ftl b/l10n-sco/toolkit/toolkit/formautofill/formautofill.ftl
deleted file mode 100644
index 2d46b5709e..0000000000
--- a/l10n-sco/toolkit/toolkit/formautofill/formautofill.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/.
-
-
-## OS Prompt Dialog
-
-# The links lead users to Form Autofill browser preferences.
-autofill-options-link = Form Autofeenish Options
-autofill-options-link-osx = Form Autofeenish Preferences
-
-## The credit card capture doorhanger
-
-
-# Used on the doorhanger when an credit card change is detected.
-
diff --git a/l10n-sco/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-sco/toolkit/toolkit/global/arrowscrollbox.ftl
new file mode 100644
index 0000000000..6fbe8159b2
--- /dev/null
+++ b/l10n-sco/toolkit/toolkit/global/arrowscrollbox.ftl
@@ -0,0 +1,3 @@
+# 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/.