From c1701504b2366542c32c5e6eeff1ba62cc75f8f6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:40:09 +0200
Subject: Merging upstream version 115.11.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../browser/browser/preferences/preferences.ftl    | 12 +++++++++
 l10n-hi-IN/browser/browser/protectionsPanel.ftl    | 17 +++++++------
 l10n-hi-IN/browser/browser/screenshots.ftl         |  8 ++++++
 l10n-hi-IN/browser/browser/translations.ftl        |  3 ---
 .../mobile/android/chrome/browser.properties       |  1 +
 .../mobile/android/chrome/passwordmgr.properties   |  1 +
 .../mobile/android/mobile/android/aboutConfig.ftl  |  1 +
 .../android/mobile/android/geckoViewConsole.ftl    |  1 +
 l10n-hi-IN/toolkit/crashreporter/crashreporter.ftl | 28 +++++++++++++++++++++
 l10n-hi-IN/toolkit/toolkit/branding/brandings.ftl  |  1 +
 .../toolkit/toolkit/formautofill/formAutofill.ftl  | 29 ++++++++++++++++++++++
 .../toolkit/toolkit/global/arrowscrollbox.ftl      |  3 +++
 12 files changed, 95 insertions(+), 10 deletions(-)
 create mode 100644 l10n-hi-IN/toolkit/crashreporter/crashreporter.ftl
 create mode 100644 l10n-hi-IN/toolkit/toolkit/global/arrowscrollbox.ftl

(limited to 'l10n-hi-IN')

diff --git a/l10n-hi-IN/browser/browser/preferences/preferences.ftl b/l10n-hi-IN/browser/browser/preferences/preferences.ftl
index 3de4dab905..28f41681dc 100644
--- a/l10n-hi-IN/browser/browser/preferences/preferences.ftl
+++ b/l10n-hi-IN/browser/browser/preferences/preferences.ftl
@@ -503,6 +503,9 @@ sync-mobile-promo = Firefox डाउनलोड करें <img data-l10n-na
 
 sync-profile-picture =
     .tooltiptext = प्रोफ़ाइल तस्वीर बदलें
+sync-profile-picture-with-alt =
+    .tooltiptext = प्रोफ़ाइल तस्वीर बदलें
+    .alt = प्रोफ़ाइल तस्वीर बदलें
 sync-sign-out =
     .label = साइन आउट…
     .accesskey = g
@@ -619,6 +622,9 @@ pane-privacy-logins-and-passwords-header = लॉगिन और पासव
 forms-ask-to-save-logins =
     .label = वेबसाइटों के लिए लॉग इन और पासवर्ड सहेजने के लिए पूछें
     .accesskey = r
+
+## Privacy Section - Passwords
+
 forms-exceptions =
     .label = अपवाद…
     .accesskey = x
@@ -643,6 +649,9 @@ forms-windows-sso-learn-more-link = अधिक जानें
 
 master-password-os-auth-dialog-caption = { -brand-full-name }
 
+## Privacy section - Autofill
+
+
 ## Privacy Section - History
 
 history-header = इतिहास
@@ -717,6 +726,9 @@ sitedata-cookies-exceptions =
 ## Privacy Section - Cookie Banner Handling
 
 
+## Privacy Section - Cookie Banner Blocking
+
+
 ## Privacy Section - Address Bar
 
 addressbar-header = पता पट्टी
diff --git a/l10n-hi-IN/browser/browser/protectionsPanel.ftl b/l10n-hi-IN/browser/browser/protectionsPanel.ftl
index bfc228a38c..a152eb42d2 100644
--- a/l10n-hi-IN/browser/browser/protectionsPanel.ftl
+++ b/l10n-hi-IN/browser/browser/protectionsPanel.ftl
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 protections-panel-sendreportview-error = रिपोर्ट भेजने में एक त्रुटि हुई थी। कृपया बाद में पुन: प्रयास करें।
-
 # A link shown when ETP is disabled for a site. Opens the breakage report subview when clicked.
 protections-panel-sitefixedsendreport-label = साइट ठीक हो गई? रिपोर्ट भेजें
 
@@ -22,13 +21,16 @@ protections-popup-footer-protection-label-standard = मानक
 # The text a screen reader speaks when focused on the info button.
 protections-panel-etp-more-info =
     .aria-label = उन्नत ट्रैकिंग सुरक्षा के बारे में अधिक जानकारी
-
 protections-panel-etp-on-header = इस साइट के लिए उन्नत ट्रैकिंग सुरक्षा चालू है।
 protections-panel-etp-off-header = इस साइट के लिए उन्नत ट्रैकिंग सुरक्षा बंद है।
 
+## Text for the toggles shown when ETP is enabled/disabled for a given site.
+## .description is transferred into a separate paragraph by the moz-toggle
+## custom element code.
+##   $host (String): the hostname of the site that is being displayed.
+
 # The link to be clicked to open the sub-panel view
 protections-panel-site-not-working = साइट काम नहीं कर रही?
-
 # The heading/title of the sub-panel view
 protections-panel-site-not-working-view =
     .title = साइट काम नहीं कर रही?
@@ -41,7 +43,6 @@ protections-panel-not-blocking-why-label = क्यों?
 ##
 
 protections-panel-content-blocking-tracking-protection = ट्रैकिंग सामग्री
-
 protections-panel-content-blocking-socialblock = सोशल मीडिया ट्रैकर
 protections-panel-content-blocking-cryptominers-label = क्रिप्टोमाइनर
 protections-panel-content-blocking-fingerprinters-label = फिंगरप्रिंटर
@@ -66,17 +67,14 @@ protections-panel-site-not-working-view-issue-list-forms = फ़ॉर्म
 protections-panel-site-not-working-view-issue-list-payments = भुगतान
 protections-panel-site-not-working-view-issue-list-comments = टिप्पणियाँ
 protections-panel-site-not-working-view-issue-list-videos = वीडियो
-
 protections-panel-site-not-working-view-send-report = एक रिपोर्ट भेजें
 
 ##
 
 protections-panel-description-shim-allowed-learn-more = अधिक जानें
-
 protections-panel-content-blocking-manage-settings =
     .label = सुरक्षा सेटिंग प्रबंधित करें
     .accesskey = M
-
 protections-panel-content-blocking-breakage-report-view =
     .title = क्षतिग्रस्त साइट की रिपोर्ट करें
 protections-panel-content-blocking-breakage-report-view-collection-url = URL
@@ -92,3 +90,8 @@ protections-panel-content-blocking-breakage-report-view-send-report =
 
 # Cookie Banner Handling
 
+
+## Protections panel info message
+
+cfr-protections-panel-header = पीछा किये बिना ब्राउज़ करें
+cfr-protections-panel-link-text = अधिक जानें
diff --git a/l10n-hi-IN/browser/browser/screenshots.ftl b/l10n-hi-IN/browser/browser/screenshots.ftl
index d4f31f37fd..1a4825993f 100644
--- a/l10n-hi-IN/browser/browser/screenshots.ftl
+++ b/l10n-hi-IN/browser/browser/screenshots.ftl
@@ -37,3 +37,11 @@ screenshots-empty-selection-error-title = आपका चयन बहुत 
 screenshots-private-window-error-details = असुविधा के लिए खेद हैं. हमलोग भविष्य संस्करण के लिए इस सुविधा पर काम कर रहे हैं.
 screenshots-generic-error-title = ओह! { -screenshots-brand-name } स्क्रीनशॉट बिगड़ गया.
 screenshots-generic-error-details = हम सुनिश्चित नहीं हैं कि अभी क्या हुआ. पुन: प्रयास या एक भिन्न पृष्ठ का एक शॉट लेना चाहते हैं?
+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-hi-IN/browser/browser/translations.ftl b/l10n-hi-IN/browser/browser/translations.ftl
index 1dc99bfe6a..c49f8d377e 100644
--- a/l10n-hi-IN/browser/browser/translations.ftl
+++ b/l10n-hi-IN/browser/browser/translations.ftl
@@ -23,9 +23,6 @@
 ## Firefox Translations language management in about:preferences.
 
 translations-manage-download-button = डाउनलोड करें
-translations-manage-language-download-button =
-    .label = डाउनलोड करें
-    .accesskey = D
 translations-settings-close-key =
     .key = w
 translations-settings-sites-column =
diff --git a/l10n-hi-IN/mobile/android/chrome/browser.properties b/l10n-hi-IN/mobile/android/chrome/browser.properties
index bab85ab411..1ed5f9f3e8 100644
--- a/l10n-hi-IN/mobile/android/chrome/browser.properties
+++ b/l10n-hi-IN/mobile/android/chrome/browser.properties
@@ -42,3 +42,4 @@ userContextWork.label = कार्य
 userContextBanking.label = बैंकिंग
 userContextShopping.label = शॉपिंग
 
+
diff --git a/l10n-hi-IN/mobile/android/chrome/passwordmgr.properties b/l10n-hi-IN/mobile/android/chrome/passwordmgr.properties
index 8072bcb7ef..747de9f02b 100644
--- a/l10n-hi-IN/mobile/android/chrome/passwordmgr.properties
+++ b/l10n-hi-IN/mobile/android/chrome/passwordmgr.properties
@@ -20,3 +20,4 @@ passwordChangeTitle=पासवर्ड कि बदलाव कि पु
 # Strings used by PromptService.js
 username=उपयोक्तानाम
 password=पासवर्ड
+
diff --git a/l10n-hi-IN/mobile/android/mobile/android/aboutConfig.ftl b/l10n-hi-IN/mobile/android/mobile/android/aboutConfig.ftl
index 0aae0b885d..669fa0d2a6 100644
--- a/l10n-hi-IN/mobile/android/mobile/android/aboutConfig.ftl
+++ b/l10n-hi-IN/mobile/android/mobile/android/aboutConfig.ftl
@@ -26,3 +26,4 @@ config-context-menu-copy-pref-name =
     .label = नाम की नक़ल लें
 config-context-menu-copy-pref-value =
     .label = मान नक़ल करें
+
diff --git a/l10n-hi-IN/mobile/android/mobile/android/geckoViewConsole.ftl b/l10n-hi-IN/mobile/android/mobile/android/geckoViewConsole.ftl
index 070d5cf731..3cb56664ae 100644
--- a/l10n-hi-IN/mobile/android/mobile/android/geckoViewConsole.ftl
+++ b/l10n-hi-IN/mobile/android/mobile/android/geckoViewConsole.ftl
@@ -20,3 +20,4 @@ console-timer-start = { $name }: टाइमर आरंभ
 #   $name (String): user-defined name for the timer
 #   $duration (String): number of milliseconds
 console-timer-end = { $name }: { $duration }ms
+
diff --git a/l10n-hi-IN/toolkit/crashreporter/crashreporter.ftl b/l10n-hi-IN/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..6ba5189019
--- /dev/null
+++ b/l10n-hi-IN/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 } 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 = Submitting your report…
+crashreporter-submit-success = Report submitted successfully!
+crashreporter-submit-failure = आपके रिपोर्ट को जमा करने में समस्या थी।
+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-hi-IN/toolkit/toolkit/branding/brandings.ftl b/l10n-hi-IN/toolkit/toolkit/branding/brandings.ftl
index bf3a39c63d..9b6e9f6042 100644
--- a/l10n-hi-IN/toolkit/toolkit/branding/brandings.ftl
+++ b/l10n-hi-IN/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-hi-IN/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-hi-IN/toolkit/toolkit/formautofill/formAutofill.ftl
index 4d23ffe00e..51708dabb2 100644
--- a/l10n-hi-IN/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-hi-IN/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -14,3 +14,32 @@ 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 = अमेरिकन एक्सप्रेस
+autofill-card-network-cartebancaire = भुगतान कार्ड
+autofill-card-network-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 = { $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-hi-IN/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-hi-IN/toolkit/toolkit/global/arrowscrollbox.ftl
new file mode 100644
index 0000000000..6fbe8159b2
--- /dev/null
+++ b/l10n-hi-IN/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/.
-- 
cgit v1.2.3