Bug 339151 – Folder Properties Retention Policy tab dialog needs to be re-worded (grammar)
p=me r=standard8 sr=bienvenu
--- a/mail/locales/en-US/chrome/messenger/folderProps.dtd
+++ b/mail/locales/en-US/chrome/messenger/folderProps.dtd
@@ -51,18 +51,18 @@
<!ENTITY retention.label "Retention Policy">
<!ENTITY retentionUseDefault.label "Use server defaults">
<!ENTITY retentionUseDefault.accesskey "d">
<!ENTITY days.label "days">
<!ENTITY daysOld.label "days old">
<!ENTITY message.label "messages">
<!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted">
-<!ENTITY retentionKeepMsg.label "Delete messages more than">
-<!ENTITY retentionKeepMsg.accesskey "m">
+<!ENTITY retentionDeleteMsg.label "Delete messages more than">
+<!ENTITY retentionDeleteMsg.accesskey "m">
<!ENTITY retentionKeepAll.label "Don't delete any messages">
<!ENTITY retentionKeepAll.accesskey "A">
<!ENTITY retentionKeepNew.label "Delete all but the last">
<!ENTITY retentionKeepNew.accesskey "l">
<!ENTITY retentionKeepUnread.label "Always delete read messages">
<!ENTITY retentionKeepUnread.accesskey "r">
<!ENTITY folderOfflineTab.label "Offline">
--- a/mailnews/base/resources/content/folderProps.xul
+++ b/mailnews/base/resources/content/folderProps.xul
@@ -126,18 +126,18 @@
<hbox flex="1" align="center">
<radio wsm_persist="true" id="keepNewMsg" accesskey="&retentionKeepNew.accesskey;"
value="3" label="&retentionKeepNew.label;" oncommand="onCheckKeepMsg();"/>
<textbox wsm_persist="true" id="retention.keepNewMsgMin" size="2" value="30"
aria-labelledby="keepNewMsg retention.keepNewMsgMin retention.keepNewMsgMinLabel"/>
<label value="&message.label;" control="retention.keepNewMsgMin" id="retention.keepNewMsgMinLabel"/>
</hbox>
<hbox flex="1" align="center">
- <radio wsm_persist="true" id="keepMsg" accesskey="&retentionKeepMsg.accesskey;"
- value="2" label="&retentionKeepMsg.label;" oncommand="onCheckKeepMsg();"/>
+ <radio wsm_persist="true" id="keepMsg" accesskey="&retentionDeleteMsg.accesskey;"
+ value="2" label="&retentionDeleteMsg.label;" oncommand="onCheckKeepMsg();"/>
<textbox wsm_persist="true" id="retention.keepOldMsgMin" size="2" value="30"
aria-labelledby="keepMsg retention.keepOldMsgMin retention.keepOldMsgMinLabel"/>
<label value="&daysOld.label;" control="retention.keepOldMsgMin" id="retention.keepOldMsgMinLabel"/>
</hbox>
</radiogroup>
</hbox>
<hbox class="indent">
<checkbox wsm_persist="true" id="retention.keepUnread" accesskey="&retentionKeepUnread.accesskey;"
--- a/suite/locales/en-US/chrome/mailnews/folderProps.dtd
+++ b/suite/locales/en-US/chrome/mailnews/folderProps.dtd
@@ -55,18 +55,18 @@
<!ENTITY days.label "days">
<!ENTITY daysOld.label "days old">
<!ENTITY message.label "messages">
<!ENTITY retentionNotDownloadRead.label "Read messages">
<!ENTITY retentionNotDownloadRead.accesskey "R">
<!ENTITY retentionDownloadMsg.label "Messages more than">
<!ENTITY retentionDownloadMsg.accesskey "e">
<!ENTITY retentionCleanup.label "Keep:">
-<!ENTITY retentionKeepMsg.label "Messages which have arrived within the last">
-<!ENTITY retentionKeepMsg.accesskey "w">
+<!ENTITY retentionDeleteMsg.label "Delete messages more than">
+<!ENTITY retentionDeleteMsg.accesskey "m">
<!ENTITY retentionKeepAll.label "All messages">
<!ENTITY retentionKeepAll.accesskey "A">
<!ENTITY retentionKeepNew.label "The newest">
<!ENTITY retentionKeepNew.accesskey "n">
<!ENTITY retentionKeepUnread.label "Only unread messages">
<!ENTITY retentionKeepUnread.accesskey "u">
<!ENTITY folderOfflineTab.label "Offline">