updated to 54.0 branding54.0-1

3 files changed, 4 insertions, 17 deletions

diff --git a/release.sh b/release.sh
index 84c28cb..551cfe6 100755
--- a/release.sh
+++ b/release.sh
@@ -3,8 +3,8 @@
 set -eu
 
 pkgname=iceweasel
-pkgver=53.0
-pkgrel=2
+pkgver=54.0
+pkgrel=1
 
 srcdir=src
 distdir=${pkgname}-${pkgver}
diff --git a/src/branding/content/Makefile.in b/src/branding/content/Makefile.in
index 8080d84..18ec06b 100644
--- a/src/branding/content/Makefile.in
+++ b/src/branding/content/Makefile.in
@@ -10,7 +10,6 @@ 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)
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
index 5f46769..22e21fa 100644
--- 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
@@ -1,12 +1,3 @@
-From: André Silva <emulatorman@parabola.nu>
-Date: Wed, 21 Sep 2016 22:48:27 -0300
-Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties
-
----
- browser/locales/Makefile.in                          |  2 ++
- .../en-US/chrome/overrides/appstrings.properties     | 26 ++++++++++----------
- 2 files changed, 15 insertions(+), 13 deletions(-)
-
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 index 894e3e0..73f5378 100644
 --- a/browser/locales/Makefile.in
@@ -60,8 +51,8 @@ index 05cf816..5301b0b 100644
  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 @@ deceptiveBlocked=This web page at %S has been reported as a deceptive site and h
- forbiddenBlocked=The site at %S has been blocked by your browser configuration.
+@@ -35,7 +35,7 @@ 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.
@@ -69,7 +60,4 @@ index 05cf816..5301b0b 100644
  ## 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.
- ## LOCALIZATION NOTE (weakCryptoUsed) - Do not translate "%S".
--weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Firefox has not connected to this website.
-+#expand weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, __MOZ_APP_DISPLAYNAME__ has not connected to this website.
  inadequateSecurityError=The website tried to negotiate an inadequate level of security.