From 940e887121f04bbbedfc3df6cd5046590d89545e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Dec 08 2021 21:44:16 +0000 Subject: Bump to 95.0 and udate patches for upstream release --- diff --git a/release.sh b/release.sh index e2792a7..8ddd7b5 100755 --- a/release.sh +++ b/release.sh @@ -3,7 +3,7 @@ set -eu pkgname=iceweasel -brandingver=93.0 +brandingver=95.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch index 98e8a56..e4427a0 100644 --- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch +++ b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch @@ -1,5 +1,5 @@ diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties -index 05cf816..5301b0b 100644 +index c2443faac1..468223bd6b 100644 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties @@ -3,25 +3,25 @@ @@ -37,12 +37,9 @@ 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 @@ 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. +@@ -38,7 +38,7 @@ cspBlocked=This page has a content security policy that prevents it from being l + xfoBlocked=This page has an X-Frame-Options policy that prevents it from being loaded in this context. 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.