bug 412989 - allow per-app override of crashreporter.ini. string changes only. r=bsmedberg/mconnor
authorted.mielczarek@gmail.com
Tue, 22 Jan 2008 16:03:58 -0800
changeset 10552 3be127211ca99a4d9f58c6d9a24f5a975fb735bf
parent 10551 cc4b60c869b0daba08419e22bc0720297c32a70d
child 10553 d583589d56692694f028812002fd756a77c3d6e7
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg, mconnor
bugs412989
milestone1.9b3pre
bug 412989 - allow per-app override of crashreporter.ini. string changes only. r=bsmedberg/mconnor
browser/locales/Makefile.in
browser/locales/en-US/crashreporter/crashreporter-override.ini
toolkit/crashreporter/client/crashreporter.h
toolkit/locales/en-US/crashreporter/crashreporter.ini
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -310,8 +310,13 @@ ifeq ($(OS_ARCH),WINNT)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/updater.app/Contents/MacOS
 else
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 endif
 endif
+
+ifdef MOZ_CRASHREPORTER
+libs:: $(addprefix $(LOCALE_SRCDIR)/,crashreporter/crashreporter-override.ini)
+	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
+endif
new file mode 100644
--- /dev/null
+++ b/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.
--- a/toolkit/crashreporter/client/crashreporter.h
+++ b/toolkit/crashreporter/client/crashreporter.h
@@ -33,19 +33,19 @@ std::string WideToUTF8(const std::wstrin
 
 #endif
 
 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"
 #define ST_COMMENTGRAYTEXT           "CommentGrayText"
 #define ST_EXTRAREPORTINFO           "ExtraReportInfo"
 #define ST_CHECKSUBMIT               "CheckSendReport"
 #define ST_CHECKURL                  "CheckIncludeURL"
 #define ST_CHECKEMAIL                "CheckSendEmail"
--- a/toolkit/locales/en-US/crashreporter/crashreporter.ini
+++ b/toolkit/locales/en-US/crashreporter/crashreporter.ini
@@ -1,20 +1,20 @@
 # This file is in the UTF-8 encoding
 [Strings]
 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 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
 CommentGrayText=Add a comment.  Note: 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