Some string fixes

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9176 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 898cecc0275c33c2f3c46c34e569af001278703d..451159b19430b61b394dfe9ddaa348bf9b140564 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -222,7 +222,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
             Mail_Fetch_Status(_("Server does not support UIDL."));
 
         if ($mailfetch_lmos == 'on') {
-            Mail_Fetch_Status(_("Leaving Mail on Server..."));
+            Mail_Fetch_Status(_("Leaving mail on server..."));
         } else {
             Mail_Fetch_Status(_("Deleting messages from server..."));
         }
@@ -238,7 +238,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
             while ( (!$MessArray) or (gettype($MessArray) != "array")) {
                  Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR);
                  // re-connect pop3
-                 Mail_Fetch_Status(_("Server error...Disconnect"));
+                 Mail_Fetch_Status(_("Server error. Disconnect"));
                  $pop3->quit();
                  Mail_Fetch_Status(_("Reconnect from dead connection"));
                  if (!$pop3->connect($mailfetch_server)) {
@@ -289,7 +289,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 
                 if ($mailfetch_lmos != 'on') {
                    if( $pop3->delete($i) ) {
-                        Mail_Fetch_Status(_("Message ") . $i . _(" deleted from Remote Server!"));
+                        Mail_Fetch_Status(_("Message %i deleted from remote server!"), $i);
                    } else {
                         Mail_Fetch_Status(_("Delete failed:") . htmlspecialchars($pop3->ERROR) );
                    }
@@ -325,4 +325,4 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 ?>
 </center>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 98ae505cb6dbb5743e581730dce536237d6ffa60..369f206c809eb5114fa366aad6d6afa0b50b3786 100644 (file)
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -167,7 +167,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
-                        _("If you leave password empty, it will be required when you fetch mail.") ,
+                        _("If you leave password empty, it will be asked when you fetch mail.") ,
                     'left' )
                 ) .
                 html_tag( 'tr',
@@ -229,11 +229,11 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', ' ', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_login" />' . _("Check mail during login"), 'left' )
+                    html_tag( 'td', '<input type="checkbox" name="mf_login" />' . _("Check mail at login"), 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_fref" />' . _("Check mail during folder refresh"), 'left' )
+                    html_tag( 'td', '<input type="checkbox" name="mf_fref" />' . _("Check mail at folder refresh"), 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
@@ -262,7 +262,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                  '&nbsp;&nbsp;<input type="submit" name="mf_action_del" value="' . _("Delete") . '" />'.
                  '</form>';
         } else {
-            echo _("No-one server in use. Try to add.");
+            echo _("No servers known.");
         }
         echo '</td></tr></table>';
         break;
@@ -356,14 +356,14 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                     html_tag( 'th', '&nbsp;', 'right' ) .
                     html_tag( 'td',
                         '<input type="checkbox" name="mf_login" ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked="checked"':'') .
-                        ' />' . _("Check mail during login"),
+                        ' />' . _("Check mail at login"),
                     'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
                     html_tag( 'td',
                         '<input type="checkbox" name="mf_fref" ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked="checked"':'') .
-                        ' />' . _("Check mail during folder refresh") ,
+                        ' />' . _("Check mail at folder refresh") ,
                     'left' )
                 ) .
                 html_tag( 'tr',
@@ -385,10 +385,10 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
         html_tag( 'table',
             html_tag( 'tr',
                 html_tag( 'td', '<b>' . _("Undefined Function") . '</b>', 'center', $color[9] ) .
-                html_tag( 'td', '<b>' . _("Hey! Wath do You are looking for?") . '</b>', 'center', $color[0] )
+                html_tag( 'td', '<b>' . _("The function you requested is unknown.") . '</b>', 'center', $color[0] )
             ) ,
         'center', '', 'width="70%"' );
     }
 
     ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/src/folders.php b/src/folders.php
index e3cc6127e6d20933348decd26d075b39a558a918..aad2cccf26dd33f3b1d8c3fc334cf526ec911c91 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -74,7 +74,7 @@ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
                 sqgetGlobalVar('orig',        $orig,     SQ_POST);
                 sqgetGlobalVar('old_name',    $old_name, SQ_POST);
                 folders_rename_do($imapConnection, $delimiter, $orig, $old_name, $new_name);
-                $td_str =  _("Renamed successfully!");
+                $td_str =  _("Renamed successfully.");
             }
             break;
         case 'delete':
@@ -311,7 +311,7 @@ if ($show_only_subscribed_folders) {
                . "\" />\n"
                . "</form></td>\n";
         } else {
-            echo _("No folders were found to unsubscribe from!") . '</td>';
+            echo _("No folders were found to unsubscribe from.") . '</td>';
         }
 
         /** SUBSCRIBE TO FOLDERS **/