From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../browser/browser/preferences/preferences.ftl    | 12 ++++++++++
 l10n-hi-IN/toolkit/crashreporter/crashreporter.ftl | 28 ++++++++++++++++++++++
 .../toolkit/toolkit/formautofill/formAutofill.ftl  | 18 ++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 l10n-hi-IN/toolkit/crashreporter/crashreporter.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/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/formautofill/formAutofill.ftl b/l10n-hi-IN/toolkit/toolkit/formautofill/formAutofill.ftl
index 7cbb3a20e1..51708dabb2 100644
--- a/l10n-hi-IN/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-hi-IN/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
 
@@ -25,3 +27,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 = ई-मेल
-- 
cgit v1.2.3