Bug 107491, follow up check in, Rename string ID nssFailure to nssFailure2

rs=Pike

browser/locales/en-US/chrome/overrides/netError.dtd

@@ -115,8 +115,8 @@
 </ul>
 ">
 
-<!ENTITY nssFailure.title "Secure Connection Failed">
-<!ENTITY nssFailure.longDesc "
+<!ENTITY nssFailure2.title "Secure Connection Failed">
+<!ENTITY nssFailure2.longDesc "
 <ul>
   <li>The page you are trying to view can not be shown because the authenticity of the received data could not be verified.</li>
   <li>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.</li>

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

docshell/resources/content/netError.xhtml

@@ -167,7 +167,7 @@
         <h1 id="et_proxyResolveFailure">&proxyResolveFailure.title;</h1>
         <h1 id="et_proxyConnectFailure">&proxyConnectFailure.title;</h1>
         <h1 id="et_contentEncodingError">&contentEncodingError.title;</h1>
-        <h1 id="et_nssFailure">&nssFailure.title;</h1>
+        <h1 id="et_nssFailure">&nssFailure2.title;</h1>
       </div>
       <div id="errorDescriptionsContainer">
         <div id="ed_generic">&generic.longDesc;</div>
@@ -186,7 +186,7 @@
         <div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc;</div>
         <div id="ed_proxyConnectFailure">&proxyConnectFailure.longDesc;</div>
         <div id="ed_contentEncodingError">&contentEncodingError.longDesc;</div>
-        <div id="ed_nssFailure">&nssFailure.longDesc;</div>
+        <div id="ed_nssFailure">&nssFailure2.longDesc;</div>
       </div>
     </div>
 

dom/locales/en-US/chrome/netError.dtd

@@ -51,5 +51,5 @@
 <!ENTITY unknownSocketType.title "Incorrect Response">
 <!ENTITY unknownSocketType.longDesc "<p>The site responded to the network request in an unexpected way and the browser cannot continue.</p>">
 
-<!ENTITY nssFailure.title "Secure Connection Failed">
-<!ENTITY nssFailure.longDesc "<p>The page you are trying to view can not be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
+<!ENTITY nssFailure2.title "Secure Connection Failed">
+<!ENTITY nssFailure2.longDesc "<p>The page you are trying to view can not be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">