author | Axel Hecht <axel@pike.org> |
Wed, 17 Apr 2013 18:21:49 +0200 | |
changeset 141271 | 2aed3055baf607398585cdb178b587a1046b5886 |
parent 141270 | 1b5ab2426f16ff3b4f58b9cc07ae4278d1dc4611 |
child 141272 | e0f0fe66ee2a925054c117d75403e670be71c2e9 |
push id | 2579 |
push user | akeybl@mozilla.com |
push date | Mon, 24 Jun 2013 18:52:47 +0000 |
treeherder | mozilla-beta@b69b7de8a05a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mfinkle |
bugs | 792077 |
milestone | 23.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -262,16 +262,21 @@ pref("browser.search.jarURIs", "chrome:/ // tell the search service that we don't really expose the "current engine" pref("browser.search.noCurrentEngine", true); #ifdef MOZ_OFFICIAL_BRANDING // {moz:official} expands to "official" pref("browser.search.official", true); #endif +// Enable sparse localization by setting a few package locale overrides +pref("chrome.override_package.global", "browser"); +pref("chrome.override_package.mozapps", "browser"); +pref("chrome.override_package.passwordmgr", "browser"); + // enable xul error pages pref("browser.xul.error_pages.enabled", true); // Specify emptyRestriction = 0 so that bookmarks appear in the list by default pref("browser.urlbar.default.behavior", 0); pref("browser.urlbar.default.behavior.emptyRestriction", 0); // Let the faviconservice know that we display favicons as 32x32px so that it
--- a/mobile/android/locales/jar.mn +++ b/mobile/android/locales/jar.mn @@ -23,9 +23,41 @@ locale/@AB_CD@/browser/checkbox.dtd (%chrome/checkbox.dtd) locale/@AB_CD@/browser/notification.dtd (%chrome/notification.dtd) locale/@AB_CD@/browser/pippki.properties (%chrome/pippki.properties) locale/@AB_CD@/browser/sync.dtd (%chrome/sync.dtd) locale/@AB_CD@/browser/sync.properties (%chrome/sync.properties) locale/@AB_CD@/browser/prompt.dtd (%chrome/prompt.dtd) locale/@AB_CD@/browser/feedback.dtd (%chrome/feedback.dtd) locale/@AB_CD@/browser/phishing.dtd (%chrome/phishing.dtd) + +# overrides for toolkit l10n, also for en-US +relativesrcdir toolkit/locales: + locale/@AB_CD@/browser/overrides/about.dtd (%chrome/global/about.dtd) + locale/@AB_CD@/browser/overrides/aboutAbout.dtd (%chrome/global/aboutAbout.dtd) + locale/@AB_CD@/browser/overrides/aboutRights.dtd (%chrome/global/aboutRights.dtd) + locale/@AB_CD@/browser/overrides/commonDialogs.properties (%chrome/global/commonDialogs.properties) + locale/@AB_CD@/browser/overrides/handling/handling.properties (%chrome/mozapps/handling/handling.properties) + locale/@AB_CD@/browser/overrides/intl.properties (%chrome/global/intl.properties) + locale/@AB_CD@/browser/overrides/intl.css (%chrome/global/intl.css) + locale/@AB_CD@/browser/overrides/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties) + locale/@AB_CD@/browser/overrides/search/search.properties (%chrome/search/search.properties) + locale/@AB_CD@/browser/overrides/update/updates.properties (%chrome/mozapps/update/updates.properties) + +% override chrome://global/locale/about.dtd chrome://browser/locale/overrides/about.dtd +% override chrome://global/locale/aboutAbout.dtd chrome://browser/locale/overrides/aboutAbout.dtd +% override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd +% override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.properties +% override chrome://mozapps/locale/handling/handling.properties chrome://browser/locale/overrides/handling/handling.properties +% override chrome://global/locale/intl.properties chrome://browser/locale/overrides/intl.properties +% override chrome://global/locale/intl.css chrome://browser/locale/overrides/intl.css +% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/overrides/passwordmgr/passwordmgr.properties +% override chrome://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties +% override chrome://mozapps/locale/update/updates.properties chrome://browser/locale/overrides/update/updates.properties + +# overrides for dom l10n, also for en-US +relativesrcdir dom/locales: + locale/@AB_CD@/browser/overrides/charsetTitles.properties (%chrome/charsetTitles.properties) + locale/@AB_CD@/browser/overrides/global.dtd (%chrome/global.dtd) + +% override chrome://global/locale/charsetTitles.properties chrome://browser/locale/overrides/charsetTitles.properties +% override chrome://global/locale/global.dtd chrome://browser/locale/overrides/global.dtd locale/@AB_CD@/browser/handling.properties (%chrome/handling.properties)
--- a/mobile/locales/Makefile.in +++ b/mobile/locales/Makefile.in @@ -166,17 +166,16 @@ libs-%: $(libs-preqs) @$(MAKE) -B $(bookmarks) AB_CD=$* @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* # Tailored target to just add the chrome processing for multi-locale builds chrome-%: $(display-deps) - @$(MAKE) -C $(DEPTH)/toolkit/locales chrome-$* @$(MAKE) -B $(bookmarks) AB_CD=$* @$(MAKE) -B searchplugins AB_CD=$* @$(MAKE) chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))