diff -r f721a3dea219 -r f4578fb6fcc3 firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Thu Oct 30 11:42:24 2014 +0100 +++ b/firefox-multilocale-chrome.patch Thu Oct 30 12:30:01 2014 +0100 @@ -1,12 +1,12 @@ # HG changeset patch -# Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd +# Parent 78b2c4af37108b3a2b6a856da7544335001cd444 # User Wolfgang Rosenauer 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 -@@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO +@@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO #endif // search engines URL @@ -39,10 +39,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) else --SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) +-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg +SEARCHPLUGINS_NAMES = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) ddg endif SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) @@ -128,7 +128,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -133,14 +133,15 @@ +@@ -135,14 +135,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/