bug 412989 - allow per-app override of crashreporter.ini. string changes only. r=bsmedberg/mconnor

browser/locales/Makefile.in

@@ -315,3 +315,8 @@ else
 endif
 endif
 endif
+
+ifdef MOZ_CRASHREPORTER
+libs:: $(addprefix $(LOCALE_SRCDIR)/,crashreporter/crashreporter-override.ini)
+	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
+endif

browser/locales/en-US/crashreporter/crashreporter-override.ini

@@ -0,0 +1,5 @@
+# This file is in the UTF-8 encoding
+[Strings]
+# LOCALIZATION NOTE (CrashReporterProductErrorText): The %s is replaced with a string containing detailed information.
+CrashReporterProductErrorText2=Firefox had a problem and crashed. We'll try to restore your tabs and windows when it restarts.\n\nUnfortunately the crash reporter is unable to submit a crash report.\n\nDetails: %s
+CrashReporterDescriptionText2=Firefox had a problem and crashed. We'll try to restore your tabs and windows when it restarts.\n\nTo help us diagnose and fix the problem, you can send us a crash report.

toolkit/crashreporter/client/crashreporter.h

@@ -38,9 +38,9 @@ typedef std::map<std::string, std::string> StringTable;
 #define ST_CRASHREPORTERTITLE        "CrashReporterTitle"
 #define ST_CRASHREPORTERVENDORTITLE  "CrashReporterVendorTitle"
 #define ST_CRASHREPORTERERROR        "CrashReporterErrorText"
-#define ST_CRASHREPORTERPRODUCTERROR "CrashReporterProductError"
+#define ST_CRASHREPORTERPRODUCTERROR "CrashReporterProductErrorText2"
 #define ST_CRASHREPORTERHEADER       "CrashReporterSorry"
-#define ST_CRASHREPORTERDESCRIPTION  "CrashReporterDescriptionText"
+#define ST_CRASHREPORTERDESCRIPTION  "CrashReporterDescriptionText2"
 #define ST_CRASHREPORTERDEFAULT      "CrashReporterDefault"
 #define ST_VIEWREPORT                "Details"
 #define ST_VIEWREPORTTITLE           "ViewReportTitle"

toolkit/locales/en-US/crashreporter/crashreporter.ini

@@ -6,10 +6,10 @@ CrashReporterVendorTitle=%s Crash Reporter
 # LOCALIZATION NOTE (CrashReporterErrorText): %s is replaced with another string containing detailed information.
 CrashReporterErrorText=The application had problem and crashed.\n\nUnfortunately the crash reporter is unable to submit a report for this crash.\n\nDetails: %s
 # LOCALIZATION NOTE (CrashReporterProductErrorText): 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!
-CrashReporterProductError=%s had a problem and crashed.  We'll try to restore your tabs and windows when it restarts.\n\nUnfortunately the crash reporter is unable to submit a crash report.\n\nDetails: %s
+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 (CrashReporterDescriptionText): The %s is replaced with the product name.
-CrashReporterDescriptionText=%s hit an unexpected problem and crashed.  We'll try to restore your tabs and windows when it restarts.\n\nTo help us diagnose and fix the problem, you can send us a crash report.
+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