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

diff --git a/include/errors.php b/include/errors.php
index 2fd46a84..972d40d9 100644
--- a/include/errors.php
+++ b/include/errors.php
@@ -20,13 +20,15 @@ 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."),
     '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(
@@ -35,9 +37,25 @@ $aErrors['SQM_IMAP_NO_SORT'] = array(
     '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