diff --git a/mobile/android/chrome/jar.mn b/mobile/android/chrome/jar.mn index 0f3e39569693..791f0ec94992 100644 --- a/mobile/android/chrome/jar.mn +++ b/mobile/android/chrome/jar.mn @@ -66,3 +66,34 @@ chrome.jar: % override chrome://global/content/config.xul chrome://browser/content/config.xhtml % override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml % override chrome://mozapps/content/extensions/extensions.xul chrome://browser/content/aboutAddons.xhtml + +# L10n resource overrides. +% 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/aboutReader.properties chrome://browser/locale/overrides/aboutReader.properties +% override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd +% override chrome://global/locale/charsetMenu.properties chrome://browser/locale/overrides/charsetMenu.properties +% override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.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://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties +% override chrome://pluginproblem/locale/pluginproblem.dtd chrome://browser/locale/overrides/plugins/pluginproblem.dtd +% override chrome://global/locale/aboutSupport.dtd chrome://browser/locale/overrides/global/aboutSupport.dtd +% override chrome://global/locale/aboutSupport.properties chrome://browser/locale/overrides/global/aboutSupport.properties +% override chrome://global/locale/crashes.dtd chrome://browser/locale/overrides/crashreporter/crashes.dtd +% override chrome://global/locale/crashes.properties chrome://browser/locale/overrides/crashreporter/crashes.properties +% override chrome://global/locale/mozilla.dtd chrome://browser/locale/overrides/global/mozilla.dtd +% override chrome://global/locale/aboutTelemetry.dtd chrome://browser/locale/overrides/global/aboutTelemetry.dtd +% override chrome://global/locale/aboutTelemetry.properties chrome://browser/locale/overrides/global/aboutTelemetry.properties +% override chrome://global/locale/aboutWebrtc.properties chrome://browser/locale/overrides/global/aboutWebrtc.properties + +# overrides for dom l10n, also for en-US +# keep this file list in sync with filter.py +% override chrome://global/locale/global.dtd chrome://browser/locale/overrides/global.dtd +% override chrome://global/locale/AccessFu.properties chrome://browser/locale/overrides/AccessFu.properties +% override chrome://global/locale/dom/dom.properties chrome://browser/locale/overrides/dom/dom.properties +% override chrome://global/locale/plugins.properties chrome://browser/locale/overrides/plugins.properties + +# mobile/locales/jar.mn overrides +% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd +% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties diff --git a/mobile/android/locales/jar.mn b/mobile/android/locales/jar.mn index 12501037a973..1cfb0d2723f2 100644 --- a/mobile/android/locales/jar.mn +++ b/mobile/android/locales/jar.mn @@ -3,6 +3,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Note: All overrides should go to mobile/android/chrome/jar.mn in order to avoid +# having to create the same override entry for each locale. @AB_CD@.jar: % locale browser @AB_CD@ %locale/@AB_CD@/browser/ @@ -64,25 +66,6 @@ relativesrcdir toolkit/locales: #about:webrtc locale/@AB_CD@/browser/overrides/global/aboutWebrtc.properties (%chrome/global/aboutWebrtc.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/aboutReader.properties chrome://browser/locale/overrides/aboutReader.properties -% override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd -% override chrome://global/locale/charsetMenu.properties chrome://browser/locale/overrides/charsetMenu.properties -% override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.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://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties -% override chrome://pluginproblem/locale/pluginproblem.dtd chrome://browser/locale/overrides/plugins/pluginproblem.dtd -% override chrome://global/locale/aboutSupport.dtd chrome://browser/locale/overrides/global/aboutSupport.dtd -% override chrome://global/locale/aboutSupport.properties chrome://browser/locale/overrides/global/aboutSupport.properties -% override chrome://global/locale/crashes.dtd chrome://browser/locale/overrides/crashreporter/crashes.dtd -% override chrome://global/locale/crashes.properties chrome://browser/locale/overrides/crashreporter/crashes.properties -% override chrome://global/locale/mozilla.dtd chrome://browser/locale/overrides/global/mozilla.dtd -% override chrome://global/locale/aboutTelemetry.dtd chrome://browser/locale/overrides/global/aboutTelemetry.dtd -% override chrome://global/locale/aboutTelemetry.properties chrome://browser/locale/overrides/global/aboutTelemetry.properties -% override chrome://global/locale/aboutWebrtc.properties chrome://browser/locale/overrides/global/aboutWebrtc.properties - # overrides for dom l10n, also for en-US # keep this file list in sync with filter.py relativesrcdir dom/locales: @@ -91,8 +74,3 @@ relativesrcdir dom/locales: locale/@AB_CD@/browser/overrides/dom/dom.properties (%chrome/dom/dom.properties) #about:plugins locale/@AB_CD@/browser/overrides/plugins.properties (%chrome/plugins.properties) - -% override chrome://global/locale/global.dtd chrome://browser/locale/overrides/global.dtd -% override chrome://global/locale/AccessFu.properties chrome://browser/locale/overrides/AccessFu.properties -% override chrome://global/locale/dom/dom.properties chrome://browser/locale/overrides/dom/dom.properties -% override chrome://global/locale/plugins.properties chrome://browser/locale/overrides/plugins.properties diff --git a/mobile/locales/jar.mn b/mobile/locales/jar.mn index 2f16c28bfb0d..7565acffe3ba 100644 --- a/mobile/locales/jar.mn +++ b/mobile/locales/jar.mn @@ -3,6 +3,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Note: All overrides should go to mobile/android/chrome/jar.mn in order to avoid +# having to create the same override entry for each locale. @AB_CD@.jar: % locale browser @AB_CD@ %locale/@AB_CD@/browser/ @@ -10,6 +12,4 @@ # Fennec-specific overrides of generic strings locale/@AB_CD@/browser/netError.dtd (%overrides/netError.dtd) -% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd locale/@AB_CD@/browser/appstrings.properties (%overrides/appstrings.properties) -% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties