From 7dfb7b150539113b224a76885680d696bf60253a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 13 Mar 2016 16:46:52 -0300 Subject: Initial import --- branding/Makefile.in | 40 + branding/aboutIce.js | 69 + branding/aboutIce.manifest | 2 + branding/configure.sh | 4 + branding/content/Makefile.in | 44 + branding/content/about-base.png | Bin 0 -> 1227 bytes branding/content/aboutCredits-base.png | Bin 0 -> 923 bytes branding/content/aboutDialog.css | 23 + branding/content/jar.mn | 1 + branding/content/moz.build | 1 + branding/content/wordmark.xsl | 20 + branding/defs.mk | 2 + branding/firefox-branding.js | 6 + branding/ice.dtd | 13 + branding/ice.xhtml | 98 + branding/iceweasel_icon.svg | 4085 +++++++++++++++++++ branding/iceweasel_logo.svg | 4290 ++++++++++++++++++++ branding/jar.mn | 7 + branding/locales/Makefile.in | 47 + branding/locales/browserconfig.properties | 3 + branding/locales/en-US/brand.dtd | 6 + branding/locales/en-US/brand.properties | 4 + branding/locales/jar.mn | 1 + branding/locales/moz.build | 1 + branding/moz.build | 6 + ...hich-phishing-shavar-to-use-depending-on-.patch | 37 + ..._DISPLAYNAME-to-fill-appstrings.propertie.patch | 61 + ...-instead-of-MOZ_APP_NAME-for-profile-rese.patch | 35 + patches/series | 3 + 29 files changed, 8909 insertions(+) create mode 100644 branding/Makefile.in create mode 100644 branding/aboutIce.js create mode 100644 branding/aboutIce.manifest create mode 100755 branding/configure.sh create mode 100644 branding/content/Makefile.in create mode 100644 branding/content/about-base.png create mode 100644 branding/content/aboutCredits-base.png create mode 100644 branding/content/aboutDialog.css create mode 120000 branding/content/jar.mn create mode 100644 branding/content/moz.build create mode 100644 branding/content/wordmark.xsl create mode 100644 branding/defs.mk create mode 100644 branding/firefox-branding.js create mode 100644 branding/ice.dtd create mode 100644 branding/ice.xhtml create mode 100644 branding/iceweasel_icon.svg create mode 100644 branding/iceweasel_logo.svg create mode 100644 branding/jar.mn create mode 100644 branding/locales/Makefile.in create mode 100644 branding/locales/browserconfig.properties create mode 100644 branding/locales/en-US/brand.dtd create mode 100644 branding/locales/en-US/brand.properties create mode 120000 branding/locales/jar.mn create mode 100644 branding/locales/moz.build create mode 100644 branding/moz.build create mode 100644 patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch create mode 100644 patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch create mode 100644 patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch create mode 100644 patches/series diff --git a/branding/Makefile.in b/branding/Makefile.in new file mode 100644 index 0000000..b395c62 --- /dev/null +++ b/branding/Makefile.in @@ -0,0 +1,40 @@ +# Branding Makefile +# - jars chrome artwork +# - copies artwork to appropriate places in objdir for bundling into app +# resources + +ifdef BRANDING_TEST +DEFINES += -DBRANDING_TEST +endif + +include $(topsrcdir)/config/rules.mk + +BROWSER_APP_FILES = \ + default16.png \ + default32.png \ + default48.png \ + mozicon128.png \ + $(NULL) + +GARBAGE += $(BROWSER_APP_FILES) + +export:: $(BROWSER_APP_FILES) + $(NSINSTALL) -D $(DIST)/branding + cp $(BROWSER_APP_FILES) $(DIST)/branding/ + +GARBAGE += iceweasel.png + +default64.png: SIZE=64 +mozicon128.png: SIZE=128 +default16.png: SIZE=16 +default32.png: SIZE=32 +default48.png: SIZE=48 +GARBAGE += document_icon.png default64.png + +mozicon128.png default16.png default32.png default48.png default64.png: $(srcdir)/iceweasel_icon.svg + rsvg-convert -w $(SIZE) -h $(SIZE) -o $@ $< + +iceweasel_logo.png: $(srcdir)/iceweasel_logo.svg + rsvg-convert -w 256 -a -o $@ $< + +GARBAGE += iceweasel_logo.png diff --git a/branding/aboutIce.js b/branding/aboutIce.js new file mode 100644 index 0000000..d9a016d --- /dev/null +++ b/branding/aboutIce.js @@ -0,0 +1,69 @@ +/* ***** 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 debAbout. + * + * The Initial Developer of the Original Code is + * Mike Hommey. + * Portions created by the Initial Developer are Copyright (C) 2007 + * 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 ***** */ + +const Cc = Components.classes; +const Ci = Components.interfaces; +const Cr = Components.results; +Components.utils.import("resource://gre/modules/Services.jsm"); +Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); + +var ice = Services.appinfo.name.toLowerCase(); + +function AboutIce() {} + +AboutIce.prototype = { + QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]), + classDescription: "about:" + ice, + classID: Components.ID("{5df05c89-5e9a-41f4-bd6a-700e4aa305fc}"), + contractID: "@mozilla.org/network/protocol/about;1?what=" + ice, + + newChannel: function(uri) + { + var channel = Services.io.newChannel("chrome://ice/content/ice.xhtml", null, null); + var securityManager = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager); + var principal = securityManager.getCodebasePrincipal(uri); + channel.originalURI = uri; + channel.owner = principal; + return channel; + }, + + getURIFlags: function(uri) + { + return Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT; + } +} + +var NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutIce]); diff --git a/branding/aboutIce.manifest b/branding/aboutIce.manifest new file mode 100644 index 0000000..ba097a9 --- /dev/null +++ b/branding/aboutIce.manifest @@ -0,0 +1,2 @@ +component {5df05c89-5e9a-41f4-bd6a-700e4aa305fc} aboutIce.js +contract @mozilla.org/network/protocol/about;1?what=iceweasel {5df05c89-5e9a-41f4-bd6a-700e4aa305fc} diff --git a/branding/configure.sh b/branding/configure.sh new file mode 100755 index 0000000..9c95df6 --- /dev/null +++ b/branding/configure.sh @@ -0,0 +1,4 @@ +MOZ_APP_BASENAME="Iceweasel" +MOZ_APP_DISPLAYNAME="Iceweasel" +MOZ_APP_PROFILE=mozilla/firefox +MOZ_APP_NAME=iceweasel diff --git a/branding/content/Makefile.in b/branding/content/Makefile.in new file mode 100644 index 0000000..6c13eac --- /dev/null +++ b/branding/content/Makefile.in @@ -0,0 +1,44 @@ +# Branding Makefile +# - jars chrome artwork + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +UNOFFICIAL_BRANDING_FILES = \ + identity-icons-brand.svg \ + silhouette-40.svg \ + $(NULL) + +libs:: about-logo.png about-logo@2x.png about-wordmark.svg about.png icon16.png icon48.png icon64.png $(UNOFFICIAL_BRANDING_FILES) +GARBAGE += $(CHROME_DEPS) + +include $(topsrcdir)/config/rules.mk + +about.png: %.png: ../iceweasel_logo.png %-base.png + composite -compose src-over -gravity center -geometry +0-26 $^ - | \ + convert - -define png:exclude-chunk=time +set date:create +set date:modify $@ + +about-logo.png: ../iceweasel_icon.svg + rsvg-convert -w 210 -h 210 -o $@ $< + +about-logo@2x.png: ../iceweasel_icon.svg + rsvg-convert -w 420 -h 420 -o $@ $< + +about-wordmark.svg: wordmark.xsl ../iceweasel_logo.svg + xsltproc -o $@ $^ + +icon64.png: ../default64.png +icon48.png: ../default48.png +icon16.png: ../default16.png +icon%.png: + cp -f $^ $@ + +../%.png: + $(MAKE) -C .. $(notdir $@) + +$(UNOFFICIAL_BRANDING_FILES): %: $(topsrcdir)/browser/branding/unofficial/content/% + cp -f $^ $@ diff --git a/branding/content/about-base.png b/branding/content/about-base.png new file mode 100644 index 0000000..6d36987 Binary files /dev/null and b/branding/content/about-base.png differ diff --git a/branding/content/aboutCredits-base.png b/branding/content/aboutCredits-base.png new file mode 100644 index 0000000..0e5d937 Binary files /dev/null and b/branding/content/aboutCredits-base.png differ diff --git a/branding/content/aboutDialog.css b/branding/content/aboutDialog.css new file mode 100644 index 0000000..5f1672d --- /dev/null +++ b/branding/content/aboutDialog.css @@ -0,0 +1,23 @@ +#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; +} diff --git a/branding/content/jar.mn b/branding/content/jar.mn new file mode 120000 index 0000000..ab5e467 --- /dev/null +++ b/branding/content/jar.mn @@ -0,0 +1 @@ +../../../browser/branding/official/content/jar.mn \ No newline at end of file diff --git a/branding/content/moz.build b/branding/content/moz.build new file mode 100644 index 0000000..7e10323 --- /dev/null +++ b/branding/content/moz.build @@ -0,0 +1 @@ +JAR_MANIFESTS += ['jar.mn'] diff --git a/branding/content/wordmark.xsl b/branding/content/wordmark.xsl new file mode 100644 index 0000000..d856425 --- /dev/null +++ b/branding/content/wordmark.xsl @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/branding/defs.mk b/branding/defs.mk new file mode 100644 index 0000000..3eb73eb --- /dev/null +++ b/branding/defs.mk @@ -0,0 +1,2 @@ +DIST_SUBDIR=browser +XPI_ROOT_APPID=$(MOZ_APP_ID) diff --git a/branding/firefox-branding.js b/branding/firefox-branding.js new file mode 100644 index 0000000..17cf43e --- /dev/null +++ b/branding/firefox-branding.js @@ -0,0 +1,6 @@ +lockPref("browser.startup.homepage_override.mstone", "ignore"); +pref("browser.aboutHomeSnippets.updateUrl", "data:text/html,"); +pref("startup.homepage_override_url",""); +pref("startup.homepage_welcome_url",""); +pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/"); +pref("devtools.selfxss.count", 0); diff --git a/branding/ice.dtd b/branding/ice.dtd new file mode 100644 index 0000000..2ae5b86 --- /dev/null +++ b/branding/ice.dtd @@ -0,0 +1,13 @@ + + +fire and thunder +swept the land. But Mammon stirred in their hearts, and the beast +Foundered, and its Corpse arose, and commanded "thou shalt +not fly in my name." And the blazes shall freeze cold, and the souls +of the followers of Mammon shall learn to tremble in the +face of ice as they did before the fire.'> + +The Book of Ice, 10:13'> diff --git a/branding/ice.xhtml b/branding/ice.xhtml new file mode 100644 index 0000000..abba41a --- /dev/null +++ b/branding/ice.xhtml @@ -0,0 +1,98 @@ + + + %iceDTD; + + %directionDTD; +]> + + + + + +&ice.title; + + + + +

+&ice.quote; +

+ +

+&ice.from; +

+ + + diff --git a/branding/iceweasel_icon.svg b/branding/iceweasel_icon.svg new file mode 100644 index 0000000..a42398b --- /dev/null +++ b/branding/iceweasel_icon.svg @@ -0,0 +1,4085 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + Iceweasel - Icon + + + Ricardo Fernández Fuentes + + + + + Ricardo Fernández Fuentes + + + iceweasel icon + + + + iceweasel + ico + icon + + + + + inkscape + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branding/iceweasel_logo.svg b/branding/iceweasel_logo.svg new file mode 100644 index 0000000..1e3aa6e --- /dev/null +++ b/branding/iceweasel_logo.svg @@ -0,0 +1,4290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branding/jar.mn b/branding/jar.mn new file mode 100644 index 0000000..017783e --- /dev/null +++ b/branding/jar.mn @@ -0,0 +1,7 @@ +#ifndef BRANDING_TEST +ice.jar: +% content ice %content/ice/ +% locale ice en-US %locale/en-US/ice/ + content/ice/ice.xhtml (ice.xhtml) + locale/en-US/ice/ice.dtd (ice.dtd) +#endif diff --git a/branding/locales/Makefile.in b/branding/locales/Makefile.in new file mode 100644 index 0000000..4ab43da --- /dev/null +++ b/branding/locales/Makefile.in @@ -0,0 +1,47 @@ +# ***** 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 Browser code. +# +# The Initial Developer of the Original Code is +# Benjamin Smedberg +# 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 ***** + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ +relativesrcdir = debian/branding/locales + +include $(DEPTH)/config/autoconf.mk + +DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) + +include $(topsrcdir)/config/rules.mk diff --git a/branding/locales/browserconfig.properties b/branding/locales/browserconfig.properties new file mode 100644 index 0000000..e25553e --- /dev/null +++ b/branding/locales/browserconfig.properties @@ -0,0 +1,3 @@ +# Do NOT localize or otherwise change these values +browser.startup.homepage=about:home + diff --git a/branding/locales/en-US/brand.dtd b/branding/locales/en-US/brand.dtd new file mode 100644 index 0000000..50c20d6 --- /dev/null +++ b/branding/locales/en-US/brand.dtd @@ -0,0 +1,6 @@ + + + + + + diff --git a/branding/locales/en-US/brand.properties b/branding/locales/en-US/brand.properties new file mode 100644 index 0000000..b69ae8d --- /dev/null +++ b/branding/locales/en-US/brand.properties @@ -0,0 +1,4 @@ +brandShorterName=Iceweasel +brandShortName=Iceweasel +brandFullName=Iceweasel +vendorShortName=Mozilla diff --git a/branding/locales/jar.mn b/branding/locales/jar.mn new file mode 120000 index 0000000..3a79f64 --- /dev/null +++ b/branding/locales/jar.mn @@ -0,0 +1 @@ +../../../browser/branding/official/locales/jar.mn \ No newline at end of file diff --git a/branding/locales/moz.build b/branding/locales/moz.build new file mode 100644 index 0000000..7e10323 --- /dev/null +++ b/branding/locales/moz.build @@ -0,0 +1 @@ +JAR_MANIFESTS += ['jar.mn'] diff --git a/branding/moz.build b/branding/moz.build new file mode 100644 index 0000000..57fb397 --- /dev/null +++ b/branding/moz.build @@ -0,0 +1,6 @@ +DIST_SUBDIR = 'browser' +export('DIST_SUBDIR') +DIRS += ['content', 'locales'] +JAR_MANIFESTS += ['jar.mn'] +EXTRA_COMPONENTS += ['aboutIce.js', 'aboutIce.manifest'] +JS_PREFERENCE_FILES += ['firefox-branding.js'] diff --git a/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch new file mode 100644 index 0000000..3fb154f --- /dev/null +++ b/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch @@ -0,0 +1,37 @@ +From: Mike Hommey +Date: Thu, 1 Apr 2010 15:34:59 +0200 +Subject: Determine which phishing shavar to use depending on + MOZ_OFFICIAL_BRANDING + +--- + modules/libpref/init/all.js | 4 ++++ + modules/libpref/moz.build | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js +index a0a9b18..6e7f443 100644 +--- a/modules/libpref/init/all.js ++++ b/modules/libpref/init/all.js +@@ -4834,7 +4834,11 @@ pref("dom.mapped_arraybuffer.enabled", false); + + // The tables used for Safebrowsing phishing and malware checks. + pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple"); ++#ifdef MOZ_OFFICIAL_BRANDING + pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple"); ++#else ++pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple"); ++#endif + pref("urlclassifier.downloadBlockTable", ""); + pref("urlclassifier.downloadAllowTable", ""); + pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,test-forbid-simple,goog-downloadwhite-digest256,mozstd-track-digest256,mozstd-trackwhite-digest256,mozfull-track-digest256"); +diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build +index 8d3a49d..702fcbf 100644 +--- a/modules/libpref/moz.build ++++ b/modules/libpref/moz.build +@@ -49,3 +49,6 @@ if CONFIG['GNU_CXX']: + FINAL_TARGET_PP_FILES += [ + 'greprefs.js', + ] ++ ++if CONFIG['MOZ_OFFICIAL_BRANDING']: ++ DEFINES['MOZ_OFFICIAL_BRANDING'] = True diff --git a/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch b/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch new file mode 100644 index 0000000..77d16ac --- /dev/null +++ b/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch @@ -0,0 +1,61 @@ +From: Mike Hommey +Date: Sat, 19 Feb 2011 11:02:30 +0100 +Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties + +--- + browser/locales/Makefile.in | 2 ++ + .../en-US/chrome/overrides/appstrings.properties | 20 ++++++++++---------- + 2 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in +index 4c092f0..038fa57 100644 +--- a/browser/locales/Makefile.in ++++ b/browser/locales/Makefile.in +@@ -26,6 +26,8 @@ SUBMAKEFILES += \ + $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ + $(NULL) + ++DEFINES += -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) ++ + # This makefile uses variable overrides from the libs-% target to + # build non-default locales to non-default dist/ locations. Be aware! + +diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties +index 0484b32..6c2fd16 100644 +--- a/browser/locales/en-US/chrome/overrides/appstrings.properties ++++ b/browser/locales/en-US/chrome/overrides/appstrings.properties +@@ -3,24 +3,24 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + malformedURI=The URL is not valid and cannot be loaded. +-fileNotFound=Firefox can't find the file at %S. +-dnsNotFound=Firefox can't find the server at %S. +-unknownProtocolFound=Firefox doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context. +-connectionFailure=Firefox can't establish a connection to the server at %S. ++#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can't find the file at %S. ++#expand dnsNotFound=__MOZ_APP_DISPLAYNAME__ can't find the server at %S. ++#expand unknownProtocolFound=__MOZ_APP_DISPLAYNAME__ doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context. ++#expand connectionFailure=__MOZ_APP_DISPLAYNAME__ can't establish a connection to the server at %S. + netInterrupt=The connection to %S was interrupted while the page was loading. + netTimeout=The server at %S is taking too long to respond. +-redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete. ++#expand redirectLoop=__MOZ_APP_DISPLAYNAME__ has detected that the server is redirecting the request for this address in a way that will never complete. + ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S" + confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. + resendButton.label=Resend +-unknownSocketType=Firefox doesn't know how to communicate with the server. ++#expand unknownSocketType=__MOZ_APP_DISPLAYNAME__ doesn't know how to communicate with the server. + netReset=The connection to the server was reset while the page was loading. + notCached=This document is no longer available. +-netOffline=Firefox is currently in offline mode and can't browse the Web. ++#expand netOffline=__MOZ_APP_DISPLAYNAME__ is currently in offline mode and can't browse the Web. + isprinting=The document cannot change while Printing or in Print Preview. +-deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection. +-proxyResolveFailure=Firefox is configured to use a proxy server that can't be found. +-proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections. ++#expand deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. __MOZ_APP_DISPLAYNAME__ has canceled the request for your protection. ++#expand proxyResolveFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that can't be found. ++#expand proxyConnectFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that is refusing connections. + contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. + unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. + externalProtocolTitle=External Protocol Request diff --git a/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch b/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch new file mode 100644 index 0000000..ef31c80 --- /dev/null +++ b/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch @@ -0,0 +1,35 @@ +From: Mike Hommey +Date: Sun, 11 May 2014 15:08:37 +0900 +Subject: Use "firefox" instead of MOZ_APP_NAME for profile reset + +--- + toolkit/modules/ResetProfile.jsm | 2 +- + toolkit/xre/nsAppRunner.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm +index 52c35c7..af2c0cf 100644 +--- a/toolkit/modules/ResetProfile.jsm ++++ b/toolkit/modules/ResetProfile.jsm +@@ -11,7 +11,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; + Cu.import("resource://gre/modules/Services.jsm"); + Cu.import("resource://gre/modules/AppConstants.jsm"); + +-const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME; ++const MOZ_APP_NAME = "firefox"; + const MOZ_BUILD_APP = AppConstants.MOZ_BUILD_APP; + + this.ResetProfile = { +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +index fe63faa..66ca008 100644 +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -4132,7 +4132,7 @@ XREMain::XRE_mainRun() + if (gDoProfileReset) { + // Automatically migrate from the current application if we just + // reset the profile. +- aKey = MOZ_APP_NAME; ++ aKey = "firefox"; + } + pm->Migrate(&mDirProvider, aKey); + } diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..6c7dde7 --- /dev/null +++ b/patches/series @@ -0,0 +1,3 @@ +iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch +iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch +iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch -- cgit v1.2.2