From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 19 Jan 2002 11:24:34 +0000 (+0000)
Subject: Latest changes as cvs freeze
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=ce628f00d2054439b69cbe7c7cf0ba4d159d0a6a;hp=731abf853abe29f95b7e65374840953b8900cc1f

Latest changes as cvs freeze


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

diff --git a/AUTHORS b/AUTHORS
index 78ed71d8..24cd120a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,8 +21,13 @@
    Wouter Teepe     <wouter@teepe.com>
    Shane Wilson
 
- Translations:
+ Translations: 
  -------------
+ 
+    Mail-List: squirrelmail-i18n@lists.sourceforge.net
+    Leaders:   Dave Huang <khym+skwirl@azeotrope.org> 
+               Philippe Mingo <philippe@squirrelmail.org>
+ 
    Bulgarian     Stanislav Yordanov <stanprog@yahoo.com>  
    Catalan       Josep Sanz <jsanz@fa.upc.es>
    Czech         Ondrej Sury <ondrej@sury.cz>
@@ -73,7 +78,6 @@
 
    Paginator Help: Charles Scheidecker
    Other Code contributions:
-       Konstantin Riabitsev <graf@relhum.org>
        Alex Bleeker <beheer@hackers.nl>
        Jan-Pieter Cornet <johnpc@xs4all.nl>
        John Williams <jw@netpimp.com> 
diff --git a/functions/date.php b/functions/date.php
index ef3f0fad..b5fde0df 100644
--- a/functions/date.php
+++ b/functions/date.php
@@ -162,9 +162,11 @@ function date_intl( $date_format, $stamp ) {
 
     $ret = str_replace( 'D', '$1', $date_format );
     $ret = str_replace( 'F', '$2', $ret );
+    $ret = str_replace( 'l', '$4', $ret );
     $ret = date( '$3'. $ret . '$3', $stamp ); // Workaround for a PHP 4.0.4 problem
     $ret = str_replace( '$1', substr( getDayName( date( 'w', $stamp ) ), 0, 3 ), $ret );
     $ret = str_replace( '$2', getMonthName( date( 'm', $stamp ) ), $ret );
+    $ret = str_replace( '$4', getDayName( date( 'w', $stamp ) ), $ret );
     $ret = str_replace( '$3', '', $ret );
     
     return( $ret );
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index b3ff5a46..746a438b 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -49,8 +49,7 @@ function isSpecialMailbox( $box ) {
     $ret = ( (strtolower($box) == 'inbox') ||
              ( $move_to_trash && isBoxBelow( $box, $trash_folder ) ) ||
              ( $move_to_sent && isBoxBelow( $box, $sent_folder )) ||
-             ($box == $draft_folder &&
-              $save_as_draft) );
+             ($save_as_draft && $box == $draft_folder ) );
 
     return( $ret );
 
diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 7fda0394..bfb54f32 100644
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-11 13:08+0100\n"
+"POT-Creation-Date: 2002-01-19 12:15+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"
@@ -20,19 +20,19 @@ msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:97
 #: squirrelmail/src/addrbook_search_html.php:65
-#: squirrelmail/src/addressbook.php:283 squirrelmail/src/vcard.php:107
+#: squirrelmail/src/addressbook.php:284 squirrelmail/src/vcard.php:107
 msgid "Name"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:98
 #: squirrelmail/src/addrbook_search_html.php:66
-#: squirrelmail/src/addressbook.php:284
+#: squirrelmail/src/addressbook.php:285
 msgid "E-mail"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:99
 #: squirrelmail/src/addrbook_search_html.php:67
-#: squirrelmail/src/addressbook.php:285
+#: squirrelmail/src/addressbook.php:286
 msgid "Info"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Close window"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:38 squirrelmail/src/addressbook.php:283
+#: squirrelmail/src/addressbook.php:38 squirrelmail/src/addressbook.php:284
 msgid "Nickname"
 msgstr ""
 
@@ -149,19 +149,19 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:257 squirrelmail/src/addressbook.php:338
+#: squirrelmail/src/addressbook.php:257 squirrelmail/src/addressbook.php:340
 msgid "Add address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:268 squirrelmail/src/addressbook.php:321
+#: squirrelmail/src/addressbook.php:269 squirrelmail/src/addressbook.php:322
 msgid "Edit selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:323
+#: squirrelmail/src/addressbook.php:271 squirrelmail/src/addressbook.php:324
 msgid "Delete selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:335
+#: squirrelmail/src/addressbook.php:337
 #, c-format
 msgid "Add to %s"
 msgstr ""
@@ -179,10 +179,10 @@ msgstr ""
 msgid "Original Message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:567
+#: squirrelmail/functions/mailbox_display.php:579
 #: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:137
-#: squirrelmail/src/download.php:143
+#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:143
+#: squirrelmail/src/download.php:149
 #: squirrelmail/src/options_highlight.php:333
 #: squirrelmail/src/options_order.php:57
 #: squirrelmail/src/printer_friendly_bottom.php:118
@@ -190,10 +190,10 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:553
+#: squirrelmail/functions/mailbox_display.php:565
 #: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:138
-#: squirrelmail/src/download.php:145
+#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:144
+#: squirrelmail/src/download.php:151
 #: squirrelmail/src/options_highlight.php:321
 #: squirrelmail/src/options_order.php:55
 #: squirrelmail/src/printer_friendly_bottom.php:112
@@ -201,28 +201,28 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:561
-#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:140
-#: squirrelmail/src/download.php:149 squirrelmail/src/options_order.php:56
+#: squirrelmail/functions/mailbox_display.php:573
+#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:146
+#: squirrelmail/src/download.php:155 squirrelmail/src/options_order.php:56
 #: squirrelmail/src/printer_friendly_bottom.php:117
 msgid "Date"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:551
+#: squirrelmail/functions/mailbox_display.php:563
 #: squirrelmail/plugins/filters/options.php:88
-#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:139
-#: squirrelmail/src/download.php:147
+#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:145
+#: squirrelmail/src/download.php:153
 #: squirrelmail/src/options_highlight.php:324
 #: squirrelmail/src/printer_friendly_bottom.php:113
 #: squirrelmail/src/search.php:118
 msgid "To"
 msgstr ""
 
-#: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:567
+#: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:566
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:489 squirrelmail/src/read_body.php:584
+#: squirrelmail/src/compose.php:489 squirrelmail/src/read_body.php:583
 msgid "To:"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgstr ""
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:512 squirrelmail/src/read_body.php:538
+#: squirrelmail/src/compose.php:512 squirrelmail/src/read_body.php:537
 msgid "Subject:"
 msgstr ""
 
@@ -263,19 +263,19 @@ msgstr ""
 msgid "Save Draft"
 msgstr ""
 
-#: squirrelmail/src/compose.php:628 squirrelmail/src/read_body.php:614
+#: squirrelmail/src/compose.php:628 squirrelmail/src/read_body.php:613
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:425
+#: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
 msgid "High"
 msgstr ""
 
-#: squirrelmail/src/compose.php:630 squirrelmail/src/read_body.php:438
+#: squirrelmail/src/compose.php:630 squirrelmail/src/read_body.php:437
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:431
+#: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
 msgid "Low"
 msgstr ""
 
@@ -300,121 +300,121 @@ msgid "Viewing a text attachment"
 msgstr ""
 
 #: squirrelmail/src/download.php:52 squirrelmail/src/download.php:54
-#: squirrelmail/src/image.php:47 squirrelmail/src/image.php:51
-#: squirrelmail/src/read_body.php:163 squirrelmail/src/vcard.php:51
+#: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
+#: squirrelmail/src/read_body.php:162 squirrelmail/src/vcard.php:51
 #: squirrelmail/src/vcard.php:55
 msgid "View message"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:623 squirrelmail/src/download.php:59
-#: squirrelmail/src/image.php:60 squirrelmail/src/vcard.php:212
+#: squirrelmail/functions/mime.php:620 squirrelmail/src/download.php:59
+#: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:212
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:41
+#: squirrelmail/src/folders_create.php:25
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:41
+#: squirrelmail/src/folders_create.php:25
 msgid "Click here to go back"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:118 squirrelmail/src/folders.php:45
-#: squirrelmail/src/left_main.php:259
+#: squirrelmail/functions/page_header.php:118 squirrelmail/src/folders.php:29
+#: squirrelmail/src/left_main.php:234
 msgid "Folders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:58
+#: squirrelmail/src/folders.php:42
 msgid "Subscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:60
+#: squirrelmail/src/folders.php:44
 msgid "Unsubscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:62
+#: squirrelmail/src/folders.php:46
 msgid "Deleted folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:64
+#: squirrelmail/src/folders.php:48
 msgid "Created folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:66
+#: squirrelmail/src/folders.php:50
 msgid "Renamed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:69 squirrelmail/src/left_main.php:298
+#: squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:273
 msgid "refresh folder list"
 msgstr ""
 
-#: squirrelmail/src/folders.php:82
+#: squirrelmail/src/folders.php:65
 msgid "Create Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:87
+#: squirrelmail/src/folders.php:70
 msgid "as a subfolder of"
 msgstr ""
 
-#: squirrelmail/src/folders.php:91 squirrelmail/src/folders.php:93
+#: squirrelmail/src/folders.php:74 squirrelmail/src/folders.php:76
 msgid "None"
 msgstr ""
 
-#: squirrelmail/src/folders.php:114
+#: squirrelmail/src/folders.php:98
 msgid "Let this folder contain subfolders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:117
+#: squirrelmail/src/folders.php:101
 msgid "Create"
 msgstr ""
 
-#: squirrelmail/src/folders.php:124
+#: squirrelmail/src/folders.php:108
 msgid "Rename a Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:145
+#: squirrelmail/src/folders.php:131
 msgid "Rename"
 msgstr ""
 
-#: squirrelmail/src/folders.php:149 squirrelmail/src/folders.php:206
+#: squirrelmail/src/folders.php:135 squirrelmail/src/folders.php:194
 msgid "No folders found"
 msgstr ""
 
-#: squirrelmail/src/folders.php:157
+#: squirrelmail/src/folders.php:143
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:524
+#: squirrelmail/functions/mailbox_display.php:536
 #: squirrelmail/plugins/filters/options.php:154
 #: squirrelmail/plugins/mail_fetch/options.php:168
 #: squirrelmail/plugins/mail_fetch/options.php:175
-#: squirrelmail/src/folders.php:202 squirrelmail/src/options_highlight.php:75
+#: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:75
 #: squirrelmail/src/options_identities.php:320
-#: squirrelmail/src/read_body.php:474
+#: squirrelmail/src/read_body.php:473
 msgid "Delete"
 msgstr ""
 
-#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:232
+#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:220
 msgid "Unsubscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:273
+#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:261
 msgid "Subscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:236
+#: squirrelmail/src/folders.php:224
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:276
+#: squirrelmail/src/folders.php:264
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:53
+#: squirrelmail/src/folders_rename_getname.php:42
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:57
+#: squirrelmail/src/folders_rename_getname.php:46
 msgid "New name:"
 msgstr ""
 
@@ -422,7 +422,7 @@ msgstr ""
 #: squirrelmail/plugins/filters/options.php:138
 #: squirrelmail/plugins/newmail/newmail_opt.php:133
 #: squirrelmail/plugins/translate/options.php:163
-#: squirrelmail/src/folders_rename_getname.php:63
+#: squirrelmail/src/folders_rename_getname.php:53
 #: squirrelmail/src/options_highlight.php:346
 msgid "Submit"
 msgstr ""
@@ -446,19 +446,19 @@ msgstr ""
 msgid "Table of Contents"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:721
-#: squirrelmail/functions/mailbox_display.php:724
-#: squirrelmail/functions/mailbox_display.php:727
+#: squirrelmail/functions/mailbox_display.php:733
+#: squirrelmail/functions/mailbox_display.php:736
+#: squirrelmail/functions/mailbox_display.php:739
 #: squirrelmail/src/help.php:187 squirrelmail/src/help.php:191
-#: squirrelmail/src/read_body.php:496 squirrelmail/src/read_body.php:498
+#: squirrelmail/src/read_body.php:495 squirrelmail/src/read_body.php:497
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:722
-#: squirrelmail/functions/mailbox_display.php:725
-#: squirrelmail/functions/mailbox_display.php:728
+#: squirrelmail/functions/mailbox_display.php:734
+#: squirrelmail/functions/mailbox_display.php:737
+#: squirrelmail/functions/mailbox_display.php:740
 #: squirrelmail/src/help.php:195 squirrelmail/src/help.php:198
-#: squirrelmail/src/read_body.php:502 squirrelmail/src/read_body.php:504
+#: squirrelmail/src/read_body.php:501 squirrelmail/src/read_body.php:503
 msgid "Next"
 msgstr ""
 
@@ -466,43 +466,43 @@ msgstr ""
 msgid "Top"
 msgstr ""
 
-#: squirrelmail/src/image.php:42
+#: squirrelmail/src/image.php:26
 msgid "Viewing an image attachment"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:115
+#: squirrelmail/src/left_main.php:93
 msgid "empty"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:292
+#: squirrelmail/src/left_main.php:267
 msgid "Last Refresh"
 msgstr ""
 
-#: squirrelmail/src/login.php:96 squirrelmail/src/login.php:140
+#: squirrelmail/src/login.php:97 squirrelmail/src/login.php:139
 msgid "Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:111
+#: squirrelmail/src/login.php:110
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
-#: squirrelmail/src/login.php:112
+#: squirrelmail/src/login.php:111
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:118
+#: squirrelmail/src/login.php:117
 #, c-format
 msgid "%s Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:122
+#: squirrelmail/src/login.php:121
 msgid "Name:"
 msgstr ""
 
 #: squirrelmail/plugins/mail_fetch/options.php:126
 #: squirrelmail/plugins/mail_fetch/options.php:207
-#: squirrelmail/src/login.php:128
+#: squirrelmail/src/login.php:127
 msgid "Password:"
 msgstr ""
 
@@ -521,116 +521,116 @@ msgid "Theme"
 msgstr ""
 
 #: squirrelmail/src/options_display.php:51
-#: squirrelmail/src/options_display.php:76
+#: squirrelmail/src/options_display.php:80
 msgid "Default"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:62
+#: squirrelmail/src/options_display.php:64
 msgid "Custom Stylesheet"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:79
+#: squirrelmail/src/options_display.php:83
 msgid "Language"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:88
+#: squirrelmail/src/options_display.php:92
 msgid "Use Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:91
+#: squirrelmail/src/options_display.php:95
 msgid "Autodetect"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:92
+#: squirrelmail/src/options_display.php:96
 msgid "Always"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:93
+#: squirrelmail/src/options_display.php:97
 #: squirrelmail/src/options_folder.php:122
 msgid "Never"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:111
+#: squirrelmail/src/options_display.php:115
 msgid "Mailbox Display Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:116
+#: squirrelmail/src/options_display.php:120
 msgid "Number of Messages to Index"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:124
+#: squirrelmail/src/options_display.php:128
 msgid "Enable Alternating Row Colors"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:131
+#: squirrelmail/src/options_display.php:135
 msgid "Enable Page Selector"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:138
+#: squirrelmail/src/options_display.php:142
 msgid "Maximum Number of Pages to Show"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:145
+#: squirrelmail/src/options_display.php:149
 msgid "Message Display and Composition"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:150
+#: squirrelmail/src/options_display.php:154
 msgid "Wrap Incoming Text At"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:158
+#: squirrelmail/src/options_display.php:162
 msgid "Size of Editor Window"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:166
+#: squirrelmail/src/options_display.php:170
 msgid "Location of Buttons when Composing"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:169
+#: squirrelmail/src/options_display.php:173
 msgid "Before headers"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:170
+#: squirrelmail/src/options_display.php:174
 msgid "Between headers and message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:171
+#: squirrelmail/src/options_display.php:175
 msgid "After message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:176
+#: squirrelmail/src/options_display.php:180
 msgid "Addressbook Display Format"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:179
+#: squirrelmail/src/options_display.php:183
 msgid "Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:180
+#: squirrelmail/src/options_display.php:184
 msgid "HTML"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:185
+#: squirrelmail/src/options_display.php:189
 msgid "Show HTML Version by Default"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:192
+#: squirrelmail/src/options_display.php:196
 msgid "Include Me in CC when I Reply All"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:199
+#: squirrelmail/src/options_display.php:203
 msgid "Enable Mailer Display"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:206
+#: squirrelmail/src/options_display.php:210
 msgid "Display Attached Images with Message"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:213
+#: squirrelmail/src/options_display.php:217
 msgid "Enable Subtle Printer Friendly Link"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:220
+#: squirrelmail/src/options_display.php:224
 msgid "Enable Printer Friendly Clean Display"
 msgstr ""
 
@@ -946,7 +946,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:573
+#: squirrelmail/functions/mailbox_display.php:585
 #: squirrelmail/src/options_order.php:59
 msgid "Size"
 msgstr ""
@@ -1122,64 +1122,64 @@ msgstr ""
 msgid "View Printable Version"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:155
+#: squirrelmail/src/read_body.php:154
 msgid "Viewing Full Header"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:291
+#: squirrelmail/src/read_body.php:290
 msgid "more"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:292
+#: squirrelmail/src/read_body.php:291
 msgid "less"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:466
+#: squirrelmail/src/read_body.php:465
 msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:478
+#: squirrelmail/src/read_body.php:477
 msgid "Resume Draft"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:515
+#: squirrelmail/src/read_body.php:514
 msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:520
+#: squirrelmail/src/read_body.php:519
 msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:525
+#: squirrelmail/src/read_body.php:524
 msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:549 squirrelmail/src/read_body.php:552
+#: squirrelmail/src/read_body.php:548 squirrelmail/src/read_body.php:551
 msgid "View Full Header"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:575
+#: squirrelmail/src/read_body.php:574
 msgid "Date:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:631
+#: squirrelmail/src/read_body.php:628
 msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:44 squirrelmail/src/redirect.php:95
-#: squirrelmail/src/redirect.php:99
+#: squirrelmail/functions/auth.php:29 squirrelmail/src/redirect.php:60
+#: squirrelmail/src/redirect.php:64
 msgid "You must be logged in to access this page."
 msgstr ""
 
-#: squirrelmail/functions/auth.php:45 squirrelmail/src/redirect.php:100
+#: squirrelmail/functions/auth.php:30 squirrelmail/src/redirect.php:65
 msgid "Go to the login page"
 msgstr ""
 
-#: squirrelmail/src/redirect.php:120 squirrelmail/src/redirect.php:124
+#: squirrelmail/src/redirect.php:85 squirrelmail/src/redirect.php:89
 msgid "There was an error contacting the mail server."
 msgstr ""
 
-#: squirrelmail/src/redirect.php:125
+#: squirrelmail/src/redirect.php:90
 msgid "Contact your administrator for help."
 msgstr ""
 
@@ -1371,12 +1371,12 @@ msgid "Nickname contains illegal characters"
 msgstr ""
 
 #: squirrelmail/functions/attachment_common.php:116
-#: squirrelmail/functions/attachment_common.php:140
-#: squirrelmail/functions/attachment_common.php:164
+#: squirrelmail/functions/attachment_common.php:141
+#: squirrelmail/functions/attachment_common.php:166
 msgid "view"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:180
+#: squirrelmail/functions/attachment_common.php:183
 msgid "Business Card"
 msgstr ""
 
@@ -1456,43 +1456,62 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: squirrelmail/functions/date.php:178
+#: squirrelmail/functions/date.php:180
 msgid "D, F j, Y g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:180
+#: squirrelmail/functions/date.php:182
 msgid "D, F j, Y G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:202
+#: squirrelmail/functions/date.php:204
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:204
+#: squirrelmail/functions/date.php:206
 msgid "G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:209
+#: squirrelmail/functions/date.php:211
 msgid "D, g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:211
+#: squirrelmail/functions/date.php:213
 msgid "D, G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:215
+#: squirrelmail/functions/date.php:217
 msgid "M j, Y"
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:83
-#: squirrelmail/functions/db_prefs.php:86
-#: squirrelmail/functions/db_prefs.php:205
+#: squirrelmail/functions/db_prefs.php:59
+#: squirrelmail/functions/db_prefs.php:66
+#: squirrelmail/functions/db_prefs.php:104
+#: squirrelmail/functions/db_prefs.php:107
+#: squirrelmail/functions/db_prefs.php:241
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
+#: squirrelmail/functions/db_prefs.php:377
+#: squirrelmail/functions/prefs.php:268
+#, c-format
+msgid "Error creating directory %s."
+msgstr ""
+
+#: squirrelmail/functions/db_prefs.php:378
+#: squirrelmail/functions/prefs.php:269
+msgid "Could not create hashed directory structure!"
+msgstr ""
+
+#: squirrelmail/functions/db_prefs.php:379
+#: squirrelmail/functions/prefs.php:171 squirrelmail/functions/prefs.php:176
+#: squirrelmail/functions/prefs.php:270
+msgid "Please contact your system administrator and report this error."
+msgstr ""
+
 #: squirrelmail/functions/display_messages.php:23
-#: squirrelmail/functions/imap_general.php:206
+#: squirrelmail/functions/imap_general.php:224
 msgid "Unknown user or password incorrect."
 msgstr ""
 
@@ -1515,155 +1534,155 @@ msgstr ""
 msgid "Click here to return to %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:119
-#: squirrelmail/functions/imap_messages.php:132
-#: squirrelmail/functions/imap_messages.php:140
-#: squirrelmail/functions/imap_messages.php:159
-#: squirrelmail/functions/imap_messages.php:168
-#: squirrelmail/functions/imap_messages.php:280
+#: squirrelmail/functions/imap_general.php:136
+#: squirrelmail/functions/imap_messages.php:119
+#: squirrelmail/functions/imap_messages.php:127
+#: squirrelmail/functions/imap_messages.php:146
+#: squirrelmail/functions/imap_messages.php:155
+#: squirrelmail/functions/imap_messages.php:268
 #: squirrelmail/plugins/filters/filters.php:89
 msgid "ERROR : Could not complete request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:121
+#: squirrelmail/functions/imap_general.php:138
 #: squirrelmail/plugins/filters/filters.php:91
 msgid "Reason Given: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:128
+#: squirrelmail/functions/imap_general.php:145
 #: squirrelmail/plugins/filters/filters.php:98
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:130
+#: squirrelmail/functions/imap_general.php:147
 #: squirrelmail/plugins/filters/filters.php:100
 msgid "Server responded: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:166
+#: squirrelmail/functions/imap_general.php:183
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:183
+#: squirrelmail/functions/imap_general.php:199
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:185
+#: squirrelmail/functions/imap_general.php:201
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:187
+#: squirrelmail/functions/imap_general.php:203
 msgid "Read data:"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:134
-#: squirrelmail/functions/imap_messages.php:161
-#: squirrelmail/functions/imap_messages.php:282
+#: squirrelmail/functions/imap_messages.php:121
+#: squirrelmail/functions/imap_messages.php:148
+#: squirrelmail/functions/imap_messages.php:270
 msgid "Unknown response from IMAP server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:142
+#: squirrelmail/functions/imap_messages.php:129
 msgid "Unknown message number in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:170
+#: squirrelmail/functions/imap_messages.php:157
 msgid "Unknown messagenumber in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:179
-#: squirrelmail/functions/imap_messages.php:208
-#: squirrelmail/functions/imap_messages.php:452
-#: squirrelmail/functions/imap_messages.php:507
-#: squirrelmail/functions/mailbox_display.php:880
+#: squirrelmail/functions/imap_messages.php:166
+#: squirrelmail/functions/imap_messages.php:195
+#: squirrelmail/functions/imap_messages.php:440
+#: squirrelmail/functions/imap_messages.php:495
+#: squirrelmail/functions/mailbox_display.php:892
 msgid "(no subject)"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:180
+#: squirrelmail/functions/imap_messages.php:167
 msgid "Unknown Sender"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:233
+#: squirrelmail/functions/imap_messages.php:222
 msgid "No To Address"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:510
+#: squirrelmail/functions/imap_messages.php:498
 msgid "(unknown sender)"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:65
+#: squirrelmail/functions/imap_search.php:61
 msgid "No Messages Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:155
+#: squirrelmail/functions/imap_search.php:151
 msgid "Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:155
+#: squirrelmail/functions/imap_search.php:151
 msgid "messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:413
+#: squirrelmail/functions/mailbox_display.php:425
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:497
+#: squirrelmail/functions/mailbox_display.php:509
 msgid "Move Selected To:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:500
+#: squirrelmail/functions/mailbox_display.php:512
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:516
+#: squirrelmail/functions/mailbox_display.php:528
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:520
+#: squirrelmail/functions/mailbox_display.php:532
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:520
+#: squirrelmail/functions/mailbox_display.php:532
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:522
+#: squirrelmail/functions/mailbox_display.php:534
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:523
+#: squirrelmail/functions/mailbox_display.php:535
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:619
+#: squirrelmail/functions/mailbox_display.php:631
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:641
+#: squirrelmail/functions/mailbox_display.php:653
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:643
+#: squirrelmail/functions/mailbox_display.php:655
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:660
+#: squirrelmail/functions/mailbox_display.php:672
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:662
+#: squirrelmail/functions/mailbox_display.php:674
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:847
+#: squirrelmail/functions/mailbox_display.php:859
 msgid "Paginate"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:854
+#: squirrelmail/functions/mailbox_display.php:866
 msgid "Show All"
 msgstr ""
 
@@ -1671,30 +1690,30 @@ msgstr ""
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:433
+#: squirrelmail/functions/mime.php:431
 msgid ""
 "Body retrieval error. The reason for this is most probably that the message "
 "is malformed. Please help us making future versions better by submitting "
 "this message to the developers knowledgebase!"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:435
+#: squirrelmail/functions/mime.php:433
 msgid "Response:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:436
+#: squirrelmail/functions/mime.php:434
 msgid "Message:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:437
+#: squirrelmail/functions/mime.php:435
 msgid "FETCH line:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:652
+#: squirrelmail/functions/mime.php:649
 msgid "Attachments"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:691
+#: squirrelmail/functions/mime.php:688
 msgid "download"
 msgstr ""
 
@@ -1742,24 +1761,10 @@ msgstr ""
 msgid "Default preference file not found!"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:171 squirrelmail/functions/prefs.php:176
-#: squirrelmail/functions/prefs.php:270
-msgid "Please contact your system administrator and report this error."
-msgstr ""
-
 #: squirrelmail/functions/prefs.php:175
 msgid "Could not create initial preference file!"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:268
-#, c-format
-msgid "Error creating directory %s."
-msgstr ""
-
-#: squirrelmail/functions/prefs.php:269
-msgid "Could not create hashed directory structure!"
-msgstr ""
-
 #: squirrelmail/plugins/filters/filters.php:360
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "