diff -r b20cf866bb49 -r 2538fd6a51be firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Tue Jan 18 10:00:48 2011 +0100 +++ b/firefox-multilocale-chrome.patch Sat Jan 22 11:10:25 2011 +0100 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer -# Parent 80550b99f4e1c3bfe561edf396dec27d47bf1696 +# Parent e3da64303bf904a8da2410754026b7a00480a589 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 -@@ -319,16 +319,20 @@ pref("browser.download.manager.scanWhenD +@@ -321,16 +321,20 @@ pref("browser.download.manager.scanWhenD pref("browser.download.manager.resumeOnWakeDelay", 10000); // search engines URL @@ -83,13 +83,16 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -87,8 +87,9 @@ +@@ -81,11 +81,12 @@ + locale/browser-region/region.properties (%chrome/browser-region/region.properties) + # the following files are browser-specific overrides + * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) + * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) + * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd - #if MOZ_UPDATE_CHANNEL == beta ++ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) - #endif -+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt)