From d4e8231baf07e773eeb4d875e6ad4e9408a5c079 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Mon, 5 Nov 2007 14:59:09 -0800
Subject: [PATCH] Bug 402369 - "Modify strings added in bug 401575 for SSL
 netError pages" [p=reed r+ui-r+a1.9+aM9=beltzner]

---
 browser/base/content/browser.js                     | 2 +-
 browser/locales/en-US/chrome/overrides/netError.dtd | 8 ++++----
 dom/locales/en-US/chrome/netError.dtd               | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 403792db06e6..e37b4d6e005e 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2313,7 +2313,7 @@ function BrowserOnCommand(event) {
       return;
     
     // If the event came from an ssl error page, it is probably either the "Add
-    // Exception" or "Get Me Out Of Here" button
+    // Exception…" or "Get me out of here!" button
     if (/^about:neterror\?e=nssBadCert/.test(event.originalTarget.ownerDocument.documentURI)) {
       var ot = event.originalTarget;
       var errorDoc = ot.ownerDocument;
diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/browser/locales/en-US/chrome/overrides/netError.dtd
index 80a46739d866..cc93b972d97a 100644
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -156,9 +156,9 @@ be temporary, and you can try again later.</li>
 <p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>
 ">
 
-<!ENTITY securityOverride.linkText "Or you can add an exception...">
-<!ENTITY securityOverride.getMeOutOfHereButton "Get Me Out of Here">
-<!ENTITY securityOverride.exceptionButtonLabel "Add Exception">
+<!ENTITY securityOverride.linkText "Or you can add an exception…">
+<!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!">
+<!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
 
 <!-- LOCALIZATION NOTE (securityOverride.warningText) - Do not translate the
 contents of the <xul:button> tags.  The only language content is the label= field,
@@ -166,7 +166,7 @@ which uses strings already defined above. The button is included here (instead o
 netError.xhtml) because it exposes functionality specific to firefox. -->
 
 <!ENTITY securityOverride.warningText "
-<p>You should not add an exception if you are using an internet connection that you do not trust completely, or if you are not used to seeing a warning for this server.</p>
+<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 
 <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
 <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/>
diff --git a/dom/locales/en-US/chrome/netError.dtd b/dom/locales/en-US/chrome/netError.dtd
index 4cad5f5fddd4..43e27ea43f5b 100644
--- a/dom/locales/en-US/chrome/netError.dtd
+++ b/dom/locales/en-US/chrome/netError.dtd
@@ -73,8 +73,8 @@
 <p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>
 ">
 
-<!ENTITY securityOverride.linkText "Or you can add an exception...">
+<!ENTITY securityOverride.linkText "Or you can add an exception…">
 <!ENTITY securityOverride.warningText "
-<p>You should not add an exception if you are using an internet connection that you do not trust completely, or if you are not used to seeing a warning for this server.</p>
+<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 <p>If you still wish to add an exception for this site, you can do so in your advanced encryption settings.</p>
 ">