|
|
@@ -0,0 +1,70 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Richard Marti <richard.marti@gmail.com>
|
|
|
+# Date 1502449119 -7200
|
|
|
+# Fri Aug 11 12:58:39 2017 +0200
|
|
|
+# Node ID 6d9c78bd8fd19aa651c91dd5a2c833f7324660d9
|
|
|
+# Parent 2d37489b09aa224a3931bfe7bf913053994dafb0
|
|
|
+Bug 1389407 - Move the override chrome entries from language manifests to product manifest. r=jorgk
|
|
|
+
|
|
|
+diff --git a/mail/base/jar.mn b/mail/base/jar.mn
|
|
|
+--- a/mail/base/jar.mn
|
|
|
++++ b/mail/base/jar.mn
|
|
|
+@@ -111,16 +111,19 @@ messenger.jar:
|
|
|
+ content/messenger/sanitize.xul (content/sanitize.xul)
|
|
|
+ content/messenger/sanitize.js (content/sanitize.js)
|
|
|
+ content/messenger/sanitizeDialog.css (content/sanitizeDialog.css)
|
|
|
+ content/messenger/sanitizeDialog.js (content/sanitizeDialog.js)
|
|
|
+ * content/messenger/toolbarIconColor.js (content/toolbarIconColor.js)
|
|
|
+ # the following files are mail-specific overrides
|
|
|
+ * content/messenger/license.html (/@mozreltopsrcdir@/toolkit/content/license.html)
|
|
|
+ % override chrome://global/content/license.html chrome://messenger/content/license.html
|
|
|
++# L10n resource overrides
|
|
|
++% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://messenger/locale/downloads/settingsChange.dtd
|
|
|
++% override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd
|
|
|
+
|
|
|
+ * content/messenger/buildconfig.html (content/buildconfig.html)
|
|
|
+ content/messenger/buildconfig.css (content/buildconfig.css)
|
|
|
+ % override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
|
|
|
+ % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css
|
|
|
+
|
|
|
+ comm.jar:
|
|
|
+ % content communicator %content/communicator/
|
|
|
+diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
|
|
|
+--- a/mail/locales/jar.mn
|
|
|
++++ b/mail/locales/jar.mn
|
|
|
+@@ -1,32 +1,32 @@
|
|
|
+ # 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 mail/base/jar.mn in order to avoid
|
|
|
++# having to create the same override entry for each locale.
|
|
|
+
|
|
|
+ #filter substitution
|
|
|
+
|
|
|
+ @AB_CD@.jar:
|
|
|
+ % locale messenger @AB_CD@ %locale/@AB_CD@/messenger/
|
|
|
+-% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://messenger/locale/downloads/settingsChange.dtd
|
|
|
+-% override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd
|
|
|
+ locale/@AB_CD@/messenger/aboutDialog.dtd (%chrome/messenger/aboutDialog.dtd)
|
|
|
+ locale/@AB_CD@/messenger/aboutDownloads.dtd (%chrome/messenger/aboutDownloads.dtd)
|
|
|
+ locale/@AB_CD@/messenger/aboutRights.dtd (%chrome/messenger/aboutRights.dtd)
|
|
|
+ locale/@AB_CD@/messenger/aboutRights.properties (%chrome/messenger/aboutRights.properties)
|
|
|
+ locale/@AB_CD@/messenger/aboutSupportMail.dtd (%chrome/messenger/aboutSupportMail.dtd)
|
|
|
+ locale/@AB_CD@/messenger/aboutSupportMail.properties (%chrome/messenger/aboutSupportMail.properties)
|
|
|
+ locale/@AB_CD@/messenger/telemetry.properties (%chrome/messenger/telemetry.properties)
|
|
|
+ locale/@AB_CD@/messenger/accountCreation.dtd (%chrome/messenger/accountCreation.dtd)
|
|
|
+ locale/@AB_CD@/messenger/accountCreation.properties (%chrome/messenger/accountCreation.properties)
|
|
|
+ locale/@AB_CD@/messenger/accountCreationModel.properties (%chrome/messenger/accountCreationModel.properties)
|
|
|
+ locale/@AB_CD@/messenger/accountCreationUtil.properties (%chrome/messenger/accountCreationUtil.properties)
|
|
|
+ locale/@AB_CD@/messenger/charsetTitles.properties (%chrome/messenger/charsetTitles.properties)
|
|
|
+- locale/@AB_CD@/messenger/systemIntegrationDialog.dtd (%chrome/messenger/systemIntegrationDialog.dtd)
|
|
|
++ locale/@AB_CD@/messenger/systemIntegrationDialog.dtd (%chrome/messenger/systemIntegrationDialog.dtd)
|
|
|
+ locale/@AB_CD@/messenger/virtualFolderProperties.dtd (%chrome/messenger/virtualFolderProperties.dtd)
|
|
|
+ locale/@AB_CD@/messenger/virtualFolderListDialog.dtd (%chrome/messenger/virtualFolderListDialog.dtd)
|
|
|
+ locale/@AB_CD@/messenger/multimessageview.properties (%chrome/messenger/multimessageview.properties)
|
|
|
+ locale/@AB_CD@/messenger/multimessageview.dtd (%chrome/messenger/multimessageview.dtd)
|
|
|
+ locale/@AB_CD@/messenger/mailOverlay.dtd (%chrome/messenger/mailOverlay.dtd)
|
|
|
+ locale/@AB_CD@/messenger/messenger.dtd (%chrome/messenger/messenger.dtd)
|
|
|
+ locale/@AB_CD@/messenger/viewZoomOverlay.dtd (%chrome/messenger/viewZoomOverlay.dtd)
|
|
|
+ locale/@AB_CD@/messenger/customizeToolbarOverlay.dtd (%chrome/messenger/customizeToolbarOverlay.dtd)
|
Bill Gianopoulos