bug 313392, move reporter l10n back into /l10n, r=bsmedberg,r/a=raccetura

client.mk

@@ -160,6 +160,7 @@ MODULES_browser :=                              \
 LOCALES_browser :=                              \
   $(LOCALES_toolkit)                            \
   browser                                       \
+  extensions/reporter                           \
   other-licenses/branding/firefox               \
   $(NULL)
 

extensions/reporter/Makefile.in

@@ -44,88 +44,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_XUL_APP
-NO_JAR_AUTO_REG = 1
-endif
-
-ifdef BUILD_ALL_LOCALES
-ALL_LOCALES = \
-	en-US \
-	ar \
-	bg \
-	ca \
-	cs \
-	da \
-	de \
-	el \
-	en-GB \
-	es-AR \
-	es-ES \
-	eu \
-	fi \
-	fr \
-	ga-IE \
-	gu-IN \
-	he \
-	hu \
-	hy-AM \
-	it \
-	ja \
-	ja-JP-mac \
-	ko \
-	mk \
-	mn \
-	nb-NO \
-	nl \
-	nn-NO \
-	pa-IN \
-	pl \
-	pt-BR \
-	ro \
-	ru \
-	sk \
-	sl \
-	sv-SE \
-	tr \
-	zh-CN \
-	zh-TW \
-	$(NULL)
-else
-ALL_LOCALES = $(AB_CD)
-endif
-
-PREF_JS_EXPORTS = $(srcdir)/resources/content/prefs/reporter.js
-
-include $(topsrcdir)/config/config.mk
-
-SUBMAKEFILES += locales/Makefile
-
-# We need the locale-loop to happen before rules.mk, but we still want the
-# default all:: target. Hack it here.
-
-SUPPRESS_DEFAULT_RULES = 1
-
-all:: 
-	$(MAKE) export
-	$(MAKE) libs
-
-# Do depend as well
-alldep:: 
-	$(MAKE) export
-	$(MAKE) depend
-	$(MAKE) libs
-
-libs realchrome:: locales/Makefile
-	@$(EXIT_ON_ERROR)                    \
-	for locale in $(ALL_LOCALES); do     \
-	  $(MAKE) -C locales AB_CD=$$locale; \
-	done
-
-install::
-	@$(EXIT_ON_ERROR)                    \
-	for locale in $(ALL_LOCALES); do     \
-	  $(MAKE) -C locales AB_CD=$$locale install; \
-	done
-
+DIRS = locales
 
 include $(topsrcdir)/config/rules.mk

extensions/reporter/locales/Makefile.in

@@ -42,16 +42,6 @@ relativesrcdir = extensions/reporter/locales
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_XUL_APP
-NO_JAR_AUTO_REG = 1
-endif
-
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
-
-ifneq (en-US,$(AB_CD))
-libs realchrome::
-	@echo "Comparing $(AB_CD) to en-US"
-	@$(PERL) $(topsrcdir)/toolkit/locales/compare-locales.pl $(srcdir)/en-US $(srcdir)/$(AB_CD)
-endif

extensions/reporter/locales/jar.mn

@@ -4,13 +4,13 @@
 @AB_CD@.jar:
 #else
 reporter.jar:
-#endif
 * locale/@AB_CD@/reporter/contents.rdf                      (generic/chrome/contents.rdf)
+#endif
 % locale reporter @AB_CD@ %locale/@AB_CD@/reporter/
-  locale/@AB_CD@/reporter/reportWizard.dtd                  (@AB_CD@/chrome/reportWizard.dtd)
-  locale/@AB_CD@/reporter/about.dtd                         (@AB_CD@/chrome/about.dtd)
-  locale/@AB_CD@/reporter/reporterOverlay.dtd               (@AB_CD@/chrome/reporterOverlay.dtd)
-  locale/@AB_CD@/reporter/reportResults.dtd                 (@AB_CD@/chrome/reportResults.dtd)
-  locale/@AB_CD@/reporter/reporter.dtd                      (@AB_CD@/chrome/reporter.dtd)
-  locale/@AB_CD@/reporter/reportWizard.properties           (@AB_CD@/chrome/reportWizard.properties)
-  locale/@AB_CD@/reporter/reporterOverlay.properties        (@AB_CD@/chrome/reporterOverlay.properties)
+  locale/@AB_CD@/reporter/reportWizard.dtd                  (%chrome/reportWizard.dtd)
+  locale/@AB_CD@/reporter/about.dtd                         (%chrome/about.dtd)
+  locale/@AB_CD@/reporter/reporterOverlay.dtd               (%chrome/reporterOverlay.dtd)
+  locale/@AB_CD@/reporter/reportResults.dtd                 (%chrome/reportResults.dtd)
+  locale/@AB_CD@/reporter/reporter.dtd                      (%chrome/reporter.dtd)
+  locale/@AB_CD@/reporter/reportWizard.properties           (%chrome/reportWizard.properties)
+  locale/@AB_CD@/reporter/reporterOverlay.properties        (%chrome/reporterOverlay.properties)