From 098dcde10086ad95e0720c092ddfd490524ed0ff Mon Sep 17 00:00:00 2001 From: "kaie%kuix.de" Date: Wed, 20 Jun 2007 14:10:32 +0000 Subject: [PATCH] Bug 107491, follow up check in, Rename string ID nssFailure to nssFailure2 rs=Pike git-svn-id: svn://10.0.0.236/trunk@228381 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/locales/en-US/chrome/overrides/netError.dtd | 4 ++-- .../embed-replacements/locale/en-US/global/netError.dtd | 4 ++-- mozilla/docshell/base/nsDocShell.cpp | 2 +- mozilla/docshell/resources/content/netError.xhtml | 4 ++-- mozilla/dom/locales/en-US/chrome/netError.dtd | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd b/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd index 18373b6979b..abbcca2616d 100644 --- a/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd +++ b/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd @@ -115,8 +115,8 @@ "> - - +
  • The page you are trying to view can not be shown because the authenticity of the received data could not be verified.
  • Please contact the web site owners to inform them of this problem. Alternatively, use the command found in the help menu to report this broken site.
    • diff --git a/mozilla/camino/embed-replacements/locale/en-US/global/netError.dtd b/mozilla/camino/embed-replacements/locale/en-US/global/netError.dtd index 0213ef8169b..fb6c4186cf8 100644 --- a/mozilla/camino/embed-replacements/locale/en-US/global/netError.dtd +++ b/mozilla/camino/embed-replacements/locale/en-US/global/netError.dtd @@ -51,5 +51,5 @@ The site responded to the network request in an unexpected way and Camino cannot continue.

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

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

    "> diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 2bbbc310bab..36d2ba5dc79 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -2918,7 +2918,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI, } } if (!messageStr.IsEmpty()) - error.AssignLiteral("nssFailure"); + error.AssignLiteral("nssFailure2"); } else { // Errors requiring simple formatting diff --git a/mozilla/docshell/resources/content/netError.xhtml b/mozilla/docshell/resources/content/netError.xhtml index 09abcd5ae01..4e81a33fe0a 100644 --- a/mozilla/docshell/resources/content/netError.xhtml +++ b/mozilla/docshell/resources/content/netError.xhtml @@ -167,7 +167,7 @@

    &proxyResolveFailure.title;

    &proxyConnectFailure.title;

    &contentEncodingError.title;

    -

    &nssFailure.title;

    +

    &nssFailure2.title;

    &generic.longDesc;
    @@ -186,7 +186,7 @@
    &proxyResolveFailure.longDesc;
    &proxyConnectFailure.longDesc;
    &contentEncodingError.longDesc;
    -
    &nssFailure.longDesc;
    +
    &nssFailure2.longDesc;
    diff --git a/mozilla/dom/locales/en-US/chrome/netError.dtd b/mozilla/dom/locales/en-US/chrome/netError.dtd index 5abd7f9e343..a5dca5eb656 100644 --- a/mozilla/dom/locales/en-US/chrome/netError.dtd +++ b/mozilla/dom/locales/en-US/chrome/netError.dtd @@ -51,5 +51,5 @@ The site responded to the network request in an unexpected way and the browser cannot continue.

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

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

    ">