Mostly remove non-relevant branding

73 files changed, 0 insertions, 879 deletions

diff --git a/other-licenses/branding/instantbird/Makefile.in b/other-licenses/branding/instantbird/Makefile.in
deleted file mode 100644
index 75a6d57b7..000000000
--- a/other-licenses/branding/instantbird/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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/.
-
-# Branding Makefile for nightlies/unofficial branding
-
-include $(topsrcdir)/config/rules.mk
-
-export::
-	$(NSINSTALL) -D $(DIST)/branding
-ifeq ($(OS_ARCH),WINNT)
-	cp $(srcdir)/instantbird.ico   $(DIST)/branding/instantbird.ico
-	cp $(srcdir)/instantbird.ico   $(DIST)/branding/app.ico
-	cp $(srcdir)/branding.nsi      $(DIST)/branding/branding.nsi
-	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
-	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
-	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
-endif
-ifdef MOZ_SPLASHSCREEN
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-	cp $(srcdir)/splash.bmp       $(DIST)/branding/splash.bmp
-endif
-endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-	cp $(srcdir)/instantbird.icns  $(DIST)/branding/instantbird.icns
-	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore
-	cp $(srcdir)/background.png    $(DIST)/branding/background.png
-	cp $(srcdir)/disk.icns         $(DIST)/branding/disk.icns
-#	cp $(srcdir)/license.r         $(DIST)/branding/license.r
-endif
-ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
-	cp $(srcdir)/mozicon128.png    $(DIST)/branding/mozicon128.png
-	cp $(srcdir)/mozicon16.xpm     $(DIST)/branding/mozicon16.xpm
-	cp $(srcdir)/mozicon50.xpm     $(DIST)/branding/mozicon50.xpm
-	cp $(srcdir)/default16.png     $(DIST)/branding/default16.png
-endif
-
-# Now sort out the branding specific icons
-ifeq ($(OS_ARCH),WINNT)
-	cp $(srcdir)/windows/blistWindow.ico $(DIST)/branding/blistWindow.ico
-	cp $(srcdir)/windows/convWindow.ico  $(DIST)/branding/convWindow.ico
-	cp $(srcdir)/windows/default.ico     $(DIST)/branding/default.ico
-endif
-ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
-	cp $(srcdir)/gtk/blistWindow.png    $(DIST)/branding/blistWindow.png
-	cp $(srcdir)/gtk/blistWindow16.png  $(DIST)/branding/blistWindow16.png
-	cp $(srcdir)/gtk/blistWindow48.png  $(DIST)/branding/blistWindow48.png
-	cp $(srcdir)/gtk/convWindow.png     $(DIST)/branding/convWindow.png
-	cp $(srcdir)/gtk/convWindow16.png   $(DIST)/branding/convWindow16.png
-	cp $(srcdir)/gtk/convWindow48.png   $(DIST)/branding/convWindow48.png
-	cp $(srcdir)/gtk/default.png        $(DIST)/branding/default.png
-	cp $(srcdir)/gtk/default16.png      $(DIST)/branding/default16.png
-	cp $(srcdir)/gtk/default48.png      $(DIST)/branding/default48.png
-endif
diff --git a/other-licenses/branding/instantbird/background.png b/other-licenses/branding/instantbird/background.png
deleted file mode 100644
index 0b96d92ee..000000000
--- a/other-licenses/branding/instantbird/background.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/branding.nsi b/other-licenses/branding/instantbird/branding.nsi
deleted file mode 100644
index bcbbe0537..000000000
--- a/other-licenses/branding/instantbird/branding.nsi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/.
-
-# NSIS defines for release builds.
-
-# BrandFullNameInternal is used for some registry and file system values that
-# should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
-!define BrandFullNameInternal "Instantbird"
-!define CompanyName           "Instantbird"
-!define URLInfoAbout          "http://www.instantbird.com/"
-!define URLUpdateInfo         "http://www.instantbird.com/"
-
diff --git a/other-licenses/branding/instantbird/configure.sh b/other-licenses/branding/instantbird/configure.sh
deleted file mode 100644
index 75301ecd6..000000000
--- a/other-licenses/branding/instantbird/configure.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-MOZ_APP_DISPLAYNAME=Instantbird
diff --git a/other-licenses/branding/instantbird/content/about-credits.png b/other-licenses/branding/instantbird/content/about-credits.png
deleted file mode 100644
index a780410e0..000000000
--- a/other-licenses/branding/instantbird/content/about-credits.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/content/about-footer.png b/other-licenses/branding/instantbird/content/about-footer.png
deleted file mode 100644
index 94d9124a3..000000000
--- a/other-licenses/branding/instantbird/content/about-footer.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/content/about.png b/other-licenses/branding/instantbird/content/about.png
deleted file mode 100644
index b2ab1d9b7..000000000
--- a/other-licenses/branding/instantbird/content/about.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/content/icon64.png b/other-licenses/branding/instantbird/content/icon64.png
deleted file mode 100644
index 4463dce37..000000000
--- a/other-licenses/branding/instantbird/content/icon64.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/default16.png b/other-licenses/branding/instantbird/default16.png
deleted file mode 100644
index 1ef44d21f..000000000
--- a/other-licenses/branding/instantbird/default16.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/disk.icns b/other-licenses/branding/instantbird/disk.icns
deleted file mode 100644
index 24dee04f5..000000000
--- a/other-licenses/branding/instantbird/disk.icns
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/dsstore b/other-licenses/branding/instantbird/dsstore
deleted file mode 100644
index f5079c58c..000000000
--- a/other-licenses/branding/instantbird/dsstore
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/blistWindow.png b/other-licenses/branding/instantbird/gtk/blistWindow.png
deleted file mode 100644
index 6a1a6c3da..000000000
--- a/other-licenses/branding/instantbird/gtk/blistWindow.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/blistWindow16.png b/other-licenses/branding/instantbird/gtk/blistWindow16.png
deleted file mode 100644
index 73bd14a1e..000000000
--- a/other-licenses/branding/instantbird/gtk/blistWindow16.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/blistWindow48.png b/other-licenses/branding/instantbird/gtk/blistWindow48.png
deleted file mode 100644
index 8264a4ec5..000000000
--- a/other-licenses/branding/instantbird/gtk/blistWindow48.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/convWindow.png b/other-licenses/branding/instantbird/gtk/convWindow.png
deleted file mode 100644
index 529349bb6..000000000
--- a/other-licenses/branding/instantbird/gtk/convWindow.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/convWindow16.png b/other-licenses/branding/instantbird/gtk/convWindow16.png
deleted file mode 100644
index 08257b314..000000000
--- a/other-licenses/branding/instantbird/gtk/convWindow16.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/convWindow48.png b/other-licenses/branding/instantbird/gtk/convWindow48.png
deleted file mode 100644
index 3b3cdabfc..000000000
--- a/other-licenses/branding/instantbird/gtk/convWindow48.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/default.png b/other-licenses/branding/instantbird/gtk/default.png
deleted file mode 100644
index e2c932611..000000000
--- a/other-licenses/branding/instantbird/gtk/default.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/default16.png b/other-licenses/branding/instantbird/gtk/default16.png
deleted file mode 100644
index 1ef44d21f..000000000
--- a/other-licenses/branding/instantbird/gtk/default16.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/gtk/default48.png b/other-licenses/branding/instantbird/gtk/default48.png
deleted file mode 100644
index 56d2b459d..000000000
--- a/other-licenses/branding/instantbird/gtk/default48.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/instantbird.icns b/other-licenses/branding/instantbird/instantbird.icns
deleted file mode 100644
index fe522f0f0..000000000
--- a/other-licenses/branding/instantbird/instantbird.icns
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/instantbird.ico b/other-licenses/branding/instantbird/instantbird.ico
deleted file mode 100644
index cd81a18bf..000000000
--- a/other-licenses/branding/instantbird/instantbird.ico
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/jar.mn b/other-licenses/branding/instantbird/jar.mn
deleted file mode 100644
index 16f56da5d..000000000
--- a/other-licenses/branding/instantbird/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/.
-
-instantbird.jar:
-% content branding %content/branding/
-	content/branding/about-credits.png	(content/about-credits.png)
-	content/branding/about-footer.png	(content/about-footer.png)
-	content/branding/about.png		(content/about.png)
-	content/branding/icon64.png		(content/icon64.png)
diff --git a/other-licenses/branding/instantbird/locales/en-US/brand.dtd b/other-licenses/branding/instantbird/locales/en-US/brand.dtd
deleted file mode 100644
index 6060bd995..000000000
--- a/other-licenses/branding/instantbird/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 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/. -->
-
-<!-- release branding -->
-
-<!ENTITY  brandShortName        "Instantbird">
-<!ENTITY  brandFullName         "Instantbird">
-<!ENTITY  brandMotto            "'Cause witches can also type!">
-<!ENTITY  vendorShortName       "Instantbird">
diff --git a/other-licenses/branding/instantbird/locales/en-US/brand.properties b/other-licenses/branding/instantbird/locales/en-US/brand.properties
deleted file mode 100644
index 9d92abf47..000000000
--- a/other-licenses/branding/instantbird/locales/en-US/brand.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/.
-
-brandShortName=Instantbird
-brandFullName=Instantbird
-vendorShortName=Instantbird
diff --git a/other-licenses/branding/instantbird/locales/jar.mn b/other-licenses/branding/instantbird/locales/jar.mn
deleted file mode 100644
index 4fb707f30..000000000
--- a/other-licenses/branding/instantbird/locales/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-#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/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/@AB_CD@/branding/
-	locale/@AB_CD@/branding/brand.dtd		(%brand.dtd)
-	locale/@AB_CD@/branding/brand.properties	(%brand.properties)
diff --git a/other-licenses/branding/instantbird/locales/moz.build b/other-licenses/branding/instantbird/locales/moz.build
deleted file mode 100644
index e59008d87..000000000
--- a/other-licenses/branding/instantbird/locales/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: set filetype=python:
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
-
-DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
diff --git a/other-licenses/branding/instantbird/moz.build b/other-licenses/branding/instantbird/moz.build
deleted file mode 100644
index bd8ad850b..000000000
--- a/other-licenses/branding/instantbird/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: set filetype=python:
-# 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/.
-
-DIRS += ['locales']
-
-JAR_MANIFESTS += ['jar.mn']
diff --git a/other-licenses/branding/instantbird/mozicon128.png b/other-licenses/branding/instantbird/mozicon128.png
deleted file mode 100644
index 4f10a67b0..000000000
--- a/other-licenses/branding/instantbird/mozicon128.png
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/mozicon16.xpm b/other-licenses/branding/instantbird/mozicon16.xpm
deleted file mode 100644
index 66e3df1d8..000000000
--- a/other-licenses/branding/instantbird/mozicon16.xpm
+++ /dev/null
@@ -1,230 +0,0 @@
-/* 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/. */
-
-/* XPM */
-static char *instantbird_16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 204 2",
-"   c #161E25",
-".  c #132636",
-"X  c #132638",
-"o  c #340000",
-"O  c #251925",
-"+  c #0F2F4D",
-"@  c #0C375C",
-"#  c #093A65",
-"$  c #093B68",
-"%  c #1F415F",
-"&  c #0F416C",
-"*  c #064175",
-"=  c #09497E",
-"-  c #1E4D6A",
-";  c #194E70",
-":  c #3E4150",
-">  c #27586D",
-",  c #316171",
-"<  c #5C3E36",
-"1  c #78462F",
-"2  c #53574F",
-"3  c #4D5F73",
-"4  c #466762",
-"5  c #4D637A",
-"6  c #5D6E7B",
-"7  c #6D674D",
-"8  c #6E6C56",
-"9  c #677C57",
-"0  c #6D6464",
-"q  c #797D74",
-"w  c #06559B",
-"e  c #0F5B91",
-"r  c #13548F",
-"t  c #0B68AB",
-"y  c #0969B4",
-"u  c #21598B",
-"i  c #2D5F85",
-"p  c #32628B",
-"a  c #266EA0",
-"s  c #2D72A1",
-"d  c #2C7BAA",
-"f  c #0F7ECB",
-"g  c #487186",
-"h  c #40789E",
-"j  c #537F85",
-"k  c #457DA9",
-"l  c #757E80",
-"z  c #788965",
-"x  c #3988B2",
-"c  c #1890D1",
-"v  c #19A2E6",
-"b  c #2A97C5",
-"n  c #21B3ED",
-"m  c #28B4EC",
-"M  c #2DBEEF",
-"N  c #27BDF0",
-"B  c #1CC5F4",
-"V  c #1EC6F4",
-"C  c #1CCDF7",
-"Z  c #1CCEF7",
-"A  c #1CD5FA",
-"S  c #3AC4D9",
-"D  c #2FCBE6",
-"F  c #2CCEE9",
-"G  c #29C5F2",
-"H  c #2CC5F2",
-"J  c #2ACDF6",
-"K  c #34C1F0",
-"L  c #36C9F3",
-"P  c #4481AD",
-"I  c #4C88B2",
-"U  c #42AAC5",
-"Y  c #44BADF",
-"T  c #58A1C6",
-"R  c #63B7DB",
-"E  c #72B2D3",
-"W  c #75BFE2",
-"Q  c #56C0BE",
-"!  c #7CC09B",
-"~  c #47D0F4",
-"^  c #63D9F5",
-"/  c #7ECFF0",
-"(  c #71D6E7",
-")  c #7AD1EF",
-"_  c #71D5F2",
-"`  c #8C583B",
-"'  c #83644C",
-"]  c #8B664D",
-"[  c #85704A",
-"{  c #877A59",
-"}  c #9B6B4A",
-"|  c #907747",
-" . c #997253",
-".. c #857161",
-"X. c #AB774F",
-"o. c #A47751",
-"O. c #AB7A51",
-"+. c #AD7951",
-"@. c #AC7B53",
-"#. c #B07C53",
-"$. c #B27E54",
-"%. c #8F8154",
-"&. c #8F8650",
-"*. c #8E9552",
-"=. c #979849",
-"-. c #98994A",
-";. c #93915F",
-":. c #939A56",
-">. c #909B5D",
-",. c #979E58",
-"<. c #949C5C",
-"1. c #9B9053",
-"2. c #989256",
-"3. c #989C52",
-"4. c #989D54",
-"5. c #989E55",
-"6. c #808370",
-"7. c #9E8B75",
-"8. c #989675",
-"9. c #99A660",
-"0. c #9CBD75",
-"q. c #B58156",
-"w. c #B28258",
-"e. c #B28259",
-"r. c #B3875F",
-"t. c #B6875B",
-"y. c #BD895C",
-"u. c #A18061",
-"i. c #A38261",
-"p. c #AE8C6D",
-"a. c #A9927D",
-"s. c #B38861",
-"d. c #B4936B",
-"f. c #B19170",
-"g. c #B49677",
-"h. c #A2A355",
-"j. c #A9B15E",
-"k. c #AFB55B",
-"l. c #B2AC56",
-"z. c #A3AE62",
-"x. c #A2B369",
-"c. c #A7B86A",
-"v. c #AEB668",
-"b. c #ADBA65",
-"n. c #AFC26A",
-"m. c #A3C97B",
-"M. c #A2CA7C",
-"N. c #A2CD7D",
-"B. c #A8C672",
-"V. c #B5C164",
-"C. c #B9C865",
-"Z. c #BDD27C",
-"A. c #C29061",
-"S. c #C59463",
-"D. c #C7A074",
-"F. c #D5A46E",
-"G. c #D6A56F",
-"H. c #DEAC72",
-"J. c #F2BE7F",
-"K. c #C0CB61",
-"L. c #CFC062",
-"P. c #DECF70",
-"I. c #D1D479",
-"U. c #D4D67A",
-"Y. c #FCE175",
-"T. c #FFE47D",
-"R. c #919C87",
-"E. c #83A49A",
-"W. c #96AD8B",
-"Q. c #9CAD91",
-"!. c #AF9C86",
-"~. c #83CEE8",
-"^. c #8BCCE4",
-"/. c #82D7EF",
-"(. c #8CD7E4",
-"). c #8CD4EB",
-"_. c #8AD8F2",
-"`. c #93D4EA",
-"'. c #96D8EC",
-"]. c #9FD5E9",
-"[. c #9BD9ED",
-"{. c #A5D6EA",
-"}. c #B3E3F2",
-"|. c #B5E2F2",
-" X c #C6B89D",
-".X c #DEB684",
-"XX c #E6BD89",
-"oX c #EBC088",
-"OX c #F4CE98",
-"+X c #EACDA1",
-"@X c #EDD1A2",
-"#X c #E8D6AF",
-"$X c #E8DAB6",
-"%X c #F8DEAE",
-"&X c #FFE789",
-"*X c #FFEA97",
-"=X c #FFEB9A",
-"-X c #FFEDA6",
-";X c #FFEEA8",
-":X c #FFEFAF",
-">X c #F5E1B4",
-",X c #F8EAC0",
-"<X c gray100",
-"1X c None",
-/* pixels */
-"1X1X1X1X1X1Xr I d P a 1X1X1X1X1X",
-"1X1X1X1Xk E ].) K '.^.T s 1X1X1X",
-"1X:X*XE.{.|.}._ B /.[.`.R e 1X1X",
-"-XT.P.W / _.L J ^ ~ H ).~.c = 1X",
-"&XY.j.U n N B Z A Z G M m v t 1X",
-"&XL.b.n.! Q S D F ( (.Y b x h < ",
-"=Xl.x.V.C.B.M.N.N.Z.U.6.a.+Xe.] ",
-";Xh.k.c.{ [ K.z.0.m.I.8.>Xs.H.u.",
-"1Xz 9.&.$Xg.;.q 7.R.W.Q.l 6 5 : ",
-"1Xg <.-.d.} O. Xp.XX@.0 f y w @ ",
-"1X% P -.&.G.o.u.D.q.r.5 u p i O ",
-"1X1X& , :.| 2.v.1.' !.#X@XXXy.1 ",
-"1X1X. * > *.3.4.5.8 >Xf..XA.S.+.",
-"1X1X1X. $ ; 9 =.-.7 >XOXt.F.J.X.",
-"1X1X1X1X  + # - 4 2 .. .$.$.q.` ",
-"1X1X1X1X1X1X1X      1X1X1X1Xo o "
-};
diff --git a/other-licenses/branding/instantbird/mozicon50.xpm b/other-licenses/branding/instantbird/mozicon50.xpm
deleted file mode 100644
index 34291a7e2..000000000
--- a/other-licenses/branding/instantbird/mozicon50.xpm
+++ /dev/null
@@ -1,315 +0,0 @@
-/* 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/. */
-
-/* XPM */
-static char *instantbird_48[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 257 2",
-"   c black",
-".  c #1E161D",
-"X  c #161D25",
-"o  c #18192A",
-"O  c #162028",
-"+  c #132638",
-"@  c #340000",
-"#  c #3C0805",
-"$  c #310F12",
-"%  c #392E3D",
-"&  c #252230",
-"*  c #341822",
-"=  c #0D3457",
-"-  c #132C47",
-";  c #163150",
-":  c #0A3A65",
-">  c #053F73",
-",  c #133864",
-"<  c #2A2F48",
-"1  c #044174",
-"2  c #04447B",
-"3  c #094372",
-"4  c #18476B",
-"5  c #114870",
-"6  c #305C6E",
-"7  c #3A6369",
-"8  c #410D09",
-"9  c #44110C",
-"0  c #4C1A12",
-"q  c #441916",
-"w  c #511E15",
-"e  c #552619",
-"r  c #4A2016",
-"t  c #4C2825",
-"y  c #552B24",
-"u  c #5D3223",
-"i  c #5A3328",
-"p  c #573936",
-"a  c #48363A",
-"s  c #602E1E",
-"d  c #633323",
-"f  c #663828",
-"g  c #643D33",
-"h  c #602E20",
-"j  c #5A4332",
-"k  c #67442B",
-"l  c #674636",
-"z  c #73422C",
-"x  c #754734",
-"c  c #705534",
-"v  c #484752",
-"b  c #4C5461",
-"n  c #5A735A",
-"m  c #526E5D",
-"M  c #795748",
-"N  c #684F47",
-"B  c #756D48",
-"V  c #657572",
-"C  c #003399",
-"Z  c blue",
-"A  c #044A84",
-"S  c #044C8A",
-"D  c #044786",
-"F  c #055397",
-"G  c #16568A",
-"H  c #165993",
-"J  c #025288",
-"K  c #065BA3",
-"L  c #1A6199",
-"P  c #0862AA",
-"I  c #096AB4",
-"U  c #0F70B7",
-"Y  c #3D6989",
-"T  c #336F93",
-"R  c #3179AB",
-"E  c #0B7AC7",
-"W  c #567D97",
-"Q  c #7B8957",
-"!  c #779172",
-"~  c #008080",
-"^  c #3B86B3",
-"/  c #0D88DA",
-"(  c #1192DD",
-")  c #128AD3",
-"_  c #169AE2",
-"`  c #18A1E5",
-"'  c #1CACEA",
-"]  c #1BA6E8",
-"[  c #1DB3ED",
-"{  c #1DB8EF",
-"}  c #1DBCF0",
-"|  c #3498CE",
-" . c #36B2D5",
-".. c #24B8EC",
-"X. c #33B1E8",
-"o. c #1CC3F3",
-"O. c #1CCAF6",
-"+. c #1CCFF8",
-"@. c #1CD1F8",
-"#. c #3AC8D9",
-"$. c #29C5F2",
-"%. c #3ACBF3",
-"&. c #2ECCEE",
-"*. c #40819E",
-"=. c #4D8EB7",
-"-. c #53B4BC",
-";. c #74B498",
-":. c #58A2C5",
-">. c #42A0CC",
-",. c #53BEE8",
-"<. c #48B7E7",
-"1. c #73A9C3",
-"2. c #70AFCF",
-"3. c #539BC8",
-"4. c #74C5A3",
-"5. c #5AC7BC",
-"6. c #45C5EE",
-"7. c #45CBF1",
-"8. c #50CCF1",
-"9. c #65CAEB",
-"0. c #78D3EE",
-"q. c #71D2F0",
-"w. c #5BC6D1",
-"e. c #89583A",
-"r. c #895539",
-"t. c #80763F",
-"y. c #865D43",
-"u. c #8A6249",
-"i. c #876653",
-"p. c #976545",
-"a. c #997457",
-"s. c #8D7152",
-"d. c #A87953",
-"f. c #B27E54",
-"g. c #8F833C",
-"h. c #88874A",
-"j. c #818A54",
-"k. c #989748",
-"l. c #98994A",
-"z. c #94954A",
-"x. c #989C53",
-"c. c #989F58",
-"v. c #939852",
-"b. c #92904C",
-"n. c #93926D",
-"m. c #99A25B",
-"M. c #9DA156",
-"N. c #9AA964",
-"B. c #99A762",
-"V. c #9BB572",
-"C. c #9DBB75",
-"Z. c #98BB7C",
-"A. c #9BB26E",
-"S. c #AD8158",
-"D. c #B78559",
-"F. c #A29453",
-"G. c #B48E69",
-"H. c #A6A95C",
-"J. c #B0AF54",
-"K. c #ACB864",
-"L. c #A1BE75",
-"P. c #B3B664",
-"I. c #A6AC68",
-"U. c #BDC25D",
-"Y. c #A1C479",
-"T. c #A2CA7B",
-"R. c #AAC674",
-"E. c #B4C568",
-"W. c #B0CB7A",
-"Q. c #AFC368",
-"!. c #9DC57F",
-"~. c #C5B13F",
-"^. c #C59766",
-"/. c #CD9D6B",
-"(. c #C9BC48",
-"). c #C7BD4C",
-"_. c #D5A36D",
-"`. c #DCAB73",
-"'. c #D6AA77",
-"]. c #C6A078",
-"[. c #EDBA7C",
-"{. c #E4B278",
-"}. c #F1BD7E",
-"|. c #E1AE75",
-" X c #C8C956",
-".X c #D4C94A",
-"XX c #CFC74D",
-"oX c #C2C965",
-"OX c #C9C971",
-"+X c #CDD279",
-"@X c #CCD077",
-"#X c #D8CA77",
-"$X c #D2D479",
-"%X c #FFDF5D",
-"&X c #EDCE48",
-"*X c #FDDE63",
-"=X c #E9D36F",
-"-X c #FFE16A",
-";X c #FFE066",
-":X c #FFE273",
-">X c #FDE47D",
-",X c #AF9A84",
-"<X c #BAA587",
-"1X c #8CB0AC",
-"2X c #9BC78C",
-"3X c #93CDDA",
-"4X c #87CDE6",
-"5X c #8CD2E8",
-"6X c #8BD0E7",
-"7X c #85DBF2",
-"8X c #93D4E9",
-"9X c #9BDAEC",
-"0X c #98D8E9",
-"qX c #99DDF1",
-"wX c #A4DAEC",
-"eX c #AEDDEF",
-"rX c #ADE1F1",
-"tX c #A4E2F1",
-"yX c #B3E2F1",
-"uX c #BAE4F3",
-"iX c #93E0F1",
-"pX c #D2B58E",
-"aX c #EEBE83",
-"sX c #C7BFA3",
-"dX c #CFC68F",
-"fX c #D8D1B2",
-"gX c #D7C7A5",
-"hX c #EAC796",
-"jX c #F2C184",
-"kX c #F3C68B",
-"lX c #F4CC93",
-"zX c #F5CF98",
-"xX c #F5D29C",
-"cX c #EDC186",
-"vX c #E6D2A9",
-"bX c #F5D5A2",
-"nX c #F7D9A6",
-"mX c #F8DDAC",
-"MX c #F6DBAA",
-"NX c #EADBB6",
-"BX c #FEE581",
-"VX c #FFE78C",
-"CX c #FFE993",
-"ZX c #FFEB9B",
-"AX c #FFEEAC",
-"SX c #FFEDA5",
-"DX c #F9E2B3",
-"FX c #F9E6B9",
-"GX c #FFF1BA",
-"HX c #FBEDC2",
-"JX c #F0EAC7",
-"KX c #FBF2CA",
-"LX c #F6F1CE",
-"PX c #FBF7D2",
-"IX c #EFE8C5",
-"UX c gray100",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXK D D D A A YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXD G R =.2.2.| | 2.:.=.R H D D YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXZ G R 2.wXwXwXwX6.o...0X9XqXqX8X2.^ G D YXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXG =.0XeXeXrXeXtX0.} } } 9.qX9X9X0X8X8X8X:.H D YXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXD R 3XeXuXeXyXrXrXrXiX$.o.o.o.8.9X9X9X0X8X8X8X4X^ A YXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXHXT W eXeXuXeXyXyXyXyXrXrX$.o.o.o.q.wX9X9X0X0X8X8X5X6X2.G 2 YXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXAXZXVXBXpX1.yXyXuXeXuXuXyXyXyXrXtXO.o.O.o.%.9X9XqX0X8X8X8X5X6X0.0.L D YXYXYXYXYXYXYX",
-"YXYXYXYXAXCX-X:X:X#X1.yXuXuXuXuXuXuXyXyXyXrX8.O.+.O.%.&.7XqXqX9X0X8X8X5X6.,.<.) L J YXYXYXYXYXYX",
-"YXYXAXCX:X;X:X;X=X^ eXyXuXuXuXuXuX7X%.8.rXiX@.+.@.q.iX0.tXiX7.$.9.5X8X5X6X4X9._ ( J 2 YXYXYXYXYX",
-"YXAXCX:X%XBX*XBXn._ eXuX0.0.uXuXuXO.o.O.+.+.+.@.7XiXtX@.%.$.o.o.} 5X8X5X6X6X,._ _ ) D YXYXYXYXYX",
-"YXZX>X%XBX:X*XJ.;.X.eX0...{ 9.uX0.o.o.O.O.+.@.@.@.7.%.@.O.o.o.} } 8.5X5X5X6X4X<._ ) I D YXYXYXYX",
-"SXBX:X-XBX-X%Xm.A.| ' ' [ [ %.9.$.o.o.o.O.O.@.@.@.@.+.+.O.o.o.o.} { 6.4X,.6.X.` _ ( / J Z YXYXYX",
-"CXBX-X-XBX>X(.V.C.;.] ' [ [ { { o.o.o.o.O.O.+.@.@.@.+.O.O.o.o.o.o.{ [ ..' [ ' ` _ ( / I A YXYXYX",
-"VXBX:X;XBX#X(.K.C.L.4.' [ [ { { } o.o.o.O.O.+.+.@.+.O.O.o.o.$.q.9...{ [ [ ' ' _ ( / / ) S C YXYX",
-"VXBXBX%XBXH.K..XR.C.C.2X-...{ { } } o.O.O.O.O.O.+.O.O.%.7.o.$.0X0X9...[ ' ' ' ` ( / / ) P 2 YXYX",
-"VXBXBX*X-Xm.A.U.XXR.L.T.Y.!.4.5.<.o.o.o.@.@.+.O.O.o.O.7X9X0.8.0X0X0XX.' ' ' ] _ ) U U H G - @ @ ",
-"ZXBXBX>X&Xm.A.V. XXXQ.T.Y.L.R.T.Y.T.!.4.5.5.#.#.#.#.@.q.0X0XwX3XwX3X-.T 6 v a p M i.s.a.p.r.# 8 ",
-"SXBXBXBX(. XA.A.V.U..X XR.Y.Y.T.T.T.T.T.T.T.T.T.T.T.T.T.=X$X$X$X$X$Xn @ M JXPXGXFXMXxXlXD.w e.0 ",
-"AXBX>X:XJ.(.K.A.V.V.E.XX.XU.R.Y.T.T.T.T.T.T.T.T.T.T.T.T.$X$X$X$X$X#Xn.N M g gXFXMXxXkXd.s ^./.0 ",
-"YXCXBXBXc.J..XP.V.C.C.C.E..X.XJ.Q.T.T.T.T.T.T.T.T.T.T.T.T.$X$X$X$X$XOXp LX<Xy u.zXzXp.d _.}._.8 ",
-"YXAXBXBXH.B.J..XK.V.C.C.C.L.u 0 XX.X XW.T.T.T.T.T.T.T.T.T.T.@X$X#X+X@Xp KXHXvXi.w g f `.}.}.|.8 ",
-"YXYXVX=XH.B.B.XX.XK.C.C.C.j g q u XX.X.X.XoXE.Y.T.Y.T.T.T.W.$X$X+X+X#Xp HXDXMXzX/.y.|.}.}.}.[.8 ",
-"YXYXSX#XH.B.B.m.XX.XP.V.k N fXg n.c R.E. X.Xg.# k Q T.T.T.T.+X$X+X@X@Xi NXmXxXlXkXaX}.}.}.}.}.8 ",
-"YXYXYX#XP.m.B.N.A.).~.e M PXfXg GXi.B T.Y.Y.p y n.s.r c n.!.R.+X+X+X+Xp pXnXaXaX/.f.d.i.M l y # ",
-"YXYXYXdXP.c.m.B.B.A.0 ,XPXLXgXf DXmXg j.Y.V.a sXi HXDXpXc t V 2XOX#XOXN w $ $ * & < ; ; , , ; @ ",
-"YXYXYXYXn.H.c.m.B.N.B s.HXFXgXd nXbXcXe n.Q n.LXg <XDXMXxXaXp.y W 3X6X2.3.E E E I P K F S D = YX",
-"YXYXYXYXT I.c.m.m.B.B.e dXmXpXs lXlXjX`.e a IXKX<Xi mXxXzXkX}.[.p.e W 2.>.E E P P K F F S D = YX",
-"YXYXYXYX4 1Xc.c.m.m.B.Q i xX'.e jXaX}.}.f.l KXHXDXy ].xXlXaX}.}._.r.@ Y E U I K K F F D A A + YX",
-"YXYXYXYX- 1.! c.x.m.m.B.k S.{.s e e z p.d sXHXDXmXG.d kXaX^.p.s s u.r R I I P K K F S D A 1 o YX",
-"YXYXYXYXO T 1.Q x.m.m.m.c.q |.|.`./.f.e.8 NXFXDXnXhXe s e f e.^.|.f.< I P K K F F S L R 2 = YXYX",
-"YXYXYXYXYX, 1.T v.M.M.m.m.B d }.}.}.aX{.p.q M hXxXzXG.^._.{.[.}.aXy P P K K F F H 3.:.*.A + YXYX",
-"YXYXYXYXYX+ R G 6 x.x.x.m.m.c e.aX}.}.{.d S.F.k x `.jX}.}.z u f u t a % < % < < N b b < & # @ @ ",
-"YXYXYXYXYXo 4 G 2 6 x.x.x.x.m.u f.=Xf.e h.P.OXOXP.c z ^.}.e i ,XLXIXNXvXhXpXpX'.<X^.^.D.f.r.@ @ ",
-"YXYXYXYXYXYXO A 1 2 7 x.l.m.v.z.r k k m.m.m.K.OXOXOXH.k f 0 fXg a.LXFXFXDXmXnXxXlXkXaXaXf.e x @ ",
-"YXYXYXYXYXYX  - 2 1 2 7 l.l.l.m.g.s.x.x.x.m.m.H.P.P.M.m.v.$ PXfXN u.DXDXnXnXxXzXkXaXaXp.e D.p.@ ",
-"YXYXYXYXYXYXYXO = 1 1 1 6 z.l.x.x.l.x.x.x.x.x.x.x.x.x.x.x.q PXKXvXi.g nXnXxXzXkXaX[.z s ^.[.p.@ ",
-"YXYXYXYXYXYXYXYXX 3 1 1 1 5 Q l.l.l.l.x.l.x.x.x.x.x.x.x.x.q KXHXHXgXi.h aXzXkXaX|.s f /.[.}.e.@ ",
-"YXYXYXYXYXYXYXYXYXO 3 1 1 1 3 n k.k.l.l.l.l.l.l.l.l.l.l.l.q GXFXDXMXhXa.y pXaX/.0 p._.}.}.}.e.@ ",
-"YXYXYXYXYXYXYXYXYX  O : 1 1 1 1 7 z.k.l.l.l.k.l.l.z.l.l.z.q FXDXMXnXnXhXd.w p.w d.|.}.}.}.[.r.@ ",
-"YXYXYXYXYXYXYXYXYXYXYXX - 2 1 1 > 3 m z.l.z.k.k.k.k.l.l.h.t DXmXmXxXzXlXcXS.z ^.[.}.}.}.}.}.z @ ",
-"YXYXYXYXYXYXYXYXYXYXYXYXO + > 2 > > 1 5 m z.k.k.k.k.k.l.g.t mXnXxXzXkXjXjX[.`.}.}.}.}.}.}.}.z @ ",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXo X + 1 2 > > 1 4 m j.k.k.g.l.g.i nXbXzXlXjXaX}.}.}.}.}.}.}.}.}.}.f @ ",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXO X + = 3 2 2 2 > 4 7 n Q h.$ M u.p.d.f.D.^./._.|.[.}.}.}.}.}.d @ ",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXX X X + - - = : 4 = = - O . $ $ @ @ @ # # # # # # 8 9 0 w 8 @ ",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXX X X X X X X X X O YXYXYXYXYXYXYXYXYXYXYXYXYXYX@ @ @ @ ",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
-};
diff --git a/other-licenses/branding/instantbird/splash.bmp b/other-licenses/branding/instantbird/splash.bmp
deleted file mode 100644
index 8437c651a..000000000
--- a/other-licenses/branding/instantbird/splash.bmp
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/windows/blistWindow.ico b/other-licenses/branding/instantbird/windows/blistWindow.ico
deleted file mode 100644
index 09decf506..000000000
--- a/other-licenses/branding/instantbird/windows/blistWindow.ico
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/windows/convWindow.ico b/other-licenses/branding/instantbird/windows/convWindow.ico
deleted file mode 100644
index 63cdb4032..000000000
--- a/other-licenses/branding/instantbird/windows/convWindow.ico
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/windows/default.ico b/other-licenses/branding/instantbird/windows/default.ico
deleted file mode 100644
index cd81a18bf..000000000
--- a/other-licenses/branding/instantbird/windows/default.ico
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/wizHeader.bmp b/other-licenses/branding/instantbird/wizHeader.bmp
deleted file mode 100644
index 525d9f620..000000000
--- a/other-licenses/branding/instantbird/wizHeader.bmp
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/wizHeaderRTL.bmp b/other-licenses/branding/instantbird/wizHeaderRTL.bmp
deleted file mode 100644
index d50ecd120..000000000
--- a/other-licenses/branding/instantbird/wizHeaderRTL.bmp
+++ /dev/null
diff --git a/other-licenses/branding/instantbird/wizWatermark.bmp b/other-licenses/branding/instantbird/wizWatermark.bmp
deleted file mode 100644
index 81580ddac..000000000
--- a/other-licenses/branding/instantbird/wizWatermark.bmp
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/LICENSE b/other-licenses/branding/thunderbird/LICENSE
deleted file mode 100644
index 92a6d2310..000000000
--- a/other-licenses/branding/thunderbird/LICENSE
+++ /dev/null
@@ -1,6 +0,0 @@
-You are not granted rights or licenses to the trademarks of the
-Mozilla Foundation or any party, including without limitation the
-Thunderbird name or logo.
-
-For more information, see: http://www.mozilla.org/foundation/licensing.html 
-
diff --git a/other-licenses/branding/thunderbird/Makefile.in b/other-licenses/branding/thunderbird/Makefile.in
deleted file mode 100644
index 08f50342a..000000000
--- a/other-licenses/branding/thunderbird/Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-# Branding Makefile
-#  - jars chrome artwork
-#  - copies artwork to appropriate places in objdir for bundling into app
-#    resources
-
-include $(topsrcdir)/config/rules.mk
-
-export::
-	$(NSINSTALL) -D $(DIST)/branding
-# Export items into the branding directory first
-ifeq ($(OS_ARCH),WINNT)
-	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
-	cp $(srcdir)/branding.nsi      $(DIST)/branding/branding.nsi
-	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
-	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
-	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
-endif
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-	cp $(srcdir)/background.png    $(DIST)/branding/background.png
-	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore
-	cp $(srcdir)/disk.icns         $(DIST)/branding/disk.icns
-	cp $(srcdir)/thunderbird.icns  $(DIST)/branding/thunderbird.icns
-endif
-ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
-	cp $(srcdir)/mailicon16.png  $(DIST)/branding/default16.png
-	cp $(srcdir)/mailicon22.png  $(DIST)/branding/default22.png
-	cp $(srcdir)/mailicon24.png  $(DIST)/branding/default24.png
-	cp $(srcdir)/mailicon32.png  $(DIST)/branding/default32.png
-	cp $(srcdir)/mailicon48.png  $(DIST)/branding/default48.png
-	cp $(srcdir)/mailicon256.png $(DIST)/branding/default256.png
-endif
-# Now sort out the branding specific icons
-ifeq ($(OS_ARCH),WINNT)
-	cp $(srcdir)/thunderbird.ico  $(DIST)/branding/messengerWindow.ico
-endif
diff --git a/other-licenses/branding/thunderbird/VisualElements_150.png b/other-licenses/branding/thunderbird/VisualElements_150.png
deleted file mode 100644
index 931076576..000000000
--- a/other-licenses/branding/thunderbird/VisualElements_150.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/VisualElements_70.png b/other-licenses/branding/thunderbird/VisualElements_70.png
deleted file mode 100644
index 0e95276ff..000000000
--- a/other-licenses/branding/thunderbird/VisualElements_70.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/background.png b/other-licenses/branding/thunderbird/background.png
deleted file mode 100644
index 272b1e33d..000000000
--- a/other-licenses/branding/thunderbird/background.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/branding.nsi b/other-licenses/branding/thunderbird/branding.nsi
deleted file mode 100644
index a227cb80b..000000000
--- a/other-licenses/branding/thunderbird/branding.nsi
+++ /dev/null
@@ -1,47 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# NSIS defines for official release builds.
-# The nightly build branding.nsi is located in mail/installer/windows/nsis
-
-# BrandFullNameInternal is used for some registry and file system values
-# instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Mozilla Thunderbird"
-!define CompanyName           "Mozilla Corporation"
-!define URLInfoAbout          "http://www.mozilla.org/${AB_CD}/"
-!define URLUpdateInfo         "http://www.mozilla.org/${AB_CD}/thunderbird/"
-!define URLSystemRequirements "https://www.mozilla.org/thunderbird/system-requirements/"
-!define SurveyURL             "http://live.mozillamessaging.com/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
diff --git a/other-licenses/branding/thunderbird/configure.sh b/other-licenses/branding/thunderbird/configure.sh
deleted file mode 100644
index f0718c97b..000000000
--- a/other-licenses/branding/thunderbird/configure.sh
+++ /dev/null
@@ -1 +0,0 @@
-MOZ_APP_DISPLAYNAME=Thunderbird
diff --git a/other-licenses/branding/thunderbird/content/about-background.png b/other-licenses/branding/thunderbird/content/about-background.png
deleted file mode 100644
index fc101ba73..000000000
--- a/other-licenses/branding/thunderbird/content/about-background.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/content/about-logo.png b/other-licenses/branding/thunderbird/content/about-logo.png
deleted file mode 100644
index 9af7c1e3a..000000000
--- a/other-licenses/branding/thunderbird/content/about-logo.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/content/about-wordmark.png b/other-licenses/branding/thunderbird/content/about-wordmark.png
deleted file mode 100644
index fa449f5b3..000000000
--- a/other-licenses/branding/thunderbird/content/about-wordmark.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/content/about.png b/other-licenses/branding/thunderbird/content/about.png
deleted file mode 100644
index 6320f9980..000000000
--- a/other-licenses/branding/thunderbird/content/about.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/content/aboutDialog.css b/other-licenses/branding/thunderbird/content/aboutDialog.css
deleted file mode 100644
index c83aec095..000000000
--- a/other-licenses/branding/thunderbird/content/aboutDialog.css
+++ /dev/null
@@ -1,31 +0,0 @@
-#clientBox {
-  background-color: #F7F7F7;
-  color: #222222;
-}
-
-#leftBox {
-  background-image: url("chrome://branding/content/about-logo.png");
-  background-repeat: no-repeat;
-  /* min-width and min-height create room for the logo */
-  min-width: 210px;
-  min-height: 210px;
-  margin-top:20px;
-  -moz-margin-start: 30px;
-}
-
-#rightBox {
-  margin-left: 30px;
-  margin-right: 30px;
-}
-
-#updateDeck > hbox > label:not([class="text-link"]) {
-  color: #909090;
-}
-
-#trademark {
-  font-size: xx-small;
-  text-align: center;
-  color: #999999;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
diff --git a/other-licenses/branding/thunderbird/content/icon48.png b/other-licenses/branding/thunderbird/content/icon48.png
deleted file mode 100644
index dc136efbc..000000000
--- a/other-licenses/branding/thunderbird/content/icon48.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/content/icon64.png b/other-licenses/branding/thunderbird/content/icon64.png
deleted file mode 100644
index 900008a19..000000000
--- a/other-licenses/branding/thunderbird/content/icon64.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/disk.icns b/other-licenses/branding/thunderbird/disk.icns
deleted file mode 100644
index a8552de34..000000000
--- a/other-licenses/branding/thunderbird/disk.icns
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/dsstore b/other-licenses/branding/thunderbird/dsstore
deleted file mode 100644
index c7e96b7aa..000000000
--- a/other-licenses/branding/thunderbird/dsstore
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/jar.mn b/other-licenses/branding/thunderbird/jar.mn
deleted file mode 100644
index 687a25862..000000000
--- a/other-licenses/branding/thunderbird/jar.mn
+++ /dev/null
@@ -1,12 +0,0 @@
-#filter substitution
-
-messenger.jar:
-% content branding %content/branding/
-  content/branding/about-background.png             (content/about-background.png)
-  content/branding/about-logo.png                   (content/about-logo.png)
-  content/branding/about-wordmark.png               (content/about-wordmark.png)
-  content/branding/about.png                        (content/about.png)
-  content/branding/icon48.png                       (content/icon48.png)
-  content/branding/icon64.png                       (content/icon64.png)
-  content/branding/aboutDialog.css                  (content/aboutDialog.css)
-  ../classic/skin/classic/messenger/icons/new-mail-alert.png       (content/icon48.png)
diff --git a/other-licenses/branding/thunderbird/locales/en-US/brand.dtd b/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
deleted file mode 100644
index 45be6df11..000000000
--- a/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- 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/. -->
-<!ENTITY  brandShortName        "Thunderbird">
-<!ENTITY  brandShorterName      "Thunderbird">
-<!ENTITY  brandFullName         "Mozilla Thunderbird">
-<!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  trademarkInfo.part1   "Mozilla Thunderbird and the Thunderbird logos
-                                 are trademarks of the Mozilla Foundation.">
diff --git a/other-licenses/branding/thunderbird/locales/en-US/brand.properties b/other-licenses/branding/thunderbird/locales/en-US/brand.properties
deleted file mode 100644
index 9dd501121..000000000
--- a/other-licenses/branding/thunderbird/locales/en-US/brand.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/.
-brandShortName=Thunderbird
-brandShorterName=Thunderbird
-brandFullName=Mozilla Thunderbird
-vendorShortName=Mozilla
diff --git a/other-licenses/branding/thunderbird/locales/jar.mn b/other-licenses/branding/thunderbird/locales/jar.mn
deleted file mode 100644
index 708e5c91a..000000000
--- a/other-licenses/branding/thunderbird/locales/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-#filter substitution
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/@AB_CD@/branding/
-  locale/@AB_CD@/branding/brand.dtd        (%brand.dtd)
-  locale/@AB_CD@/branding/brand.properties (%brand.properties)
diff --git a/other-licenses/branding/thunderbird/locales/moz.build b/other-licenses/branding/thunderbird/locales/moz.build
deleted file mode 100644
index e0eb66aac..000000000
--- a/other-licenses/branding/thunderbird/locales/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: set filetype=python:
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
diff --git a/other-licenses/branding/thunderbird/mailicon16.png b/other-licenses/branding/thunderbird/mailicon16.png
deleted file mode 100644
index f02637c67..000000000
--- a/other-licenses/branding/thunderbird/mailicon16.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/mailicon22.png b/other-licenses/branding/thunderbird/mailicon22.png
deleted file mode 100644
index 5d4ac829f..000000000
--- a/other-licenses/branding/thunderbird/mailicon22.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/mailicon24.png b/other-licenses/branding/thunderbird/mailicon24.png
deleted file mode 100644
index 19095455f..000000000
--- a/other-licenses/branding/thunderbird/mailicon24.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/mailicon256.png b/other-licenses/branding/thunderbird/mailicon256.png
deleted file mode 100644
index f0c5b99ea..000000000
--- a/other-licenses/branding/thunderbird/mailicon256.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/mailicon32.png b/other-licenses/branding/thunderbird/mailicon32.png
deleted file mode 100644
index 0ea704699..000000000
--- a/other-licenses/branding/thunderbird/mailicon32.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/mailicon48.png b/other-licenses/branding/thunderbird/mailicon48.png
deleted file mode 100644
index dc136efbc..000000000
--- a/other-licenses/branding/thunderbird/mailicon48.png
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/moz.build b/other-licenses/branding/thunderbird/moz.build
deleted file mode 100644
index b032e9d82..000000000
--- a/other-licenses/branding/thunderbird/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# vim: set filetype=python:
-# 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/.
-
-DIRS += ['locales']
-
-JAR_MANIFESTS += ['jar.mn']
-
-JS_PREFERENCE_FILES += [
-    'thunderbird-branding.js',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-  FINAL_TARGET_FILES += [
-      'thunderbird.VisualElementsManifest.xml',
-  ]
-  FINAL_TARGET_FILES.VisualElements += [
-      'VisualElements_150.png',
-      'VisualElements_70.png',
-  ]
diff --git a/other-licenses/branding/thunderbird/thunderbird-branding.js b/other-licenses/branding/thunderbird/thunderbird-branding.js
deleted file mode 100644
index 1d980e3fc..000000000
--- a/other-licenses/branding/thunderbird/thunderbird-branding.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Default start page
-pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-
-// start page override to load after an update
-pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-
-// Interval: Time between checks for a new version (in seconds)
-// nightly=8 hours, official=24 hours
-pref("app.update.interval", 86400);
-
-// The time interval between the downloading of mar file chunks in the
-// background (in seconds)
-pref("app.update.download.backgroundInterval", 600);
-
-// Give the user x seconds to react before showing the big UI. default=24 hours
-pref("app.update.promptWaitTime", 86400);
-
-pref("app.vendorURL", "http://www.mozilla.org/%LOCALE%/%APP%/");
-
-pref("browser.search.param.ms-pc", "MOZT");
diff --git a/other-licenses/branding/thunderbird/thunderbird.VisualElementsManifest.xml b/other-licenses/branding/thunderbird/thunderbird.VisualElementsManifest.xml
deleted file mode 100644
index 8b819fd36..000000000
--- a/other-licenses/branding/thunderbird/thunderbird.VisualElementsManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-  <VisualElements
-      ShowNameOnSquare150x150Logo='on'
-      Square150x150Logo='VisualElements\VisualElements_150.png'
-      Square70x70Logo='VisualElements\VisualElements_70.png'
-      ForegroundText='dark'
-      BackgroundColor='#c4d3d3'/>
-</Application>
diff --git a/other-licenses/branding/thunderbird/thunderbird.icns b/other-licenses/branding/thunderbird/thunderbird.icns
deleted file mode 100644
index 1db9c046f..000000000
--- a/other-licenses/branding/thunderbird/thunderbird.icns
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/thunderbird.ico b/other-licenses/branding/thunderbird/thunderbird.ico
deleted file mode 100644
index 913b57bc2..000000000
--- a/other-licenses/branding/thunderbird/thunderbird.ico
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/wizHeader.bmp b/other-licenses/branding/thunderbird/wizHeader.bmp
deleted file mode 100644
index 68810eb3e..000000000
--- a/other-licenses/branding/thunderbird/wizHeader.bmp
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/wizHeaderRTL.bmp b/other-licenses/branding/thunderbird/wizHeaderRTL.bmp
deleted file mode 100644
index 799b8f6ab..000000000
--- a/other-licenses/branding/thunderbird/wizHeaderRTL.bmp
+++ /dev/null
diff --git a/other-licenses/branding/thunderbird/wizWatermark.bmp b/other-licenses/branding/thunderbird/wizWatermark.bmp
deleted file mode 100644
index 4633c3713..000000000
--- a/other-licenses/branding/thunderbird/wizWatermark.bmp
+++ /dev/null