equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent dd43958a61127a39cb7e59ba6118a57b685255e2 |
3 # Parent 2f0c475e3ea9ba2309ab4ff7debb8bd0d6850a14 |
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 @@ -356,16 +356,20 @@ pref("browser.download.useToolkitUI", tr |
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 @@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
33 @@ -121,39 +121,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 |
93 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
93 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) |
94 repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
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 @@ -103,16 +103,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) |
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/ |
109 locale/feedback/main.dtd (%feedback/main.dtd) |
109 locale/feedback/main.dtd (%feedback/main.dtd) |
110 locale/feedback/main.properties (%feedback/main.properties) |
110 locale/feedback/main.properties (%feedback/main.properties) |
|
111 % locale pdf.js @AB_CD@ %locale/pdfviewer/ |
|
112 locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) |
|
113 locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) |
111 #ifdef MOZ_WEBAPP_RUNTIME |
114 #ifdef MOZ_WEBAPP_RUNTIME |
112 % locale webapprt @AB_CD@ %locale/webapprt/ |
115 % locale webapprt @AB_CD@ %locale/webapprt/ |
113 locale/webapprt/webapp.dtd (%webapprt/webapp.dtd) |
|
114 locale/webapprt/webapp.properties (%webapprt/webapp.properties) |
|
115 #endif |
|