X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Ferrors.php;h=972d40d926df3e2a30b4e71977699aed23f27453;hp=476e8ac39c8d239808ad7e0e92540ca5f5f9ec16;hb=6d31e3a336f60a88ffef070c60df49591f02c18c;hpb=1455d7ecf10b340d84a04b189f2d90abf883ef30

diff --git a/include/errors.php b/include/errors.php
index 476e8ac3..972d40d9 100644
--- a/include/errors.php
+++ b/include/errors.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
-* errors.php
-*
-* Copyright (c) 2005 The SquirrelMail Project Team
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-*
-* @version $Id$
-* @package squirrelmail
-*/
+ * errors.php
+ *
+ * @copyright &copy; 2005-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ */
 
+/** init error array */
 $aError = array();
 
 define('SQM_ERROR_IMAP',1);
@@ -20,23 +20,42 @@ define('SQM_ERROR_DB',16);
 define('SQM_ERROR_PLUGIN',32);
 // define('SQM_ERROR_X',64);  future error category
 
+
+
 $aErrors['SQM_IMAP_NO_THREAD'] = array(
     'level'    => E_USER_ERROR,
     'category' => SQM_ERROR_IMAP,
-    'message'  =>  _("Thread sorting is not supported by your IMAP server.") . "\n" .
-                   _("Please contact your system administrator and report this error."),
+    'message'  => _("Thread sorting is not supported by your IMAP server.") . "\n" .
+                  _("Please contact your system administrator and report this error."),
     'link'     => '',
-    'tip'     => _("Run \"configure\", choose option 4 (General options) and set option 10 (Allow server thread sort to false")
+    'tip'      => _("Run \"configure\", choose option 4 (General options) and set option 10 (Disable server thread sort) to true).")
 );
 
 $aErrors['SQM_IMAP_NO_SORT'] = array(
     'level'    => E_USER_ERROR,
     'category' => SQM_ERROR_IMAP,
-    'message'  =>  _( "Server-side sorting is not supported by your IMAP server.") . "\n" .
-                   _("Please contact your system administrator and report this error."),
+    'message'  => _( "Server-side sorting is not supported by your IMAP server.") . "\n" .
+                  _("Please contact your system administrator and report this error."),
     'link'     => '',
-    'tip'     => _("Run \"configure\", choose option 4 (General options) and set option 11 (Allow server-side sorting to false")
+    'tip'      => _("Run \"configure\", choose option 4 (General options) and set option 11 (Disable server-side sorting) to true.")
 );
 
+$aErrors['SQM_IMAP_BADCHARSET'] = array(
+    'level'    => E_USER_NOTICE,
+    'category' => SQM_ERROR_IMAP,
+    'message'  => _( "Your used charset is not supported by your IMAP server.") . "\n" .
+                  _("Please contact your system administrator and report this error."),
+    'link'     => '',
+    'tip'      => _("Run \"configure\", choose option 4 (General options) and set option 12 (Allow server charset search) to false) or choose option 10 (Language settings) and set option 2 (Default charset) to a charset supported by your IMAP server.")
+);
 
+$aErrors['SQM_IMAP_ERROR'] = array(
+    'level'    => E_USER_ERROR,
+    'category' => SQM_ERROR_IMAP,
+    'message'  => _( "Your IMAP server returned an error.") . "\n" .
+                  _("Please contact your system administrator and report this error."),
+    'link'     => ''
+);
 //$aError['SQM_FS'] // Filesystem related errors
+
+?>
\ No newline at end of file