Merging upstream version 126.0.

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

2 files changed, 65 insertions, 58 deletions

diff --git a/toolkit/locales/en-US/crashreporter/crashreporter.ftl b/toolkit/locales/en-US/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..95099d7f7b
--- /dev/null
+++ b/toolkit/locales/en-US/crashreporter/crashreporter.ftl
@@ -0,0 +1,65 @@
+# 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-branded-title = { -brand-short-name } Crash Reporter
+
+crashreporter-apology = We’re Sorry
+crashreporter-crashed-and-restore = { -brand-short-name } had a problem and crashed. We’ll try to restore your tabs and windows when it restarts.
+crashreporter-plea = To help us diagnose and fix the problem, you can send us a crash report.
+
+crashreporter-information = This application is run after a crash to report the problem to { -vendor-short-name }. It should not be run directly.
+
+crashreporter-error = { -brand-short-name } had a problem and crashed. Unfortunately, the crash reporter is unable to submit a report for this crash.
+# $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-loading-details = Loading…
+
+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-send-report = Tell { -vendor-short-name } about this crash so they can fix it.
+
+crashreporter-include-url = Include the address of the page I was on.
+
+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 = 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 }
+
+# $url (String) - the url which the user can use to view the submitted crash report
+crashreporter-crash-details = You can view details of this crash at { $url }.
+
+# Error strings
+
+crashreporter-error-minidump-analyzer = Failed to run minidump-analyzer
+# $path (String) - the file path
+crashreporter-error-opening-file = Failed to open file ({ $path })
+# $path (String) - the file path
+crashreporter-error-loading-file = Failed to load file ({ $path })
+# $path (String) - the path
+crashreporter-error-creating-dir = Failed to create directory ({ $path })
+crashreporter-error-no-home-dir = Missing home directory
+# $from (String) - the source path
+# $to (String) - the destination path
+crashreporter-error-moving-path = Failed to move { $from } to { $to }
+crashreporter-error-version-eol = Version end of life: crash reports are no longer accepted.
diff --git a/toolkit/locales/en-US/crashreporter/crashreporter.ini b/toolkit/locales/en-US/crashreporter/crashreporter.ini
deleted file mode 100644
index ce4622c228..0000000000
--- a/toolkit/locales/en-US/crashreporter/crashreporter.ini
+++ /dev/null
@@ -1,58 +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/.
-
-# This file is in the UTF-8 encoding
-[Strings]
-# LOCALIZATION NOTE (isRTL):
-# Leave this entry empty unless your language requires right-to-left layout,
-# for example like Arabic, Hebrew, Persian. If your language needs RTL, please
-# use the untranslated English word "yes" as value
-isRTL=
-CrashReporterTitle=Crash Reporter
-# LOCALIZATION NOTE (CrashReporterVendorTitle): %s is replaced with the vendor name.  (i.e. "Mozilla")
-CrashReporterVendorTitle=%s Crash Reporter
-# LOCALIZATION NOTE (CrashReporterErrorText): %s is replaced with another string containing detailed information.
-CrashReporterErrorText=The application had a problem and crashed.\n\nUnfortunately, the crash reporter is unable to submit a report for this crash.\n\nDetails: %s
-# LOCALIZATION NOTE (CrashReporterProductErrorText2): The first %s is replaced with the product name (i.e. "Firefox"), the second is replaced with another string containing detailed information.  These two substitutions can not be reordered!
-CrashReporterProductErrorText2=%s had a problem and crashed.\n\nUnfortunately, the crash reporter is unable to submit a crash report.\n\nDetails: %s
-CrashReporterSorry=We're Sorry
-# LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
-CrashReporterDescriptionText2=%s had a problem and crashed.\n\nTo help us diagnose and fix the problem, you can send us a crash report.
-CrashReporterDefault=This application is run after a crash to report the problem to the application vendor.  It should not be run directly.
-Details=Details…
-ViewReportTitle=Report Contents
-CommentGrayText=Add a comment (comments are publicly visible)
-ExtraReportInfo=This report also contains technical information about the state of the application when it crashed.
-# LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
-CheckSendReport=Tell %s about this crash so they can fix it
-CheckIncludeURL=Include the address of the page I was on
-ReportPreSubmit2=Your crash report will be submitted before you quit or restart.
-ReportDuringSubmit2=Submitting your report…
-ReportSubmitSuccess=Report submitted successfully!
-ReportSubmitFailed=There was a problem submitting your report.
-ReportResubmit=Resending reports that previously failed to send…
-# LOCALIZATION NOTE (Quit2): The %s is replaced with the product name.
-Quit2=Quit %s
-# LOCALIZATION NOTE (Restart): The %s is replaced with the product name.
-Restart=Restart %s
-Ok=OK
-Close=Close
-
-# LOCALIZATION NOTE (CrashID): The %s is replaced with the Crash ID from the server, which is a string like abc12345-6789-0abc-def1-23456abcdef1
-CrashID=Crash ID: %s
-# LOCALIZATION NOTE (CrashDetailsURL): The %s is replaced with a URL that the user can visit to view the crash details.
-CrashDetailsURL=You can view details of this crash at %s
-ErrorBadArguments=The application passed an invalid argument.
-ErrorExtraFileExists=The application didn't leave an application data file.
-ErrorExtraFileRead=Couldn't read the application data file.
-ErrorExtraFileMove=Couldn't move application data file.
-ErrorDumpFileExists=The application did not leave a crash dump file.
-ErrorDumpFileMove=Couldn't move crash dump.
-ErrorNoProductName=The application did not identify itself.
-ErrorNoServerURL=The application did not specify a crash reporting server.
-ErrorNoSettingsPath=Couldn't find the crash reporter's settings.
-ErrorCreateDumpDir=Couldn't create pending dump directory.
-# LOCALIZATION NOTE (ErrorEndOfLife): The %s is replaced with the product name.
-ErrorEndOfLife=The version of %s you are using is no longer supported. Crash reports are no longer being accepted for this version. Please consider upgrading to a supported version.
-