equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd |
2 # Parent 78b2c4af37108b3a2b6a856da7544335001cd444 |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
4 Add searchplugins to chrome packaging for proper localization |
4 Add searchplugins to chrome packaging for proper localization |
5 |
5 |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
9 @@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO |
9 @@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO |
10 #endif |
10 #endif |
11 |
11 |
12 // search engines URL |
12 // search engines URL |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
14 |
14 |
37 endif |
37 endif |
38 |
38 |
39 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
39 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
40 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
40 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
41 else |
41 else |
42 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
42 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg |
43 +SEARCHPLUGINS_NAMES = $(shell cat \ |
43 +SEARCHPLUGINS_NAMES = $(shell cat \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) ddg |
46 endif |
46 endif |
47 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
47 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
48 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
48 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
49 -PP_TARGETS += SEARCHPLUGINS |
49 -PP_TARGETS += SEARCHPLUGINS |
50 +#PP_TARGETS += SEARCHPLUGINS |
50 +#PP_TARGETS += SEARCHPLUGINS |
126 </Url> |
126 </Url> |
127 <Url type="text/html" method="GET" template="https://www.google.com/" rel="searchform"/> |
127 <Url type="text/html" method="GET" template="https://www.google.com/" rel="searchform"/> |
128 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
128 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
129 --- a/browser/locales/jar.mn |
129 --- a/browser/locales/jar.mn |
130 +++ b/browser/locales/jar.mn |
130 +++ b/browser/locales/jar.mn |
131 @@ -133,14 +133,15 @@ |
131 @@ -135,14 +135,15 @@ |
132 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
132 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
133 #endif |
133 #endif |
134 % locale browser-region @AB_CD@ %locale/browser-region/ |
134 % locale browser-region @AB_CD@ %locale/browser-region/ |
135 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
135 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
136 # the following files are browser-specific overrides |
136 # the following files are browser-specific overrides |