updated branding for 70.070.0-1

11 files changed, 22 insertions, 152 deletions

diff --git a/src/branding/locales/en-US/brand.dtd b/src/branding/locales/en-US/brand.dtd
index c83e6d0..fc0c674 100644
--- a/src/branding/locales/en-US/brand.dtd
+++ b/src/branding/locales/en-US/brand.dtd
@@ -1,5 +1,6 @@
 <!ENTITY  brandShorterName      "Iceweasel">
 <!ENTITY  brandShortName        "Iceweasel">
 <!ENTITY  brandFullName         "Iceweasel">
+<!ENTITY  brandProductName      "Iceweasel">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
diff --git a/src/branding/locales/en-US/brand.ftl b/src/branding/locales/en-US/brand.ftl
index ca180e0..ec13ee3 100644
--- a/src/branding/locales/en-US/brand.ftl
+++ b/src/branding/locales/en-US/brand.ftl
@@ -1,2 +1,6 @@
+-brand-shorter-name = Iceweasel
 -brand-short-name = Iceweasel
+-brand-full-name = Iceweasel
+-brand-product-name = Iceweasel
 -vendor-short-name = Mozilla
+trademarkInfo = { " " }
diff --git a/src/branding/locales/en-US/brand.properties b/src/branding/locales/en-US/brand.properties
index ea073d6..2276bc3 100644
--- a/src/branding/locales/en-US/brand.properties
+++ b/src/branding/locales/en-US/brand.properties
@@ -1,6 +1,7 @@
 brandShorterName=Iceweasel
 brandShortName=Iceweasel
 brandFullName=Iceweasel
+brandProductName=Iceweasel
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync
diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
index bafb02f..26f1ef3 100644
--- a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
+++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
@@ -10,7 +10,7 @@ diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupe
 index c5ab86b65..c402ab76f 100644
 --- a/browser/installer/allowed-dupes.mn
 +++ b/browser/installer/allowed-dupes.mn
-@@ -120,9 +120,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
+@@ -112,9 +112,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
  components/FxAccountsPush.js
  crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
  crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
deleted file mode 100644
index 2ff6677..0000000
--- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: André Silva <emulatorman@parabola.nu>
-Date: Sat, 19 Nov 2016 02:54:21 -0300
-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, 4 insertions(+), 3 deletions(-)
-
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index 11bfba3..ed817aa 100644
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -5630,9 +5630,7 @@ pref("dom.mapped_arraybuffer.enabled", t
- 
- // The tables used for Safebrowsing phishing and malware checks
- pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,test-harmful-simple,test-malware-simple,test-unwanted-simple");
--#ifdef MOZILLA_OFFICIAL
--// In official builds, we are allowed to use Google's private phishing
--// list (see bug 1288840).
-+#ifdef MOZ_OFFICIAL_BRANDING
- pref("urlclassifier.phishTable", "goog-phish-proto,test-phish-simple");
- #else
- pref("urlclassifier.phishTable", "googpub-phish-proto,test-phish-simple");
-diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
-index 1c2c13e..7783e9d 100644
---- a/modules/libpref/moz.build
-+++ b/modules/libpref/moz.build
-@@ -52,3 +52,6 @@ if CONFIG['MOZ_ENABLE_WEBRENDER']:
- FINAL_TARGET_PP_FILES += [
-     'greprefs.js',
- ]
-+
-+if CONFIG['MOZ_OFFICIAL_BRANDING']:
-+    DEFINES['MOZ_OFFICIAL_BRANDING'] = True
diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
index b120020..d43e49c 100644
--- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
+++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
@@ -2,22 +2,22 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 index e205cd4c55..d12adbb558 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -5206,9 +5206,7 @@ pref("dom.mapped_arraybuffer.enabled", true);
+@@ -4970,9 +4970,7 @@ pref("dom.mapped_arraybuffer.enabled", true);
  
  // The tables used for Safebrowsing phishing and malware checks
  pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,moztest-harmful-simple,moztest-malware-simple,moztest-unwanted-simple");
 -#ifdef MOZILLA_OFFICIAL
--// In official builds, we are allowed to use Google's private phishing
--// list (see bug 1288840).
+-  // In official builds, we are allowed to use Google's private phishing
+-  // list (see bug 1288840).
 +#ifdef MOZ_OFFICIAL_BRANDING
- pref("urlclassifier.phishTable", "goog-phish-proto,moztest-phish-simple");
+   pref("urlclassifier.phishTable", "goog-phish-proto,moztest-phish-simple");
  #else
- pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple");
+   pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple");
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 index 9b7620dbca..877ebf9034 100644
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -61,3 +61,6 @@ else:
+@@ -157,3 +157,6 @@ else:
      FINAL_TARGET_PP_FILES += [
          'greprefs.js',
      ]
diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
deleted file mode 100644
index b2ef791..0000000
--- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index 894e3e0..73f5378 100644
---- a/browser/locales/Makefile.in
-+++ b/browser/locales/Makefile.in
-@@ -11,6 +11,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 05cf816..5301b0b 100644
---- a/browser/locales/en-US/chrome/overrides/appstrings.properties
-+++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
-@@ -3,25 +3,25 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- malformedURI2=Please check that the URL is correct and try again.
--fileNotFound=Firefox can’t find the file at %S.
-+#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can’t find the file at %S.
- fileAccessDenied=The file at %S is not readable.
- dnsNotFound2=We can’t connect to 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 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
-@@ -36,9 +36,9 @@ unwantedBlocked=The site at %S has been
- deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
- cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
- corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
--remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
-+#expand remoteXUL=This page uses an unsupported technology that is no longer available by default in __MOZ_APP_DISPLAYNAME__.
- ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
--sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
-+#expand sslv3Used=__MOZ_APP_DISPLAYNAME__ cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
- inadequateSecurityError=The website tried to negotiate an inadequate level of security.
- blockedByPolicy=Your organization has blocked access to this page or website.
--networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired.
-+#expand networkProtocolError=__MOZ_APP_DISPLAYNAME__ has experienced a network protocol violation that cannot be repaired.
diff --git a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
deleted file mode 100644
index dad8a5c..0000000
--- a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Mike Hommey <mh@glandium.org>
-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
-@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["ResetProfile"];
- const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
- const {AppConstants} = ChromeUtils.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;
- 
- var 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
-@@ -4377,7 +4377,7 @@ nsresult XREMain::XRE_mainRun() {
-         if (gDoProfileReset) {
-           // Automatically migrate from the current application if we just
-           // reset the profile.
--          aKey = MOZ_APP_NAME;
-+          aKey = "firefox";
-           gResetOldProfile->GetName(aName);
-         }
-         pm->Migrate(&mDirProvider, aKey, aName);
diff --git a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch
index dad8a5c..07050b9 100644
--- a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch
+++ b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch
@@ -11,9 +11,9 @@ 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
-@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["ResetProfile"];
- const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
- const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+@@ -11,7 +11,7 @@ var EXPORTED_SYMBOLS = ["ResetProfile"];
+   "resource://gre/modules/AppConstants.jsm"
+ );
  
 -const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME;
 +const MOZ_APP_NAME = "firefox";
@@ -24,7 +24,7 @@ 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
-@@ -4377,7 +4377,7 @@ nsresult XREMain::XRE_mainRun() {
+@@ -4349,7 +4349,7 @@ nsresult XREMain::XRE_mainRun() {
          if (gDoProfileReset) {
            // Automatically migrate from the current application if we just
            // reset the profile.
diff --git a/src/patches/iceweasel-branding/enable-object-directory-paths.patch b/src/patches/iceweasel-branding/enable-object-directory-paths.patch
index 2a5733f..74791e4 100644
--- a/src/patches/iceweasel-branding/enable-object-directory-paths.patch
+++ b/src/patches/iceweasel-branding/enable-object-directory-paths.patch
@@ -2,9 +2,9 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
 index 41ae8ae..dcc3263 100644
 --- a/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
-@@ -637,8 +637,6 @@ class Path(ContextDerivedValue, unicode)
- class SourcePath(Path):
+@@ -640,8 +640,6 @@ class Path(ContextDerivedValue, unicode)
      """Like Path, but limited to paths in the source directory."""
+ 
      def __init__(self, context, value):
 -        if value.startswith('!'):
 -            raise ValueError('Object directory paths are not allowed')
diff --git a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
index 9e73b5e..6bb47f5 100644
--- a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
+++ b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
@@ -2,7 +2,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
 index cffcff1..85d28cc 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -240,13 +240,6 @@
+@@ -249,13 +249,6 @@
  @RESPATH@/chrome/toolkit.manifest
  @RESPATH@/chrome/recording.manifest
  @RESPATH@/chrome/recording/*
@@ -16,8 +16,8 @@ index cffcff1..85d28cc 100644
  @RESPATH@/browser/features/*
  
  ; [Webide Files]
-@@ -265,15 +258,10 @@
- @RESPATH@/browser/@PREF_DIR@/devtools-client.js
+@@ -271,15 +264,10 @@
+ @RESPATH@/browser/chrome/devtools.manifest
  @RESPATH@/browser/@PREF_DIR@/debugger.js
  
 -; shell icons