Bug 515842 - "Make labels for IMAP autosync policies more descriptive to avoid mixup with retention settings" [r=Standard8 sr=bienvenu ui-r=clarkbw]
authorrsx11m <rsx11m.pub@gmail.com>
Tue, 29 Sep 2009 22:51:37 +0100
changeset 7246 a223efa170d506a913d46fea2fe2f153a62992f6
parent 7245 f0fcde0a28a0df94941fb89c1f481b4e8f0726f8
child 7247 a1ef95ec8bfe9475c141ef5b067af9beefe1d856
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersStandard8, bienvenu, clarkbw
bugs515842
Bug 515842 - "Make labels for IMAP autosync policies more descriptive to avoid mixup with retention settings" [r=Standard8 sr=bienvenu ui-r=clarkbw] X-Channel-Repo: comm-central X-Channel-Converted-Revision: 5c30e830c725c019a376ce425e068376055b3a22
mail/chrome/messenger/am-offline.dtd
suite/chrome/mailnews/pref/am-offline.dtd
--- a/mail/chrome/messenger/am-offline.dtd
+++ b/mail/chrome/messenger/am-offline.dtd
@@ -1,14 +1,17 @@
 <!ENTITY doNotDownloadPop3Movemail.label "To save disk space, do not download:">
-<!ENTITY doNotDownload.label "To save disk space, do not download for offline use:">
+<!ENTITY doNotDownloadNntp.label "To save disk space, do not download for offline use:">
+<!ENTITY doNotDownloadImap.label "To save disk space, downloading messages from the server and keeping local copies for offline use can be restricted by age or size.">
 <!ENTITY allFoldersOffline.label "Keep messages for this account on this computer">
 <!ENTITY allFoldersOffline.accesskey "o">
 <!ENTITY offlineNotDownload.label "Messages larger than">
 <!ENTITY offlineNotDownload.accesskey "M">
+<!ENTITY autosyncNotDownload.label "Don't download messages larger than">
+<!ENTITY autosyncNotDownload.accesskey "m">
 <!ENTITY kb.label "KB">
 <!ENTITY daysOld.label "days old">
 <!ENTITY message.label "messages">
 <!ENTITY nntpNotDownloadRead.label "Read messages">
 <!ENTITY nntpNotDownloadRead.accesskey "d">
 <!ENTITY nntpDownloadMsg.label "Messages more than">
 <!ENTITY nntpDownloadMsg.accesskey "e">
 <!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted.">
@@ -28,22 +31,24 @@
 <!ENTITY nntpRemoveMsgBody.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">
 
-<!-- LOCALIZATION NOTE: (useAutosyncBefore.label, useAutosyncMiddle.label, useAutosyncAfter.label):
-  The entities useAutosyncBefore.label, useAutosyncMiddle.label, and
-  useAutosyncAfter.label appear on a single line in preferences as follows:
+<!-- LOCALIZATION NOTE: (ageAutosyncBefore.label, ageAutosyncMiddle.label, ageAutosyncAfter.label):
+  The entities ageAutosyncBefore.label, ageAutosyncMiddle.label, and ageAutosyncAfter.label appear
+  on a single line within the scope of useAutosync.ByAge as follows:
 
-  &useAutosyncBefore.label [textbox for autosync value] &useAutosyncMiddle.label; [dropdown for autosync interval] &useAutosyncAfter.label;
+  &ageAutosyncBefore.label [textbox for autosync value] &ageAutosyncMiddle.label; [dropdown for autosync interval] &ageAutosyncAfter.label;
 -->
-<!ENTITY useAutosyncBefore.label         "">
-<!ENTITY useAutosyncMiddle.label         "">
-<!ENTITY allInterval.label               "All">
-<!ENTITY dayInterval.label               "Days of">
-<!ENTITY weekInterval.label              "Weeks of">
-<!ENTITY monthInterval.label             "Months of">
-<!ENTITY yearInterval.label              "Years of">
-<!ENTITY useAutosyncAfter.label          "email will be stored on disk">
+<!ENTITY allAutosync.label               "Synchronize all messages locally regardless of age">
+<!ENTITY allAutosync.accesskey           "c">
+<!ENTITY ageAutosyncBefore.label         "Synchronize the most recent">
+<!ENTITY ageAutosync.accesskey           "z">
+<!ENTITY ageAutosyncMiddle.label         "">
+<!ENTITY dayAgeInterval.label            "Days">
+<!ENTITY weekAgeInterval.label           "Weeks">
+<!ENTITY monthAgeInterval.label          "Months">
+<!ENTITY yearAgeInterval.label           "Years">
+<!ENTITY ageAutosyncAfter.label          "">
--- a/suite/chrome/mailnews/pref/am-offline.dtd
+++ b/suite/chrome/mailnews/pref/am-offline.dtd
@@ -1,14 +1,17 @@
 <!ENTITY doNotDownloadPop3Movemail.label "To save disk space, do not download:">
-<!ENTITY doNotDownload.label "To save disk space, do not download for offline use:">
+<!ENTITY doNotDownloadNntp.label "To save disk space, do not download for offline use:">
+<!ENTITY doNotDownloadImap.label "To save disk space, downloading messages from the server and keeping local copies for offline use can be restricted by age or size.">
 <!ENTITY allFoldersOffline.label "Keep messages for this account on this computer">
 <!ENTITY allFoldersOffline.accesskey "o">
 <!ENTITY offlineNotDownload.label "Messages larger than">
 <!ENTITY offlineNotDownload.accesskey "M">
+<!ENTITY autosyncNotDownload.label "Don't download messages larger than">
+<!ENTITY autosyncNotDownload.accesskey "m">
 <!ENTITY kb.label "KB">
 <!ENTITY daysOld.label "days old">
 <!ENTITY message.label "messages">
 <!ENTITY nntpNotDownloadRead.label "Read messages">
 <!ENTITY nntpNotDownloadRead.accesskey "d">
 <!ENTITY nntpDownloadMsg.label "Messages more than">
 <!ENTITY nntpDownloadMsg.accesskey "e">
 <!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted.">
@@ -28,22 +31,24 @@
 <!ENTITY nntpRemoveMsgBody.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">
 
-<!-- LOCALIZATION NOTE: (useAutosyncBefore.label, useAutosyncMiddle.label, useAutosyncAfter.label):
-  The entities useAutosyncBefore.label, useAutosyncMiddle.label, and
-  useAutosyncAfter.label appear on a single line in preferences as follows:
+<!-- LOCALIZATION NOTE: (ageAutosyncBefore.label, ageAutosyncMiddle.label, ageAutosyncAfter.label):
+  The entities ageAutosyncBefore.label, ageAutosyncMiddle.label, and ageAutosyncAfter.label appear
+  on a single line within the scope of useAutosync.ByAge as follows:
 
-  &useAutosyncBefore.label [textbox for autosync value] &useAutosyncMiddle.label; [dropdown for autosync interval] &useAutosyncAfter.label;
+  &ageAutosyncBefore.label [textbox for autosync value] &ageAutosyncMiddle.label; [dropdown for autosync interval] &ageAutosyncAfter.label;
 -->
-<!ENTITY useAutosyncBefore.label         "">
-<!ENTITY useAutosyncMiddle.label         "">
-<!ENTITY allInterval.label               "All">
-<!ENTITY dayInterval.label               "Days of">
-<!ENTITY weekInterval.label              "Weeks of">
-<!ENTITY monthInterval.label             "Months of">
-<!ENTITY yearInterval.label              "Years of">
-<!ENTITY useAutosyncAfter.label          "email will be stored on disk">
+<!ENTITY allAutosync.label               "Synchronize all messages locally regardless of age">
+<!ENTITY allAutosync.accesskey           "c">
+<!ENTITY ageAutosyncBefore.label         "Synchronize the most recent">
+<!ENTITY ageAutosync.accesskey           "z">
+<!ENTITY ageAutosyncMiddle.label         "">
+<!ENTITY dayAgeInterval.label            "Days">
+<!ENTITY weekAgeInterval.label           "Weeks">
+<!ENTITY monthAgeInterval.label          "Months">
+<!ENTITY yearAgeInterval.label           "Years">
+<!ENTITY ageAutosyncAfter.label          "">