From fb9f41c121fea780464a0b048f7215eb15d3f3c8 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 30 Dec 2014 08:09:15 +0100 Subject: [PATCH] Backed out changeset 470c550c782b (bug 1115668) for breaking dt tests on a CLOSED TREE --- dom/locales/en-US/chrome/security/security.properties | 5 ++--- dom/security/nsMixedContentBlocker.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dom/locales/en-US/chrome/security/security.properties b/dom/locales/en-US/chrome/security/security.properties index 3c6db0a80542..076229c0c71b 100644 --- a/dom/locales/en-US/chrome/security/security.properties +++ b/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. diff --git a/dom/security/nsMixedContentBlocker.cpp b/dom/security/nsMixedContentBlocker.cpp index ef68db3343c5..1bdfc6e364a0 100644 --- a/dom/security/nsMixedContentBlocker.cpp +++ b/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"); } }