Removing trailing spaces from strings.

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

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 714946a2bee6d0a919764788cd51e557a0e834bf..57d9c2d651cf4592dc8cde02b1f0727aab002380 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -691,7 +691,7 @@ function sqimap_create_stream($server,$port,$tls=0) {
                 // starttls command failed
                 sqimap_error_box(sprintf(_("Error connecting to IMAP server: %s."), $server),
                                  'STARTTLS',
-                                 _("Server replied: "),
+                                 _("Server replied:") . ' ',
                                  $starttls_message);
                 exit();
             }
@@ -1244,4 +1244,4 @@ function map_yp_alias($username) {
    return chop(substr($yp, strlen($username)+1));
 }
 
-?>
+?>
\ No newline at end of file

diff --git a/plugins/mail_fetch/class.POP3.php b/plugins/mail_fetch/class.POP3.php
index 9fcec0611a118b50f35df9f6708548b7046664c2..0866e945ea33543dfb674243480b3a6a198e932a 100644 (file)
--- a/plugins/mail_fetch/class.POP3.php
+++ b/plugins/mail_fetch/class.POP3.php
@@ -92,7 +92,7 @@ class POP3 {
         $fp = @fsockopen("$server", $port, $errno, $errstr);
 
         if(!$fp) {
-            $this->ERROR = _("POP3 connect:") . ' ' . _("Error ") . "[$errno] [$errstr]";
+            $this->ERROR = _("POP3 connect:") . ' ' . _("Error") . ' ' . "[$errno] [$errstr]";
             unset($this->FP);
             return false;
         }
@@ -104,7 +104,7 @@ class POP3 {
         if($this->DEBUG)
             error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
         if(!$this->is_ok($reply)) {
-            $this->ERROR = _("POP3 connect:") . ' ' . _("Error ") . "[$reply]";
+            $this->ERROR = _("POP3 connect:") . ' ' . _("Error") . ' ' . "[$reply]";
             unset($this->FP);
             return false;
         }
@@ -125,7 +125,7 @@ class POP3 {
         } else {
             $reply = $this->send_cmd("USER $user");
             if(!$this->is_ok($reply)) {
-                $this->ERROR = _("POP3 user:") . ' ' . _("Error ") . "[$reply]";
+                $this->ERROR = _("POP3 user:") . ' ' . _("Error") . ' ' . "[$reply]";
                 return false;
             } else
                 return true;
@@ -248,7 +248,7 @@ class POP3 {
         }
         if(!$this->is_ok($reply))
         {
-            $this->ERROR = _("POP3 top:") . ' ' . _("Error ") . "[$reply]";
+            $this->ERROR = _("POP3 top:") . ' ' . _("Error") . ' ' . "[$reply]";
             return false;
         }
 
@@ -302,7 +302,7 @@ class POP3 {
             }
             if(!$this->is_ok($reply))
             {
-                $this->ERROR = _("POP3 pop_list:") . ' ' . _("Error ") . "[$reply]";
+                $this->ERROR = _("POP3 pop_list:") . ' ' . _("Error") . ' ' . "[$reply]";
                 return false;
             }
             list($junk,$num,$size) = preg_split('/\s+/',$reply);
@@ -313,7 +313,7 @@ class POP3 {
         if(!$this->is_ok($reply))
         {
             $reply = $this->strip_clf($reply);
-            $this->ERROR = _("POP3 pop_list:") . ' ' . _("Error ") .  "[$reply]";
+            $this->ERROR = _("POP3 pop_list:") . ' ' . _("Error") . ' ' .  "[$reply]";
             return false;
         }
         $MsgArray = array();
@@ -361,7 +361,7 @@ class POP3 {
 
         if(!$this->is_ok($reply))
         {
-            $this->ERROR = _("POP3 get:") . ' ' . _("Error ") . "[$reply]";
+            $this->ERROR = _("POP3 get:") . ' ' . _("Error") . ' ' . "[$reply]";
             return false;
         }
 
@@ -394,7 +394,7 @@ class POP3 {
         $reply = $this->send_cmd("STAT");
         if(!$this->is_ok($reply))
         {
-            $this->ERROR = _("POP3 last:") . ' ' . _("Error ") . "[$reply]";
+            $this->ERROR = _("POP3 last:") . ' ' . _("Error") . ' ' . "[$reply]";
             return $last;
         }
 
@@ -427,7 +427,7 @@ class POP3 {
             //  response - if it ever does, something truely
             //  wild is going on.
 
-            $this->ERROR = _("POP3 reset:") . ' ' . _("Error ") . "[$reply]";
+            $this->ERROR = _("POP3 reset:") . ' ' . _("Error") . ' ' . "[$reply]";
             @error_log("POP3 reset: ERROR [$reply]",0);
         }
         $this->quit();
@@ -526,7 +526,7 @@ class POP3 {
             $reply = $this->send_cmd($cmd);
             if(!$this->is_ok($reply))
             {
-                $this->ERROR = _("POP3 uidl:") . ' ' . _("Error ") . "[$reply]";
+                $this->ERROR = _("POP3 uidl:") . ' ' . _("Error") . ' ' . "[$reply]";
                 return false;
             }
             list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
@@ -549,7 +549,7 @@ class POP3 {
             if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
             if(!$this->is_ok($reply))
             {
-                $this->ERROR = _("POP3 uidl:") . ' ' . _("Error ") . "[$reply]";
+                $this->ERROR = _("POP3 uidl:") . ' ' . _("Error") . ' ' . "[$reply]";
                 return false;
             }
 
@@ -593,7 +593,7 @@ class POP3 {
         $reply = $this->send_cmd("DELE $msgNum");
         if(!$this->is_ok($reply))
         {
-            $this->ERROR = _("POP3 delete:") . ' ' . _("Command failed ") . "[$reply]";
+            $this->ERROR = _("POP3 delete:") . ' ' . _("Command failed") . ' ' . "[$reply]";
             return false;
         }
         return true;

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index ecfdad68e06f9ca6f574aaa329db3751e1895116..205ad317cac8ee264541e5c596516062962b5ec7 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -156,8 +156,9 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
     echo '<br />' .
         html_tag( 'table',
             html_tag( 'tr',
-                html_tag( 'td', '<b>' . _("Fetching from ") .
-                    htmlspecialchars($mailfetch[$i_loop]['alias']) .
+                html_tag( 'td', '<b>' .
+                    sprintf(_("Fetching from %s"),
+                        htmlspecialchars($mailfetch[$i_loop]['alias'])) .
                     '</b>',
                 'center' ) ,
             '', $color[9] ) ,
@@ -166,7 +167,7 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
     flush();
 
     if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
-        Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR );
+        Mail_Fetch_Status($pop3->ERROR );
         continue;
     }
 
@@ -227,7 +228,7 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
     }
 
     for (; $i <= $Count; $i++) {
-        Mail_Fetch_Status(_("Fetching message ") . "$i" );
+        Mail_Fetch_Status(sprintf(_("Fetching message %s."), $i));
 
         if (!ini_get('safe_mode'))
             set_time_limit(20); // 20 seconds per message max
@@ -235,13 +236,13 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
         $MessArray = $pop3->get($i);
 
         while ( (!$MessArray) or (gettype($MessArray) != "array")) {
-            Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR);
+            Mail_Fetch_Status($pop3->ERROR);
             // re-connect pop3
             Mail_Fetch_Status(_("Server error. Disconnect"));
             $pop3->quit();
             Mail_Fetch_Status(_("Reconnect from dead connection"));
             if (!$pop3->connect($mailfetch_server)) {
-                Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR );
+                Mail_Fetch_Status($pop3->ERROR );
                 Mail_Fetch_Status(_("Saving UIDL"));
                 setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]);
 
@@ -255,7 +256,7 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
 
                 continue;
             }
-            Mail_Fetch_Status(_("Refetching message ") . "$i" );
+            Mail_Fetch_Status(sprintf(_("Refetching message %s."), $i));
             $MessArray = $pop3->get($i);
 
         } // end while

diff --git a/plugins/mail_fetch/functions.php b/plugins/mail_fetch/functions.php
index e7f4081cd6b23f993078fdf342b9313bf9594a23..7bb8fa5314869d01e301ee3c96e6c81f498594e4 100644 (file)
--- a/plugins/mail_fetch/functions.php
+++ b/plugins/mail_fetch/functions.php
@@ -134,7 +134,7 @@ function mail_fetch_login_function() {
             $pop3 = new POP3($mailfetch_server, 60);
 
             if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
-                $outMsg .= _("Warning, ") . $pop3->ERROR;
+                $outMsg .= _("Warning:") . ' ' . $pop3->ERROR;
                 continue;
             }
 
@@ -142,7 +142,7 @@ function mail_fetch_login_function() {
 
             $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
             if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
-                $outMsg .= _("Login Failed:") . $pop3->ERROR;
+                $outMsg .= _("Login Failed:") . ' ' . $pop3->ERROR;
                 continue;
             }
 
@@ -180,7 +180,7 @@ function mail_fetch_login_function() {
                 $MessArray = $pop3->get($i);
 
                 if ( (!$MessArray) or (gettype($MessArray) != "array")) {
-                    $outMsg .= _("Warning, ") . $pop3->ERROR;
+                    $outMsg .= _("Warning:") . ' ' . $pop3->ERROR;
                     continue 2;
                 }
 

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 1b1f0e746a88ecdd945221957bcc83ab5cd5e89d..bbcab60c35409915ace867550a9b294a7e71c2fa 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -1,20 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# LANGUAGE (xx_XX) SquirrelMail Translation
+# Copyright (c) 1999-2006 The SquirrelMail Project Team
+# This file is distributed under the same license as the SquirrelMail package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# $Id$
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-11-23 19:15+0200\n"
+"Project-Id-Version: SquirrelMail DEVEL\n"
+"POT-Creation-Date: 2006-02-01 07:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: LANGUAGE <squirrelmail-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#, c-format
+#, php-format
 msgid "About SquirrelMail %s"
 msgstr ""
 
@@ -24,14 +26,14 @@ msgid ""
 msgstr ""
 
 #. i18n: %s displays org_name variable value enclosed in () or empty string.
-#, c-format
+#, php-format
 msgid ""
 "If you have questions about or problems with your mail account, passwords, "
 "abuse etc, please refer to your system administrator or provider%s."
 msgstr ""
 
 #. i18n: %s tags are used in order to remove html URL attributes from translation
-#, c-format
+#, php-format
 msgid ""
 "They can assist you adequately with these issues. The SquirrelMail Project "
 "Team cannot help you with that. The %shelp system%s provides answers to "
@@ -39,7 +41,7 @@ msgid ""
 msgstr ""
 
 #. i18n: %s tags are used in order to remove html URL attributes from translation
-#, c-format
+#, php-format
 msgid ""
 "SquirrelMail is a feature rich, standards compliant webmail application "
 "written in PHP. It was made by a group of volunteers united in the "
@@ -48,7 +50,7 @@ msgid ""
 msgstr ""
 
 #. i18n: %s tags are used in order to remove html URL attributes from translation
-#, c-format
+#, php-format
 msgid ""
 "For more information about SquirrelMail and the SquirrelMail Project Team, "
 "see %sthe SquirrelMail website%s."
@@ -57,7 +59,7 @@ msgstr ""
 msgid "System information"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "You are using SquirrelMail version: %s"
 msgstr ""
 
@@ -118,7 +120,7 @@ msgstr ""
 msgid "List all"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
@@ -147,8 +149,6 @@ msgstr ""
 msgid "You can only edit one address at the time"
 msgstr ""
 
-#. FIXME: Test if $olddata really contains anything and return an error message if it doesn't
-#. Display the "new address" form
 msgid "Update address"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr ""
 #. *
 #. * To translators: %s is for author's name
 #.
-#, c-format
+#, php-format
 msgid "%s wrote:"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 #. * If you have to put author's name in front of date string, check comments about
 #. * argument swapping at http://www.php.net/sprintf
 #.
-#, c-format
+#, php-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
@@ -289,7 +289,7 @@ msgstr ""
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Error: Draft folder %s does not exist."
 msgstr ""
 
@@ -323,15 +323,6 @@ msgstr ""
 msgid "as a subfolder of"
 msgstr ""
 
-#. *
-#. * Theme description
-#. *
-#. * @copyright &copy; 2004-2005 The SquirrelMail Project Team
-#. * @license http://opensource.org/licenses/gpl-license.php GNU Public License
-#. * @version $Id$
-#. * @package squirrelmail
-#. * @subpackage themes
-#.
 msgid "None"
 msgstr ""
 
@@ -436,7 +427,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%s Logo"
 msgstr ""
 
@@ -446,7 +437,7 @@ msgstr ""
 msgid "By the SquirrelMail Project Team"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%s Login"
 msgstr ""
 
@@ -549,7 +540,7 @@ msgstr ""
 msgid "Default Identity"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Alternate Identity %d"
 msgstr ""
 
@@ -714,7 +705,7 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Was displayed on %s"
 msgstr ""
 
@@ -995,7 +986,7 @@ msgstr ""
 msgid "Viewing a Business Card"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "vCard Version %s is not supported. Some information might not be converted "
 "correctly."
@@ -1050,7 +1041,7 @@ msgid ""
 "Could not include PEAR database functions required for the database backend."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Is PEAR installed, and is the include path set correctly to find %s?"
 msgstr ""
 
@@ -1058,7 +1049,7 @@ msgid "Personal address book"
 msgstr ""
 
 #. Fail
-#, c-format
+#, php-format
 msgid "Database error: %s"
 msgstr ""
 
@@ -1066,12 +1057,12 @@ msgid "Addressbook is read-only"
 msgstr ""
 
 #. i18n: don't use html formating in translation
-#, c-format
+#, php-format
 msgid "User \"%s\" already exists"
 msgstr ""
 
 #. i18n: don't use html formating in translation
-#, c-format
+#, php-format
 msgid "User \"%s\" does not exist"
 msgstr ""
 
@@ -1104,7 +1095,7 @@ msgid "Error initializing addressbook database."
 msgstr ""
 
 #. no need to use $abook->error, because message explains error.
-#, c-format
+#, php-format
 msgid "Error opening file %s"
 msgstr ""
 
@@ -1114,7 +1105,7 @@ msgstr ""
 msgid "Error initializing global addressbook."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Error initializing LDAP server %s:"
 msgstr ""
 
@@ -1284,36 +1275,36 @@ msgstr ""
 msgid "D, H:i"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Click here to return to %s"
 msgstr ""
 
 msgid "Go to the login page"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Preference file, %s, does not exist. Log out, and log back in to create a "
 "default preference file."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Preference file, %s, could not be opened. Contact your system administrator "
 "to resolve this issue."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Preference file, %s, could not be written. Contact your system administrator "
 "to resolve this issue."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Preference file, %s, could not be copied from temporary file, %s. Contact "
 "your system administrator to resolve this issue."
@@ -1322,26 +1313,26 @@ msgstr ""
 msgid "Could not create initial preference file!"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%s should be writable by user %s"
 msgstr ""
 
 msgid "Signature is too big."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Signature file, %s, could not be opened. Contact your system administrator "
 "to resolve this issue."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Signature file, %s, could not be written. Contact your system administrator "
 "to resolve this issue."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Signature file, %s, could not be copied from temporary file, %s. Contact "
 "your system administrator to resolve this issue."
@@ -1350,7 +1341,7 @@ msgstr ""
 msgid "Illegal folder name."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "The name may not contain any of the following: %s"
 msgstr ""
 
@@ -1372,7 +1363,7 @@ msgstr ""
 msgid "You have not selected a folder to delete. Please do so."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
@@ -1427,7 +1418,7 @@ msgstr ""
 msgid "Server responded:"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
@@ -1436,11 +1427,24 @@ msgid ""
 "missing the openssl extension."
 msgstr ""
 
-#, c-format
+msgid ""
+"IMAP STARTTLS is enabled in SquirrelMail configuration, but used IMAP server "
+"does not support STARTTLS."
+msgstr ""
+
+msgid "Unable to start TLS."
+msgstr ""
+
+msgid ""
+"IMAP STARTTLS is enabled in SquirrelMail configuration, but used PHP version "
+"does not support functions that allow to enable encryption on open socket."
+msgstr ""
+
+#, php-format
 msgid "Bad request: %s"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Unknown error: %s"
 msgstr ""
 
@@ -1550,7 +1554,7 @@ msgstr ""
 msgid "This external link will open in a new window"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Option Type '%s' Not Found"
 msgstr ""
 
@@ -1558,14 +1562,11 @@ msgstr ""
 msgid "unavailable"
 msgstr ""
 
-msgid "Current Folder"
-msgstr ""
-
 #. javascript off
 msgid "Compose"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Error creating directory %s."
 msgstr ""
 
@@ -1575,6 +1576,34 @@ msgstr ""
 msgid "Terminating SquirrelMail due to a fatal error"
 msgstr ""
 
+msgid "Email delivery error"
+msgstr ""
+
+#, php-format
+msgid "Can't execute command '%s'."
+msgstr ""
+
+msgid ""
+"Secure SMTP (TLS) is enabled in SquirrelMail configuration, but used PHP "
+"version does not support it."
+msgstr ""
+
+msgid "Can't open SMTP stream."
+msgstr ""
+
+msgid "TLS session is already activated."
+msgstr ""
+
+msgid ""
+"SMTP STARTTLS is enabled in SquirrelMail configuration, but used SMTP server "
+"does not support it"
+msgstr ""
+
+msgid ""
+"SMTP STARTTLS is enabled in SquirrelMail configuration, but used PHP version "
+"does not support functions that allow to enable encryption on open socket."
+msgstr ""
+
 msgid "Service not available, closing channel"
 msgstr ""
 
@@ -1738,22 +1767,25 @@ msgstr ""
 msgid "General Display Options"
 msgstr ""
 
+msgid "Template"
+msgstr ""
+
 msgid "Theme"
 msgstr ""
 
-#. *
-#. * Theme description
-#. *
-#. * @copyright &copy; 2004-2005 The SquirrelMail Project Team
-#. * @license http://opensource.org/licenses/gpl-license.php GNU Public License
-#. * @version $Id$
-#. * @package squirrelmail
-#. * @subpackage themes
-#.
 msgid "Default"
 msgstr ""
 
-msgid "Custom Stylesheet"
+msgid "Default font style"
+msgstr ""
+
+msgid "Font style"
+msgstr ""
+
+msgid "Font size"
+msgstr ""
+
+msgid "Default font size"
 msgstr ""
 
 msgid "Language"
@@ -1901,7 +1933,7 @@ msgstr ""
 msgid "Seconds"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%d Minute"
 msgid_plural "%d Minutes"
 msgstr[0] ""
@@ -2058,15 +2090,6 @@ msgstr ""
 msgid "Prefix Signature with '-- ' Line"
 msgstr ""
 
-#. *
-#. * Theme description
-#. *
-#. * @copyright &copy; 2004-2005 The SquirrelMail Project Team
-#. * @license http://opensource.org/licenses/gpl-license.php GNU Public License
-#. * @version $Id$
-#. * @package squirrelmail
-#. * @subpackage themes
-#.
 msgid "XP"
 msgstr ""
 
@@ -2168,10 +2191,21 @@ msgstr ""
 msgid "Use &quot;detect&quot; to auto-detect."
 msgstr ""
 
-msgid "Use TLS for IMAP Connections"
+msgid "IMAP Connection Security"
+msgstr ""
+
+msgid "Plain text connection"
 msgstr ""
 
-msgid "Requires PHP 4.3.x! Experimental."
+msgid "Secure IMAP (TLS) connection"
+msgstr ""
+
+msgid "IMAP STARTTLS connection"
+msgstr ""
+
+msgid ""
+"Requires higher PHP version and special functions. See SquirrelMail "
+"documentation."
 msgstr ""
 
 msgid "IMAP Authentication Type"
@@ -2189,13 +2223,16 @@ msgstr ""
 msgid "Sendmail Path"
 msgstr ""
 
+msgid "Sendmail Arguments"
+msgstr ""
+
 msgid "SMTP Server Address"
 msgstr ""
 
 msgid "SMTP Server Port"
 msgstr ""
 
-msgid "Use TLS for SMTP Connections"
+msgid "SMTP Connection Security"
 msgstr ""
 
 msgid "SMTP Authentication Type"
@@ -2494,7 +2531,7 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Plugin directory could not be found: %s"
 msgstr ""
 
@@ -2529,13 +2566,13 @@ msgid ""
 "for any common problems."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Make sure that you are running the most recent copy of %s. You are currently "
 "using version %s."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Check to see if your bug is already listed in the %sBug List%s on "
 "SourceForge. If it is, we already know about it and are trying to fix it."
@@ -2547,7 +2584,7 @@ msgid ""
 "view a specific message, keep that message around so maybe we can see it."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "If there were warnings displayed above, try to resolve them yourself. Read "
 "the guides in the %s directory where SquirrelMail was installed."
@@ -2592,7 +2629,7 @@ msgstr ""
 msgid "Show button in toolbar"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Could not write calendar file %s"
 msgstr ""
 
@@ -2635,6 +2672,9 @@ msgstr ""
 msgid "Date:"
 msgstr ""
 
+msgid "m/d/Y"
+msgstr ""
+
 msgid "Time:"
 msgstr ""
 
@@ -2704,7 +2744,6 @@ msgstr ""
 msgid "6 hr."
 msgstr ""
 
-#. Add Calendar link to upper menu
 msgid "Calendar"
 msgstr ""
 
@@ -2723,7 +2762,7 @@ msgstr ""
 msgid "Your current password is not correct."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Your new password should be %s to %s characters long."
 msgstr ""
 
@@ -2756,11 +2795,11 @@ msgid "Plugin is not configured correctly."
 msgstr ""
 
 #. set error message
-#, c-format
+#, php-format
 msgid "Setting of LDAP connection option %s to value %s failed."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Incorrect LDAP connection option: %s"
 msgstr ""
 
@@ -2771,7 +2810,7 @@ msgstr ""
 msgid "Unable to use TLS."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Error: %s"
 msgstr ""
 
@@ -2781,7 +2820,7 @@ msgstr ""
 msgid "Unable to bind to LDAP server."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Server replied: %s"
 msgstr ""
 
@@ -2809,7 +2848,7 @@ msgstr ""
 msgid "ldap_get_dn error."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Unsupported crypto: %s"
 msgstr ""
 
@@ -2882,11 +2921,11 @@ msgstr ""
 msgid "Required change password backend configuration options are missing."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Connection error: %s"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Invalid table name: %s"
 msgstr ""
 
@@ -2902,7 +2941,7 @@ msgstr ""
 msgid "Invalid domain field"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Query failed: %s"
 msgstr ""
 
@@ -2918,7 +2957,7 @@ msgstr ""
 msgid "Unable to encrypt new password."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Unable to set new password: %s"
 msgstr ""
 
@@ -3141,7 +3180,7 @@ msgstr ""
 msgid "Contains:"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "If %s contains %s then move to %s"
 msgstr ""
 
@@ -3154,7 +3193,7 @@ msgstr ""
 msgid "Spam Filtering"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "WARNING! Tell the administrator to set the %s variable."
 msgstr ""
 
@@ -3181,14 +3220,14 @@ msgid ""
 "scanned."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Spam is sent to %s."
 msgstr ""
 
 msgid "not set yet"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Spam scan is limited to %s."
 msgstr ""
 
@@ -3198,7 +3237,7 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%s is not found."
 msgstr ""
 
@@ -3242,6 +3281,13 @@ msgstr ""
 msgid "Request:"
 msgstr ""
 
+msgid "Execution time:"
+msgstr ""
+
+#, php-format
+msgid "%s ms"
+msgstr ""
+
 msgid ""
 "Run some test IMAP commands, displaying both the command and the result. "
 "These tests use the SquirrelMail IMAP commands and your current SquirrelMail "
@@ -3263,25 +3309,25 @@ msgstr ""
 msgid "Contact Listowner"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "This will send a message to %s requesting help for this list. You will "
 "receive an emailed response at the address below."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "This will send a message to %s requesting that you will be subscribed to "
 "this list. You will be subscribed with the address below."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "This will send a message to %s requesting that you will be unsubscribed from "
 "this list. It will try to unsubscribe the adress below."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Unknown action: %s"
 msgstr ""
 
@@ -3297,7 +3343,7 @@ msgstr ""
 msgid "No server specified"
 msgstr ""
 
-msgid "Error "
+msgid "Error"
 msgstr ""
 
 msgid "POP3 user:"
@@ -3351,9 +3397,6 @@ msgstr ""
 msgid "POP3 last:"
 msgstr ""
 
-#.  The POP3 RSET command -never- gives a -ERR
-#.  response - if it ever does, something truely
-#.  wild is going on.
 msgid "POP3 reset:"
 msgstr ""
 
@@ -3378,7 +3421,7 @@ msgstr ""
 msgid "No msg number submitted"
 msgstr ""
 
-msgid "Command failed "
+msgid "Command failed"
 msgstr ""
 
 msgid "Select Server:"
@@ -3399,10 +3442,8 @@ msgstr ""
 msgid "Click here to go to the options page."
 msgstr ""
 
-msgid "Fetching from "
-msgstr ""
-
-msgid "Oops, "
+#, php-format
+msgid "Fetching from %s"
 msgstr ""
 
 msgid "Opening IMAP server"
@@ -3420,7 +3461,7 @@ msgstr ""
 msgid "Login OK: Inbox EMPTY"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Login OK: Inbox contains %s message"
 msgid_plural "Login OK: Inbox contains %s messages"
 msgstr[0] ""
@@ -3438,7 +3479,8 @@ msgstr ""
 msgid "Deleting messages from server..."
 msgstr ""
 
-msgid "Fetching message "
+#, php-format
+msgid "Fetching message %s."
 msgstr ""
 
 #. re-connect pop3
@@ -3452,7 +3494,8 @@ msgstr ""
 msgid "Saving UIDL"
 msgstr ""
 
-msgid "Refetching message "
+#, php-format
+msgid "Refetching message %s."
 msgstr ""
 
 msgid "Error Appending Message!"
@@ -3467,14 +3510,14 @@ msgstr ""
 msgid "Message appended to mailbox"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Message %d deleted from remote server!"
 msgstr ""
 
 msgid "Delete failed:"
 msgstr ""
 
-msgid "Warning, "
+msgid "Warning:"
 msgstr ""
 
 msgid "Mail Fetch Result:"
@@ -3602,7 +3645,7 @@ msgid ""
 "when new mail arrives."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%s New Message"
 msgid_plural "%s New Messages"
 msgstr[0] ""
@@ -3611,7 +3654,7 @@ msgstr[1] ""
 msgid "New Mail Notification"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "The %s option will check ALL of your folders for unseen mail, not just the "
 "inbox for notification."
@@ -3620,7 +3663,7 @@ msgstr ""
 msgid "Check all boxes, not just INBOX"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Selecting the %s option will enable the showing of a popup window when "
 "unseen mail is in your folders (requires JavaScript)."
@@ -3629,7 +3672,7 @@ msgstr ""
 msgid "Show popup window on new mail"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Use the %s option to only check for messages that are recent. Recent "
 "messages are those that have just recently showed up and have not been "
@@ -3640,7 +3683,7 @@ msgstr ""
 msgid "Count only messages that are RECENT"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Selecting the %s option will change the title in some browsers to let you "
 "know when you have new mail (requires JavaScript, and only works in IE but "
@@ -3651,7 +3694,7 @@ msgstr ""
 msgid "Change title on supported browsers"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Select %s to turn on playing a media file when unseen mail is in your "
 "folders. When enabled, you can specify the media file to play in the "
@@ -3661,7 +3704,7 @@ msgstr ""
 msgid "Enable Media Playing"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Select from the list of %s the media file to play when new mail arrives. If "
 "no file is specified, %s, no sound will be used."
@@ -3700,7 +3743,7 @@ msgstr ""
 msgid "Uploaded Media File:"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Media file %s will be removed, if you upload other media file."
 msgstr ""
 
@@ -3713,7 +3756,7 @@ msgstr ""
 msgid "SquirrelMail Notice:"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "You have %s new message"
 msgid_plural "You have %s new messages"
 msgstr[0] ""
@@ -3836,7 +3879,7 @@ msgid ""
 "the spam and helps in letting the proper people know about the abuse."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "To use it, you must get a SpamCop authorization code. There is a free %ssign "
 "up page%s so you can use SpamCop."
@@ -3845,7 +3888,7 @@ msgstr ""
 msgid "Before you sign up, be warned"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Some users have reported that the email addresses used with SpamCop find "
 "their way onto spam lists. To be safe, you can just create an email "
@@ -3915,7 +3958,7 @@ msgstr ""
 msgid "More information"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "For more information about SpamCop, it's services, spam in general, and many "
 "related topics, try reading through SpamCop's %sHelp and Feedback%s section."
@@ -3968,7 +4011,7 @@ msgid ""
 "encrypted data is no longer accessible."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid ""
 "Your %s dictionary is encrypted with password that differs from your current "
 "password."
@@ -3983,9 +4026,6 @@ msgstr ""
 msgid "Proceed"
 msgstr ""
 
-#. *
-#. * Add some string vars so they can be i18n'd.
-#.
 msgid "You must make a choice"
 msgstr ""
 
@@ -4003,7 +4043,7 @@ msgid "Invalid SquirrelSpell module."
 msgstr ""
 
 #. TODO: replace error_box() with sqspell_makeWindow()
-#, c-format
+#, php-format
 msgid "Could not run the spellchecker command (%s)."
 msgstr ""
 
@@ -4012,16 +4052,16 @@ msgid "Error while writing to pipe."
 msgstr ""
 
 #. TODO: replace error_box() with sqspell_makeWindow()
-#, c-format
+#, php-format
 msgid "Could not open temporary file '%s'."
 msgstr ""
 
 #. TODO: replace error_box() with sqspell_makeWindow()
-#, c-format
+#, php-format
 msgid "Error while writing to temporary file '%s'."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "I tried to execute '%s', but it returned:"
 msgstr ""
 
@@ -4043,7 +4083,7 @@ msgstr ""
 msgid "SquirrelSpell Results"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Found %d error"
 msgid_plural "Found %d errors"
 msgstr[0] ""
@@ -4164,7 +4204,7 @@ msgstr ""
 msgid "Please check any words you wish to delete from your dictionary."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%s dictionary"
 msgstr ""
 
@@ -4177,9 +4217,6 @@ msgstr ""
 msgid "Edit your Personal Dictionary"
 msgstr ""
 
-#. *
-#. * Set up some i18n'able wrappers for javascript.
-#.
 msgid "Please make your selection first."
 msgstr ""
 
@@ -4241,7 +4278,7 @@ msgid ""
 "Please encrypt my personal dictionary and store it in an encrypted format."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Deleting the following entries from %s dictionary:"
 msgstr ""
 
@@ -4271,11 +4308,11 @@ msgstr ""
 msgid "SquirrelSpell Initiating"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Settings adjusted to: %s with %s as default dictionary."
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Using %s dictionary for spellcheck."
 msgstr ""
 
@@ -4339,7 +4376,7 @@ msgstr ""
 msgid "Maximum of 150 words translated, powered by Systran"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Number of supported language pairs: %s"
 msgstr ""
 
@@ -4355,7 +4392,7 @@ msgstr ""
 msgid "No known limits, powered by Translation Experts' InterTran"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Number of supported languages: %s"
 msgstr ""
 
@@ -4365,7 +4402,7 @@ msgstr ""
 msgid "Russian translations, maximum of 500 characters translated"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "%s to %s"
 msgstr ""
 
@@ -4533,7 +4570,6 @@ msgstr ""
 msgid "Paginate"
 msgstr ""
 
-#. Compute the 'show all' string.
 msgid "Show All"
 msgstr ""
 
@@ -4549,11 +4585,11 @@ msgstr ""
 msgid "More info:"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Viewing Messages: %s to %s (%s total)"
 msgstr ""
 
-#, c-format
+#, php-format
 msgid "Viewing Message: %s (%s total)"
 msgstr ""
 
@@ -4569,18 +4605,9 @@ msgstr ""
 msgid "Click here to change the sorting of the message list"
 msgstr ""
 
-#. *
-#. * independent_strings.php
-#. *
-#. * Copyright (c) 1999-2005 The SquirrelMail Project Team
-#. * Licensed under the GNU GPL. For full terms see the file COPYING.
-#. *
-#. * The purpose of this module is to store translation strings that
-#. * are not into the code. For example strings that can come
-#. * through an external source like emails.
-#. *
-#. * $Id$
-#.
+msgid "Current Folder"
+msgstr ""
+
 msgid "Delivery error report"
 msgstr ""