From: jervfors Date: Wed, 11 Aug 2004 15:32:23 +0000 (+0000) Subject: I18n fixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d3b3a524c091171c117c06f1d9342b495f6a0783;p=squirrelmail.git 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 06c96771..688bfd3b 100644 --- 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 = '
' . _("Thread sorting is not supported by your IMAP server.") . '
' . - _("Please report this to the system administrator.") . + _("Please contact your system administrator and report this error.") . '
'; $aMailbox['SORT'] -= SQSORT_THREAD; } else { @@ -785,7 +785,7 @@ function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) { if ($id === false) { $error = '
' . _("Server-side sorting is not supported by your IMAP server.") . '
' . - _("Please report this to the system administrator.") . + _("Please contact your system administrator and report this error.") . '
'; } 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 5a97148b..4f60da8d 100644 --- 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 \n" "Language-Team: LANGUAGE \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 1421ba43..e459c0aa 100644 --- 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.
"; + $string = _("The IMAP server is reporting that logins are disabled.").'
'; if (!$use_imap_tls) { - $string .= "The use of TLS may allow SquirrelMail to login.
"; + $string .= _("The use of TLS may allow SquirrelMail to login.").'
'; } - $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 '' . "\n"; do_hook('login_bottom'); echo "\n". "\n"; -?> +?> \ No newline at end of file