diff -r 55fe9dc16b1f -r 830e50bbfc79 firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Tue Sep 11 19:27:36 2012 +0200 +++ b/firefox-multilocale-chrome.patch Thu Sep 13 21:36:45 2012 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer -# Parent 5c446cfb862fdb6685634dbeea9bff31fa19fc3e +# Parent ba286b90465d93b93487c0de6f8ebe5d1821d2c0 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -327,16 +327,20 @@ pref("browser.download.useToolkitUI", fa +@@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL @@ -30,7 +30,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -121,39 +121,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr +@@ -118,39 +118,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; install:: $(addprefix generic/profile/,$(PROFILE_FILES)) @@ -89,18 +89,18 @@ @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe - repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) + repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) + @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -108,16 +108,17 @@ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides - * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) - * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) - * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) + locale/browser/netError.dtd (%chrome/overrides/netError.dtd) + locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) + locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd