Backed out changeset 470c550c782b (bug 1115668) for breaking dt tests on a CLOSED TREE

dom/locales/en-US/chrome/security/security.properties

@@ -15,9 +15,8 @@ SHA1Sig=This site makes use of a SHA-1 Certificate; it's recommended you use cer
 InsecurePasswordsPresentOnPage=Password fields present on an insecure (http://) page. This is a security risk that allows user login credentials to be stolen.
 InsecureFormActionPasswordsPresent=Password fields present in a form with an insecure (http://) form action. This is a security risk that allows user login credentials to be stolen.
 InsecurePasswordsPresentOnIframe=Password fields present on an insecure (http://) iframe. This is a security risk that allows user login credentials to be stolen.
-# LOCALIZATION NOTE: "%1$S" is the URI of the insecure mixed content resource
-LoadingMixedActiveContent2=Loading mixed (insecure) active content "%1$S" on a secure page
-LoadingMixedDisplayContent2=Loading mixed (insecure) display content "%1$S" on a secure page
+LoadingMixedActiveContent=Loading mixed (insecure) active content on a secure page "%1$S"
+LoadingMixedDisplayContent=Loading mixed (insecure) display content on a secure page "%1$S"
 # LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
 BothAllowScriptsAndSameOriginPresent=An iframe which has both allow-scripts and allow-same-origin for its sandbox attribute can remove its sandboxing.
 

dom/security/nsMixedContentBlocker.cpp

@@ -178,9 +178,9 @@ LogMixedContentMessage(MixedContentTypes aClassification,
     severityFlag = nsIScriptError::warningFlag;
     messageCategory.AssignLiteral("Mixed Content Message");
     if (aClassification == eMixedDisplay) {
-      messageLookupKey.AssignLiteral("LoadingMixedDisplayContent2");
+      messageLookupKey.AssignLiteral("LoadingMixedDisplayContent");
     } else {
-      messageLookupKey.AssignLiteral("LoadingMixedActiveContent2");
+      messageLookupKey.AssignLiteral("LoadingMixedActiveContent");
     }
   }