Minor clean and a string unified with STABLE

[squirrelmail.git] / plugins / filters / spamoptions.php

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 730086cf6bc788496d49cbcb4862a7ec4e4f6aca..63f64b00ece3c16a3e826412c7fa6b0e0e9ec73f 100644 (file)
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -59,7 +59,7 @@ if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) {
     if (isset($filters_spam_folder_set)) {
         setPref($data_dir, $username, 'filters_spam_folder', $filters_spam_folder_set);
     } else {
-       echo _("You must select spam folder.");
+       echo _("You must select a spam folder.");
     }
 
     // setting scan type
@@ -67,7 +67,7 @@ if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) {
     if (isset($filters_spam_scan_set)) {
        setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set);
     } else {
-       echo _("You must select scan type.");
+       echo _("You must select a scan type.");
     }
 
     foreach ($spam_filters as $Key => $Value) {
@@ -93,7 +93,7 @@ echo html_tag( 'table',
 if ($SpamFilters_YourHop == ' ') {
     echo '<br />' .
         html_tag( 'div', '<b>' .
-            sprintf(_("WARNING! Tell your admin to set the %s variable"),'SpamFilters_YourHop') .
+            sprintf(_("WARNING! Tell the administrator to set the %s variable."), '&quot;SpamFilters_YourHop&quot;') .
             '</b>' ,
         'center' ) .
         '<br />';
@@ -148,14 +148,14 @@ if (isset($action) && $action == 'spam') {
     if ($filters_spam_scan == 'new') {
         echo ' selected';
     }
-    echo '>' . _("Only unread messages") . '</option>' .
+    echo '>' . _("Unread messages only") . '</option>' .
             '</select>'.
         '</td>'.
     '</tr>'.
     html_tag( 'tr',
           html_tag( 'td', '&nbsp;' ) .
           html_tag( 'td',
-              _("The more messages you scan, the longer it takes. I would suggest that you scan only new messages. If you make a change to your filters, I would set it to scan all messages, then go view my INBOX, then come back and set it to scan only new messages. That way, your new spam filters will be applied and you'll scan even the spam you read with the new filters.") ,
+              _("The more messages scanned, the longer it takes. It's recommended to scan unread messages only. If a change to the filters is made, it's recommended to set it to scan all messages, then go view the INBOX, then come back and set it to scan unread messages only. That way, the new spam filters will be applied and even the spam you didn't catch with the old filters will be scanned.") ,
           'left' )
       );
 
@@ -199,9 +199,9 @@ if (isset($action) && $action == 'spam') {
     echo html_tag( 'p', '', 'center' ) .
          '[<a href="spamoptions.php?action=spam">' . _("Edit") . '</a>]' .
          ' - [<a href="../../src/options.php">' . _("Done") . '</a>]</center><br /><br />';
-    printf( _("Spam is sent to %s"), ($filters_spam_folder?'<b>'.imap_utf7_decode_local($filters_spam_folder).'</b>':'[<i>'._("not set yet").'</i>]' ) );
-    echo '<br>';
-    printf( _("Spam scan is limited to <b>%s</b>"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) );
+    printf( _("Spam is sent to %s."), ($filters_spam_folder?'<b>'.imap_utf7_decode_local($filters_spam_folder).'</b>':'[<i>'._("not set yet").'</i>]' ) );
+    echo '<br />';
+    printf( _("Spam scan is limited to %s."), '<b>' . ( ($filters_spam_scan == 'new')?_("Unread messages only"):_("All messages") ) . '</b>' );
     echo '</p>'.
         '<table border="0" cellpadding="3" cellspacing="0" align="center" bgcolor="' . $color[0] . "\">\n";