Bug 482623 - "change 'Privacy' tab to 'Security'" [r=mkmelin+mozilla]
authorBryan W Clark <clarkbw@gnome.org>
Wed, 11 Mar 2009 19:55:40 +0000
changeset 2185 92b814189264999c947ed7fa9e332da62b86efe4
parent 2184 996cdbab71a91ad267a26fd9f92d10ff0cd9a90d
child 2186 6cd94467079dd2e483d4f913a34024f325c2178a
push idunknown
push userunknown
push dateunknown
reviewersmkmelin
bugs482623
Bug 482623 - "change 'Privacy' tab to 'Security'" [r=mkmelin+mozilla]
mail/components/preferences/jar.mn
mail/components/preferences/preferences.xul
mail/components/preferences/privacy.js
mail/components/preferences/privacy.xul
mail/components/preferences/security.js
mail/components/preferences/security.xul
mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
mail/locales/en-US/chrome/messenger/preferences/security.dtd
mail/locales/jar.mn
mail/themes/gnomestripe/jar.mn
mail/themes/gnomestripe/mail/preferences/preferences.css
mail/themes/gnomestripe/mail/preferences/privacy.png
mail/themes/gnomestripe/mail/preferences/security.png
mail/themes/pinstripe/mail/preferences/preferences.css
mail/themes/qute/jar.mn
mail/themes/qute/mail/preferences/preferences.css
mail/themes/qute/mail/preferences/privacy.png
mail/themes/qute/mail/preferences/security.png
--- a/mail/components/preferences/jar.mn
+++ b/mail/components/preferences/jar.mn
@@ -3,18 +3,18 @@ messenger.jar:
 *   content/messenger/preferences/general.xul
 *   content/messenger/preferences/general.js
 *   content/messenger/preferences/display.xul
 *   content/messenger/preferences/display.js
 *   content/messenger/preferences/compose.xul
 *   content/messenger/preferences/compose.js
 *   content/messenger/preferences/sendoptions.xul
 *   content/messenger/preferences/sendoptions.js
-*   content/messenger/preferences/privacy.xul
-*   content/messenger/preferences/privacy.js
+*   content/messenger/preferences/security.xul
+*   content/messenger/preferences/security.js
 *   content/messenger/preferences/junkLog.xul
 *   content/messenger/preferences/junkLog.js
 *   content/messenger/preferences/advanced.js
 *   content/messenger/preferences/advanced.xul
 *   content/messenger/preferences/receipts.xul
 *   content/messenger/preferences/connection.js
 *   content/messenger/preferences/connection.xul
 *   content/messenger/preferences/downloads.js
--- a/mail/components/preferences/preferences.xul
+++ b/mail/components/preferences/preferences.xul
@@ -81,15 +81,15 @@
 #endif
   
   <prefpane id="paneGeneral" label="&paneGeneral.title;"
             src="chrome://messenger/content/preferences/general.xul"/>
   <prefpane id="paneDisplay" label="&paneDisplay.title;"
             src="chrome://messenger/content/preferences/display.xul"/>
   <prefpane id="paneCompose" label="&paneComposition.title;"
             src="chrome://messenger/content/preferences/compose.xul"/>
-  <prefpane id="panePrivacy" label="&panePrivacy.title;"
-            src="chrome://messenger/content/preferences/privacy.xul"/>
+  <prefpane id="paneSecurity" label="&paneSecurity.title;"
+            src="chrome://messenger/content/preferences/security.xul"/>
   <prefpane id="paneDownloads" label="&paneAttachments.title;"
             src="chrome://messenger/content/preferences/downloads.xul"/>
   <prefpane id="paneAdvanced" label="&paneAdvanced.title;"
             src="chrome://messenger/content/preferences/advanced.xul"/>
 </prefwindow>
rename from mail/components/preferences/privacy.js
rename to mail/components/preferences/security.js
--- a/mail/components/preferences/privacy.js
+++ b/mail/components/preferences/security.js
@@ -31,43 +31,43 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-var gPrivacyPane = {
+var gSecurityPane = {
   mPane: null,
   mInitialized: false,
 
   init: function ()
   {
-    this.mPane = document.getElementById("panePrivacy");
+    this.mPane = document.getElementById("paneSecurity");
 
     this.updateManualMarkMode(document.getElementById('manualMark').checked);
     this.updateJunkLogButton(document.getElementById('enableJunkLogging').checked);
 
     this._initMasterPasswordUI();
 
     // update the checkbox for downloading phishing url tables
     // this.updateDownloadedPhishingListState();
 
-    var preference = document.getElementById("mail.preferences.privacy.selectedTabIndex");
+    var preference = document.getElementById("mail.preferences.security.selectedTabIndex");
     if (preference.value)
-      document.getElementById("privacyPrefs").selectedIndex = preference.value;
+      document.getElementById("securityPrefs").selectedIndex = preference.value;
     this.mInitialized = true;
   },
 
   tabSelectionChanged: function ()
   {
     if (this.mInitialized)
-      document.getElementById("mail.preferences.privacy.selectedTabIndex")
-              .valueFromPreferences = document.getElementById("privacyPrefs").selectedIndex;
+      document.getElementById("mail.preferences.security.selectedTabIndex")
+              .valueFromPreferences = document.getElementById("securityPrefs").selectedIndex;
   },
 
   updateManualMarkMode: function(aEnableRadioGroup)
   {
     document.getElementById('manualMarkMode').disabled = !aEnableRadioGroup;
   },
 
   updateJunkLogButton: function(aEnableButton)
rename from mail/components/preferences/privacy.xul
rename to mail/components/preferences/security.xul
--- a/mail/components/preferences/privacy.xul
+++ b/mail/components/preferences/security.xul
@@ -34,32 +34,32 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 <!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-<!ENTITY % privacyDTD SYSTEM "chrome://messenger/locale/preferences/privacy.dtd">
+<!ENTITY % securityDTD SYSTEM "chrome://messenger/locale/preferences/security.dtd">
 %brandDTD;
-%privacyDTD;
+%securityDTD;
 ]>
 
-<overlay id="PrivacyPaneOverlay"
+<overlay id="SecurityPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
            
-  <prefpane id="panePrivacy" onpaneload="gPrivacyPane.init();">
-    <script type="application/x-javascript" src="chrome://messenger/content/preferences/privacy.js"/>
+  <prefpane id="paneSecurity" onpaneload="gSecurityPane.init();">
+    <script type="application/x-javascript" src="chrome://messenger/content/preferences/security.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <preferences>
-      <preference id="mail.preferences.privacy.selectedTabIndex"
-                  name="mail.preferences.privacy.selectedTabIndex" type="int"/>
+      <preference id="mail.preferences.security.selectedTabIndex"
+                  name="mail.preferences.security.selectedTabIndex" type="int"/>
       <preference id="mail.spam.manualMark" 
                   name="mail.spam.manualMark" 
                   type="bool"/>
       <preference id="mail.spam.manualMarkMode"
                   name="mail.spam.manualMarkMode"
                   type="int"/>
       <preference id="mail.spam.markAsReadOnSpam"
                   name="mail.spam.markAsReadOnSpam"
@@ -76,67 +76,66 @@
       <preference id="mailnews.downloadToTempFile"
                   name="mailnews.downloadToTempFile"
                   type="bool"/>                   
       <preference id="pref.privacy.disable_button.view_passwords"
                   name="pref.privacy.disable_button.view_passwords"
                   type="bool"/>
     </preferences>
 
-    <tabbox id="privacyPrefs" flex="1" onselect="gPrivacyPane.tabSelectionChanged();">
+    <tabbox id="securityPrefs" flex="1" onselect="gSecurityPane.tabSelectionChanged();">
       <tabs>
         <tab label="&itemJunk.label;"/>
         <tab label="&itemPhishing.label;"/>
         <tab label="&itemAntiVirus.label;"/>
         <tab label="&itemPasswords.label;"/>
       </tabs>
       
       <tabpanels flex="1">
         <tabpanel orient="vertical">
           <description>&junkMail.intro;</description>
           <separator class="thin"/>
           
           <checkbox id="manualMark" 
                     preference="mail.spam.manualMark"
-                    oncommand="gPrivacyPane.updateManualMarkMode(this.checked);"
+                    oncommand="gSecurityPane.updateManualMarkMode(this.checked);"
                     label="&manualMark.label;" accesskey="&manualMark.accesskey;"/>
 
           <radiogroup id="manualMarkMode" class="indent"
                       preference="mail.spam.manualMarkMode" aria-labelledby="manualMark">
             <radio id="manualMarkMode0" value="0" label="&manualMarkModeMove.label;" accesskey="&manualMarkModeMove.accesskey;"/>
             <radio id="manualMarkMode1" value="1" label="&manualMarkModeDelete.label;" accesskey="&manualMarkModeDelete.accesskey;"/>
           </radiogroup>
           
           <checkbox id="markAsReadOnSpam" label="&markAsReadOnSpam.label;" 
                     accesskey="&markAsReadOnSpam.accesskey;"
                     preference="mail.spam.markAsReadOnSpam"/>
 
           <hbox align="start">
             <checkbox id="enableJunkLogging" label="&enableJunkLogging.label;"
-                      oncommand="gPrivacyPane.updateJunkLogButton(this.checked);" 
+                      oncommand="gSecurityPane.updateJunkLogButton(this.checked);" 
                       preference="mail.spam.logging.enabled" 
                       accesskey="&enableJunkLogging.accesskey;"/>
             <spacer flex="1"/>
             <button id="openJunkLogButton" label="&openJunkLog.label;" accesskey="&openJunkLog.accesskey;" 
-                    oncommand="gPrivacyPane.openJunkLog();"/>
+                    oncommand="gSecurityPane.openJunkLog();"/>
           </hbox>
           <hbox align="start">
             <spacer flex="1"/>
             <button label="&resetTrainingData.label;" accesskey="&resetTrainingData.accesskey;" 
-                    oncommand="gPrivacyPane.resetTrainingData()"/>
+                    oncommand="gSecurityPane.resetTrainingData()"/>
           </hbox>          
         </tabpanel>
         
         <!-- Phishing Detector --> 
         <tabpanel orient="vertical">
           <description>&phishingDetector1.intro;</description>
           <separator class="thin"/>
           <checkbox id="enablePhishingDetector"
                     label="&enablePhishingDetector1.label;" accesskey="&enablePhishingDetector1.accesskey;"
-                    oncommand="gPrivacyPane.updateDownloadedPhishingListState()" 
                     preference="mail.phishing.detection.enabled"/>
 <!--          
           <checkbox id="useDownloadedList" class="indent" label="&useDownloadedList.label;"
                     accesskey="&useDownloadedList.accesskey;" 
                     preference="browser.safebrowsing.enabled"/>
 -->                    
         </tabpanel>
 
@@ -152,32 +151,32 @@
         
         <!-- Password --> 
 
         <tabpanel orient="vertical"> 
           <description>&savedPasswords.intro;</description>
           <hbox>
             <spacer flex="1"/>
             <button label="&savedPasswords.label;" accesskey="&savedPasswords.accesskey;"
-                    oncommand="gPrivacyPane.showPasswords();"
+                    oncommand="gSecurityPane.showPasswords();"
                     preference="pref.privacy.disable_button.view_passwords"/>
           </hbox>
           <!-- XXX button to do a showExceptions()? -->
 
           <separator class="thin"/>
 
           <description flex="1">&masterPassword.intro;</description>
           <hbox>
             <checkbox id="useMasterPassword" flex="1"
                       label="&useMasterPassword.label;" accesskey="&useMasterPassword.accesskey;"
-                      oncommand="gPrivacyPane.updateMasterPasswordButton();"/>
+                      oncommand="gSecurityPane.updateMasterPasswordButton();"/>
 
             <button id="changeMasterPassword"
                     label="&changeMasterPassword.label;" accesskey="&changeMasterPassword.accesskey;"
-                    oncommand="gPrivacyPane.changeMasterPassword();"/>
+                    oncommand="gSecurityPane.changeMasterPassword();"/>
           </hbox>
           <separator flex="1"/>
         </tabpanel>
       </tabpanels>
     </tabbox>
 
     <separator/>
 
--- a/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
@@ -4,10 +4,10 @@
 <!ENTITY  prefWindow.styleWindows "width: 44em; min-height: 38.5em;">
 <!ENTITY  prefWindow.styleMac     "width: 47em;">
 <!ENTITY  prefWindow.styleGNOME   "width: 42em; min-height: 38em;">
 
 <!ENTITY paneGeneral.title        "General">
 <!ENTITY paneDisplay.title        "Display">
 <!ENTITY paneComposition.title    "Composition">
 <!ENTITY paneAttachments.title    "Attachments">
-<!ENTITY panePrivacy.title        "Privacy">
+<!ENTITY paneSecurity.title       "Security">
 <!ENTITY paneAdvanced.title       "Advanced">
rename from mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
rename to mail/locales/en-US/chrome/messenger/preferences/security.dtd
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -110,17 +110,17 @@
   locale/@AB_CD@/messenger/messengercompose/sendProgress.properties     (%chrome/messenger/messengercompose/sendProgress.properties)
   locale/@AB_CD@/messenger/messengercompose/composeMsgs.properties      (%chrome/messenger/messengercompose/composeMsgs.properties)
   locale/@AB_CD@/messenger/messengercompose/mailComposeEditorOverlay.dtd (%chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd)
   locale/@AB_CD@/messenger/preferences/preferences.dtd                  (%chrome/messenger/preferences/preferences.dtd)
   locale/@AB_CD@/messenger/preferences/general.dtd                      (%chrome/messenger/preferences/general.dtd)
   locale/@AB_CD@/messenger/preferences/display.dtd                      (%chrome/messenger/preferences/display.dtd)
   locale/@AB_CD@/messenger/preferences/compose.dtd                      (%chrome/messenger/preferences/compose.dtd)
   locale/@AB_CD@/messenger/preferences/sendoptions.dtd                  (%chrome/messenger/preferences/sendoptions.dtd)
-  locale/@AB_CD@/messenger/preferences/privacy.dtd                      (%chrome/messenger/preferences/privacy.dtd)
+  locale/@AB_CD@/messenger/preferences/security.dtd                     (%chrome/messenger/preferences/security.dtd)
   locale/@AB_CD@/messenger/preferences/junkLog.dtd                      (%chrome/messenger/preferences/junkLog.dtd)
   locale/@AB_CD@/messenger/preferences/viewpasswords.dtd                (%chrome/messenger/preferences/viewpasswords.dtd)
   locale/@AB_CD@/messenger/preferences/advanced.dtd                     (%chrome/messenger/preferences/advanced.dtd)
   locale/@AB_CD@/messenger/preferences/receipts.dtd                     (%chrome/messenger/preferences/receipts.dtd)
   locale/@AB_CD@/messenger/preferences/connection.dtd                   (%chrome/messenger/preferences/connection.dtd)
   locale/@AB_CD@/messenger/preferences/downloads.dtd                    (%chrome/messenger/preferences/downloads.dtd)
   locale/@AB_CD@/messenger/preferences/downloadactions.dtd              (%chrome/messenger/preferences/downloadactions.dtd)
   locale/@AB_CD@/messenger/preferences/changeaction.dtd                 (%chrome/messenger/preferences/changeaction.dtd)
--- a/mail/themes/gnomestripe/jar.mn
+++ b/mail/themes/gnomestripe/jar.mn
@@ -68,17 +68,17 @@ classic.jar:
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
   skin/classic/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
   skin/classic/messenger-newsblog/icons/rss-feed.png          (mail/newsblog/rss-feed.png)
   skin/classic/messenger-newsblog/icons/server-rss.png        (mail/newsblog/server-rss.png)
   skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
   skin/classic/messenger/preferences/general.png              (mail/preferences/general.png)
   skin/classic/messenger/preferences/display.png              (mail/preferences/display.png)
   skin/classic/messenger/preferences/composition.png          (mail/preferences/composition.png)
-  skin/classic/messenger/preferences/privacy.png              (mail/preferences/privacy.png)
+  skin/classic/messenger/preferences/security.png             (mail/preferences/security.png)
   skin/classic/messenger/preferences/attachments.png          (mail/preferences/attachments.png)
   skin/classic/messenger/preferences/advanced.png             (mail/preferences/advanced.png)
   skin/classic/messenger/preferences/background.png           (mail/preferences/background.png)
   skin/classic/messenger/preferences/hover.png                (mail/preferences/hover.png)
   skin/classic/messenger/preferences/selected.png             (mail/preferences/selected.png)
   skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (mail/smime/msgCompSMIMEOverlay.css)
   skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (mail/smime/msgHdrViewSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (mail/smime/msgReadSMIMEOverlay.css)
--- a/mail/themes/gnomestripe/mail/preferences/preferences.css
+++ b/mail/themes/gnomestripe/mail/preferences/preferences.css
@@ -44,18 +44,18 @@ radio[pane=paneGeneral] {
   list-style-image: url("chrome://messenger/skin/preferences/general.png");
 }
 radio[pane=paneDisplay] {
   list-style-image: url("chrome://messenger/skin/preferences/display.png");
 }
 radio[pane=paneCompose] {
   list-style-image: url("chrome://messenger/skin/preferences/composition.png");
 }
-radio[pane=panePrivacy] {
-  list-style-image: url("chrome://messenger/skin/preferences/privacy.png");
+radio[pane=paneSecurity] {
+  list-style-image: url("chrome://messenger/skin/preferences/security.png");
 }
 radio[pane=paneDownloads] {
   list-style-image: url("chrome://messenger/skin/preferences/attachments.png");
 }
 radio[pane=paneAdvanced] {
   list-style-image: url("chrome://messenger/skin/preferences/advanced.png");
 }
 
deleted file mode 100644
index 8729ccd54112d6b96292678ac1fb30e46c1f6955..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c15d404dd02a0ca264828dd9f5b28c7f13e8552f
GIT binary patch
literal 1777
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
T%H=jL00000NkvXXu0mjfU4~eS
--- a/mail/themes/pinstripe/mail/preferences/preferences.css
+++ b/mail/themes/pinstripe/mail/preferences/preferences.css
@@ -95,21 +95,21 @@ radio[pane=paneDisplay]:active {
 radio[pane=paneCompose] {
   -moz-image-region: rect(0px, 96px, 32px, 64px)
 }
 
 radio[pane=paneCompose]:active {
   -moz-image-region: rect(32px, 96px, 64px, 64px)
 }
 
-radio[pane=panePrivacy] {
+radio[pane=paneSecurity] {
   -moz-image-region: rect(0px 128px 32px 96px);
 }
 
-radio[pane=panePrivacy]:active {
+radio[pane=paneSecurity]:active {
   -moz-image-region: rect(32px 128px 64px 96px);
 }
 
 radio[pane=paneDownloads] {
   -moz-image-region: rect(0px 160px 32px 128px);
 }
 
 radio[pane=paneDownloads]:active {
@@ -194,17 +194,17 @@ caption {
 #paneContent row {
   padding: 0 4px;
 }
 
 #advancedPrefs {
   margin: 0 8px;
 }
 
-#privacyPrefs {
+#securityPrefs {
   padding: 0 4px;
 }
 
 tabpanels {
   padding: 18px 10px 10px;
   margin: 0 6px 6px;
 }
 
--- a/mail/themes/qute/jar.mn
+++ b/mail/themes/qute/jar.mn
@@ -67,17 +67,17 @@ classic.jar:
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
   skin/classic/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
   skin/classic/messenger-newsblog/icons/rss-feed.png          (mail/newsblog/rss-feed.png)
   skin/classic/messenger-newsblog/icons/server-rss.png        (mail/newsblog/server-rss.png)
   skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
   skin/classic/messenger/preferences/general.png              (mail/preferences/general.png)
   skin/classic/messenger/preferences/display.png              (mail/preferences/display.png)
   skin/classic/messenger/preferences/composition.png          (mail/preferences/composition.png)
-  skin/classic/messenger/preferences/privacy.png              (mail/preferences/privacy.png)
+  skin/classic/messenger/preferences/security.png             (mail/preferences/security.png)
   skin/classic/messenger/preferences/attachments.png          (mail/preferences/attachments.png)
   skin/classic/messenger/preferences/advanced.png             (mail/preferences/advanced.png)
   skin/classic/messenger/preferences/background.png           (mail/preferences/background.png)
   skin/classic/messenger/preferences/hover.png                (mail/preferences/hover.png)
   skin/classic/messenger/preferences/selected.png             (mail/preferences/selected.png)
   skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (mail/smime/msgCompSMIMEOverlay.css)
   skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (mail/smime/msgHdrViewSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (mail/smime/msgReadSMIMEOverlay.css)
--- a/mail/themes/qute/mail/preferences/preferences.css
+++ b/mail/themes/qute/mail/preferences/preferences.css
@@ -74,18 +74,18 @@ radio[pane=paneGeneral] {
   list-style-image: url("chrome://messenger/skin/preferences/general.png");
 }
 radio[pane=paneDisplay] {
   list-style-image: url("chrome://messenger/skin/preferences/display.png");
 }
 radio[pane=paneCompose] {
   list-style-image: url("chrome://messenger/skin/preferences/composition.png");
 }
-radio[pane=panePrivacy] {
-  list-style-image: url("chrome://messenger/skin/preferences/privacy.png");
+radio[pane=paneSecurity] {
+  list-style-image: url("chrome://messenger/skin/preferences/security.png");
 }
 radio[pane=paneDownloads] {
   list-style-image: url("chrome://messenger/skin/preferences/attachments.png");
 }
 radio[pane=paneAdvanced] {
   list-style-image: url("chrome://messenger/skin/preferences/advanced.png");
 }
 
deleted file mode 100644
index 8729ccd54112d6b96292678ac1fb30e46c1f6955..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c15d404dd02a0ca264828dd9f5b28c7f13e8552f
GIT binary patch
literal 1777
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
T%H=jL00000NkvXXu0mjfU4~eS