diff --git a/extensions/reporter/Makefile.in b/extensions/reporter/Makefile.in index e98223741c1f..ad3d513bcf6e 100644 --- a/extensions/reporter/Makefile.in +++ b/extensions/reporter/Makefile.in @@ -44,5 +44,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +DIRS = \ + locales \ + $(NULL) + include $(topsrcdir)/config/rules.mk diff --git a/extensions/reporter/jar.mn b/extensions/reporter/jar.mn index 706a083b3e2a..df48cb6a7d5c 100644 --- a/extensions/reporter/jar.mn +++ b/extensions/reporter/jar.mn @@ -7,14 +7,6 @@ reporter.jar: content/reporter/about.xul (resources/content/reporter/about.xul) content/reporter/error.xhtml (resources/content/reporter/error.xhtml) content/reporter/report.xhtml (resources/content/reporter/report.xhtml) - locale/en-US/reporter/contents.rdf (resources/locale/en-US/reporter/contents.rdf) - locale/en-US/reporter/reportWizard.dtd (resources/locale/en-US/reporter/reportWizard.dtd) - locale/en-US/reporter/about.dtd (resources/locale/en-US/reporter/about.dtd) - locale/en-US/reporter/reporterOverlay.dtd (resources/locale/en-US/reporter/reporterOverlay.dtd) - locale/en-US/reporter/reportResults.dtd (resources/locale/en-US/reporter/reportResults.dtd) - locale/en-US/reporter/reporter.dtd (resources/locale/en-US/reporter/reporter.dtd) - locale/en-US/reporter/reportWizard.properties (resources/locale/en-US/reporter/reportWizard.properties) - locale/en-US/reporter/reporterOverlay.properties (resources/locale/en-US/reporter/reporterOverlay.properties) skin/classic/reporter/contents.rdf (resources/skin/classic/reporter/contents.rdf) skin/classic/reporter/browserOverlay.css (resources/skin/classic/reporter/browserOverlay.css) skin/classic/reporter/icon.png (resources/skin/classic/reporter/icon.png) @@ -23,3 +15,4 @@ reporter.jar: skin/classic/reporter/reporter-icon-large.png (resources/skin/classic/reporter/reporter-icon-large.png) skin/classic/reporter/reporter-icon-small.png (resources/skin/classic/reporter/reporter-icon-small.png) skin/classic/reporter/splash.png (resources/skin/classic/reporter/splash.png) + \ No newline at end of file diff --git a/extensions/reporter/locales/Makefile.in b/extensions/reporter/locales/Makefile.in new file mode 100644 index 000000000000..5e2cfbf997d0 --- /dev/null +++ b/extensions/reporter/locales/Makefile.in @@ -0,0 +1,47 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is the Mozilla Browser code. +# +# The Initial Developer of the Original Code is +# Benjamin Smedberg +# Portions created by the Initial Developer are Copyright (C) 2004 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ +relativesrcdir = extensions/reporter/locales + +include $(DEPTH)/config/autoconf.mk + +DEFINES += -DAB_CD=$(AB_CD) + +include $(topsrcdir)/config/rules.mk diff --git a/extensions/reporter/resources/locale/en-US/reporter/about.dtd b/extensions/reporter/locales/en-US/chrome/about.dtd similarity index 100% rename from extensions/reporter/resources/locale/en-US/reporter/about.dtd rename to extensions/reporter/locales/en-US/chrome/about.dtd diff --git a/extensions/reporter/resources/locale/en-US/reporter/reportResults.dtd b/extensions/reporter/locales/en-US/chrome/reportResults.dtd similarity index 100% rename from extensions/reporter/resources/locale/en-US/reporter/reportResults.dtd rename to extensions/reporter/locales/en-US/chrome/reportResults.dtd diff --git a/extensions/reporter/resources/locale/en-US/reporter/reportWizard.dtd b/extensions/reporter/locales/en-US/chrome/reportWizard.dtd similarity index 100% rename from extensions/reporter/resources/locale/en-US/reporter/reportWizard.dtd rename to extensions/reporter/locales/en-US/chrome/reportWizard.dtd diff --git a/extensions/reporter/resources/locale/en-US/reporter/reportWizard.properties b/extensions/reporter/locales/en-US/chrome/reportWizard.properties similarity index 100% rename from extensions/reporter/resources/locale/en-US/reporter/reportWizard.properties rename to extensions/reporter/locales/en-US/chrome/reportWizard.properties diff --git a/extensions/reporter/resources/locale/en-US/reporter/reporter.dtd b/extensions/reporter/locales/en-US/chrome/reporter.dtd similarity index 100% rename from extensions/reporter/resources/locale/en-US/reporter/reporter.dtd rename to extensions/reporter/locales/en-US/chrome/reporter.dtd diff --git a/extensions/reporter/resources/locale/en-US/reporter/reporterOverlay.dtd b/extensions/reporter/locales/en-US/chrome/reporterOverlay.dtd similarity index 100% rename from extensions/reporter/resources/locale/en-US/reporter/reporterOverlay.dtd rename to extensions/reporter/locales/en-US/chrome/reporterOverlay.dtd diff --git a/extensions/reporter/resources/locale/en-US/reporter/reporterOverlay.properties b/extensions/reporter/locales/en-US/chrome/reporterOverlay.properties similarity index 100% rename from extensions/reporter/resources/locale/en-US/reporter/reporterOverlay.properties rename to extensions/reporter/locales/en-US/chrome/reporterOverlay.properties diff --git a/extensions/reporter/resources/locale/en-US/reporter/contents.rdf b/extensions/reporter/locales/generic/chrome/contents.rdf similarity index 50% rename from extensions/reporter/resources/locale/en-US/reporter/contents.rdf rename to extensions/reporter/locales/generic/chrome/contents.rdf index 00f291e0c857..33df25db36eb 100644 --- a/extensions/reporter/resources/locale/en-US/reporter/contents.rdf +++ b/extensions/reporter/locales/generic/chrome/contents.rdf @@ -1,13 +1,16 @@ + +#filter substitution + - + - + - - + + diff --git a/extensions/reporter/locales/jar.mn b/extensions/reporter/locales/jar.mn new file mode 100644 index 000000000000..0c0ee193417e --- /dev/null +++ b/extensions/reporter/locales/jar.mn @@ -0,0 +1,21 @@ +#filter substitution + +@AB_CD@.jar: +* locale/@AB_CD@/reporter/contents.rdf (generic/chrome/contents.rdf) + 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) + +reporter.jar: +* locale/en-US/reporter/contents.rdf (generic/chrome/contents.rdf) + locale/en-US/reporter/reportWizard.dtd (%chrome/reportWizard.dtd) + locale/en-US/reporter/about.dtd (%chrome/about.dtd) + locale/en-US/reporter/reporterOverlay.dtd (%chrome/reporterOverlay.dtd) + locale/en-US/reporter/reportResults.dtd (%chrome/reportResults.dtd) + locale/en-US/reporter/reporter.dtd (%chrome/reporter.dtd) + locale/en-US/reporter/reportWizard.properties (%chrome/reportWizard.properties) + locale/en-US/reporter/reporterOverlay.properties (%chrome/reporterOverlay.properties) \ No newline at end of file