summaryrefslogtreecommitdiffstats
path: root/b2g/branding
diff options
context:
space:
mode:
Diffstat (limited to 'b2g/branding')
-rw-r--r--b2g/branding/branding-common.mozbuild23
-rw-r--r--b2g/branding/browserhtml/app.icnsbin0 -> 256255 bytes
-rw-r--r--b2g/branding/browserhtml/app.icobin0 -> 370070 bytes
-rw-r--r--b2g/branding/browserhtml/background.pngbin0 -> 129900 bytes
-rw-r--r--b2g/branding/browserhtml/configure.sh5
-rw-r--r--b2g/branding/browserhtml/content/about.pngbin0 -> 25842 bytes
-rw-r--r--b2g/branding/browserhtml/content/favicon32.pngbin0 -> 2670 bytes
-rw-r--r--b2g/branding/browserhtml/content/icon48.pngbin0 -> 5302 bytes
-rw-r--r--b2g/branding/browserhtml/content/icon64.pngbin0 -> 8267 bytes
-rw-r--r--b2g/branding/browserhtml/content/jar.mn10
-rw-r--r--b2g/branding/browserhtml/content/logo.pngbin0 -> 19488 bytes
-rw-r--r--b2g/branding/browserhtml/content/logoWordmark.pngbin0 -> 14021 bytes
-rw-r--r--b2g/branding/browserhtml/content/moz.build7
-rw-r--r--b2g/branding/browserhtml/content/splash.pngbin0 -> 19610 bytes
-rw-r--r--b2g/branding/browserhtml/default.pngbin0 -> 36395 bytes
-rw-r--r--b2g/branding/browserhtml/disk.icnsbin0 -> 891873 bytes
-rw-r--r--b2g/branding/browserhtml/dsstorebin0 -> 12292 bytes
-rw-r--r--b2g/branding/browserhtml/locales/en-US/brand.dtd7
-rw-r--r--b2g/branding/browserhtml/locales/en-US/brand.properties6
-rw-r--r--b2g/branding/browserhtml/locales/jar.mn11
-rw-r--r--b2g/branding/browserhtml/locales/moz.build7
-rw-r--r--b2g/branding/browserhtml/moz.build10
-rw-r--r--b2g/branding/horizon/app.icnsbin0 -> 53371 bytes
-rw-r--r--b2g/branding/horizon/app.icobin0 -> 15086 bytes
-rw-r--r--b2g/branding/horizon/background.pngbin0 -> 129900 bytes
-rw-r--r--b2g/branding/horizon/configure.sh5
-rw-r--r--b2g/branding/horizon/content/about.pngbin0 -> 25842 bytes
-rw-r--r--b2g/branding/horizon/content/favicon32.pngbin0 -> 2670 bytes
-rw-r--r--b2g/branding/horizon/content/icon48.pngbin0 -> 5302 bytes
-rw-r--r--b2g/branding/horizon/content/icon64.pngbin0 -> 8267 bytes
-rw-r--r--b2g/branding/horizon/content/jar.mn10
-rw-r--r--b2g/branding/horizon/content/logo.pngbin0 -> 19488 bytes
-rw-r--r--b2g/branding/horizon/content/logoWordmark.pngbin0 -> 14021 bytes
-rw-r--r--b2g/branding/horizon/content/moz.build7
-rw-r--r--b2g/branding/horizon/content/splash.pngbin0 -> 19610 bytes
-rw-r--r--b2g/branding/horizon/default.pngbin0 -> 51360 bytes
-rw-r--r--b2g/branding/horizon/disk.icnsbin0 -> 891873 bytes
-rw-r--r--b2g/branding/horizon/dsstorebin0 -> 12292 bytes
-rw-r--r--b2g/branding/horizon/locales/en-US/brand.dtd8
-rw-r--r--b2g/branding/horizon/locales/en-US/brand.properties6
-rw-r--r--b2g/branding/horizon/locales/jar.mn11
-rw-r--r--b2g/branding/horizon/locales/moz.build7
-rw-r--r--b2g/branding/horizon/moz.build10
-rw-r--r--b2g/branding/official/app.icnsbin0 -> 11953 bytes
-rw-r--r--b2g/branding/official/app.icobin0 -> 4286 bytes
-rw-r--r--b2g/branding/official/background.pngbin0 -> 129900 bytes
-rw-r--r--b2g/branding/official/configure.sh6
-rw-r--r--b2g/branding/official/content/about.pngbin0 -> 25842 bytes
-rw-r--r--b2g/branding/official/content/favicon32.pngbin0 -> 2670 bytes
-rw-r--r--b2g/branding/official/content/icon48.pngbin0 -> 5302 bytes
-rw-r--r--b2g/branding/official/content/icon64.pngbin0 -> 8267 bytes
-rw-r--r--b2g/branding/official/content/jar.mn10
-rw-r--r--b2g/branding/official/content/logo.pngbin0 -> 19488 bytes
-rw-r--r--b2g/branding/official/content/logoWordmark.pngbin0 -> 14021 bytes
-rw-r--r--b2g/branding/official/content/moz.build7
-rw-r--r--b2g/branding/official/content/splash.pngbin0 -> 19610 bytes
-rw-r--r--b2g/branding/official/default.pngbin0 -> 4762 bytes
-rw-r--r--b2g/branding/official/disk.icnsbin0 -> 891873 bytes
-rw-r--r--b2g/branding/official/dsstorebin0 -> 12292 bytes
-rw-r--r--b2g/branding/official/locales/en-US/brand.dtd8
-rw-r--r--b2g/branding/official/locales/en-US/brand.properties6
-rw-r--r--b2g/branding/official/locales/jar.mn11
-rw-r--r--b2g/branding/official/locales/moz.build7
-rw-r--r--b2g/branding/official/moz.build10
-rw-r--r--b2g/branding/unofficial/app.icnsbin0 -> 11953 bytes
-rw-r--r--b2g/branding/unofficial/app.icobin0 -> 4286 bytes
-rw-r--r--b2g/branding/unofficial/background.pngbin0 -> 129900 bytes
-rw-r--r--b2g/branding/unofficial/configure.sh6
-rw-r--r--b2g/branding/unofficial/content/about.pngbin0 -> 16858 bytes
-rw-r--r--b2g/branding/unofficial/content/favicon32.pngbin0 -> 1761 bytes
-rw-r--r--b2g/branding/unofficial/content/icon48.pngbin0 -> 4053 bytes
-rw-r--r--b2g/branding/unofficial/content/icon64.pngbin0 -> 5897 bytes
-rw-r--r--b2g/branding/unofficial/content/jar.mn10
-rw-r--r--b2g/branding/unofficial/content/logo.pngbin0 -> 19844 bytes
-rw-r--r--b2g/branding/unofficial/content/logoWordmark.pngbin0 -> 15088 bytes
-rw-r--r--b2g/branding/unofficial/content/moz.build7
-rw-r--r--b2g/branding/unofficial/content/splash.pngbin0 -> 19766 bytes
-rw-r--r--b2g/branding/unofficial/default.pngbin0 -> 4762 bytes
-rw-r--r--b2g/branding/unofficial/disk.icnsbin0 -> 891873 bytes
-rw-r--r--b2g/branding/unofficial/dsstorebin0 -> 12292 bytes
-rw-r--r--b2g/branding/unofficial/locales/en-US/brand.dtd8
-rw-r--r--b2g/branding/unofficial/locales/en-US/brand.properties6
-rw-r--r--b2g/branding/unofficial/locales/jar.mn11
-rw-r--r--b2g/branding/unofficial/locales/moz.build7
-rw-r--r--b2g/branding/unofficial/moz.build10
85 files changed, 280 insertions, 0 deletions
diff --git a/b2g/branding/branding-common.mozbuild b/b2g/branding/branding-common.mozbuild
new file mode 100644
index 000000000..ae4aeb285
--- /dev/null
+++ b/b2g/branding/branding-common.mozbuild
@@ -0,0 +1,23 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+@template
+def B2GBranding():
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+ BRANDING_FILES += [
+ 'app.ico',
+ ]
+ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+ BRANDING_FILES += [
+ 'app.icns',
+ 'background.png',
+ 'disk.icns',
+ 'dsstore',
+ ]
+ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+ BRANDING_FILES += [
+ 'default.png',
+ ]
diff --git a/b2g/branding/browserhtml/app.icns b/b2g/branding/browserhtml/app.icns
new file mode 100644
index 000000000..3d680134e
--- /dev/null
+++ b/b2g/branding/browserhtml/app.icns
Binary files differ
diff --git a/b2g/branding/browserhtml/app.ico b/b2g/branding/browserhtml/app.ico
new file mode 100644
index 000000000..04596e4d0
--- /dev/null
+++ b/b2g/branding/browserhtml/app.ico
Binary files differ
diff --git a/b2g/branding/browserhtml/background.png b/b2g/branding/browserhtml/background.png
new file mode 100644
index 000000000..db5576a33
--- /dev/null
+++ b/b2g/branding/browserhtml/background.png
Binary files differ
diff --git a/b2g/branding/browserhtml/configure.sh b/b2g/branding/browserhtml/configure.sh
new file mode 100644
index 000000000..71c6129d2
--- /dev/null
+++ b/b2g/branding/browserhtml/configure.sh
@@ -0,0 +1,5 @@
+# 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=Browser.html
diff --git a/b2g/branding/browserhtml/content/about.png b/b2g/branding/browserhtml/content/about.png
new file mode 100644
index 000000000..3cc1444f6
--- /dev/null
+++ b/b2g/branding/browserhtml/content/about.png
Binary files differ
diff --git a/b2g/branding/browserhtml/content/favicon32.png b/b2g/branding/browserhtml/content/favicon32.png
new file mode 100644
index 000000000..ac4a6968b
--- /dev/null
+++ b/b2g/branding/browserhtml/content/favicon32.png
Binary files differ
diff --git a/b2g/branding/browserhtml/content/icon48.png b/b2g/branding/browserhtml/content/icon48.png
new file mode 100644
index 000000000..b7513c2e4
--- /dev/null
+++ b/b2g/branding/browserhtml/content/icon48.png
Binary files differ
diff --git a/b2g/branding/browserhtml/content/icon64.png b/b2g/branding/browserhtml/content/icon64.png
new file mode 100644
index 000000000..c8bee8fca
--- /dev/null
+++ b/b2g/branding/browserhtml/content/icon64.png
Binary files differ
diff --git a/b2g/branding/browserhtml/content/jar.mn b/b2g/branding/browserhtml/content/jar.mn
new file mode 100644
index 000000000..8a2c16964
--- /dev/null
+++ b/b2g/branding/browserhtml/content/jar.mn
@@ -0,0 +1,10 @@
+# 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/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/logoWordmark.png (logoWordmark.png)
+ content/branding/logo.png (logo.png)
+ content/branding/favicon32.png (favicon32.png)
diff --git a/b2g/branding/browserhtml/content/logo.png b/b2g/branding/browserhtml/content/logo.png
new file mode 100644
index 000000000..9d9d0c57e
--- /dev/null
+++ b/b2g/branding/browserhtml/content/logo.png
Binary files differ
diff --git a/b2g/branding/browserhtml/content/logoWordmark.png b/b2g/branding/browserhtml/content/logoWordmark.png
new file mode 100644
index 000000000..878363181
--- /dev/null
+++ b/b2g/branding/browserhtml/content/logoWordmark.png
Binary files differ
diff --git a/b2g/branding/browserhtml/content/moz.build b/b2g/branding/browserhtml/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/browserhtml/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/browserhtml/content/splash.png b/b2g/branding/browserhtml/content/splash.png
new file mode 100644
index 000000000..84ab581d2
--- /dev/null
+++ b/b2g/branding/browserhtml/content/splash.png
Binary files differ
diff --git a/b2g/branding/browserhtml/default.png b/b2g/branding/browserhtml/default.png
new file mode 100644
index 000000000..ae4736223
--- /dev/null
+++ b/b2g/branding/browserhtml/default.png
Binary files differ
diff --git a/b2g/branding/browserhtml/disk.icns b/b2g/branding/browserhtml/disk.icns
new file mode 100644
index 000000000..c49b7b878
--- /dev/null
+++ b/b2g/branding/browserhtml/disk.icns
Binary files differ
diff --git a/b2g/branding/browserhtml/dsstore b/b2g/branding/browserhtml/dsstore
new file mode 100644
index 000000000..657101d6e
--- /dev/null
+++ b/b2g/branding/browserhtml/dsstore
Binary files differ
diff --git a/b2g/branding/browserhtml/locales/en-US/brand.dtd b/b2g/branding/browserhtml/locales/en-US/brand.dtd
new file mode 100644
index 000000000..6c3088d70
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/en-US/brand.dtd
@@ -0,0 +1,7 @@
+<!-- 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 "Browser.html">
+<!ENTITY brandFullName "Mozilla Browser.html">
+<!ENTITY vendorShortName "Mozilla">
diff --git a/b2g/branding/browserhtml/locales/en-US/brand.properties b/b2g/branding/browserhtml/locales/en-US/brand.properties
new file mode 100644
index 000000000..897d1a800
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# 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=Browser.html
+brandFullName=Mozilla Browser.html
diff --git a/b2g/branding/browserhtml/locales/jar.mn b/b2g/branding/browserhtml/locales/jar.mn
new file mode 100644
index 000000000..2ea47e168
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/jar.mn
@@ -0,0 +1,11 @@
+#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/branding/
+# Branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/b2g/branding/browserhtml/locales/moz.build b/b2g/branding/browserhtml/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/browserhtml/moz.build b/b2g/branding/browserhtml/moz.build
new file mode 100644
index 000000000..bf7aff4c0
--- /dev/null
+++ b/b2g/branding/browserhtml/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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 += ['content', 'locales']
+
+include('../branding-common.mozbuild')
+B2GBranding()
diff --git a/b2g/branding/horizon/app.icns b/b2g/branding/horizon/app.icns
new file mode 100644
index 000000000..6c7b9f5b5
--- /dev/null
+++ b/b2g/branding/horizon/app.icns
Binary files differ
diff --git a/b2g/branding/horizon/app.ico b/b2g/branding/horizon/app.ico
new file mode 100644
index 000000000..49eb90419
--- /dev/null
+++ b/b2g/branding/horizon/app.ico
Binary files differ
diff --git a/b2g/branding/horizon/background.png b/b2g/branding/horizon/background.png
new file mode 100644
index 000000000..db5576a33
--- /dev/null
+++ b/b2g/branding/horizon/background.png
Binary files differ
diff --git a/b2g/branding/horizon/configure.sh b/b2g/branding/horizon/configure.sh
new file mode 100644
index 000000000..65774e384
--- /dev/null
+++ b/b2g/branding/horizon/configure.sh
@@ -0,0 +1,5 @@
+# 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=Horizon
diff --git a/b2g/branding/horizon/content/about.png b/b2g/branding/horizon/content/about.png
new file mode 100644
index 000000000..3cc1444f6
--- /dev/null
+++ b/b2g/branding/horizon/content/about.png
Binary files differ
diff --git a/b2g/branding/horizon/content/favicon32.png b/b2g/branding/horizon/content/favicon32.png
new file mode 100644
index 000000000..ac4a6968b
--- /dev/null
+++ b/b2g/branding/horizon/content/favicon32.png
Binary files differ
diff --git a/b2g/branding/horizon/content/icon48.png b/b2g/branding/horizon/content/icon48.png
new file mode 100644
index 000000000..b7513c2e4
--- /dev/null
+++ b/b2g/branding/horizon/content/icon48.png
Binary files differ
diff --git a/b2g/branding/horizon/content/icon64.png b/b2g/branding/horizon/content/icon64.png
new file mode 100644
index 000000000..c8bee8fca
--- /dev/null
+++ b/b2g/branding/horizon/content/icon64.png
Binary files differ
diff --git a/b2g/branding/horizon/content/jar.mn b/b2g/branding/horizon/content/jar.mn
new file mode 100644
index 000000000..8a2c16964
--- /dev/null
+++ b/b2g/branding/horizon/content/jar.mn
@@ -0,0 +1,10 @@
+# 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/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/logoWordmark.png (logoWordmark.png)
+ content/branding/logo.png (logo.png)
+ content/branding/favicon32.png (favicon32.png)
diff --git a/b2g/branding/horizon/content/logo.png b/b2g/branding/horizon/content/logo.png
new file mode 100644
index 000000000..9d9d0c57e
--- /dev/null
+++ b/b2g/branding/horizon/content/logo.png
Binary files differ
diff --git a/b2g/branding/horizon/content/logoWordmark.png b/b2g/branding/horizon/content/logoWordmark.png
new file mode 100644
index 000000000..878363181
--- /dev/null
+++ b/b2g/branding/horizon/content/logoWordmark.png
Binary files differ
diff --git a/b2g/branding/horizon/content/moz.build b/b2g/branding/horizon/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/horizon/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/horizon/content/splash.png b/b2g/branding/horizon/content/splash.png
new file mode 100644
index 000000000..84ab581d2
--- /dev/null
+++ b/b2g/branding/horizon/content/splash.png
Binary files differ
diff --git a/b2g/branding/horizon/default.png b/b2g/branding/horizon/default.png
new file mode 100644
index 000000000..0e6a4016c
--- /dev/null
+++ b/b2g/branding/horizon/default.png
Binary files differ
diff --git a/b2g/branding/horizon/disk.icns b/b2g/branding/horizon/disk.icns
new file mode 100644
index 000000000..c49b7b878
--- /dev/null
+++ b/b2g/branding/horizon/disk.icns
Binary files differ
diff --git a/b2g/branding/horizon/dsstore b/b2g/branding/horizon/dsstore
new file mode 100644
index 000000000..657101d6e
--- /dev/null
+++ b/b2g/branding/horizon/dsstore
Binary files differ
diff --git a/b2g/branding/horizon/locales/en-US/brand.dtd b/b2g/branding/horizon/locales/en-US/brand.dtd
new file mode 100644
index 000000000..ad7a938b5
--- /dev/null
+++ b/b2g/branding/horizon/locales/en-US/brand.dtd
@@ -0,0 +1,8 @@
+<!-- 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 "Horizon">
+<!ENTITY brandFullName "Mozilla Horizon">
+<!ENTITY vendorShortName "Mozilla">
+<!ENTITY logoTrademark "Horizon and the Horizon logos are trademarks of the Mozilla Foundation.">
diff --git a/b2g/branding/horizon/locales/en-US/brand.properties b/b2g/branding/horizon/locales/en-US/brand.properties
new file mode 100644
index 000000000..ce9e209cf
--- /dev/null
+++ b/b2g/branding/horizon/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# 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=Horizon
+brandFullName=Mozilla Horizon
diff --git a/b2g/branding/horizon/locales/jar.mn b/b2g/branding/horizon/locales/jar.mn
new file mode 100644
index 000000000..2ea47e168
--- /dev/null
+++ b/b2g/branding/horizon/locales/jar.mn
@@ -0,0 +1,11 @@
+#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/branding/
+# Branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/b2g/branding/horizon/locales/moz.build b/b2g/branding/horizon/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/horizon/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/horizon/moz.build b/b2g/branding/horizon/moz.build
new file mode 100644
index 000000000..bf7aff4c0
--- /dev/null
+++ b/b2g/branding/horizon/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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 += ['content', 'locales']
+
+include('../branding-common.mozbuild')
+B2GBranding()
diff --git a/b2g/branding/official/app.icns b/b2g/branding/official/app.icns
new file mode 100644
index 000000000..eba850aae
--- /dev/null
+++ b/b2g/branding/official/app.icns
Binary files differ
diff --git a/b2g/branding/official/app.ico b/b2g/branding/official/app.ico
new file mode 100644
index 000000000..5d4a61dc9
--- /dev/null
+++ b/b2g/branding/official/app.ico
Binary files differ
diff --git a/b2g/branding/official/background.png b/b2g/branding/official/background.png
new file mode 100644
index 000000000..db5576a33
--- /dev/null
+++ b/b2g/branding/official/background.png
Binary files differ
diff --git a/b2g/branding/official/configure.sh b/b2g/branding/official/configure.sh
new file mode 100644
index 000000000..127a0f1a1
--- /dev/null
+++ b/b2g/branding/official/configure.sh
@@ -0,0 +1,6 @@
+# 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=B2G
+MOZ_UPDATER=
diff --git a/b2g/branding/official/content/about.png b/b2g/branding/official/content/about.png
new file mode 100644
index 000000000..3cc1444f6
--- /dev/null
+++ b/b2g/branding/official/content/about.png
Binary files differ
diff --git a/b2g/branding/official/content/favicon32.png b/b2g/branding/official/content/favicon32.png
new file mode 100644
index 000000000..ac4a6968b
--- /dev/null
+++ b/b2g/branding/official/content/favicon32.png
Binary files differ
diff --git a/b2g/branding/official/content/icon48.png b/b2g/branding/official/content/icon48.png
new file mode 100644
index 000000000..b7513c2e4
--- /dev/null
+++ b/b2g/branding/official/content/icon48.png
Binary files differ
diff --git a/b2g/branding/official/content/icon64.png b/b2g/branding/official/content/icon64.png
new file mode 100644
index 000000000..c8bee8fca
--- /dev/null
+++ b/b2g/branding/official/content/icon64.png
Binary files differ
diff --git a/b2g/branding/official/content/jar.mn b/b2g/branding/official/content/jar.mn
new file mode 100644
index 000000000..8a2c16964
--- /dev/null
+++ b/b2g/branding/official/content/jar.mn
@@ -0,0 +1,10 @@
+# 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/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/logoWordmark.png (logoWordmark.png)
+ content/branding/logo.png (logo.png)
+ content/branding/favicon32.png (favicon32.png)
diff --git a/b2g/branding/official/content/logo.png b/b2g/branding/official/content/logo.png
new file mode 100644
index 000000000..9d9d0c57e
--- /dev/null
+++ b/b2g/branding/official/content/logo.png
Binary files differ
diff --git a/b2g/branding/official/content/logoWordmark.png b/b2g/branding/official/content/logoWordmark.png
new file mode 100644
index 000000000..878363181
--- /dev/null
+++ b/b2g/branding/official/content/logoWordmark.png
Binary files differ
diff --git a/b2g/branding/official/content/moz.build b/b2g/branding/official/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/official/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/official/content/splash.png b/b2g/branding/official/content/splash.png
new file mode 100644
index 000000000..84ab581d2
--- /dev/null
+++ b/b2g/branding/official/content/splash.png
Binary files differ
diff --git a/b2g/branding/official/default.png b/b2g/branding/official/default.png
new file mode 100644
index 000000000..c4307fc84
--- /dev/null
+++ b/b2g/branding/official/default.png
Binary files differ
diff --git a/b2g/branding/official/disk.icns b/b2g/branding/official/disk.icns
new file mode 100644
index 000000000..c49b7b878
--- /dev/null
+++ b/b2g/branding/official/disk.icns
Binary files differ
diff --git a/b2g/branding/official/dsstore b/b2g/branding/official/dsstore
new file mode 100644
index 000000000..657101d6e
--- /dev/null
+++ b/b2g/branding/official/dsstore
Binary files differ
diff --git a/b2g/branding/official/locales/en-US/brand.dtd b/b2g/branding/official/locales/en-US/brand.dtd
new file mode 100644
index 000000000..1a6f39148
--- /dev/null
+++ b/b2g/branding/official/locales/en-US/brand.dtd
@@ -0,0 +1,8 @@
+<!-- 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 "Firefox">
+<!ENTITY brandFullName "Mozilla Firefox">
+<!ENTITY vendorShortName "Mozilla">
+<!ENTITY logoTrademark "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
diff --git a/b2g/branding/official/locales/en-US/brand.properties b/b2g/branding/official/locales/en-US/brand.properties
new file mode 100644
index 000000000..d0203e35a
--- /dev/null
+++ b/b2g/branding/official/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# 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=Firefox
+brandFullName=Mozilla Firefox
diff --git a/b2g/branding/official/locales/jar.mn b/b2g/branding/official/locales/jar.mn
new file mode 100644
index 000000000..2ea47e168
--- /dev/null
+++ b/b2g/branding/official/locales/jar.mn
@@ -0,0 +1,11 @@
+#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/branding/
+# Branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/b2g/branding/official/locales/moz.build b/b2g/branding/official/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/official/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/official/moz.build b/b2g/branding/official/moz.build
new file mode 100644
index 000000000..bf7aff4c0
--- /dev/null
+++ b/b2g/branding/official/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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 += ['content', 'locales']
+
+include('../branding-common.mozbuild')
+B2GBranding()
diff --git a/b2g/branding/unofficial/app.icns b/b2g/branding/unofficial/app.icns
new file mode 100644
index 000000000..eba850aae
--- /dev/null
+++ b/b2g/branding/unofficial/app.icns
Binary files differ
diff --git a/b2g/branding/unofficial/app.ico b/b2g/branding/unofficial/app.ico
new file mode 100644
index 000000000..5d4a61dc9
--- /dev/null
+++ b/b2g/branding/unofficial/app.ico
Binary files differ
diff --git a/b2g/branding/unofficial/background.png b/b2g/branding/unofficial/background.png
new file mode 100644
index 000000000..db5576a33
--- /dev/null
+++ b/b2g/branding/unofficial/background.png
Binary files differ
diff --git a/b2g/branding/unofficial/configure.sh b/b2g/branding/unofficial/configure.sh
new file mode 100644
index 000000000..127a0f1a1
--- /dev/null
+++ b/b2g/branding/unofficial/configure.sh
@@ -0,0 +1,6 @@
+# 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=B2G
+MOZ_UPDATER=
diff --git a/b2g/branding/unofficial/content/about.png b/b2g/branding/unofficial/content/about.png
new file mode 100644
index 000000000..3819f6337
--- /dev/null
+++ b/b2g/branding/unofficial/content/about.png
Binary files differ
diff --git a/b2g/branding/unofficial/content/favicon32.png b/b2g/branding/unofficial/content/favicon32.png
new file mode 100644
index 000000000..3f04acd50
--- /dev/null
+++ b/b2g/branding/unofficial/content/favicon32.png
Binary files differ
diff --git a/b2g/branding/unofficial/content/icon48.png b/b2g/branding/unofficial/content/icon48.png
new file mode 100644
index 000000000..3ae248c85
--- /dev/null
+++ b/b2g/branding/unofficial/content/icon48.png
Binary files differ
diff --git a/b2g/branding/unofficial/content/icon64.png b/b2g/branding/unofficial/content/icon64.png
new file mode 100644
index 000000000..fe980153b
--- /dev/null
+++ b/b2g/branding/unofficial/content/icon64.png
Binary files differ
diff --git a/b2g/branding/unofficial/content/jar.mn b/b2g/branding/unofficial/content/jar.mn
new file mode 100644
index 000000000..8a2c16964
--- /dev/null
+++ b/b2g/branding/unofficial/content/jar.mn
@@ -0,0 +1,10 @@
+# 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/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/logoWordmark.png (logoWordmark.png)
+ content/branding/logo.png (logo.png)
+ content/branding/favicon32.png (favicon32.png)
diff --git a/b2g/branding/unofficial/content/logo.png b/b2g/branding/unofficial/content/logo.png
new file mode 100644
index 000000000..91377a312
--- /dev/null
+++ b/b2g/branding/unofficial/content/logo.png
Binary files differ
diff --git a/b2g/branding/unofficial/content/logoWordmark.png b/b2g/branding/unofficial/content/logoWordmark.png
new file mode 100644
index 000000000..a3017f59e
--- /dev/null
+++ b/b2g/branding/unofficial/content/logoWordmark.png
Binary files differ
diff --git a/b2g/branding/unofficial/content/moz.build b/b2g/branding/unofficial/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/unofficial/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/unofficial/content/splash.png b/b2g/branding/unofficial/content/splash.png
new file mode 100644
index 000000000..25a0830ea
--- /dev/null
+++ b/b2g/branding/unofficial/content/splash.png
Binary files differ
diff --git a/b2g/branding/unofficial/default.png b/b2g/branding/unofficial/default.png
new file mode 100644
index 000000000..c4307fc84
--- /dev/null
+++ b/b2g/branding/unofficial/default.png
Binary files differ
diff --git a/b2g/branding/unofficial/disk.icns b/b2g/branding/unofficial/disk.icns
new file mode 100644
index 000000000..c49b7b878
--- /dev/null
+++ b/b2g/branding/unofficial/disk.icns
Binary files differ
diff --git a/b2g/branding/unofficial/dsstore b/b2g/branding/unofficial/dsstore
new file mode 100644
index 000000000..657101d6e
--- /dev/null
+++ b/b2g/branding/unofficial/dsstore
Binary files differ
diff --git a/b2g/branding/unofficial/locales/en-US/brand.dtd b/b2g/branding/unofficial/locales/en-US/brand.dtd
new file mode 100644
index 000000000..1a6f39148
--- /dev/null
+++ b/b2g/branding/unofficial/locales/en-US/brand.dtd
@@ -0,0 +1,8 @@
+<!-- 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 "Firefox">
+<!ENTITY brandFullName "Mozilla Firefox">
+<!ENTITY vendorShortName "Mozilla">
+<!ENTITY logoTrademark "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
diff --git a/b2g/branding/unofficial/locales/en-US/brand.properties b/b2g/branding/unofficial/locales/en-US/brand.properties
new file mode 100644
index 000000000..d0203e35a
--- /dev/null
+++ b/b2g/branding/unofficial/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# 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=Firefox
+brandFullName=Mozilla Firefox
diff --git a/b2g/branding/unofficial/locales/jar.mn b/b2g/branding/unofficial/locales/jar.mn
new file mode 100644
index 000000000..5a77695c9
--- /dev/null
+++ b/b2g/branding/unofficial/locales/jar.mn
@@ -0,0 +1,11 @@
+#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/branding/
+# Nightly branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/b2g/branding/unofficial/locales/moz.build b/b2g/branding/unofficial/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/b2g/branding/unofficial/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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'] \ No newline at end of file
diff --git a/b2g/branding/unofficial/moz.build b/b2g/branding/unofficial/moz.build
new file mode 100644
index 000000000..bf7aff4c0
--- /dev/null
+++ b/b2g/branding/unofficial/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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 += ['content', 'locales']
+
+include('../branding-common.mozbuild')
+B2GBranding()