Bug 1434667 - Move the thunderbird branding to mail/branding. r=Pike,tomprince
authorRichard Marti <richard.marti@gmail.com>
Wed, 31 Jan 2018 21:10:46 +0100
changeset 58734 1ea8335be979cfa88206e3c47be898c8f33354ee
parent 58733 e62f73758e138743a47f2682f721862f09cd89c4
child 58735 7350e693cbb52a581f7c0874457ea6344e16a549
push id5878
push useracelists@atlas.sk
push dateSat, 03 Feb 2018 00:11:09 +0000
treeherdertry-comm-central@49a2e695b54a [default view] [failures only]
reviewersPike, tomprince
bugs1434667
Bug 1434667 - Move the thunderbird branding to mail/branding. r=Pike,tomprince
mail/branding/thunderbird/LICENSE
mail/branding/thunderbird/VisualElements_150.png
mail/branding/thunderbird/VisualElements_70.png
mail/branding/thunderbird/background.png
mail/branding/thunderbird/branding.nsi
mail/branding/thunderbird/configure.sh
mail/branding/thunderbird/content/about-background.png
mail/branding/thunderbird/content/about-logo.png
mail/branding/thunderbird/content/about-wordmark.png
mail/branding/thunderbird/content/about.png
mail/branding/thunderbird/content/aboutDialog.css
mail/branding/thunderbird/default128.png
mail/branding/thunderbird/default16.png
mail/branding/thunderbird/default22.png
mail/branding/thunderbird/default24.png
mail/branding/thunderbird/default256.png
mail/branding/thunderbird/default32.png
mail/branding/thunderbird/default48.png
mail/branding/thunderbird/default64.png
mail/branding/thunderbird/disk.icns
mail/branding/thunderbird/dsstore
mail/branding/thunderbird/jar.mn
mail/branding/thunderbird/locales/en-US/brand.dtd
mail/branding/thunderbird/locales/en-US/brand.properties
mail/branding/thunderbird/locales/jar.mn
mail/branding/thunderbird/locales/moz.build
mail/branding/thunderbird/messengerWindow.ico
mail/branding/thunderbird/moz.build
mail/branding/thunderbird/thunderbird-branding.js
mail/branding/thunderbird/thunderbird.VisualElementsManifest.xml
mail/branding/thunderbird/thunderbird.icns
mail/branding/thunderbird/wizHeader.bmp
mail/branding/thunderbird/wizHeaderRTL.bmp
mail/branding/thunderbird/wizWatermark.bmp
mail/confvars.sh
mail/locales/filter.py
mail/locales/l10n-beta.ini
mail/locales/l10n-central.ini
mail/locales/l10n.ini
mail/locales/l10n.toml
other-licenses/branding/thunderbird/LICENSE
other-licenses/branding/thunderbird/VisualElements_150.png
other-licenses/branding/thunderbird/VisualElements_70.png
other-licenses/branding/thunderbird/background.png
other-licenses/branding/thunderbird/branding.nsi
other-licenses/branding/thunderbird/configure.sh
other-licenses/branding/thunderbird/content/about-background.png
other-licenses/branding/thunderbird/content/about-logo.png
other-licenses/branding/thunderbird/content/about-wordmark.png
other-licenses/branding/thunderbird/content/about.png
other-licenses/branding/thunderbird/content/aboutDialog.css
other-licenses/branding/thunderbird/default128.png
other-licenses/branding/thunderbird/default16.png
other-licenses/branding/thunderbird/default22.png
other-licenses/branding/thunderbird/default24.png
other-licenses/branding/thunderbird/default256.png
other-licenses/branding/thunderbird/default32.png
other-licenses/branding/thunderbird/default48.png
other-licenses/branding/thunderbird/default64.png
other-licenses/branding/thunderbird/disk.icns
other-licenses/branding/thunderbird/dsstore
other-licenses/branding/thunderbird/jar.mn
other-licenses/branding/thunderbird/locales/en-US/brand.dtd
other-licenses/branding/thunderbird/locales/en-US/brand.properties
other-licenses/branding/thunderbird/locales/jar.mn
other-licenses/branding/thunderbird/locales/moz.build
other-licenses/branding/thunderbird/messengerWindow.ico
other-licenses/branding/thunderbird/moz.build
other-licenses/branding/thunderbird/thunderbird-branding.js
other-licenses/branding/thunderbird/thunderbird.VisualElementsManifest.xml
other-licenses/branding/thunderbird/thunderbird.icns
other-licenses/branding/thunderbird/wizHeader.bmp
other-licenses/branding/thunderbird/wizHeaderRTL.bmp
other-licenses/branding/thunderbird/wizWatermark.bmp
rename from other-licenses/branding/thunderbird/LICENSE
rename to mail/branding/thunderbird/LICENSE
--- a/other-licenses/branding/thunderbird/LICENSE
+++ b/mail/branding/thunderbird/LICENSE
@@ -1,6 +1,10 @@
-You are not granted rights or licenses to the trademarks of the
+These files are under the MPL 2, as below. However, please note that you 
+are not granted any trademark rights or licenses to the trademarks of the
 Mozilla Foundation or any party, including without limitation the
-Thunderbird name or logo.
+Firefox name or logo.
 
 For more information, see: http://www.mozilla.org/foundation/licensing.html 
 
+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/.
rename from other-licenses/branding/thunderbird/VisualElements_150.png
rename to mail/branding/thunderbird/VisualElements_150.png
rename from other-licenses/branding/thunderbird/VisualElements_70.png
rename to mail/branding/thunderbird/VisualElements_70.png
rename from other-licenses/branding/thunderbird/background.png
rename to mail/branding/thunderbird/background.png
rename from other-licenses/branding/thunderbird/branding.nsi
rename to mail/branding/thunderbird/branding.nsi
rename from other-licenses/branding/thunderbird/configure.sh
rename to mail/branding/thunderbird/configure.sh
rename from other-licenses/branding/thunderbird/content/about-background.png
rename to mail/branding/thunderbird/content/about-background.png
rename from other-licenses/branding/thunderbird/content/about-logo.png
rename to mail/branding/thunderbird/content/about-logo.png
rename from other-licenses/branding/thunderbird/content/about-wordmark.png
rename to mail/branding/thunderbird/content/about-wordmark.png
rename from other-licenses/branding/thunderbird/content/about.png
rename to mail/branding/thunderbird/content/about.png
rename from other-licenses/branding/thunderbird/content/aboutDialog.css
rename to mail/branding/thunderbird/content/aboutDialog.css
rename from other-licenses/branding/thunderbird/default128.png
rename to mail/branding/thunderbird/default128.png
rename from other-licenses/branding/thunderbird/default16.png
rename to mail/branding/thunderbird/default16.png
rename from other-licenses/branding/thunderbird/default22.png
rename to mail/branding/thunderbird/default22.png
rename from other-licenses/branding/thunderbird/default24.png
rename to mail/branding/thunderbird/default24.png
rename from other-licenses/branding/thunderbird/default256.png
rename to mail/branding/thunderbird/default256.png
rename from other-licenses/branding/thunderbird/default32.png
rename to mail/branding/thunderbird/default32.png
rename from other-licenses/branding/thunderbird/default48.png
rename to mail/branding/thunderbird/default48.png
rename from other-licenses/branding/thunderbird/default64.png
rename to mail/branding/thunderbird/default64.png
rename from other-licenses/branding/thunderbird/disk.icns
rename to mail/branding/thunderbird/disk.icns
rename from other-licenses/branding/thunderbird/dsstore
rename to mail/branding/thunderbird/dsstore
rename from other-licenses/branding/thunderbird/jar.mn
rename to mail/branding/thunderbird/jar.mn
rename from other-licenses/branding/thunderbird/locales/en-US/brand.dtd
rename to mail/branding/thunderbird/locales/en-US/brand.dtd
rename from other-licenses/branding/thunderbird/locales/en-US/brand.properties
rename to mail/branding/thunderbird/locales/en-US/brand.properties
rename from other-licenses/branding/thunderbird/locales/jar.mn
rename to mail/branding/thunderbird/locales/jar.mn
rename from other-licenses/branding/thunderbird/locales/moz.build
rename to mail/branding/thunderbird/locales/moz.build
rename from other-licenses/branding/thunderbird/messengerWindow.ico
rename to mail/branding/thunderbird/messengerWindow.ico
rename from other-licenses/branding/thunderbird/moz.build
rename to mail/branding/thunderbird/moz.build
rename from other-licenses/branding/thunderbird/thunderbird-branding.js
rename to mail/branding/thunderbird/thunderbird-branding.js
rename from other-licenses/branding/thunderbird/thunderbird.VisualElementsManifest.xml
rename to mail/branding/thunderbird/thunderbird.VisualElementsManifest.xml
rename from other-licenses/branding/thunderbird/thunderbird.icns
rename to mail/branding/thunderbird/thunderbird.icns
rename from other-licenses/branding/thunderbird/wizHeader.bmp
rename to mail/branding/thunderbird/wizHeader.bmp
rename from other-licenses/branding/thunderbird/wizHeaderRTL.bmp
rename to mail/branding/thunderbird/wizHeaderRTL.bmp
rename from other-licenses/branding/thunderbird/wizWatermark.bmp
rename to mail/branding/thunderbird/wizWatermark.bmp
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -23,17 +23,17 @@ fi
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 MOZ_APP_VERSION_DISPLAY_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt
 MOZ_APP_VERSION_DISPLAY=`cat $MOZ_APP_VERSION_DISPLAY_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
-MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/other-licenses/branding/thunderbird
+MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=thunderbird-comm-central
--- a/mail/locales/filter.py
+++ b/mail/locales/filter.py
@@ -1,15 +1,16 @@
 def test(mod, path, entity=None):
   import re
   # ignore anything but Thunderbird
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "devtools/shared", "devtools/client",
                  "mail", "chat", "editor/ui", "extensions/spellcheck",
-                 "other-licenses/branding/thunderbird"):
+                 "other-licenses/branding/thunderbird",
+                 "mail/branding/thunderbird"):
     return "ignore"
 
   # ignore MOZ_LANGPACK_CONTRIBUTORS
   if mod == "mail" and path == "defines.inc" and \
      entity == "MOZ_LANGPACK_CONTRIBUTORS":
     return "ignore"
   # ignore dictionaries
   if mod == "extensions/spellcheck":
--- a/mail/locales/l10n-beta.ini
+++ b/mail/locales/l10n-beta.ini
@@ -1,16 +1,17 @@
 [general]
 depth = ../..
 all = mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
+    mail/branding/thunderbird
     editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 devtools_client = mozilla/devtools/client/locales/l10n.ini
 
--- a/mail/locales/l10n-central.ini
+++ b/mail/locales/l10n-central.ini
@@ -1,16 +1,17 @@
 [general]
 depth = ../..
 all = mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
+    mail/branding/thunderbird
     editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 devtools_client = mozilla/devtools/client/locales/l10n.ini
 
--- a/mail/locales/l10n.ini
+++ b/mail/locales/l10n.ini
@@ -1,16 +1,17 @@
 [general]
 depth = ../..
 all = mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
+    mail/branding/thunderbird
     editor/ui
 
 [includes]
 # include toolkit from mozilla.
 # Don't specify which, use l10n-central.ini and friends if you're
 # not working on a local check-out
 toolkit = mozilla/toolkit/locales/l10n.ini
 devtools_client = mozilla/devtools/client/locales/l10n.ini
--- a/mail/locales/l10n.toml
+++ b/mail/locales/l10n.toml
@@ -87,16 +87,20 @@ locales = [
 [[paths]]
     reference = "editor/ui/locales/en-US/**"
     l10n = "{l}editor/ui/**"
 
 [[paths]]
     reference = "other-licenses/branding/thunderbird/locales/en-US/**"
     l10n = "{l}other-licenses/branding/thunderbird/**"
 
+[[paths]]
+    reference = "mail/branding/thunderbird/locales/en-US/**"
+    l10n = "{l}mail/branding/thunderbird/**"
+
 [[includes]]
     path = "{mozilla}/devtools/client/locales/l10n.toml"
 
 [[includes]]
     path = "{mozilla}/toolkit/locales/l10n.toml"
 
 [[paths]]
     reference = "{mozilla}/devtools/shim/locales/en-US/**"