bug 358079 - Proper l10n for crash reporter client. r=pike/bsmedberg (blocking1.9)
authorted.mielczarek@gmail.com
Wed, 10 Oct 2007 11:49:04 -0700
changeset 6796 070728bbe64cb0c98ac754e5e118189bf37c4212
parent 6795 f0c75ad06636f3036ab3767cca453a3aaf92e183
child 6797 4e91104b42f7d154b559c6bb010fbefa9d58ae0d
push idunknown
push userunknown
push dateunknown
reviewerspike, bsmedberg
bugs358079
milestone1.9a9pre
bug 358079 - Proper l10n for crash reporter client. r=pike/bsmedberg (blocking1.9)
toolkit/crashreporter/client/Makefile.in
toolkit/crashreporter/client/crashreporter.ini
toolkit/locales/Makefile.in
toolkit/locales/en-US/crashreporter/crashreporter.ini
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -43,19 +43,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PROGRAM = crashreporter$(BIN_SUFFIX)
 DIST_PROGRAM = crashreporter$(BIN_SUFFIX)
 REQUIRES = sender
 
-#XXX: should move to toolkit/locale
-DIST_FILES = crashreporter.ini
-
 LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src
 
 CPPSRCS = crashreporter.cpp
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += crashreporter_win.cpp
 LIBS += \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/sender/$(LIB_PREFIX)crash_report_sender_s.$(LIB_SUFFIX) \
@@ -97,16 +94,14 @@ ifeq ($(OS_ARCH),Darwin)
 libs::
 	$(NSINSTALL) -D $(DIST)/bin/crashreporter.app
 	rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/crashreporter.app 
 	sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
 	  iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/crashreporter.app/Contents/Resources/English.lproj/InfoPlist.strings
 	$(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS
 	$(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS
 	rm -f $(DIST)/bin/crashreporter
-	$(NSINSTALL) $(DIST)/bin/crashreporter.ini $(DIST)/bin/crashreporter.app/Contents/MacOS
-	rm -f $(DIST)/bin/crashreporter.ini
 endif
 
 ifeq ($(OS_ARCH),Linux)
 export:: $(srcdir)/../google-breakpad/src/common/linux/http_upload.cc
 	$(INSTALL) $^ .
 endif
deleted file mode 100644
--- a/toolkit/crashreporter/client/crashreporter.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-; This file is in the UTF-8 encoding
-[Strings]
-CrashReporterTitle=Crash Reporter
-CrashReporterVendorTitle=%s Crash Reporter
-CrashReporterError=We're sorry, but the application hit an unexpected problem and crashed.\n\nUnfortunately the crash reporter is unable to submit a report for this crash.\n\nDetails: %s
-CrashReporterProductError=We're sorry, but %s hit an unexpected 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
-CrashReporterHeader=Crash! Bang! Boom!
-CrashReporterDescription=We're sorry, but %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 repair this 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.
-ViewReport=View Report
-ExtraReportInfo=This report also contains information about the state of the application when it crashed.
-CheckSubmit=Submit crash report to %s
-CheckEmail=Email me when the problem is fixed
-Close=Close
-Restart=Restart %s
-SubmitFailed=Failed to submit crash report
-CrashID=Crash ID: %s
-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.
-
--- a/toolkit/locales/Makefile.in
+++ b/toolkit/locales/Makefile.in
@@ -54,8 +54,17 @@ include $(topsrcdir)/config/rules.mk
 
 libs-%:
 	@$(MAKE) -C ../../netwerk/locales/ libs AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$*
 ifdef MOZ_PSM
 	@$(MAKE) -C ../../security/manager/locales/ libs AB_CD=$* XPI_NAME=locale-$*
 endif
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$*
+
+ifdef MOZ_CRASHREPORTER
+libs:: $(addprefix $(LOCALE_SRCDIR)/,crashreporter/crashreporter.ini)
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/crashreporter.app/Contents/MacOS
+else
+	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
+endif
+endif
new file mode 100644
--- /dev/null
+++ b/toolkit/locales/en-US/crashreporter/crashreporter.ini
@@ -0,0 +1,37 @@
+# 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 (CrashReporterError): %s is replaced with another string containing detailed information.
+CrashReporterError=We're sorry, but the application hit an unexpected problem and crashed.\n\nUnfortunately the crash reporter is unable to submit a report for this crash.\n\nDetails: %s
+# LOCALIZATION NOTE (CrashReporterProductError): 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=We're sorry, but %s hit an unexpected 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
+CrashReporterHeader=Crash! Bang! Boom!
+# LOCALIZATION NOTE (CrashReporterDescription): The %s is replaced with the product name.
+CrashReporterDescription=We're sorry, but %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 repair this 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.
+ViewReport=View Report
+ExtraReportInfo=This report also contains information about the state of the application when it crashed.
+# LOCALIZATION NOTE (CheckSubmit): The %s is replaced with the vendor name.
+CheckSubmit=Submit crash report to %s
+CheckEmail=Email me when the problem is fixed
+Close=Close
+# LOCALIZATION NOTE (Restart): The %s is replaced with the product name.
+Restart=Restart %s
+SubmitFailed=Failed to submit crash report
+# 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.
+