diff --git a/mozilla/toolkit/crashreporter/client/Makefile.in b/mozilla/toolkit/crashreporter/client/Makefile.in
index 3ceeb2a953f..c264a8021f1 100644
--- a/mozilla/toolkit/crashreporter/client/Makefile.in
+++ b/mozilla/toolkit/crashreporter/client/Makefile.in
@@ -48,9 +48,6 @@ 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
@@ -102,8 +99,6 @@ libs::
 	$(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)
diff --git a/mozilla/toolkit/locales/Makefile.in b/mozilla/toolkit/locales/Makefile.in
index 7344dad6b7e..552f3d8b218 100644
--- a/mozilla/toolkit/locales/Makefile.in
+++ b/mozilla/toolkit/locales/Makefile.in
@@ -59,3 +59,12 @@ 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
diff --git a/mozilla/toolkit/crashreporter/client/crashreporter.ini b/mozilla/toolkit/locales/en-US/crashreporter/crashreporter.ini
similarity index 65%
rename from mozilla/toolkit/crashreporter/client/crashreporter.ini
rename to mozilla/toolkit/locales/en-US/crashreporter/crashreporter.ini
index 48b24307323..ad1b4bbb6f6 100644
--- a/mozilla/toolkit/crashreporter/client/crashreporter.ini
+++ b/mozilla/toolkit/locales/en-US/crashreporter/crashreporter.ini
@@ -1,22 +1,29 @@
-; This file is in the UTF-8 encoding
+# 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.