1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 5c446cfb862fdb6685634dbeea9bff31fa19fc3e |
3 # Parent ba286b90465d93b93487c0de6f8ebe5d1821d2c0 |
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 @@ -327,16 +327,20 @@ pref("browser.download.useToolkitUI", fa |
9 @@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr |
10 pref("browser.download.panel.removeFinishedDownloads", false); |
10 pref("browser.download.panel.removeFinishedDownloads", false); |
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 |
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 @@ -121,39 +121,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
33 @@ -118,39 +118,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
34 install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
34 install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
35 |
35 |
36 install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
36 install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
37 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
37 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
38 |
38 |
87 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
87 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
88 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
88 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
89 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 |
89 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 |
90 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
90 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
91 |
91 |
92 |
|
93 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
92 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
94 repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
93 repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
|
94 @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
95 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
95 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
96 --- a/browser/locales/jar.mn |
96 --- a/browser/locales/jar.mn |
97 +++ b/browser/locales/jar.mn |
97 +++ b/browser/locales/jar.mn |
98 @@ -108,16 +108,17 @@ |
98 @@ -108,16 +108,17 @@ |
99 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
99 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
100 # the following files are browser-specific overrides |
100 # the following files are browser-specific overrides |
101 * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
101 locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
102 * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
102 locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
103 * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
103 locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
104 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
104 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
105 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
105 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
106 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
106 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
107 + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
107 + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
108 % locale testpilot @AB_CD@ %locale/feedback/ |
108 % locale testpilot @AB_CD@ %locale/feedback/ |