Bug 1014282: Do not direct every ssl error to 'Report Web Forgery' (r=margaret)
authorMonica Chew <mmc@mozilla.com>
Thu, 22 May 2014 16:26:57 -0700
changeset 3560 291b61f3e01876bccc4bd7c25d813efef6e7ee25
parent 3559 fba19f48f9707ae7f96094a38bcdc1fb79f168b7
child 3568 69e2786ed8d450d6dbd959abd633d9886c289122
child 3570 9483f8add37c320001889dcf3a6e510f20a5dfc5
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersmargaret
bugs1014282
Bug 1014282: Do not direct every ssl error to 'Report Web Forgery' (r=margaret) X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 184d497bd84a5affcba6afefa7d25443051cc55c
browser/chrome/overrides/netError.dtd
dom/chrome/netError.dtd
mobile/overrides/netError.dtd
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -125,20 +125,20 @@
 <ul>
   <li>Check to make sure your system has the Personal Security Manager
     installed.</li>
   <li>This might be due to a non-standard configuration on the server.</li>
 </ul>
 ">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc "
+<!ENTITY nssFailure2.longDesc2 "
 <ul>
   <li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li>
-  <li>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.</li>
+  <li>Please contact the website owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "
 <ul>
   <li>This could be a problem with the server's configuration, or it could be
 someone trying to impersonate the server.</li>
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -61,17 +61,17 @@
 
 <!ENTITY redirectLoop.title "Redirect Loop">
 <!ENTITY redirectLoop.longDesc "<p>The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.</p><ul><li>Have you disabled or blocked cookies required by this site?</li><li><em>NOTE</em>: If accepting the site's cookies does not resolve the problem, it is likely a server configuration issue and not your computer.</li></ul>">
 
 <!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 nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
+<!ENTITY nssFailure2.longDesc2 "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "<ul>
 <li>This could be a problem with the server's configuration, or it could be someone trying to impersonate the server.</li>
 <li>If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.</li>
 </ul>
 ">
 
--- a/mobile/overrides/netError.dtd
+++ b/mobile/overrides/netError.dtd
@@ -120,20 +120,20 @@
 <ul>
   <li>Check to make sure your system has the Personal Security Manager
     installed.</li>
   <li>This might be due to a non-standard configuration on the server.</li>
 </ul>
 ">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc "
+<!ENTITY nssFailure2.longDesc2 "
 <ul>
   <li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li>
-  <li>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.</li>
+  <li>Please contact the website owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "
 <ul>
   <li>This could be a problem with the server's configuration, or it could be
 someone trying to impersonate the server.</li>