Finished v38 initial rebase

20 files changed, 87 insertions, 33 deletions

diff --git a/data/branding/icecat/LICENSE b/data/branding/icecat/LICENSE
index e69de29..41dc232 100644
--- a/data/branding/icecat/LICENSE
+++ b/data/branding/icecat/LICENSE
@@ -0,0 +1,3 @@
+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/data/branding/icecat/Makefile.in b/data/branding/icecat/Makefile.in
index 3b5c4d5..d858c5b 100644
--- a/data/branding/icecat/Makefile.in
+++ b/data/branding/icecat/Makefile.in
@@ -12,7 +12,6 @@ BRANDING_FILES := \
 	branding.nsi \
 	appname.bmp \
 	bgintro.bmp \
-	bgplain.bmp \
 	clock.bmp \
 	particles.bmp \
 	pencil.bmp \
@@ -45,13 +44,6 @@ BRANDING_FILES := \
 	$(NULL)
 endif
 
-ifeq ($(OS_ARCH),OS2)
-BRANDING_FILES := \
-	icecat-os2.ico \
-	document-os2.ico \
-	$(NULL)
-endif
-
 BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
@@ -62,4 +54,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
diff --git a/data/branding/icecat/bgplain.bmp b/data/branding/icecat/bgplain.bmp
deleted file mode 100644
index c82f896..0000000
--- a/data/branding/icecat/bgplain.bmp
+++ /dev/null
diff --git a/data/branding/icecat/branding.nsi b/data/branding/icecat/branding.nsi
index 9b6ab6a..57a76b2 100644
--- a/data/branding/icecat/branding.nsi
+++ b/data/branding/icecat/branding.nsi
@@ -8,13 +8,11 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "IceCat"
+!define BrandFullNameInternal "GNU IceCat"
 !define CompanyName           "GNU"
 !define URLInfoAbout          "http://www.gnu.org/software/gnuzilla/"
-!define URLUpdateInfo         "http://www.gnu.org/software/gnuzilla/"
-
-!define URLStubDownload "http://www.gnu.org/software/gnuzilla/"
-!define URLManualDownload "http://ftp.gnu.org/gnu/gnuzilla/"
+!define URLUpdateInfo         "https://savannah.gnu.org/projects/gnuzilla/"
+!define HelpLink              "http://libreplanet.org/wiki/Group:IceCat/ "
 
 ; The OFFICIAL define is a workaround to support different urls for Release and
 ; Beta since they share the same branding when building with other branches that
@@ -42,9 +40,8 @@
 !define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
 !define FOOTER_BKGRD_COLOR 0xFFFFFF
 !define INTRO_BLURB_TEXT_COLOR 0x666666
-!define OPTIONS_TEXT_COLOR_NORMAL 0x000000
-!define OPTIONS_TEXT_COLOR_FADED 0x666666
-!define OPTIONS_BKGRD_COLOR 0xF0F0F0
 !define INSTALL_BLURB_TEXT_COLOR 0x666666
 !define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
-!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x999999
+!define COMMON_TEXT_COLOR_NORMAL 0x000000
+!define COMMON_TEXT_COLOR_FADED 0x666666
+!define COMMON_BKGRD_COLOR 0xF0F0F0
diff --git a/data/branding/icecat/clock.bmp b/data/branding/icecat/clock.bmp
index c74398e..7da034d 100644
--- a/data/branding/icecat/clock.bmp
+++ b/data/branding/icecat/clock.bmp
diff --git a/data/branding/icecat/content/about-background.png b/data/branding/icecat/content/about-background.png
deleted file mode 100644
index f626f74..0000000
--- a/data/branding/icecat/content/about-background.png
+++ /dev/null
diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn
index b692816..fec1857 100644
--- a/data/branding/icecat/content/jar.mn
+++ b/data/branding/icecat/content/jar.mn
@@ -15,6 +15,7 @@ browser.jar:
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.png      (identity-icons-brand.png)
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
+  content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
 #ifdef MOZ_METRO
   content/branding/metro-about.css               (metro-about.css)
diff --git a/data/branding/icecat/content/silhouette-40.svg b/data/branding/icecat/content/silhouette-40.svg
new file mode 100644
index 0000000..72d2291
--- /dev/null
+++ b/data/branding/icecat/content/silhouette-40.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="-45 31 40 40"
+   enable-background="new -45 31 40 40"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="silhouette-40.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1364"
+     inkscape:window-height="711"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="13.597656"
+     inkscape:cx="20"
+     inkscape:cy="20"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#cccccc;fill-opacity:1"
+     d="m -29.459925,62.826172 c -4.282871,-1.498444 -7.01554,-5.271633 -7.038444,-9.718502 -0.0069,-1.336809 0.192968,-2.876549 0.48876,-3.765461 0.275225,-0.827077 0.712775,-2.451219 0.972332,-3.609184 0.766254,-3.418421 2.81783,-5.875581 5.79156,-6.936486 2.71284,-0.967833 7.410895,-0.263677 9.569525,1.434298 0.731058,0.57505 0.839662,0.590069 1.085873,0.150115 0.240694,-0.430097 0.432202,-0.377031 1.593597,0.441595 1.121801,0.790717 1.572211,0.924624 2.999426,0.89172 0.923673,-0.02127 1.679404,0.06969 1.679404,0.202194 0,0.132503 -0.332903,0.692117 -0.739783,1.243652 -0.406881,0.551479 -0.829045,1.626681 -0.938144,2.389329 -0.109101,0.76265 -0.476233,1.690884 -0.815854,2.062731 -0.564659,0.61822 -0.587327,0.806767 -0.264919,2.20349 0.604832,2.620302 0.439528,4.871804 -0.584387,7.959636 -1.041195,3.139961 -2.179996,4.686981 -3.844982,5.223227 -1.584569,0.510408 -8.336739,0.393455 -9.953964,-0.172354 z m 5.669233,-1.663126 -0.3825,-0.692466 -0.171999,0.902282 c -0.123252,0.646598 -0.04155,0.95458 0.28829,1.086823 0.608784,0.244005 0.746551,-0.427023 0.266209,-1.296639 z m 3.352123,1.284001 c 0,-0.278645 -0.82974,-1.224594 -1.074165,-1.224594 -0.07089,0 -0.128899,0.338391 -0.128899,0.75193 0,0.551423 0.160408,0.75193 0.601532,0.75193 0.330842,0 0.601532,-0.125698 0.601532,-0.279266 z m 1.884127,-0.502057 c 0.240948,-0.240958 -0.0744,-1.023297 -0.412477,-1.023297 -0.147724,0 -0.268587,0.27069 -0.268587,0.601577 0,0.586232 0.319012,0.783749 0.681064,0.42172 z m -7.179229,-0.597967 c 0.100673,-0.262341 0.07,-0.678983 -0.06816,-0.925865 -0.206691,-0.369364 -0.337239,-0.317573 -0.736738,0.292129 -0.267046,0.407559 -0.40235,0.824201 -0.30068,0.925865 0.341831,0.341832 0.921037,0.188771 1.105583,-0.292129 z m -5.206852,-1.555369 c -3.206778,-3.206816 -4.013595,-7.760032 -1.713328,-9.669081 0.855182,-0.70973 1.643643,-0.05585 2.941517,2.438582 2.813889,5.408671 5.089386,7.494362 8.206872,7.522402 1.716451,0.01523 2.799811,-0.463412 3.836249,-1.695566 0.854132,-1.015455 1.742132,-3.696519 1.742132,-5.259898 0,-2.411897 -0.296643,-3.348029 -1.165658,-3.678409 -2.086591,-0.793341 -2.840825,-1.317683 -3.227892,-2.244055 -0.594447,-1.422731 -1.016225,-1.548654 -1.820437,-0.543637 -0.846961,1.058501 -0.941663,3.50532 -0.208504,5.387119 0.782503,2.008457 1.451423,4.620183 1.237989,4.83361 -0.39178,0.391818 -1.758031,-0.198081 -2.013184,-0.869222 -0.142339,-0.374385 -0.475913,-0.860871 -0.741277,-1.081068 -0.265364,-0.220253 -0.482481,-0.636331 -0.482481,-0.924623 0,-0.288236 -0.265807,-0.862057 -0.590682,-1.275032 -0.685221,-0.871139 -1.189959,-2.641401 -1.481225,-5.195131 -0.300251,-2.632545 -0.675449,-3.158072 -2.254653,-3.158072 -1.446422,0 -3.023015,0.953284 -4.527204,2.737311 -2.811571,3.334715 -2.706233,8.708294 0.234598,11.967409 0.657167,0.728292 3.14076,2.438977 3.540969,2.438977 0.119802,0 -0.56141,-0.779236 -1.513801,-1.731616 z m 3.409983,0.170719 c 0.62654,-0.894497 0.420769,-0.986288 -0.692941,-0.308998 -0.514327,0.312777 -0.845396,0.658447 -0.735708,0.768122 0.383182,0.383186 0.970975,0.194301 1.428649,-0.459124 z m -1.254282,-1.388769 c 1.133918,-0.973819 0.27441,-1.331336 -0.945553,-0.393341 -0.409113,0.314526 -0.627399,0.703354 -0.505558,0.900476 0.225411,0.364738 0.580305,0.240733 1.451111,-0.507135 z M -30.21346,56.85203 c 0.496264,-0.406769 0.794068,-0.740251 0.661788,-0.741098 -0.473774,-0.0057 -2.015234,0.922084 -2.015234,1.209305 0,0.461494 0.379404,0.33021 1.353446,-0.468207 z m -0.150383,-2.002194 c 0,-0.366656 -1.894056,0.475316 -2.037534,0.90578 -0.08375,0.251227 0.224653,0.204625 0.956982,-0.144597 0.594303,-0.283385 1.080552,-0.62595 1.080552,-0.761183 z m -0.902298,-2.097426 c 0,-0.330888 -1.480537,0.692579 -1.494376,1.033057 -0.0052,0.127898 0.32891,0.01072 0.742463,-0.260197 0.413552,-0.270972 0.751913,-0.618728 0.751913,-0.77286 z m 2.603125,-9.825131 c -0.273771,-0.30251 -0.497763,-0.791218 -0.497763,-1.086005 0,-0.457697 0.09034,-0.432275 0.618514,0.174065 0.581847,0.667935 0.599677,0.671095 0.300765,0.05309 -0.519424,-1.07392 -0.362327,-1.415843 0.300767,-0.654621 0.616371,0.70758 0.617365,0.707675 0.286855,0.02708 -0.415677,-0.855957 -0.121476,-1.443961 0.474854,-0.949053 0.233403,0.193711 0.424371,0.51235 0.424371,0.70809 0,0.195739 0.356492,0.82205 0.792204,1.391842 0.435712,0.569758 0.696922,0.765245 0.580468,0.434357 -0.116454,-0.330831 -0.290592,-1.007569 -0.386972,-1.503832 l -0.175238,-0.902298 0.66581,0.589572 c 0.567604,0.502611 0.706789,0.524793 0.943611,0.150385 0.152791,-0.241556 0.279871,-0.288777 0.282405,-0.10494 0.0027,0.193786 0.320582,0.273848 0.756519,0.190514 0.483184,-0.09236 0.751916,-0.0071 0.751916,0.238703 0,0.255433 0.199766,0.201657 0.601532,-0.161936 0.341125,-0.308715 0.601532,-0.393996 0.601532,-0.196997 0,0.191062 0.33836,0.347383 0.751914,0.347383 1.219033,0 0.873478,-0.43289 -1.096272,-1.373338 -3.245522,-1.549558 -8.20055,-1.103455 -9.852504,0.887033 -0.464142,0.559253 -0.131294,1.310219 0.362056,0.816905 0.230613,-0.230612 0.483679,-0.08718 0.88242,0.500139 l 0.559076,0.823524 -0.164666,-1.203116 -0.164666,-1.203066 0.482221,1.052685 c 0.26522,0.579 0.637515,1.152144 0.827321,1.273667 0.580457,0.371678 0.613046,0.257093 0.09095,-0.31983 z m 13.938997,-0.05134 c 0.349548,-0.225894 0.258394,-0.29258 -0.404743,-0.29619 -0.470741,0 -1.254696,-0.240157 -1.742123,-0.528088 -0.776271,-0.458554 -0.921399,-0.467881 -1.169672,-0.0752 -0.438756,0.694001 -0.343574,1.015409 0.173592,0.586187 0.385152,-0.31966 0.553293,-0.299909 0.966746,0.113567 0.557349,0.557347 1.490332,0.642932 2.1762,0.199717 z m -17.143654,-0.433402 c 0,-0.07294 -0.135343,-0.216282 -0.300765,-0.318516 -0.165421,-0.102234 -0.300765,-0.04254 -0.300765,0.132631 0,0.175188 0.135344,0.318527 0.300765,0.318527 0.165422,0 0.300765,-0.05969 0.300765,-0.132642 z"
+     id="path2998"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/data/branding/icecat/document-os2.ico b/data/branding/icecat/document-os2.ico
deleted file mode 100644
index 214e92c..0000000
--- a/data/branding/icecat/document-os2.ico
+++ /dev/null
diff --git a/data/branding/icecat/icecat-os2.ico b/data/branding/icecat/icecat-os2.ico
deleted file mode 100644
index 560d198..0000000
--- a/data/branding/icecat/icecat-os2.ico
+++ /dev/null
diff --git a/data/branding/icecat/locales/Makefile.in b/data/branding/icecat/locales/Makefile.in
deleted file mode 100644
index 82f614e..0000000
--- a/data/branding/icecat/locales/Makefile.in
+++ /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/.
-
-DEFINES += -DAB_CD=$(AB_CD)
diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd
index 519de9b..3788266 100644
--- a/data/branding/icecat/locales/en-US/brand.dtd
+++ b/data/branding/icecat/locales/en-US/brand.dtd
@@ -2,7 +2,8 @@
    - 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  brandShorterName      "IceCat">
 <!ENTITY  brandShortName        "IceCat">
-<!ENTITY  brandFullName         "IceCat">
+<!ENTITY  brandFullName         "GNU IceCat">
 <!ENTITY  vendorShortName       "GNU">
-<!ENTITY  trademarkInfo.part1   "">
+<!ENTITY  trademarkInfo.part1   "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.">
diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties
index 3120429..73ef208 100644
--- a/data/branding/icecat/locales/en-US/brand.properties
+++ b/data/branding/icecat/locales/en-US/brand.properties
@@ -2,9 +2,10 @@
 # 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/.
 
+brandShorterName=IceCat
 brandShortName=IceCat
-brandFullName=IceCat
-vendorShortName=GNU
+brandFullName=Mozilla IceCat
+vendorShortName=Mozilla
 
 homePageSingleStartMain=IceCat Start, a fast home page with built-in search
 homePageImport=Import your home page from %S
diff --git a/data/branding/icecat/locales/jar.mn b/data/branding/icecat/locales/jar.mn
index ff4e055..ff8c28c 100644
--- a/data/branding/icecat/locales/jar.mn
+++ b/data/branding/icecat/locales/jar.mn
@@ -6,7 +6,6 @@
 
 @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.dtd        (%brand.dtd)
+* locale/branding/brand.properties (%brand.properties)
+* locale/branding/browserconfig.properties (browserconfig.properties)
diff --git a/data/branding/icecat/locales/moz.build b/data/branding/icecat/locales/moz.build
index 3a54c0c..c97072b 100644
--- a/data/branding/icecat/locales/moz.build
+++ b/data/branding/icecat/locales/moz.build
@@ -4,6 +4,4 @@
 # 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/.
 
-DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
-
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/data/branding/icecat/moz.build b/data/branding/icecat/moz.build
index 3e2f88f..408c1f0 100644
--- a/data/branding/icecat/moz.build
+++ b/data/branding/icecat/moz.build
@@ -8,3 +8,8 @@ DIRS += ['content', 'locales']
 
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
+
+JS_PREFERENCE_FILES += [
+    'pref/icecat-branding.js',
+]
+
diff --git a/data/branding/icecat/particles.bmp b/data/branding/icecat/particles.bmp
index ab74ce0..d523606 100644
--- a/data/branding/icecat/particles.bmp
+++ b/data/branding/icecat/particles.bmp
diff --git a/data/branding/icecat/pencil-rtl.bmp b/data/branding/icecat/pencil-rtl.bmp
index e50d92d..67d2fe5 100644
--- a/data/branding/icecat/pencil-rtl.bmp
+++ b/data/branding/icecat/pencil-rtl.bmp
diff --git a/data/branding/icecat/pencil.bmp b/data/branding/icecat/pencil.bmp
index 252c10f..7dd5574 100644
--- a/data/branding/icecat/pencil.bmp
+++ b/data/branding/icecat/pencil.bmp
diff --git a/data/branding/icecat/pref/icecat-branding.js b/data/branding/icecat/pref/icecat-branding.js
index 58a869e..4c0eb17 100644
--- a/data/branding/icecat/pref/icecat-branding.js
+++ b/data/branding/icecat/pref/icecat-branding.js
@@ -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/. */
+
 pref("startup.homepage_override_url","http://www.gnu.org");
 pref("startup.homepage_welcome_url","http://www.gnu.org/software/gnuzilla/");
 // The time interval between checks for a new version (in seconds)
@@ -22,3 +26,4 @@ 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", "");
+