Bug 1377911 - Move the override chrome entries from language manifests to product manifests. r=Pike a=merge
authorZibi Braniecki <zbraniecki@mozilla.com>
Thu, 24 Aug 2017 16:21:48 -0700
changeset 428902 31465a03c03d1eec31cd4dd5d6b803724dcb29cd
parent 428901 e8b80dec78b40a0ffff9406cd31ac832c5d821a4
child 428903 2f0b519d13e9dd945b37b235db1981d5ffb2199f
child 429019 b395d209667f8689d31ff48ee64392c85621aacb
child 429063 58df049ba4c4ebc210ee5dacd0fc4283bae730c9
push id1567
push userjlorenzo@mozilla.com
push dateThu, 02 Nov 2017 12:36:05 +0000
treeherdermozilla-release@e512c14a0406 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike, merge
bugs1377911
milestone57.0a1
first release with
nightly linux32
31465a03c03d / 57.0a1 / 20170826100418 / files
nightly linux64
31465a03c03d / 57.0a1 / 20170826100418 / files
nightly mac
31465a03c03d / 57.0a1 / 20170826100418 / files
nightly win32
31465a03c03d / 57.0a1 / 20170826100418 / files
nightly win64
31465a03c03d / 57.0a1 / 20170826100418 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1377911 - Move the override chrome entries from language manifests to product manifests. r=Pike a=merge MozReview-Commit-ID: 7VgO2ui9yH5
browser/base/jar.mn
browser/locales/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -169,8 +169,13 @@ browser.jar:
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
         content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
         content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)
 % overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
 
 % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
+
+# L10n resource overrides.
+% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
+% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
+% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
--- a/browser/locales/jar.mn
+++ b/browser/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 browser/base/jar.mn in order to avoid
+# having to create the same override entry for each locale.
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/browser/
 *   locale/browser/bookmarks.html                  (generic/profile/bookmarks.html.in)
     locale/browser/aboutAccounts.dtd               (%chrome/browser/aboutAccounts.dtd)
     locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)
     locale/browser/aboutPrivateBrowsing.dtd        (%chrome/browser/aboutPrivateBrowsing.dtd)
     locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties)
@@ -114,19 +116,16 @@
     locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)
     locale/browser/searchplugins/images/yandex-ru.ico  (searchplugins/images/yandex-ru.ico)
 % locale browser-region @AB_CD@ %locale/browser-region/
     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
 % locale pdf.js @AB_CD@ %locale/pdfviewer/
     locale/pdfviewer/viewer.properties             (%pdfviewer/viewer.properties)
     locale/pdfviewer/chrome.properties             (%pdfviewer/chrome.properties)
 
 #ifdef XPI_NAME
 # Bug 1240628, restructure how l10n repacks work with feature addons
 # This is hacky, but ensures the chrome.manifest chain is complete
 [.] chrome.jar: