diff --git a/b2g/locales/en-US/chrome/overrides/appstrings.properties b/b2g/locales/en-US/chrome/overrides/appstrings.properties index d69f69bfdbb9..458386736929 100644 --- a/b2g/locales/en-US/chrome/overrides/appstrings.properties +++ b/b2g/locales/en-US/chrome/overrides/appstrings.properties @@ -34,7 +34,7 @@ unwantedBlocked=The site at %S has been reported as serving unwanted software an deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences. forbiddenBlocked=The site at %S has been blocked by your browser configuration. cspBlocked=This page has a content security policy that prevents it from being loaded in this way. -corruptedContentError=The site at %S has experienced a network protocol violation that cannot be repaired. +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. sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Firefox has not connected to this website. diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml index 9aabebfed47d..980a72268906 100644 --- a/browser/base/content/aboutNetError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -521,7 +521,7 @@

&certerror.longpagetitle1;

&cspBlocked.title;

&remoteXUL.title;

-

&corruptedContentError.title;

+

&corruptedContentErrorv2.title;

&sslv3Used.title;

&weakCryptoUsed.title;

&inadequateSecurityError.title;

@@ -550,7 +550,7 @@
&certerror.introPara;
&cspBlocked.longDesc;
&remoteXUL.longDesc;
-
&corruptedContentError.longDesc;
+
&corruptedContentErrorv2.longDesc;
&sslv3Used.longDesc2;
&weakCryptoUsed.longDesc2;
&inadequateSecurityError.longDesc;
diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties index 3be76aacdd01..05cf81699600 100644 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties @@ -35,7 +35,7 @@ unwantedBlocked=The site at %S has been reported as serving unwanted software an deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences. forbiddenBlocked=The site at %S has been blocked by your browser configuration. cspBlocked=This page has a content security policy that prevents it from being loaded in this way. -corruptedContentError=The site at %S has experienced a network protocol violation that cannot be repaired. +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. ## 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. diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/browser/locales/en-US/chrome/overrides/netError.dtd index d615b98774e4..873c9637219e 100644 --- a/browser/locales/en-US/chrome/overrides/netError.dtd +++ b/browser/locales/en-US/chrome/overrides/netError.dtd @@ -165,8 +165,8 @@ was trying to connect. --> &brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.

"> - -The page you are trying to view cannot be shown because an error in the data transmission was detected.

"> + +The page you are trying to view cannot be shown because an error in the data transmission was detected.

"> diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index c13c9bc514cc..07a931655889 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -5066,11 +5066,11 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, break; case NS_ERROR_CORRUPTED_CONTENT: // Broken Content Detected. e.g. Content-MD5 check failure. - error.AssignLiteral("corruptedContentError"); + error.AssignLiteral("corruptedContentErrorv2"); break; case NS_ERROR_INTERCEPTION_FAILED: // ServiceWorker intercepted request, but something went wrong. - error.AssignLiteral("corruptedContentError"); + error.AssignLiteral("corruptedContentErrorv2"); break; case NS_ERROR_NET_INADEQUATE_SECURITY: // Server negotiated bad TLS for HTTP/2. diff --git a/docshell/resources/content/netError.xhtml b/docshell/resources/content/netError.xhtml index 70c81961255a..1db7131d3648 100644 --- a/docshell/resources/content/netError.xhtml +++ b/docshell/resources/content/netError.xhtml @@ -307,7 +307,7 @@

&nssBadCert.title;

&cspBlocked.title;

&remoteXUL.title;

-

&corruptedContentError.title;

+

&corruptedContentErrorv2.title;

&inadequateSecurityError.title;

@@ -334,7 +334,7 @@
&nssBadCert.longDesc2;
&cspBlocked.longDesc;
&remoteXUL.longDesc;
-
&corruptedContentError.longDesc;
+
&corruptedContentErrorv2.longDesc;
&inadequateSecurityError.longDesc;
diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js index 98190c7c7a84..688b54d6f37b 100644 --- a/dom/browser-element/BrowserElementChildPreload.js +++ b/dom/browser-element/BrowserElementChildPreload.js @@ -1673,7 +1673,7 @@ BrowserElementChild.prototype = { sendAsyncMsg('error', { type: 'unsafeContentType' }); return; case Cr.NS_ERROR_CORRUPTED_CONTENT : - sendAsyncMsg('error', { type: 'corruptedContentError' }); + sendAsyncMsg('error', { type: 'corruptedContentErrorv2' }); return; default: diff --git a/dom/locales/en-US/chrome/appstrings.properties b/dom/locales/en-US/chrome/appstrings.properties index 73bb17260b07..19a3eeeaf6ba 100644 --- a/dom/locales/en-US/chrome/appstrings.properties +++ b/dom/locales/en-US/chrome/appstrings.properties @@ -34,7 +34,7 @@ unwantedBlocked=The site at %S has been reported as serving unwanted software an deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences. forbiddenBlocked=The site at %S has been blocked by your browser configuration. cspBlocked=This page has a content security policy that prevents it from being loaded in this way. -corruptedContentError=The site at %S has experienced a network protocol violation that cannot be repaired. +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. sslv3Used=The safety of your data on %S could not be guaranteed because it uses SSLv3, a broken security protocol. weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, the connection to this website has not been established. diff --git a/dom/locales/en-US/chrome/netError.dtd b/dom/locales/en-US/chrome/netError.dtd index 564543f117ec..b141af1cb6ca 100644 --- a/dom/locales/en-US/chrome/netError.dtd +++ b/dom/locales/en-US/chrome/netError.dtd @@ -87,8 +87,8 @@ The browser prevented this page from loading in this way because the page has a content security policy that disallows it.

"> - -The page you are trying to view cannot be shown because an error in the data transmission was detected.

"> + +The page you are trying to view cannot be shown because an error in the data transmission was detected.

">

"> diff --git a/mobile/android/chrome/content/netError.xhtml b/mobile/android/chrome/content/netError.xhtml index e1d10a668932..f4c727c06142 100644 --- a/mobile/android/chrome/content/netError.xhtml +++ b/mobile/android/chrome/content/netError.xhtml @@ -323,7 +323,7 @@

&nssBadCert.title;

&cspBlocked.title;

&remoteXUL.title;

-

&corruptedContentError.title;

+

&corruptedContentErrorv2.title;

&sslv3Used.title;

&weakCryptoUsed.title;

&inadequateSecurityError.title;

@@ -356,7 +356,7 @@
&nssBadCert.longDesc2;
&cspBlocked.longDesc;
&remoteXUL.longDesc;
-
&corruptedContentError.longDesc;
+
&corruptedContentErrorv2.longDesc;
&sslv3Used.longDesc;
&weakCryptoUsed.longDesc;
&inadequateSecurityError.longDesc;
diff --git a/mobile/locales/en-US/overrides/appstrings.properties b/mobile/locales/en-US/overrides/appstrings.properties index 6760aec77a3d..9c68d8f1214c 100644 --- a/mobile/locales/en-US/overrides/appstrings.properties +++ b/mobile/locales/en-US/overrides/appstrings.properties @@ -35,7 +35,7 @@ deceptiveBlocked=This web page at %S has been reported as a deceptive site and h unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences. forbiddenBlocked=The site at %S has been blocked by your browser configuration. cspBlocked=This page has a content security policy that prevents it from being loaded in this way. -corruptedContentError=The site at %S has experienced a network protocol violation that cannot be repaired. +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. sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Firefox has not connected to this website. diff --git a/mobile/locales/en-US/overrides/netError.dtd b/mobile/locales/en-US/overrides/netError.dtd index 94453740875f..82d2a8e371b5 100644 --- a/mobile/locales/en-US/overrides/netError.dtd +++ b/mobile/locales/en-US/overrides/netError.dtd @@ -184,8 +184,8 @@ be temporary, and you can try again later. &brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.

"> - -The page you are trying to view cannot be shown because an error in the data transmission was detected.

"> + +The page you are trying to view cannot be shown because an error in the data transmission was detected.

">