From 36057e75f9bca0ef0b2544e3b180f7e6ff5d87d9 Mon Sep 17 00:00:00 2001
From: Cykesiopka <cykesiopka.bmo@gmail.com>
Date: Mon, 27 Oct 2014 21:06:00 -0400
Subject: [PATCH] Bug 1057035 - Fix terminology used in the certificate
 exception dialog. r=keeler

---
 .../locales/en-US/chrome/pippki/pippki.properties      | 10 +++++-----
 .../manager/pki/resources/content/exceptionDialog.js   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/security/manager/locales/en-US/chrome/pippki/pippki.properties b/security/manager/locales/en-US/chrome/pippki/pippki.properties
index 23f0be0dd8d9..85c29536ed65 100644
--- a/security/manager/locales/en-US/chrome/pippki/pippki.properties
+++ b/security/manager/locales/en-US/chrome/pippki/pippki.properties
@@ -147,17 +147,17 @@ writeFileUnknownError=Unknown error
 addExceptionBrandedWarning2=You are about to override how %S identifies this site.
 addExceptionInvalidHeader=This site attempts to identify itself with invalid information.
 addExceptionDomainMismatchShort=Wrong Site
-addExceptionDomainMismatchLong=Certificate belongs to a different site, which could indicate an identity theft.
+addExceptionDomainMismatchLong2=The certificate belongs to a different site, which could mean that someone is trying to impersonate this site.
 addExceptionExpiredShort=Outdated Information
-addExceptionExpiredLong=Certificate is not currently valid. It is impossible to verify whether this identity was reported as stolen or lost.
+addExceptionExpiredLong2=The certificate is not currently valid. It may have been stolen or lost, and could be used by someone to impersonate this site.
 addExceptionUnverifiedOrBadSignatureShort=Unknown Identity
-addExceptionUnverifiedOrBadSignatureLong=Certificate is not trusted, because it hasn't been verified by a recognized authority using a secure signature.
+addExceptionUnverifiedOrBadSignatureLong2=The certificate is not trusted because it hasn't been verified as issued by a trusted authority using a secure signature.
 addExceptionValidShort=Valid Certificate
 addExceptionValidLong=This site provides valid, verified identification.  There is no need to add an exception.
 addExceptionCheckingShort=Checking Information
-addExceptionCheckingLong=Attempting to identify the site…
+addExceptionCheckingLong2=Attempting to identify this site…
 addExceptionNoCertShort=No Information Available
-addExceptionNoCertLong=Unable to obtain identification status for the given site.
+addExceptionNoCertLong2=Unable to obtain identification status for this site.
 addExceptionConnectionFailed=Connection Failed
 
 #Certificate Exists in database
diff --git a/security/manager/pki/resources/content/exceptionDialog.js b/security/manager/pki/resources/content/exceptionDialog.js
index 229500b0fe09..640791f898fc 100644
--- a/security/manager/pki/resources/content/exceptionDialog.js
+++ b/security/manager/pki/resources/content/exceptionDialog.js
@@ -187,11 +187,11 @@ function updateCertStatus() {
   if(gCert) {
     if(gBroken) { 
       var mms = "addExceptionDomainMismatchShort";
-      var mml = "addExceptionDomainMismatchLong";
+      var mml = "addExceptionDomainMismatchLong2";
       var exs = "addExceptionExpiredShort";
-      var exl = "addExceptionExpiredLong";
+      var exl = "addExceptionExpiredLong2";
       var uts = "addExceptionUnverifiedOrBadSignatureShort";
-      var utl = "addExceptionUnverifiedOrBadSignatureLong";
+      var utl = "addExceptionUnverifiedOrBadSignatureLong2";
       var use1 = false;
       if (gSSLStatus.isDomainMismatch) {
         bucketId += gNsISecTel.WARNING_BAD_CERT_TOP_ADD_EXCEPTION_FLAG_DOMAIN;
@@ -263,7 +263,7 @@ function updateCertStatus() {
   }
   else if (gChecking) {
     shortDesc = "addExceptionCheckingShort";
-    longDesc  = "addExceptionCheckingLong";
+    longDesc  = "addExceptionCheckingLong2";
     // We're checking the certificate, so we disable the Get Certificate
     // button to make sure that the user can't interrupt the process and
     // trigger another certificate fetch.
@@ -274,7 +274,7 @@ function updateCertStatus() {
   }
   else {
     shortDesc = "addExceptionNoCertShort";
-    longDesc  = "addExceptionNoCertLong";
+    longDesc  = "addExceptionNoCertLong2";
     // We're done checking the certificate, so allow the user to check it again.
     document.getElementById("checkCertButton").disabled = false;
     document.getElementById("viewCertButton").disabled = true;