Bug 480674 Formulate content policy for Audio/Video tags. r=mnyromyr,sr=dmose,ui-review=clarkbw
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 05 May 2009 16:04:46 +0100
changeset 2560 36f643f97e8b0b8fa417dfefb710e9ebb08f54c8
parent 2559 54b3c5e6cd1189cf58de5bd7bd2237e4acde48e8
child 2561 d81442502c169850740f4f9408d22fa6b03c132c
push idunknown
push userunknown
push dateunknown
reviewersmnyromyr, dmose
bugs480674
Bug 480674 Formulate content policy for Audio/Video tags. r=mnyromyr,sr=dmose,ui-review=clarkbw
mail/base/content/mailWindowOverlay.js
mail/base/content/mailWindowOverlay.xul
mail/locales/en-US/chrome/messenger/addressbook/abCardOverlay.dtd
mail/locales/en-US/chrome/messenger/messenger.dtd
mail/locales/en-US/chrome/messenger/messenger.properties
mailnews/addrbook/resources/content/abCardOverlay.xul
suite/locales/en-US/chrome/mailnews/addressbook/abCardOverlay.dtd
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -2617,17 +2617,17 @@ var gMessageNotificationBar =
 
   setRemoteContentMsg: function(aMsgHdr)
   {
     // update the allow remote content for sender string
     var headerParser = Components.classes["@mozilla.org/messenger/headerparser;1"]
                                  .getService(Components.interfaces.nsIMsgHeaderParser);
     var emailAddress = headerParser.extractHeaderAddressMailboxes(aMsgHdr.author);
     document.getElementById('allowRemoteContentForAuthorDesc').value =
-      gMessengerBundle.getFormattedString('alwaysLoadRemoteContentForSender1',
+      gMessengerBundle.getFormattedString('alwaysLoadRemoteContentForSender2',
                          [emailAddress ? emailAddress : aMsgHdr.author]);
     this.updateMsgNotificationBar(kMsgNotificationRemoteImages, true);
   },
 
   setPhishingMsg: function()
   {
     this.updateMsgNotificationBar(kMsgNotificationPhishingBar, true);
   },
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1732,21 +1732,21 @@
     <image id="junkBarImage"/>
     <description flex="1" class="msgNotificationBarText">&junkBarMessage1.label;</description>
     <button label="&junkBarButton1.label;" oncommand="JunkSelectedMessages(false);"/>
   </hbox>
 
   <hbox id="remoteContentBar" class="msgNotificationBar" align="center">
     <image id="remoteContentImage"/>
     <vbox flex="1">
-      <description class="msgNotificationBarText">&remoteContentMessage1.label;</description>
+      <description class="msgNotificationBarText">&remoteContentMessage2.label;</description>
       <label id="allowRemoteContentForAuthorDesc" class="msgNotificaton-smallText text-link"
              onclick="allowRemoteContentForSender();"/>
     </vbox>
-    <button label="&loadRemoteContentButton2.label;" oncommand="LoadMsgWithRemoteContent();"/>
+    <button label="&loadRemoteContentButton3.label;" oncommand="LoadMsgWithRemoteContent();"/>
   </hbox>
 </deck>
 
 <statusbar class="chromeclass-status" id="status-bar">
   <hbox insertbefore="unreadMessageCount"  id="statusTextBox" flex="1">
     <statusbarpanel id="offline-status" class="statusbarpanel-iconic" oncommand="MailOfflineMgr.toggleOfflineStatus();"/>
     <statusbarpanel id="statusText" label="&statusText.label;" flex="1"/>
     <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
--- a/mail/locales/en-US/chrome/messenger/addressbook/abCardOverlay.dtd
+++ b/mail/locales/en-US/chrome/messenger/addressbook/abCardOverlay.dtd
@@ -74,23 +74,23 @@
 <!ENTITY PreferMailFormat.label         "Prefers to receive messages formatted as:">
 <!ENTITY PreferMailFormat.accesskey     "v">
 <!ENTITY PlainText.label                "Plain Text">
 <!ENTITY HTML.label                     "HTML">
 <!ENTITY Unknown.label                  "Unknown">
 <!ENTITY ScreenName.label               "Screen Name:">
 <!ENTITY ScreenName.accesskey           "S">
 
-<!ENTITY allowRemoteContent.label       "Allow remote images.">
-<!ENTITY allowRemoteContent.accesskey   "r">
-<!ENTITY allowRemoteContent.tooltip     "In HTML messages it is possible to
-embed images from remote sources. Opening such a message will open a
+<!ENTITY allowRemoteContent1.label      "Allow remote content.">
+<!ENTITY allowRemoteContent1.accesskey  "r">
+<!ENTITY allowRemoteContent1.tooltip    "In HTML messages it is possible to
+embed content from remote sources. Opening such a message will open a
 connection to this external source. This may allow tracking of the
 message being read. Checking this box will allow such external embedded
-images in HTML messages from this contact.">
+content in HTML messages from this contact.">
 
 <!ENTITY WorkPhone.label                "Work:">
 <!ENTITY WorkPhone.accesskey            "k">
 <!ENTITY HomePhone.label                "Home:">
 <!ENTITY HomePhone.accesskey            "o">
 <!ENTITY FaxNumber.label                "Fax:">
 <!ENTITY FaxNumber.accesskey            "x">
 <!ENTITY PagerNumber.label              "Pager:">
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -672,18 +672,18 @@ you can use these alternative items. Oth
 <!ENTITY contextPrintPreview.accesskey "v">
 
 <!-- Junk Bar -->
 <!ENTITY junkBarMessage1.label "Junk Mail">
 <!ENTITY junkBarButton1.label "Not Junk">
 <!ENTITY junkInfoButton.label "?">
 
 <!-- Remote Content Bar -->
-<!ENTITY remoteContentMessage1.label "To protect your privacy, remote images have been blocked.">
-<!ENTITY loadRemoteContentButton2.label "Display Images Now">
+<!ENTITY remoteContentMessage2.label "To protect your privacy, &brandShortName; has blocked remote content in this message.">
+<!ENTITY loadRemoteContentButton3.label "Show Remote Content">
 
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage2.label "This message may be a scam.">
 <!ENTITY removePhishingBarButton1.label "Ignore Warning">
 <!ENTITY reportPhishingError1.label "This message doesn't appear to be a scam.">
 
 <!-- Message Header Button Box (to show hidden email addresses) -->
 <!ENTITY more.label "more">
--- a/mail/locales/en-US/chrome/messenger/messenger.properties
+++ b/mail/locales/en-US/chrome/messenger/messenger.properties
@@ -446,18 +446,18 @@ moveToFolderAgain=Move to "%1$S" Again
 moveToFolderAgainAccessKey=t
 #LOCALIZATION NOTE %1$S is the name of the folder we will copy to
 # copyToFolderAgainAccessKey
 # should have the same value as moveToFolderAgainAccessKey as they are the same menu item in the UI
 # copyToFolderAgainAccessKey should also be a letter that occurs before %1$S
 copyToFolderAgain=Copy to "%1$S" Again
 copyToFolderAgainAccessKey=t
 
-#LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote images for
-alwaysLoadRemoteContentForSender1= Always load remote images from %1$S 
+#LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
+alwaysLoadRemoteContentForSender2= Always load remote content from %1$S 
 
 # Strings for growl notifications on Mac OS X
 growlNotification=New Mail
 
 # mailCommands.js
 emptyJunkTitle=Confirm
 emptyJunkMessage=Are you sure you want to permanently delete all messages and subfolders in the Junk folder?
 emptyJunkDontAsk=Don't ask me again.
--- a/mailnews/addrbook/resources/content/abCardOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardOverlay.xul
@@ -201,19 +201,19 @@
           <menulist id="PreferMailFormatPopup">
             <menupopup>
               <!-- 0,1,2 come from nsIAbPreferMailFormat in nsIAbCard.idl -->
               <menuitem value="0" label="&Unknown.label;"/>
               <menuitem value="1" label="&PlainText.label;"/>
               <menuitem value="2" label="&HTML.label;"/>
             </menupopup>
           </menulist>
-          <checkbox id="allowRemoteContent" label="&allowRemoteContent.label;"
-                    accesskey="&allowRemoteContent.accesskey;"
-                    tooltiptext="&allowRemoteContent.tooltip;"/>
+          <checkbox id="allowRemoteContent" label="&allowRemoteContent1.label;"
+                    accesskey="&allowRemoteContent1.accesskey;"
+                    tooltiptext="&allowRemoteContent1.tooltip;"/>
         </hbox>
       </vbox> <!-- End of Name Tab -->
 
       <!-- ** Home Address Tab ** -->
       <vbox id="abHomeTab" >
         <hbox align="center">
           <spacer flex="1"/>
           <label control="HomeAddress" value="&HomeAddress.label;"
--- a/suite/locales/en-US/chrome/mailnews/addressbook/abCardOverlay.dtd
+++ b/suite/locales/en-US/chrome/mailnews/addressbook/abCardOverlay.dtd
@@ -74,23 +74,23 @@
 <!ENTITY PreferMailFormat.label         "Prefers to receive messages formatted as:">
 <!ENTITY PreferMailFormat.accesskey     "v">
 <!ENTITY PlainText.label                "Plain Text">
 <!ENTITY HTML.label                     "HTML">
 <!ENTITY Unknown.label                  "Unknown">
 <!ENTITY ScreenName.label               "Screen Name:">
 <!ENTITY ScreenName.accesskey           "S">
 
-<!ENTITY allowRemoteContent.label       "Allow remote images.">
-<!ENTITY allowRemoteContent.accesskey   "r">
-<!ENTITY allowRemoteContent.tooltip     "In HTML messages it is possible to
-embed images from remote sources. Opening such a message will open a
+<!ENTITY allowRemoteContent1.label      "Allow remote content.">
+<!ENTITY allowRemoteContent1.accesskey  "r">
+<!ENTITY allowRemoteContent1.tooltip    "In HTML messages it is possible to
+embed content from remote sources. Opening such a message will open a
 connection to this external source. This may allow tracking of the
 message being read. Checking this box will allow such external embedded
-images in HTML messages from this contact.">
+content in HTML messages from this contact.">
 
 <!ENTITY WorkPhone.label                "Work:">
 <!ENTITY WorkPhone.accesskey            "k">
 <!ENTITY HomePhone.label                "Home:">
 <!ENTITY HomePhone.accesskey            "o">
 <!ENTITY FaxNumber.label                "Fax:">
 <!ENTITY FaxNumber.accesskey            "x">
 <!ENTITY PagerNumber.label              "Pager:">