Merging upstream version 115.11.0esr.

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

4 files changed, 60 insertions, 0 deletions

diff --git a/l10n-mr/toolkit/crashreporter/crashreporter.ftl b/l10n-mr/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..f8cac6beee
--- /dev/null
+++ b/l10n-mr/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 = To help us diagnose and fix the problem, you 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 run after a crash to report the problem to the application vendor.  It should not be run directly.
+crashreporter-button-details = Details…
+crashreporter-view-report-title = Report Contents
+crashreporter-comment-prompt = Add a comment (comments are publicly visible)
+crashreporter-report-info = This report also contains technical information about the state of the application when it crashed.
+crashreporter-submit-status = Your crash report will be submitted before you quit or restart.
+crashreporter-submit-in-progress = आपला अहवाल पाठवत आहोत…
+crashreporter-submit-success = Report submitted successfully!
+crashreporter-submit-failure = There was a problem submitting your report.
+crashreporter-resubmit-status = Resending reports that previously failed to send…
+crashreporter-button-quit = Quit { -brand-short-name }
+crashreporter-button-restart = Restart { -brand-short-name }
+crashreporter-button-ok = OK
+crashreporter-button-close = Close
+# $id (String) - the crash id from the server, typically a UUID
+crashreporter-crash-identifier = Crash ID: { $id }
+
+# Error strings
+
diff --git a/l10n-mr/toolkit/toolkit/branding/brandings.ftl b/l10n-mr/toolkit/toolkit/branding/brandings.ftl
index bf3a39c63d..9b6e9f6042 100644
--- a/l10n-mr/toolkit/toolkit/branding/brandings.ftl
+++ b/l10n-mr/toolkit/toolkit/branding/brandings.ftl
@@ -41,3 +41,4 @@
 -relay-brand-name = Firefox Relay
 -relay-brand-short-name = Relay
 
+-mozmonitor-brand-name = Mozilla Monitor
diff --git a/l10n-mr/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-mr/toolkit/toolkit/formautofill/formAutofill.ftl
index 966a2d74a6..c63998fc99 100644
--- a/l10n-mr/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-mr/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -14,3 +14,31 @@ 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
+
+autofill-card-network-amex = American Express
+autofill-card-network-cartebancaire = Carte Bancaire
+autofill-card-network-discover = शोधा
+autofill-card-network-jcb = JCB
+autofill-card-network-mastercard = MasterCard
+autofill-card-network-mir = MIR
+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 = ईमेल
diff --git a/l10n-mr/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-mr/toolkit/toolkit/global/arrowscrollbox.ftl
new file mode 100644
index 0000000000..6fbe8159b2
--- /dev/null
+++ b/l10n-mr/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/.