Bug 1389397 - Remove the override chrome entries from language manifests. r=pike
MozReview-Commit-ID: IsNb6inPCtf
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -61,8 +61,39 @@ chrome.jar:
content/WebcompatReporter.js (content/WebcompatReporter.js)
#endif
% content branding %content/branding/
% 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
--- a/mobile/android/locales/jar.mn
+++ b/mobile/android/locales/jar.mn
@@ -1,13 +1,15 @@
#filter substitution
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/
locale/@AB_CD@/browser/about.dtd (%chrome/about.dtd)
locale/@AB_CD@/browser/aboutAccounts.dtd (%chrome/aboutAccounts.dtd)
locale/@AB_CD@/browser/aboutAccounts.properties (%chrome/aboutAccounts.properties)
locale/@AB_CD@/browser/aboutAddons.dtd (%chrome/aboutAddons.dtd)
locale/@AB_CD@/browser/aboutAddons.properties (%chrome/aboutAddons.properties)
@@ -59,40 +61,16 @@ relativesrcdir toolkit/locales:
#about:mozilla
locale/@AB_CD@/browser/overrides/global/mozilla.dtd (%chrome/global/mozilla.dtd)
#about:telemetry
locale/@AB_CD@/browser/overrides/global/aboutTelemetry.dtd (%chrome/global/aboutTelemetry.dtd)
locale/@AB_CD@/browser/overrides/global/aboutTelemetry.properties (%chrome/global/aboutTelemetry.properties)
#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:
locale/@AB_CD@/browser/overrides/global.dtd (%chrome/global.dtd)
locale/@AB_CD@/browser/overrides/AccessFu.properties (%chrome/accessibility/AccessFu.properties)
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
--- a/mobile/locales/jar.mn
+++ b/mobile/locales/jar.mn
@@ -1,15 +1,15 @@
#filter substitution
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/
locale/@AB_CD@/browser/region.properties (%chrome/region.properties)
# 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