Back out bug 326584/changeset f1fcff5eb061 due to regression caused where keepUnreadOnly can unintentionally flip to true.
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 10 Jun 2009 22:14:27 +0100
changeset 7088 77774b0b6a345bb1d51f552142f7dcf47cc5494d
parent 7087 ce3d25636d8374d3090dfc32fc396b0dccbc85df
child 7089 c41e54f7efe3cc2759c3ce3ffa5b61164861934d
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
bugs326584
Back out bug 326584/changeset f1fcff5eb061 due to regression caused where keepUnreadOnly can unintentionally flip to true. X-Channel-Repo: comm-central X-Channel-Converted-Revision: e59b05bbbb6413bf3884d4870b2f4f6fe656c97f
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/folderProps.dtd
suite/chrome/common/help/mail_help.xhtml
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/pref/am-offline.dtd
--- a/mail/chrome/messenger/am-offline.dtd
+++ b/mail/chrome/messenger/am-offline.dtd
@@ -13,20 +13,22 @@
 <!ENTITY nntpDownloadMsg.accesskey "e">
 <!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted.">
 <!ENTITY retentionCleanupImap.label "To recover disk space, old messages can be permanently deleted, both local copies and originals on the remote server.">
 <!ENTITY retentionCleanupPop.label "To recover disk space, old messages can be permanently deleted, including originals on the remote server.">
 <!ENTITY retentionKeepMsg.label "Delete messages more than">
 <!ENTITY retentionKeepMsg.accesskey "t">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
 <!ENTITY retentionKeepAll.accesskey "n">
-<!ENTITY retentionKeepRecent.label "Delete all but the most recent">
-<!ENTITY retentionKeepRecent.accesskey "b">
+<!ENTITY retentionKeepNew.label "Delete all but the last">
+<!ENTITY retentionKeepNew.accesskey "b">
+<!ENTITY retentionKeepUnread.label "Always delete read messages">
+<!ENTITY retentionKeepUnread.accesskey "w">
 <!ENTITY retentionApplyToFlagged.label "Always keep starred messages">
 <!ENTITY retentionApplyToFlagged.accesskey "k">
-<!ENTITY nntpRemoveMsgBody.label "Remove bodies from messages more than">
-<!ENTITY nntpRemoveMsgBody.accesskey "o">
+<!ENTITY nntpRemoveBody.label "Only message bodies less than">
+<!ENTITY nntpRemoveBody.accesskey "O">
 <!ENTITY offlineSelectNntp.label "Select newsgroups for offline use…">
 <!ENTITY offlineSelectNntp.accesskey "S">
 <!ENTITY offlineImapAdvancedOffline.label "Advanced…">
 <!ENTITY offlineImapAdvancedOffline.accesskey "v">
 <!ENTITY syncGroupTitle.label "Message Synchronizing">
 <!ENTITY diskspaceGroupTitle.label "Disk Space">
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -56,18 +56,20 @@
 <!ENTITY message.label "messages">
 <!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted.">
 <!ENTITY retentionCleanupImap.label "To recover disk space, old messages can be permanently deleted, both local copies and originals on the remote server.">
 <!ENTITY retentionCleanupPop.label "To recover disk space, old messages can be permanently deleted, including originals on the remote server.">
 <!ENTITY retentionDeleteMsg.label "Delete messages more than">
 <!ENTITY retentionDeleteMsg.accesskey "m">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
 <!ENTITY retentionKeepAll.accesskey "A">
-<!ENTITY retentionKeepRecent.label "Delete all but the most recent">
-<!ENTITY retentionKeepRecent.accesskey "l">
+<!ENTITY retentionKeepNew.label "Delete all but the last">
+<!ENTITY retentionKeepNew.accesskey "l">
+<!ENTITY retentionKeepUnread.label "Always delete read messages">
+<!ENTITY retentionKeepUnread.accesskey "r">
 <!ENTITY retentionApplyToFlagged.label "Always keep starred messages">
 <!ENTITY retentionApplyToFlagged.accesskey "e">
 
 <!ENTITY folderSynchronizationTab.label          "Synchronization">
 <!ENTITY folderCheckForNewMessages.label         "Check this folder for new messages">
 <!ENTITY folderCheckForNewMessages.accesskey     "C">
 
 <!ENTITY offlineFolder.check.label               "Select this folder for offline use">
--- a/suite/chrome/common/help/mail_help.xhtml
+++ b/suite/chrome/common/help/mail_help.xhtml
@@ -4103,35 +4103,36 @@ to filter unwanted mail, and how phishin
 
 <p>&brandShortName; can automatically delete old messages for you. You
   can configure this process with the options listed below
   <strong>To recover disk space, old messages can be permanently
   deleted</strong>:</p>
 
 <ul>
   <li><strong>Don't delete any messages</strong>: Keep all messages. Never
-    delete messages automatically based on their age.</li>
-  <li><strong>Delete all but the most recent [__] messages</strong>: Enter the
-    number of messages to keep. With this setting only messages older than these
+    delete messages automatically.</li>
+  <li><strong>Delete all but the last [__] messages</strong>: Enter the number
+    of messages to keep. With this setting only messages older than these
     messages are deleted.</li>
   <li><strong>Delete messages more than [__] days old </strong>:
     Keep all messages that arrived within the given number of days.</li>
 </ul>
 
 <p>With the following settings you can further constrain the three options to
   delete messages automatically. This is especially useful in combination with
   the option to keep all messages.</p> 
 
 <ul>
+  <li><strong>Always delete read messages</strong>: Select this option to
+    remove read messages.</li>
   <li><strong>Always keep flagged messages</strong>: Use this option to deny
     &brandShortName; to delete any messages you have flagged.</li>
-  <li><strong>Remove bodies from message more than [__] days old</strong>:
-    Select this option to retain all headers but to delete message bodies that
-    are older than the number of days you specify here (news accounts only).
-    Any option to delete the entire message based on age still applies.</li>
+  <li><strong>Only message bodies less than [__] days old</strong>: Select this
+    option to deny &brandShortName; the deletion of messages that are newer
+    than the number of days you specify here (news accounts only).</li>
 </ul>
 
 <p>This policy can be overridden for an individual folder in the Folder
   Properties, Retention Policy tab.</p>
 
 <p><strong>Note:</strong> If message synchronization is enabled (for IMAP), or
   messages are left on the server for POP accounts), the settings apply to
   <em>both</em> local copies and their originals on the server.</p>
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -56,18 +56,20 @@
 <!ENTITY message.label "messages">
 <!ENTITY retentionCleanup.label "Keep messages:">
 <!ENTITY retentionCleanupImap.label "Keep messages, both the local copies and their originals on the server:">
 <!ENTITY retentionCleanupPop.label "Keep messages, including their originals on the server:">
 <!ENTITY retentionDeleteMsg.label "Delete messages more than">
 <!ENTITY retentionDeleteMsg.accesskey "m">
 <!ENTITY retentionKeepAll.label "All messages">
 <!ENTITY retentionKeepAll.accesskey "A">
-<!ENTITY retentionKeepRecent.label "The newest">
-<!ENTITY retentionKeepRecent.accesskey "n">
+<!ENTITY retentionKeepNew.label "The newest">
+<!ENTITY retentionKeepNew.accesskey "n">
+<!ENTITY retentionKeepUnread.label "Only unread messages">
+<!ENTITY retentionKeepUnread.accesskey "u">
 <!ENTITY retentionApplyToFlagged.label "Always keep flagged messages">
 <!ENTITY retentionApplyToFlagged.accesskey "e">
 
 <!ENTITY folderSynchronizationTab.label          "Synchronization">
 <!ENTITY folderCheckForNewMessages.label         "Check this folder for new messages">
 <!ENTITY folderCheckForNewMessages.accesskey     "C">
 
 <!ENTITY offlineFolder.check.label               "Select this folder for offline use">
--- a/suite/chrome/mailnews/pref/am-offline.dtd
+++ b/suite/chrome/mailnews/pref/am-offline.dtd
@@ -13,20 +13,22 @@
 <!ENTITY nntpDownloadMsg.accesskey "e">
 <!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted.">
 <!ENTITY retentionCleanupImap.label "To recover disk space, old messages can be permanently deleted, both the local copies and their originals on the server.">
 <!ENTITY retentionCleanupPop.label "To recover disk space, old messages can be permanently deleted, including their originals on the server.">
 <!ENTITY retentionKeepMsg.label "Delete messages more than">
 <!ENTITY retentionKeepMsg.accesskey "t">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
 <!ENTITY retentionKeepAll.accesskey "n">
-<!ENTITY retentionKeepRecent.label "Delete all but the most recent">
-<!ENTITY retentionKeepRecent.accesskey "b">
+<!ENTITY retentionKeepNew.label "Delete all but the last">
+<!ENTITY retentionKeepNew.accesskey "b">
+<!ENTITY retentionKeepUnread.label "Always delete read messages">
+<!ENTITY retentionKeepUnread.accesskey "w">
 <!ENTITY retentionApplyToFlagged.label "Always keep flagged messages">
 <!ENTITY retentionApplyToFlagged.accesskey "k">
-<!ENTITY nntpRemoveMsgBody.label "Remove bodies from messages more than">
-<!ENTITY nntpRemoveMsgBody.accesskey "o">
+<!ENTITY nntpRemoveBody.label "Only message bodies less than">
+<!ENTITY nntpRemoveBody.accesskey "O">
 <!ENTITY offlineSelectNntp.label "Select newsgroups for offline use…">
 <!ENTITY offlineSelectNntp.accesskey "S">
 <!ENTITY offlineImapAdvancedOffline.label "Advanced…">
 <!ENTITY offlineImapAdvancedOffline.accesskey "v">
 <!ENTITY syncGroupTitle.label "Message Synchronizing">
 <!ENTITY diskspaceGroupTitle.label "Disk Space">