diff --git a/helpers/DATA/firefox/branding/Makefile.in b/helpers/DATA/firefox/branding/Makefile.in
index 539a8192737fec6c261e0f74578933fdec0194f1..25578dc4f228bed5ca85ebca16275aef6e5786c8 100644
--- a/helpers/DATA/firefox/branding/Makefile.in
+++ b/helpers/DATA/firefox/branding/Makefile.in
@@ -1,98 +1,74 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Trisquel 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is Trisquel Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Justin Dolske <dolske@mozilla.com> (original author)
-#
-# 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 *****
+# 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/.
-DEPTH = ../../..
+DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-
-DIRS = \
- content \
- locales \
- $(NULL)
+include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/abrowser-branding.js
-include $(topsrcdir)/config/rules.mk
-
-WINDOWS_BRANDING_FILES = \
+# On Windows only do this step for browser, skip for metro.
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
+BRANDING_FILES := \
abrowser.ico \
document.ico \
branding.nsi \
+ appname.bmp \
+ bgintro.bmp \
+ bgplain.bmp \
+ clock.bmp \
+ particles.bmp \
+ pencil.bmp \
+ pencil-rtl.bmp \
wizHeader.bmp \
wizHeaderRTL.bmp \
wizWatermark.bmp \
+ newwindow.ico \
+ newtab.ico \
+ pbmode.ico \
$(NULL)
-
-ifdef MOZ_SPLASHSCREEN
-WINDOWS_BRANDING_FILES += splash.bmp
endif
-OSX_BRANDING_FILES = \
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+BRANDING_FILES := \
background.png \
abrowser.icns \
disk.icns \
document.icns \
dsstore \
$(NULL)
+endif
-LINUX_BRANDING_FILES = \
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+BRANDING_FILES := \
default16.png \
- default22.png \
- default24.png \
default32.png \
default48.png \
- default128.png \
- default256.png \
- document.png \
mozicon128.png \
$(NULL)
-
-
-export::
- $(NSINSTALL) -D $(DIST)/branding
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
- cp $(addprefix $(srcdir)/, $(WINDOWS_BRANDING_FILES)) $(DIST)/branding/
endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- cp $(addprefix $(srcdir)/, $(OSX_BRANDING_FILES)) $(DIST)/branding/
+
+ifeq ($(OS_ARCH),OS2)
+BRANDING_FILES := \
+ abrowser-os2.ico \
+ document-os2.ico \
+ $(NULL)
endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
- $(NSINSTALL) -D $(DIST)/install
+
+BRANDING_DEST := $(DIST)/branding
+BRANDING_TARGET := export
+INSTALL_TARGETS += BRANDING
+
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
+VISUALMANIFEST := VisualElementsManifest.xml
+VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
+VISUALMANIFEST_PATH := $(DIST)/bin
+PP_TARGETS += VISUALMANIFEST
endif
+
+include $(topsrcdir)/config/rules.mk
diff --git a/helpers/DATA/firefox/branding/VisualElementsManifest.xml b/helpers/DATA/firefox/branding/VisualElementsManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e97c80c75be6f2bfba01c80be641ce97b22190b
--- /dev/null
+++ b/helpers/DATA/firefox/branding/VisualElementsManifest.xml
@@ -0,0 +1,16 @@
+<Application
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <VisualElements
+ DisplayName="@MOZ_APP_DISPLAYNAME@"
+ Logo="tileresources\VisualElements_logo.png"
+ SmallLogo="tileresources\VisualElements_smalllogo.png"
+ ForegroundText="light"
+ BackgroundColor="#001226">
+ <DefaultTile
+ ShortName="@MOZ_APP_DISPLAYNAME@"
+ ShowName="allLogos"
+ />
+ <SplashScreen
+ Image="tileresources\VisualElements_splashscreen.png" />
+ </VisualElements>
+</Application>
diff --git a/helpers/DATA/firefox/branding/abrowser-os2.ico b/helpers/DATA/firefox/branding/abrowser-os2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0518438a040d8fa9b5523893e9edbcf9faf9a38c
Binary files /dev/null and b/helpers/DATA/firefox/branding/abrowser-os2.ico differ
diff --git a/helpers/DATA/firefox/branding/appname.bmp b/helpers/DATA/firefox/branding/appname.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..0ec19e17046330bfbbb3c27591cea7c36336d84a
Binary files /dev/null and b/helpers/DATA/firefox/branding/appname.bmp differ
diff --git a/helpers/DATA/firefox/branding/bgintro.bmp b/helpers/DATA/firefox/branding/bgintro.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..dc5240c631ee150d51774e4ab721945f0ff56e21
Binary files /dev/null and b/helpers/DATA/firefox/branding/bgintro.bmp differ
diff --git a/helpers/DATA/firefox/branding/bgplain.bmp b/helpers/DATA/firefox/branding/bgplain.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..5330aca6532ba1000dd87fc1d41a717aee721c0e
Binary files /dev/null and b/helpers/DATA/firefox/branding/bgplain.bmp differ
diff --git a/helpers/DATA/firefox/branding/branding.nsi b/helpers/DATA/firefox/branding/branding.nsi
index 0040f9027f7280c1302a313eb9b6576a828db216..8a725ca268d9b2560031547048c228da10f22c6e 100644
--- a/helpers/DATA/firefox/branding/branding.nsi
+++ b/helpers/DATA/firefox/branding/branding.nsi
@@ -1,42 +1,8 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Trisquel 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 Trisquel Installer code.
-#
-# The Initial Developer of the Original Code is Trisquel 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 *****
+# 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 branding defines for unofficial builds.
-# The official release build branding.nsi is located in other-license/branding/abrowser/
-# The nightly build branding.nsi is located in browser/installer/windows/nsis/
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
@@ -44,3 +10,34 @@
!define CompanyName "Trisquel"
!define URLInfoAbout "http://trisquel.info/browser"
!define URLUpdateInfo "http://trisquel.info/wiki"
+
+!define URLStubDownload "http://trisquel.info/browser"
+!define URLManualDownload "http://trisquel.info/browser"
+!define Channel "unofficial"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload "Mozilla Corporation"
+!define CertIssuerDownload "Thawte Code Signing CA - G2"
+
+# Dialog units are used so the UI displays correctly with the system's DPI
+# settings.
+# The dialog units for the bitmap's dimensions should match exactly with the
+# bitmap's width and height in pixels.
+!define APPNAME_BMP_WIDTH_DU 159u
+!define APPNAME_BMP_HEIGHT_DU 26u
+!define INTRO_BLURB_WIDTH_DU "230u"
+!define INTRO_BLURB_EDGE_DU "198u"
+!define INTRO_BLURB_LTR_TOP_DU "16u"
+!define INTRO_BLURB_RTL_TOP_DU "11u"
+
+# UI Colors that can be customized for each channel
+!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
+!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
+!define FOOTER_BKGRD_COLOR 0xFFFFFF
+!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
+!define OPTIONS_TEXT_COLOR_NORMAL 0xFFFFFF
+!define OPTIONS_TEXT_COLOR_FADED 0xA1AAB3
+!define OPTIONS_BKGRD_COLOR 0x0F1B26
+!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
+!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
+!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0xA1AAB3
diff --git a/helpers/DATA/firefox/branding/clock.bmp b/helpers/DATA/firefox/branding/clock.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..7e12754e383c12f0c577a182f4aba3ef4304569d
Binary files /dev/null and b/helpers/DATA/firefox/branding/clock.bmp differ
diff --git a/helpers/DATA/firefox/branding/configure.sh b/helpers/DATA/firefox/branding/configure.sh
index 00107a7b94af3875c6348664a7bb319d26fc5a3e..5cb25e4367820a21464684815ff926331e44ca3a 100644
--- a/helpers/DATA/firefox/branding/configure.sh
+++ b/helpers/DATA/firefox/branding/configure.sh
@@ -1 +1,5 @@
-MOZ_APP_DISPLAYNAME=Abrowser
+# 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=MozillaDeveloperPreview
diff --git a/helpers/DATA/firefox/branding/content/Makefile.in b/helpers/DATA/firefox/branding/content/Makefile.in
index 827181f9b49f2508503757ca0839161b77505625..2a0a285826c4e715809dc241d5a92bb62e24368e 100644
--- a/helpers/DATA/firefox/branding/content/Makefile.in
+++ b/helpers/DATA/firefox/branding/content/Makefile.in
@@ -1,11 +1,22 @@
+# 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
# - jars chrome artwork
-DEPTH = ../../../..
+DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
+# resources needed for the metro tile interface
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
+TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
+TILE_DEST := $(DIST)/bin/tileresources
+INSTALL_TARGETS += TILE
+endif
+
include $(topsrcdir)/config/rules.mk
diff --git a/helpers/DATA/firefox/branding/content/VisualElements_logo.png b/helpers/DATA/firefox/branding/content/VisualElements_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2209c889a5ac31e347ab54fa5542be82574a0b54
Binary files /dev/null and b/helpers/DATA/firefox/branding/content/VisualElements_logo.png differ
diff --git a/helpers/DATA/firefox/branding/content/VisualElements_smalllogo.png b/helpers/DATA/firefox/branding/content/VisualElements_smalllogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ec011009ac91f6b1f419126b391e0cc1d4c20a4
Binary files /dev/null and b/helpers/DATA/firefox/branding/content/VisualElements_smalllogo.png differ
diff --git a/helpers/DATA/firefox/branding/content/VisualElements_splashscreen.png b/helpers/DATA/firefox/branding/content/VisualElements_splashscreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5c99928dc14ed0bbe476a260eb5d153d46bd05e
Binary files /dev/null and b/helpers/DATA/firefox/branding/content/VisualElements_splashscreen.png differ
diff --git a/helpers/DATA/firefox/branding/content/about-wordmark.png b/helpers/DATA/firefox/branding/content/about-wordmark.png
index ac0931fda5e3a4e0265ec7e36a3eacc75377e0b0..4a8bcdc85a6a9c3509964bbc5293ca96ebf89128 100644
Binary files a/helpers/DATA/firefox/branding/content/about-wordmark.png and b/helpers/DATA/firefox/branding/content/about-wordmark.png differ
diff --git a/helpers/DATA/firefox/branding/content/aboutDialog.css b/helpers/DATA/firefox/branding/content/aboutDialog.css
index f74c55cbef6c65a8ab461784f718c9980f744718..1113fd1f2967ee298579113deb5d6998748617a9 100644
--- a/helpers/DATA/firefox/branding/content/aboutDialog.css
+++ b/helpers/DATA/firefox/branding/content/aboutDialog.css
@@ -1,3 +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/. */
+
#aboutDialogContainer {
background-image: url("chrome://branding/content/about-background.png");
background-repeat: no-repeat;
diff --git a/helpers/DATA/firefox/branding/content/jar.mn b/helpers/DATA/firefox/branding/content/jar.mn
index 2413eb64a285d988dcd80e98050ff381ef591216..abe651b98c80fef493aff4fc4b221bc61993657c 100644
--- a/helpers/DATA/firefox/branding/content/jar.mn
+++ b/helpers/DATA/firefox/branding/content/jar.mn
@@ -1,3 +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/.
+
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
@@ -6,6 +10,6 @@ browser.jar:
content/branding/about-wordmark.png (about-wordmark.png)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
- content/branding/icon128.png (../mozicon128.png)
content/branding/icon16.png (../default16.png)
+ content/branding/icon32.png (../default32.png)
content/branding/aboutDialog.css (aboutDialog.css)
diff --git a/helpers/DATA/firefox/branding/content/moz.build b/helpers/DATA/firefox/branding/content/moz.build
new file mode 100644
index 0000000000000000000000000000000000000000..58ce5e273390f0fb4bbf5a0a64e29e8bf571e490
--- /dev/null
+++ b/helpers/DATA/firefox/branding/content/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/helpers/DATA/firefox/branding/document-os2.ico b/helpers/DATA/firefox/branding/document-os2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..214e92cef45cc11f13a54015977afbc0d8321f29
Binary files /dev/null and b/helpers/DATA/firefox/branding/document-os2.ico differ
diff --git a/helpers/DATA/firefox/branding/dsstore b/helpers/DATA/firefox/branding/dsstore
index de66526874a9d5a9cb693a6378a5a22f6166e787..bbba9ecce0d455ff3d5450fc965c8bd9571b4270 100644
Binary files a/helpers/DATA/firefox/branding/dsstore and b/helpers/DATA/firefox/branding/dsstore differ
diff --git a/helpers/DATA/firefox/branding/locales/Makefile.in b/helpers/DATA/firefox/branding/locales/Makefile.in
index 0ad5a56b1bbf837cbe10d858ffb2932d3fc7300f..d199ba23528ebca579a00318a0e911a7a1a34e45 100644
--- a/helpers/DATA/firefox/branding/locales/Makefile.in
+++ b/helpers/DATA/firefox/branding/locales/Makefile.in
@@ -1,44 +1,12 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Trisquel 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 Trisquel Browser code.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <benjamin@smedbergs.us>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 *****
+# 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/.
-DEPTH = ../../../..
+DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
-relativesrcdir = browser/branding/unofficial/locales
+relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
diff --git a/helpers/DATA/firefox/branding/locales/browserconfig.properties b/helpers/DATA/firefox/branding/locales/browserconfig.properties
index fa747df829a5b431dbc7fea85c1d404f68b4c67b..2cfd1eae374554ec8a3096a4fd2a4886487cde3b 100644
--- a/helpers/DATA/firefox/branding/locales/browserconfig.properties
+++ b/helpers/DATA/firefox/branding/locales/browserconfig.properties
@@ -1,2 +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/.
+
# Do NOT localize or otherwise change these values
browser.startup.homepage=http://trisquel.info
diff --git a/helpers/DATA/firefox/branding/locales/en-US/brand.dtd b/helpers/DATA/firefox/branding/locales/en-US/brand.dtd
index f5eb4c8d76c95f7e283a1ba8bcb13d8836d3929f..c2e72f467bf72a1e78a84e7a8ea15bded4a99866 100644
--- a/helpers/DATA/firefox/branding/locales/en-US/brand.dtd
+++ b/helpers/DATA/firefox/branding/locales/en-US/brand.dtd
@@ -1,3 +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 "Abrowser">
<!ENTITY brandFullName "Abrowser">
<!ENTITY vendorShortName "Trisquel">
diff --git a/helpers/DATA/firefox/branding/locales/en-US/brand.properties b/helpers/DATA/firefox/branding/locales/en-US/brand.properties
index ab2d3229470ee9696bfac6431ba160c36aa87c48..7f82b88a5c3241cf67d7dcbb6b90cc64f4c9b353 100644
--- a/helpers/DATA/firefox/branding/locales/en-US/brand.properties
+++ b/helpers/DATA/firefox/branding/locales/en-US/brand.properties
@@ -1,3 +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/.
+
brandShortName=Abrowser
brandFullName=Abrowser
vendorShortName=Trisquel
diff --git a/helpers/DATA/firefox/branding/locales/jar.mn b/helpers/DATA/firefox/branding/locales/jar.mn
index 409a51e26a247868297f972abf5f5fe1577849f9..ff4e055adb6bf8662e60b88a118581b9fc068d2a 100644
--- a/helpers/DATA/firefox/branding/locales/jar.mn
+++ b/helpers/DATA/firefox/branding/locales/jar.mn
@@ -1,8 +1,12 @@
#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/
# Unofficial branding only exists in en-US
locale/branding/brand.dtd (en-US/brand.dtd)
-* locale/branding/brand.properties (en-US/brand.properties)
-* locale/branding/browserconfig.properties (browserconfig.properties)
+ locale/branding/brand.properties (en-US/brand.properties)
+ locale/branding/browserconfig.properties (browserconfig.properties)
diff --git a/helpers/DATA/firefox/branding/locales/moz.build b/helpers/DATA/firefox/branding/locales/moz.build
new file mode 100644
index 0000000000000000000000000000000000000000..58ce5e273390f0fb4bbf5a0a64e29e8bf571e490
--- /dev/null
+++ b/helpers/DATA/firefox/branding/locales/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/helpers/DATA/firefox/branding/moz.build b/helpers/DATA/firefox/branding/moz.build
new file mode 100644
index 0000000000000000000000000000000000000000..f179404cbd35421896f9d6aaf5ebc4911ff5b56e
--- /dev/null
+++ b/helpers/DATA/firefox/branding/moz.build
@@ -0,0 +1,7 @@
+# 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']
+
diff --git a/helpers/DATA/firefox/branding/newtab.ico b/helpers/DATA/firefox/branding/newtab.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6e3fee6229beba45996cfd9be6cc839258ec86d3
Binary files /dev/null and b/helpers/DATA/firefox/branding/newtab.ico differ
diff --git a/helpers/DATA/firefox/branding/newwindow.ico b/helpers/DATA/firefox/branding/newwindow.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a30093564c1bf0b4d905de41e46cadc3fdff9832
Binary files /dev/null and b/helpers/DATA/firefox/branding/newwindow.ico differ
diff --git a/helpers/DATA/firefox/branding/particles.bmp b/helpers/DATA/firefox/branding/particles.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..12578c671305c80273a02aa639804f844a84e8e5
Binary files /dev/null and b/helpers/DATA/firefox/branding/particles.bmp differ
diff --git a/helpers/DATA/firefox/branding/pbmode.ico b/helpers/DATA/firefox/branding/pbmode.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d21799475a2322e259313ecd560ccb842e81d79d
Binary files /dev/null and b/helpers/DATA/firefox/branding/pbmode.ico differ
diff --git a/helpers/DATA/firefox/branding/pencil-rtl.bmp b/helpers/DATA/firefox/branding/pencil-rtl.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..29205113a98d3921827ff06b66ea1626f28cca59
Binary files /dev/null and b/helpers/DATA/firefox/branding/pencil-rtl.bmp differ
diff --git a/helpers/DATA/firefox/branding/pencil.bmp b/helpers/DATA/firefox/branding/pencil.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..ef65392b7e9beb9c1864886c447c7fc1ae89c110
Binary files /dev/null and b/helpers/DATA/firefox/branding/pencil.bmp differ
diff --git a/helpers/DATA/firefox/branding/pref/abrowser-branding.js b/helpers/DATA/firefox/branding/pref/abrowser-branding.js
index 6ae865a145965610429440318c09958c5cdb8299..7d7f5d2507f2c57c237ea3526fc126c3f4c7e1ab 100644
--- a/helpers/DATA/firefox/branding/pref/abrowser-branding.js
+++ b/helpers/DATA/firefox/branding/pref/abrowser-branding.js
@@ -10,6 +10,15 @@ pref("app.update.download.backgroundInterval", 60);
// attempts fail.
pref("app.update.url.manual", "http://trisquel.info/browser");
// A default value for the "More information about this update" link
-// supplied in the "An update is available" page of the update wizard.
+// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://trisquel.info/browser");
+// Release notes and vendor URLs
+pref("app.releaseNotesURL", "http://trisquel.info/browser");
+pref("app.vendorURL", "http://trisquel.info/browser/");
+
+// Search codes belong only in builds with official branding
+pref("browser.search.param.yahoo-fr", "");
+pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
+pref("browser.search.param.yahoo-fr-ja", "");
+pref("browser.search.param.yahoo-f-CN", "");
diff --git a/helpers/make-firefox b/helpers/make-firefox
index da7b8799f2599dfbb1f9b25ec78facf2cdd350fb..5026618982b757c6ba5c2b5b706404182437e595 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -38,7 +38,7 @@ sed "s/Provides.*/Provides: firefox-locale-@LANGCODE@/" -i debian/control.langpa
sed '/Package: firefox/,/It can be safely removed/d' -i debian/control.in
# Remove Ubuntu bookmarks
-sed -i /ubuntu-bookmarks/d debian/patches/series.in
+sed -i /ubuntu-bookmarks/d debian/patches/series
rm debian/patches/ubuntu-bookmarks*
#Unbrand url codes for google and amazon
@@ -105,7 +105,7 @@ sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40
sed '/Package: @MOZ_PKG_NAME@-dev/,/Description:/ s/Provides:/Provides:firefox-dev, /' debian/control.in -i
# Redirect feedback menu
-sed s:input.mozilla.com/feedback:trisquel.info/contact: -i browser/base/content/utilityOverlay.js
+sed s:input.mozilla.com/feedback:trisquel.info/contact: b2g/app/b2g.js -i
# Make abrowser-locale-$lang provide firefox-locale-$lang
#sed 's/Package:\(.*\)/Package:\1\nProvides: firefox-locale-@LANGCODE@/g' debian/control.langpacks* -i