I18n fixes

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 06c9677143d4472ce4974870063f914f6ac61f9e..688bfd3bce9c35aaf3247fcaf54c3f27a27e0f27 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -771,7 +771,7 @@ function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) {
         if ($aRes === false) {
             $error = '<b><small><center><font color=red>' .
                 _("Thread sorting is not supported by your IMAP server.") . '<br />' .
-                _("Please report this to the system administrator.") .
+                _("Please contact your system administrator and report this error.") .
                 '</center></small></b>';
             $aMailbox['SORT'] -= SQSORT_THREAD;
         } else {
@@ -785,7 +785,7 @@ function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) {
         if ($id === false) {
             $error =  '<b><small><center><font color=red>' .
                 _("Server-side sorting is not supported by your IMAP server.") . '<br />' .
-                _("Please report this to the system administrator.") .
+                _("Please contact your system administrator and report this error.") .
                 '</center></small></b>';
         } else {
             $aMailbox['UIDSET'][$iSetIndx] = $id;
@@ -2047,4 +2047,4 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) {
 }
 
 // vim: et ts=4
-?>
+?>
\ No newline at end of file

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 5a97148b26e013725db42cabd2b26881b2b32180..4f60da8d66cd824dc637869b7636f975a6f9fd3b 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-08-10 14:53+0200\n"
+"POT-Creation-Date: 2004-08-11 17:46+0200\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"
@@ -392,6 +392,15 @@ msgstr ""
 msgid "Save folder tree"
 msgstr ""
 
+msgid "The IMAP server is reporting that logins are disabled."
+msgstr ""
+
+msgid "The use of TLS may allow SquirrelMail to login."
+msgstr ""
+
+msgid "Please contact your system administrator and report this error."
+msgstr ""
+
 msgid "Login"
 msgstr ""
 
@@ -984,9 +993,6 @@ msgstr ""
 msgid "Is PEAR installed, and is the include path set correctly to find %s?"
 msgstr ""
 
-msgid "Please contact your system administrator and report this error."
-msgstr ""
-
 msgid "Personal address book"
 msgstr ""
 
@@ -1364,9 +1370,6 @@ msgstr ""
 msgid "Thread sorting is not supported by your IMAP server."
 msgstr ""
 
-msgid "Please report this to the system administrator."
-msgstr ""
-
 msgid "Server-side sorting is not supported by your IMAP server."
 msgstr ""
 

diff --git a/src/login.php b/src/login.php
index 1421ba43337e4844f4883c3003e165f748907d4d..e459c0aac24a59eb57fc4188212485b8f5325a7e 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -64,11 +64,11 @@ if($imap_auth_mech == 'login') {
     $logindisabled = sqimap_capability($imap,'LOGINDISABLED');
     sqimap_logout($imap);
     if ($logindisabled) {
-        $string = "The IMAP server is reporting that logins are disabled.<br>";
+        $string = _("The IMAP server is reporting that logins are disabled.").'<br />';
         if (!$use_imap_tls) {
-            $string .= "The use of TLS may allow SquirrelMail to login.<br>";
+            $string .= _("The use of TLS may allow SquirrelMail to login.").'<br />';
         }
-        $string .= "Please contact your system administrator.";
+        $string .= _("Please contact your system administrator and report this error.");
         error_box($string,$color);
         exit;
     }
@@ -186,4 +186,4 @@ echo '</form>' . "\n";
 do_hook('login_bottom');
 echo "</body>\n".
      "</html>\n";
-?>
+?>
\ No newline at end of file