equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 020e09bf3fc6f17b3041ecf70f1376da37db8645 |
2 # Parent 596aaeb7e5417f1f97eab2116503013bc68c0c3a |
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 @@ -340,16 +340,20 @@ pref("browser.download.panel.shown", fal |
9 @@ -351,16 +351,20 @@ pref("browser.helperApps.deleteTempFileO |
10 pref("browser.download.panel.firstSessionCompleted", false); |
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 |
15 // pointer to the default engine name |
15 // pointer to the default engine name |
28 pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
28 pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
29 |
29 |
30 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
30 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
31 --- a/browser/locales/Makefile.in |
31 --- a/browser/locales/Makefile.in |
32 +++ b/browser/locales/Makefile.in |
32 +++ b/browser/locales/Makefile.in |
33 @@ -71,20 +71,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST |
33 @@ -63,20 +63,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST |
34 |
34 |
35 STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ |
35 STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ |
36 $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
36 $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
37 cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
37 cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
38 chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
38 chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
53 ifdef MOZ_METRO |
53 ifdef MOZ_METRO |
54 # metro build, include both app folders |
54 # metro build, include both app folders |
55 DIST_SUBDIRS = browser metro |
55 DIST_SUBDIRS = browser metro |
56 else |
56 else |
57 DIST_SUBDIRS = $(DIST_SUBDIR) |
57 DIST_SUBDIRS = $(DIST_SUBDIR) |
58 @@ -131,20 +133,44 @@ install:: $(addprefix generic/profile/,$ |
58 @@ -123,20 +125,44 @@ install:: $(addprefix generic/profile/,$ |
59 |
59 |
60 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
60 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
61 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
61 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
62 |
62 |
63 # metro build calls back here for search engine plugins |
63 # metro build calls back here for search engine plugins |
129 <SearchForm>https://www.google.com/</SearchForm> |
129 <SearchForm>https://www.google.com/</SearchForm> |
130 </SearchPlugin> |
130 </SearchPlugin> |
131 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
131 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
132 --- a/browser/locales/jar.mn |
132 --- a/browser/locales/jar.mn |
133 +++ b/browser/locales/jar.mn |
133 +++ b/browser/locales/jar.mn |
134 @@ -119,14 +119,15 @@ |
134 @@ -122,14 +122,15 @@ |
135 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
135 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
136 #endif |
136 #endif |
137 % locale browser-region @AB_CD@ %locale/browser-region/ |
137 % locale browser-region @AB_CD@ %locale/browser-region/ |
138 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
138 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
139 # the following files are browser-specific overrides |
139 # the following files are browser-specific overrides |