From bce84acfd90e225dcd88daad0eba65f2e1ad0fba Mon Sep 17 00:00:00 2001 From: Monica Chew Date: Thu, 22 May 2014 16:26:57 -0700 Subject: [PATCH] Bug 1014282: Do not direct every ssl error to 'Report Web Forgery' (r=margaret) --- browser/base/content/aboutneterror/netError.xhtml | 2 +- browser/locales/en-US/chrome/overrides/netError.dtd | 4 ++-- browser/metro/base/content/pages/netError.xhtml | 2 +- docshell/resources/content/netError.xhtml | 2 +- dom/locales/en-US/chrome/netError.dtd | 2 +- mobile/android/chrome/content/netError.xhtml | 2 +- mobile/locales/en-US/overrides/netError.dtd | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/browser/base/content/aboutneterror/netError.xhtml b/browser/base/content/aboutneterror/netError.xhtml index ad7a564fb6de..147e53f712a9 100644 --- a/browser/base/content/aboutneterror/netError.xhtml +++ b/browser/base/content/aboutneterror/netError.xhtml @@ -314,7 +314,7 @@
&proxyConnectFailure.longDesc;
&contentEncodingError.longDesc;
&unsafeContentType.longDesc;
-
&nssFailure2.longDesc;
+
&nssFailure2.longDesc2;
&nssBadCert.longDesc2;
&malwareBlocked.longDesc;
&cspFrameAncestorBlocked.longDesc;
diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/browser/locales/en-US/chrome/overrides/netError.dtd index 2ebcfc481f00..f2ed8ec3d3fa 100644 --- a/browser/locales/en-US/chrome/overrides/netError.dtd +++ b/browser/locales/en-US/chrome/overrides/netError.dtd @@ -130,10 +130,10 @@ "> -
  • The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
    • -
  • Please contact the website owners to inform them of this problem. Alternatively, use the command found in the help menu to report this broken site.
    • +
  • Please contact the website owners to inform them of this problem.
    • "> diff --git a/browser/metro/base/content/pages/netError.xhtml b/browser/metro/base/content/pages/netError.xhtml index 705e616a0d00..e292b0b2ac41 100644 --- a/browser/metro/base/content/pages/netError.xhtml +++ b/browser/metro/base/content/pages/netError.xhtml @@ -314,7 +314,7 @@
    &proxyConnectFailure.longDesc;
    &contentEncodingError.longDesc;
    &unsafeContentType.longDesc;
    -
    &nssFailure2.longDesc;
    +
    &nssFailure2.longDesc2;
    &nssBadCert.longDesc2;
    &cspFrameAncestorBlocked.longDesc;
    &remoteXUL.longDesc;
    diff --git a/docshell/resources/content/netError.xhtml b/docshell/resources/content/netError.xhtml index 517f36cf4135..5e4339951fb4 100644 --- a/docshell/resources/content/netError.xhtml +++ b/docshell/resources/content/netError.xhtml @@ -314,7 +314,7 @@
    &proxyConnectFailure.longDesc;
    &contentEncodingError.longDesc;
    &unsafeContentType.longDesc;
    -
    &nssFailure2.longDesc;
    +
    &nssFailure2.longDesc2;
    &nssBadCert.longDesc2;
    &malwareBlocked.longDesc;
    &cspFrameAncestorBlocked.longDesc;
    diff --git a/dom/locales/en-US/chrome/netError.dtd b/dom/locales/en-US/chrome/netError.dtd index 3135f125e76e..2b0f41120bf2 100644 --- a/dom/locales/en-US/chrome/netError.dtd +++ b/dom/locales/en-US/chrome/netError.dtd @@ -66,7 +66,7 @@ The site responded to the network request in an unexpected way and the browser cannot continue.

    "> -The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.

    "> +The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.

    "> diff --git a/mobile/android/chrome/content/netError.xhtml b/mobile/android/chrome/content/netError.xhtml index faeecd636368..f48a7d254af7 100644 --- a/mobile/android/chrome/content/netError.xhtml +++ b/mobile/android/chrome/content/netError.xhtml @@ -322,7 +322,7 @@
    &proxyConnectFailure.longDesc;
    &contentEncodingError.longDesc;
    &unsafeContentType.longDesc;
    -
    &nssFailure2.longDesc;
    +
    &nssFailure2.longDesc2;
    &nssBadCert.longDesc2;
    &cspFrameAncestorBlocked.longDesc;
    &remoteXUL.longDesc;
    diff --git a/mobile/locales/en-US/overrides/netError.dtd b/mobile/locales/en-US/overrides/netError.dtd index 00afc09d2138..a8d44437626d 100644 --- a/mobile/locales/en-US/overrides/netError.dtd +++ b/mobile/locales/en-US/overrides/netError.dtd @@ -125,10 +125,10 @@ "> -
  • The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
    • -
  • Please contact the website owners to inform them of this problem. Alternatively, use the command found in the help menu to report this broken site.
    • +
  • Please contact the website owners to inform them of this problem.
    • ">