X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=po%2Fsquirrelmail.po;h=6cb29d2f4f0bf67c2a3975d3ac1111c19f159c0f;hb=23bcec6f5d6fa3c9dda7c4306fd1b43c683ed234;hp=a36ab9478877e5a8909a0e69cd5afb2684fae888;hpb=46bb8da8de53e495aebabac0150e2f9a491aceae;p=squirrelmail.git

diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index a36ab947..6cb29d2f 100644
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-09 19:45+0100\n"
+"POT-Creation-Date: 2002-07-04 12:53+0300\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"
@@ -18,455 +19,561 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:98
-#: squirrelmail/src/addrbook_search_html.php:67
-#: squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:85
+#: squirrelmail/src/addrbook_search.php:100
+#: squirrelmail/src/addrbook_search_html.php:90
+#: squirrelmail/src/addressbook.php:305 squirrelmail/src/vcard.php:89
 msgid "Name"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:99
-#: squirrelmail/src/addrbook_search_html.php:68
-#: squirrelmail/src/addressbook.php:286
+#: squirrelmail/src/addrbook_search.php:101
+#: squirrelmail/src/addrbook_search_html.php:91
+#: squirrelmail/src/addressbook.php:306
 msgid "E-mail"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:69
-#: squirrelmail/src/addressbook.php:287
+#: squirrelmail/src/addrbook_search.php:102
+#: squirrelmail/src/addrbook_search_html.php:92
+#: squirrelmail/src/addressbook.php:307
 msgid "Info"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:103
-#: squirrelmail/src/addrbook_search_html.php:72
+#: squirrelmail/src/addrbook_search.php:105
+#: squirrelmail/src/addrbook_search_html.php:95
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:570
-#: squirrelmail/plugins/filters/options.php:88
-#: squirrelmail/src/addrbook_search_html.php:82
-#: squirrelmail/src/compose.php:310 squirrelmail/src/download.php:132
-#: squirrelmail/src/download.php:139
-#: squirrelmail/src/options_highlight.php:325
-#: squirrelmail/src/printer_friendly_bottom.php:96
-#: squirrelmail/src/search.php:339
-msgid "To"
-msgstr ""
-
-#: squirrelmail/plugins/filters/options.php:91
-#: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:338
-msgid "Cc"
-msgstr ""
-
-#: squirrelmail/src/addrbook_search_html.php:86
-msgid "Bcc"
-msgstr ""
-
-#: squirrelmail/src/addrbook_search_html.php:99
-msgid "Use Addresses"
-msgstr ""
-
-#: squirrelmail/src/addrbook_search_html.php:118
-msgid "Address Book Search"
+#: squirrelmail/src/addrbook_search.php:165
+#: squirrelmail/src/addrbook_search.php:261
+#: squirrelmail/src/addrbook_search_html.php:253
+msgid "No persons matching your search was found"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:173
-#: squirrelmail/src/addrbook_search_html.php:127
+#: squirrelmail/src/addrbook_search.php:180
+#: squirrelmail/src/addrbook_search_html.php:162
 msgid "Search for"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:179
-#: squirrelmail/src/addrbook_search_html.php:137
+#: squirrelmail/src/addrbook_search.php:187
+#: squirrelmail/src/addrbook_search_html.php:172
 msgid "in"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:180
-#: squirrelmail/src/addrbook_search_html.php:140
+#: squirrelmail/src/addrbook_search.php:188
+#: squirrelmail/src/addrbook_search_html.php:175
 msgid "All address books"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:130
-#: squirrelmail/src/addrbook_search.php:191
-#: squirrelmail/src/addrbook_search_html.php:151
-#: squirrelmail/src/search.php:202
+#: squirrelmail/src/addrbook_search.php:202
+#: squirrelmail/src/addrbook_search_html.php:190
+#: squirrelmail/src/search.php:194 squirrelmail/src/search.php:198
+#: squirrelmail/src/search.php:218 squirrelmail/src/search.php:366
+#: squirrelmail/src/search.php:396 squirrelmail/src/search.php:417
+#: squirrelmail/src/search.php:426 squirrelmail/functions/page_header.php:224
 msgid "Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:192
-#: squirrelmail/src/addrbook_search_html.php:152
+#: squirrelmail/src/addrbook_search.php:203
+#: squirrelmail/src/addrbook_search_html.php:191
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:213
-#: squirrelmail/src/addrbook_search_html.php:182
+#: squirrelmail/src/addrbook_search.php:205 squirrelmail/src/compose.php:639
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
+#: squirrelmail/plugins/newmail/testsound.php:36
+msgid "Close"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search.php:226
+#: squirrelmail/src/addrbook_search_html.php:221
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:239
-#: squirrelmail/src/addrbook_search_html.php:207
+#: squirrelmail/src/addrbook_search.php:252
+#: squirrelmail/src/addrbook_search_html.php:246
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:159
-#: squirrelmail/src/addrbook_search.php:246
-#: squirrelmail/src/addrbook_search_html.php:212
-msgid "No persons matching your search was found"
+#: squirrelmail/src/addrbook_search_html.php:81
+#: squirrelmail/src/addrbook_search_html.php:83
+#: squirrelmail/src/addrbook_search_html.php:85
+#: squirrelmail/plugins/mail_fetch/fetch.php:71
+msgid "All"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:225
-msgid "Return"
+#: squirrelmail/src/addrbook_search_html.php:106
+#: squirrelmail/src/compose.php:464 squirrelmail/src/download.php:401
+#: squirrelmail/src/download.php:410 squirrelmail/src/options_highlight.php:83
+#: squirrelmail/src/options_highlight.php:372
+#: squirrelmail/src/printer_friendly_bottom.php:103
+#: squirrelmail/src/search.php:363
+#: squirrelmail/functions/mailbox_display.php:793
+#: squirrelmail/plugins/filters/options.php:125
+msgid "To"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/testsound.php:33
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:412
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
-#: squirrelmail/src/addrbook_search.php:194
-msgid "Close"
+#: squirrelmail/src/addrbook_search_html.php:108
+#: squirrelmail/src/compose.php:471 squirrelmail/src/options_highlight.php:86
+#: squirrelmail/src/options_highlight.php:375 squirrelmail/src/search.php:362
+#: squirrelmail/plugins/filters/options.php:128
+msgid "Cc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:110
+msgid "Bcc"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:39 squirrelmail/src/addressbook.php:285
+#: squirrelmail/src/addrbook_search_html.php:126
+msgid "Use Addresses"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:150
+msgid "Address Book Search"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:267
+msgid "Return"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:40 squirrelmail/src/addressbook.php:304
+#: squirrelmail/plugins/abook_take/take.php:35
 msgid "Nickname"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:40
+#: squirrelmail/src/addressbook.php:41
+#: squirrelmail/plugins/abook_take/take.php:37
 msgid "Must be unique"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:41
+#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/plugins/abook_take/take.php:41
 msgid "E-mail address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/src/addressbook.php:43
+#: squirrelmail/plugins/abook_take/take.php:60
 msgid "First name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:43
+#: squirrelmail/src/addressbook.php:44
+#: squirrelmail/plugins/abook_take/take.php:64
 msgid "Last name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:44
+#: squirrelmail/src/addressbook.php:45
+#: squirrelmail/plugins/abook_take/take.php:68
 msgid "Additional info"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:58
+#: squirrelmail/src/addressbook.php:61
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:154
+#: squirrelmail/src/addressbook.php:157
 msgid "You can only edit one address at the time"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:168 squirrelmail/src/addressbook.php:170
-#: squirrelmail/src/addressbook.php:200 squirrelmail/src/addressbook.php:202
+#: squirrelmail/src/addressbook.php:171 squirrelmail/src/addressbook.php:175
+#: squirrelmail/src/addressbook.php:208 squirrelmail/src/addressbook.php:212
 msgid "Update address"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:25
-#: squirrelmail/functions/display_messages.php:76
-#: squirrelmail/functions/display_messages.php:92
-#: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:239
+#: squirrelmail/src/addressbook.php:197 squirrelmail/src/addressbook.php:251
+#: squirrelmail/functions/display_messages.php:70
+#: squirrelmail/functions/display_messages.php:89
+#: squirrelmail/functions/display_messages.php:106
+#: squirrelmail/functions/display_messages.php:172
 msgid "ERROR"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:214
+#: squirrelmail/src/addressbook.php:224
 msgid "Unknown error"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:258 squirrelmail/src/addressbook.php:341
+#: squirrelmail/src/addressbook.php:271 squirrelmail/src/addressbook.php:373
+#: squirrelmail/plugins/abook_take/take.php:73
 msgid "Add address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:323
+#: squirrelmail/src/addressbook.php:285 squirrelmail/src/addressbook.php:351
 msgid "Edit selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:272 squirrelmail/src/addressbook.php:325
+#: squirrelmail/src/addressbook.php:287 squirrelmail/src/addressbook.php:353
 msgid "Delete selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:338
+#: squirrelmail/src/addressbook.php:368
+#: squirrelmail/plugins/abook_take/take.php:29
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
-#: squirrelmail/src/compose.php:43
+#: squirrelmail/src/compose.php:98
 msgid "Draft Email Saved"
 msgstr ""
 
-#: squirrelmail/src/compose.php:132 squirrelmail/src/compose.php:173
-#: squirrelmail/src/compose.php:184
+#: squirrelmail/src/compose.php:201 squirrelmail/src/compose.php:245
+#: squirrelmail/src/compose.php:255
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-#: squirrelmail/src/compose.php:305
+#: squirrelmail/src/compose.php:459
 msgid "Original Message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:586
-#: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:130
-#: squirrelmail/src/download.php:135
-#: squirrelmail/src/options_highlight.php:334
+#: squirrelmail/src/compose.php:460 squirrelmail/src/download.php:399
+#: squirrelmail/src/download.php:406
+#: squirrelmail/src/options_highlight.php:381
 #: squirrelmail/src/options_order.php:40
-#: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/search.php:336
+#: squirrelmail/src/printer_friendly_bottom.php:117
+#: squirrelmail/src/search.php:360
+#: squirrelmail/functions/mailbox_display.php:813
+#: squirrelmail/plugins/filters/options.php:134
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:572
-#: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:131
-#: squirrelmail/src/download.php:137
-#: squirrelmail/src/options_highlight.php:322
+#: squirrelmail/src/compose.php:461 squirrelmail/src/download.php:171
+#: squirrelmail/src/download.php:400 squirrelmail/src/download.php:408
+#: squirrelmail/src/options_highlight.php:80
+#: squirrelmail/src/options_highlight.php:369
 #: squirrelmail/src/options_order.php:38
-#: squirrelmail/src/printer_friendly_bottom.php:95
-#: squirrelmail/src/search.php:337
+#: squirrelmail/src/printer_friendly_bottom.php:99
+#: squirrelmail/src/search.php:361
+#: squirrelmail/functions/mailbox_display.php:796
+#: squirrelmail/plugins/filters/options.php:122
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:580
-#: squirrelmail/src/compose.php:308 squirrelmail/src/download.php:133
-#: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
-#: squirrelmail/src/printer_friendly_bottom.php:100
+#: squirrelmail/src/compose.php:462 squirrelmail/src/download.php:402
+#: squirrelmail/src/download.php:412 squirrelmail/src/options_order.php:39
+#: squirrelmail/src/printer_friendly_bottom.php:113
+#: squirrelmail/functions/mailbox_display.php:805
 msgid "Date"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:50
-#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:712
+#: squirrelmail/src/compose.php:628
+msgid "Draft Saved"
+msgstr ""
+
+#: squirrelmail/src/compose.php:631
+msgid "Your Message has been sent"
+msgstr ""
+
+#: squirrelmail/src/compose.php:650 squirrelmail/src/read_body.php:872
+#: squirrelmail/plugins/listcommands/mailout.php:54
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:492 squirrelmail/src/read_body.php:183
-#: squirrelmail/src/read_body.php:729
+#: squirrelmail/src/compose.php:677 squirrelmail/src/download.php:183
+#: squirrelmail/src/read_body.php:220 squirrelmail/src/read_body.php:887
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:500
+#: squirrelmail/src/compose.php:684
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:508
+#: squirrelmail/src/compose.php:691
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:515 squirrelmail/src/read_body.php:184
-#: squirrelmail/src/read_body.php:683
+#: squirrelmail/src/compose.php:719 squirrelmail/src/download.php:176
+#: squirrelmail/src/read_body.php:221 squirrelmail/src/read_body.php:847
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:560 squirrelmail/src/compose.php:623
+#: squirrelmail/src/compose.php:762 squirrelmail/src/compose.php:858
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:566
+#: squirrelmail/src/compose.php:769
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:571 squirrelmail/src/options_order.php:126
+#: squirrelmail/src/compose.php:772 squirrelmail/src/options_order.php:132
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:587
+#: squirrelmail/src/compose.php:791
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:613
-#: squirrelmail/src/compose.php:617 squirrelmail/src/compose.php:621
-msgid "Addresses"
-msgstr ""
-
-#: squirrelmail/src/compose.php:626
-msgid "Save Draft"
-msgstr ""
-
-#: squirrelmail/src/compose.php:632 squirrelmail/src/read_body.php:759
+#: squirrelmail/src/compose.php:824 squirrelmail/src/read_body.php:913
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:191
-#: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:633 squirrelmail/src/read_body.php:570
+#: squirrelmail/src/compose.php:825 squirrelmail/src/read_body.php:622
+#: squirrelmail/plugins/calendar/functions.php:99
+#: squirrelmail/plugins/administrator/defines.php:201
 msgid "High"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:634 squirrelmail/src/read_body.php:583
+#: squirrelmail/src/compose.php:826 squirrelmail/src/read_body.php:635
+#: squirrelmail/plugins/calendar/functions.php:98
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:188
-#: squirrelmail/src/compose.php:635 squirrelmail/src/read_body.php:576
+#: squirrelmail/src/compose.php:827 squirrelmail/src/read_body.php:628
+#: squirrelmail/plugins/administrator/defines.php:198
 msgid "Low"
 msgstr ""
 
-#: squirrelmail/src/compose.php:642
-msgid "Confirm reading:"
+#: squirrelmail/src/compose.php:833
+msgid "Receipt"
+msgstr ""
+
+#: squirrelmail/src/compose.php:835
+msgid "On read"
 msgstr ""
 
-#: squirrelmail/src/compose.php:664
+#: squirrelmail/src/compose.php:837
+msgid "On Delivery"
+msgstr ""
+
+#: squirrelmail/src/compose.php:845
+#: squirrelmail/src/options_identities.php:314
+#: squirrelmail/src/options_personal.php:99
+msgid "Signature"
+msgstr ""
+
+#: squirrelmail/src/compose.php:848 squirrelmail/src/compose.php:852
+#: squirrelmail/src/compose.php:856 squirrelmail/functions/page_header.php:218
+msgid "Addresses"
+msgstr ""
+
+#: squirrelmail/src/compose.php:861
+msgid "Save Draft"
+msgstr ""
+
+#: squirrelmail/src/compose.php:880
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:749
+#: squirrelmail/src/compose.php:972
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:752
+#: squirrelmail/src/compose.php:975
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:752
+#: squirrelmail/src/compose.php:975
 msgid "who"
 msgstr ""
 
-#: squirrelmail/src/download.php:31
-msgid "Viewing a text attachment"
+#: squirrelmail/src/download.php:32 squirrelmail/src/download.php:34
+#: squirrelmail/src/download.php:102 squirrelmail/src/image.php:26
+#: squirrelmail/src/image.php:30 squirrelmail/src/read_body.php:437
+#: squirrelmail/src/vcard.php:36 squirrelmail/src/vcard.php:40
+msgid "View message"
 msgstr ""
 
-#: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
-#: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
-#: squirrelmail/src/read_body.php:306 squirrelmail/src/vcard.php:35
-#: squirrelmail/src/vcard.php:39
-msgid "View message"
+#: squirrelmail/src/download.php:43
+msgid "Viewing a text attachment"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:636 squirrelmail/src/download.php:41
-#: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:196
+#: squirrelmail/src/download.php:50 squirrelmail/src/download.php:109
+#: squirrelmail/src/image.php:49 squirrelmail/src/vcard.php:213
+#: squirrelmail/functions/mime.php:863
+#: squirrelmail/plugins/abook_take/setup.php:91
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:27
-msgid "Illegal folder name.  Please select a different name."
+#: squirrelmail/src/download.php:101
+msgid "Viewing a message attachment"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:27
-msgid "Click here to go back"
+#: squirrelmail/src/download.php:137
+msgid "Save to:"
+msgstr ""
+
+#: squirrelmail/src/download.php:141
+msgid "Extract"
+msgstr ""
+
+#: squirrelmail/src/download.php:156 squirrelmail/src/left_main.php:74
+#: squirrelmail/src/search.php:329 squirrelmail/functions/imap_search.php:217
+#: squirrelmail/functions/mailbox_display.php:717
+#: squirrelmail/functions/page_header.php:192
+#: squirrelmail/plugins/mail_fetch/options.php:172
+#: squirrelmail/plugins/mail_fetch/options.php:290
+#: squirrelmail/plugins/delete_move_next/setup.php:219
+msgid "INBOX"
+msgstr ""
+
+#: squirrelmail/src/download.php:189 squirrelmail/src/read_body.php:880
+#: squirrelmail/plugins/calendar/event_create.php:125
+#: squirrelmail/plugins/calendar/event_delete.php:35
+#: squirrelmail/plugins/calendar/event_edit.php:37
+#: squirrelmail/plugins/calendar/event_edit.php:103
+#: squirrelmail/plugins/calendar/event_edit.php:127
+msgid "Date:"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:126 squirrelmail/src/folders.php:29
-#: squirrelmail/src/left_main.php:238
+#: squirrelmail/src/download.php:197 squirrelmail/src/read_body.php:895
+msgid "Cc:"
+msgstr ""
+
+#: squirrelmail/src/download.php:205 squirrelmail/src/read_body.php:905
+msgid "Bcc:"
+msgstr ""
+
+#: squirrelmail/src/download.php:224 squirrelmail/src/read_body.php:586
+msgid "more"
+msgstr ""
+
+#: squirrelmail/src/download.php:225 squirrelmail/src/read_body.php:587
+msgid "less"
+msgstr ""
+
+#: squirrelmail/src/folders.php:28 squirrelmail/src/left_main.php:754
+#: squirrelmail/functions/page_header.php:220
 msgid "Folders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:42
+#: squirrelmail/src/folders.php:37
 msgid "Subscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:44
+#: squirrelmail/src/folders.php:39
 msgid "Unsubscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:46
+#: squirrelmail/src/folders.php:41
 msgid "Deleted folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:48
+#: squirrelmail/src/folders.php:43
 msgid "Created folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:50
+#: squirrelmail/src/folders.php:45
 msgid "Renamed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:277
+#: squirrelmail/src/folders.php:51 squirrelmail/src/left_main.php:793
 msgid "refresh folder list"
 msgstr ""
 
-#: squirrelmail/src/folders.php:65
+#: squirrelmail/src/folders.php:64
 msgid "Create Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:70
+#: squirrelmail/src/folders.php:71
 msgid "as a subfolder of"
 msgstr ""
 
-#: squirrelmail/src/folders.php:74 squirrelmail/src/folders.php:76
+#: squirrelmail/src/folders.php:75 squirrelmail/src/folders.php:77
 msgid "None"
 msgstr ""
 
-#: squirrelmail/src/folders.php:98
+#: squirrelmail/src/folders.php:102
 msgid "Let this folder contain subfolders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:101
+#: squirrelmail/src/folders.php:105
 msgid "Create"
 msgstr ""
 
-#: squirrelmail/src/folders.php:108
+#: squirrelmail/src/folders.php:141
 msgid "Rename a Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:131
+#: squirrelmail/src/folders.php:149 squirrelmail/src/folders.php:190
+msgid "Select a folder"
+msgstr ""
+
+#: squirrelmail/src/folders.php:168
 msgid "Rename"
 msgstr ""
 
-#: squirrelmail/src/folders.php:135 squirrelmail/src/folders.php:194
+#: squirrelmail/src/folders.php:172 squirrelmail/src/folders.php:212
 msgid "No folders found"
 msgstr ""
 
-#: squirrelmail/src/folders.php:143
+#: squirrelmail/src/folders.php:182
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:543
-#: squirrelmail/plugins/filters/options.php:154
-#: squirrelmail/plugins/mail_fetch/options.php:163
-#: squirrelmail/plugins/mail_fetch/options.php:170
-#: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
-#: squirrelmail/src/options_identities.php:305
-#: squirrelmail/src/read_body.php:619
+#: squirrelmail/src/folders.php:208 squirrelmail/src/options_highlight.php:101
+#: squirrelmail/src/options_identities.php:328
+#: squirrelmail/src/read_body.php:729
+#: squirrelmail/functions/mailbox_display.php:739
+#: squirrelmail/plugins/filters/options.php:196
+#: squirrelmail/plugins/mail_fetch/options.php:214
+#: squirrelmail/plugins/mail_fetch/options.php:221
 msgid "Delete"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:34
-#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:220
+#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:245
+#: squirrelmail/plugins/listcommands/setup.php:36
 msgid "Unsubscribe"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:33
-#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:261
+#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:286
+#: squirrelmail/plugins/listcommands/setup.php:35
 msgid "Subscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:224
+#: squirrelmail/src/folders.php:249
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:264
+#: squirrelmail/src/folders.php:289
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:40
+#: squirrelmail/src/folders_create.php:29
+msgid "Illegal folder name.  Please select a different name."
+msgstr ""
+
+#: squirrelmail/src/folders_create.php:29
+#: squirrelmail/src/folders_delete.php:29
+#: squirrelmail/src/folders_rename_getname.php:24
+msgid "Click here to go back"
+msgstr ""
+
+#: squirrelmail/src/folders_delete.php:29
+msgid "You have not selected a folder to delete. Please do so."
+msgstr ""
+
+#: squirrelmail/src/folders_rename_getname.php:24
+msgid "You have not selected a folder to rename. Please do so."
+msgstr ""
+
+#: squirrelmail/src/folders_rename_getname.php:50
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:44
+#: squirrelmail/src/folders_rename_getname.php:55
 msgid "New name:"
 msgstr ""
 
-#: squirrelmail/functions/options.php:414
-#: squirrelmail/plugins/filters/options.php:138
-#: squirrelmail/plugins/newmail/newmail_opt.php:133
+#: squirrelmail/src/folders_rename_getname.php:62
+#: squirrelmail/src/options_highlight.php:394
+#: squirrelmail/functions/options.php:419
+#: squirrelmail/plugins/filters/options.php:174
 #: squirrelmail/plugins/translate/options.php:160
-#: squirrelmail/src/folders_rename_getname.php:51
-#: squirrelmail/src/options_highlight.php:347
+#: squirrelmail/plugins/newmail/newmail_opt.php:155
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:132
-#: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:91
+#: squirrelmail/src/help.php:90 squirrelmail/functions/page_header.php:226
+#: squirrelmail/plugins/listcommands/setup.php:39
 msgid "Help"
 msgstr ""
 
-#: squirrelmail/src/help.php:131
+#: squirrelmail/src/help.php:129
 #, c-format
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
 "instead."
 msgstr ""
 
-#: squirrelmail/src/help.php:137
+#: squirrelmail/src/help.php:135
 msgid "Some or all of the help documents are not present!"
 msgstr ""
 
@@ -474,211 +581,322 @@ msgstr ""
 msgid "Table of Contents"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:746
-#: squirrelmail/functions/mailbox_display.php:749
-#: squirrelmail/functions/mailbox_display.php:752
-#: squirrelmail/plugins/delete_move_next/setup.php:149
-#: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:641 squirrelmail/src/read_body.php:643
+#: squirrelmail/src/read_body.php:775 squirrelmail/src/read_body.php:777
+#: squirrelmail/functions/mailbox_display.php:978
+#: squirrelmail/functions/mailbox_display.php:981
+#: squirrelmail/functions/mailbox_display.php:984
+#: squirrelmail/plugins/delete_move_next/setup.php:167
+#: squirrelmail/plugins/delete_move_next/setup.php:169
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:747
-#: squirrelmail/functions/mailbox_display.php:750
-#: squirrelmail/functions/mailbox_display.php:753
-#: squirrelmail/plugins/delete_move_next/setup.php:154
-#: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:647 squirrelmail/src/read_body.php:649
+#: squirrelmail/src/read_body.php:781 squirrelmail/src/read_body.php:783
+#: squirrelmail/functions/mailbox_display.php:979
+#: squirrelmail/functions/mailbox_display.php:982
+#: squirrelmail/functions/mailbox_display.php:985
+#: squirrelmail/plugins/delete_move_next/setup.php:172
+#: squirrelmail/plugins/delete_move_next/setup.php:174
 msgid "Next"
 msgstr ""
 
-#: squirrelmail/src/help.php:219
+#: squirrelmail/src/help.php:217
 msgid "Top"
 msgstr ""
 
-#: squirrelmail/src/image.php:26
+#: squirrelmail/src/image.php:42
 msgid "Viewing an image attachment"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:529
-#: squirrelmail/functions/page_header.php:103
-#: squirrelmail/plugins/mail_fetch/options.php:137
-#: squirrelmail/plugins/mail_fetch/options.php:214
-#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:305
-msgid "INBOX"
+#: squirrelmail/src/left_main.php:98 squirrelmail/src/left_main.php:251
+#: squirrelmail/src/left_main.php:326
+msgid "purge"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:97
-msgid "empty"
+#: squirrelmail/src/left_main.php:787
+msgid "Last Refresh"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:271
-msgid "Last Refresh"
+#: squirrelmail/src/left_main.php:867
+msgid "Save folder tree"
 msgstr ""
 
-#: squirrelmail/src/login.php:97 squirrelmail/src/login.php:141
+#: squirrelmail/src/login.php:103 squirrelmail/src/login.php:171
 msgid "Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:112
+#: squirrelmail/src/login.php:133
+#: squirrelmail/functions/display_messages.php:164
+#, c-format
+msgid "%s Logo"
+msgstr ""
+
+#: squirrelmail/src/login.php:136
+#: squirrelmail/functions/display_messages.php:167
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
-#: squirrelmail/src/login.php:113
+#: squirrelmail/src/login.php:137
+#: squirrelmail/functions/display_messages.php:168
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:119
+#: squirrelmail/src/login.php:141
 #, c-format
 msgid "%s Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:123
+#: squirrelmail/src/login.php:149
 msgid "Name:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:126
-#: squirrelmail/plugins/mail_fetch/options.php:202
-#: squirrelmail/src/login.php:129
+#: squirrelmail/src/login.php:157
+#: squirrelmail/plugins/mail_fetch/options.php:157
+#: squirrelmail/plugins/mail_fetch/options.php:274
 msgid "Password:"
 msgstr ""
 
-#: squirrelmail/src/move_messages.php:79
-#: squirrelmail/src/move_messages.php:114
-#: squirrelmail/src/move_messages.php:143
+#: squirrelmail/src/move_messages.php:94
+msgid "<No subject>"
+msgstr ""
+
+#: squirrelmail/src/move_messages.php:172
+#: squirrelmail/src/move_messages.php:225
+#: squirrelmail/src/move_messages.php:254
 msgid "No messages were selected."
 msgstr ""
 
-#: squirrelmail/src/options_display.php:32
+#: squirrelmail/src/options.php:136 squirrelmail/src/options.php:285
+msgid "Personal Information"
+msgstr ""
+
+#: squirrelmail/src/options.php:142 squirrelmail/src/options.php:293
+msgid "Display Preferences"
+msgstr ""
+
+#: squirrelmail/src/options.php:148 squirrelmail/src/options.php:301
+#: squirrelmail/src/options_highlight.php:64
+msgid "Message Highlighting"
+msgstr ""
+
+#: squirrelmail/src/options.php:154 squirrelmail/src/options.php:309
+msgid "Folder Preferences"
+msgstr ""
+
+#: squirrelmail/src/options.php:160 squirrelmail/src/options.php:317
+#: squirrelmail/src/options_order.php:32
+msgid "Index Order"
+msgstr ""
+
+#: squirrelmail/src/options.php:200 squirrelmail/src/options_highlight.php:64
+#: squirrelmail/src/options_identities.php:57
+#: squirrelmail/src/options_order.php:32
+#: squirrelmail/functions/page_header.php:222
+#: squirrelmail/plugins/filters/options.php:71
+#: squirrelmail/plugins/translate/options.php:94
+#: squirrelmail/plugins/newmail/newmail_opt.php:38
+msgid "Options"
+msgstr ""
+
+#: squirrelmail/src/options.php:268
+msgid "Successfully Saved Options"
+msgstr ""
+
+#: squirrelmail/src/options.php:273
+msgid "Refresh Folder List"
+msgstr ""
+
+#: squirrelmail/src/options.php:275
+msgid "Refresh Page"
+msgstr ""
+
+#: squirrelmail/src/options.php:287
+msgid ""
+"This contains personal information about yourself such as your name, your "
+"email address, etc."
+msgstr ""
+
+#: squirrelmail/src/options.php:295
+msgid ""
+"You can change the way that SquirrelMail looks and displays information to "
+"you, such as the colors, the language, and other settings."
+msgstr ""
+
+#: squirrelmail/src/options.php:303
+msgid ""
+"Based upon given criteria, incoming messages can have different background "
+"colors in the message list.  This helps to easily distinguish who the "
+"messages are from, especially for mailing lists."
+msgstr ""
+
+#: squirrelmail/src/options.php:311
+msgid ""
+"These settings change the way your folders are displayed and manipulated."
+msgstr ""
+
+#: squirrelmail/src/options.php:319
+msgid ""
+"The order of the message index can be rearranged and changed to contain the "
+"headers in any order you want."
+msgstr ""
+
+#: squirrelmail/src/options_display.php:33
 msgid "General Display Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:44
+#: squirrelmail/src/options_display.php:45
 msgid "Theme"
 msgstr ""
 
+#: squirrelmail/src/options_display.php:52
+#: squirrelmail/src/options_display.php:81
 #: squirrelmail/plugins/administrator/defines.php:42
-#: squirrelmail/src/options_display.php:51
-#: squirrelmail/src/options_display.php:80
 msgid "Default"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:64
+#: squirrelmail/src/options_display.php:65
 msgid "Custom Stylesheet"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:83
+#: squirrelmail/src/options_display.php:85
 msgid "Language"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:92
+#: squirrelmail/src/options_display.php:94
 msgid "Use Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:95
+#: squirrelmail/src/options_display.php:97
 msgid "Autodetect"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:96
+#: squirrelmail/src/options_display.php:98
 msgid "Always"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:97
+#: squirrelmail/src/options_display.php:99
 #: squirrelmail/src/options_folder.php:122
 msgid "Never"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:115
+#: squirrelmail/src/options_display.php:117
 msgid "Mailbox Display Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:120
+#: squirrelmail/src/options_display.php:122
 msgid "Number of Messages to Index"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:128
+#: squirrelmail/src/options_display.php:130
 msgid "Enable Alternating Row Colors"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:135
+#: squirrelmail/src/options_display.php:137
 msgid "Enable Page Selector"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:142
+#: squirrelmail/src/options_display.php:144
 msgid "Maximum Number of Pages to Show"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:149
+#: squirrelmail/src/options_display.php:151
 msgid "Message Display and Composition"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:154
+#: squirrelmail/src/options_display.php:156
 msgid "Wrap Incoming Text At"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:162
+#: squirrelmail/src/options_display.php:164
 msgid "Size of Editor Window"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:170
+#: squirrelmail/src/options_display.php:172
 msgid "Location of Buttons when Composing"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:173
+#: squirrelmail/src/options_display.php:175
 msgid "Before headers"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:174
+#: squirrelmail/src/options_display.php:176
 msgid "Between headers and message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:175
+#: squirrelmail/src/options_display.php:177
 msgid "After message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:180
+#: squirrelmail/src/options_display.php:183
 msgid "Addressbook Display Format"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:183
+#: squirrelmail/src/options_display.php:186
 msgid "Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:184
+#: squirrelmail/src/options_display.php:187
 msgid "HTML"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:189
+#: squirrelmail/src/options_display.php:192
 msgid "Show HTML Version by Default"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:196
+#: squirrelmail/src/options_display.php:199
 msgid "Include Me in CC when I Reply All"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:203
+#: squirrelmail/src/options_display.php:206
+msgid "Include CCs when forwarding messages"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:213
 msgid "Enable Mailer Display"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:210
+#: squirrelmail/src/options_display.php:220
 msgid "Display Attached Images with Message"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:217
+#: squirrelmail/src/options_display.php:227
 msgid "Enable Subtle Printer Friendly Link"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:224
+#: squirrelmail/src/options_display.php:234
 msgid "Enable Printer Friendly Clean Display"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:231
+#: squirrelmail/src/options_display.php:242
 msgid "Enable request/confirm reading"
 msgstr ""
 
+#: squirrelmail/src/options_display.php:250
+msgid "Always compose in a new window"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:257
+msgid "Width of compose window"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:265
+msgid "Height of compose window"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:273
+msgid "Append signature before reply/forward text"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:280
+msgid "Use receive date for sort"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:287
+msgid "Use References header for thread sort"
+msgstr ""
+
 #: squirrelmail/src/options_folder.php:40
 msgid "Special Folder Options"
 msgstr ""
@@ -691,8 +909,8 @@ msgstr ""
 msgid "Do not use Trash"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:125
 #: squirrelmail/src/options_folder.php:67
+#: squirrelmail/plugins/administrator/defines.php:135
 msgid "Trash Folder"
 msgstr ""
 
@@ -700,8 +918,8 @@ msgstr ""
 msgid "Do not use Sent"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:128
 #: squirrelmail/src/options_folder.php:78
+#: squirrelmail/plugins/administrator/defines.php:138
 msgid "Sent Folder"
 msgstr ""
 
@@ -709,8 +927,8 @@ msgstr ""
 msgid "Do not use Drafts"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:131
 #: squirrelmail/src/options_folder.php:89
+#: squirrelmail/plugins/administrator/defines.php:141
 msgid "Draft Folder"
 msgstr ""
 
@@ -730,8 +948,8 @@ msgstr ""
 msgid "Right"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:45
 #: squirrelmail/src/options_folder.php:111
+#: squirrelmail/plugins/administrator/defines.php:45
 msgid "pixels"
 msgstr ""
 
@@ -759,18 +977,18 @@ msgstr ""
 msgid "Enable Unread Message Notification"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:152
 #: squirrelmail/src/options_folder.php:145
+#: squirrelmail/plugins/administrator/defines.php:162
 msgid "No Notification"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:153
 #: squirrelmail/src/options_folder.php:146
+#: squirrelmail/plugins/administrator/defines.php:163
 msgid "Only INBOX"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:154
 #: squirrelmail/src/options_folder.php:147
+#: squirrelmail/plugins/administrator/defines.php:164
 msgid "All Folders"
 msgstr ""
 
@@ -778,13 +996,13 @@ msgstr ""
 msgid "Unread Message Notification Type"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:157
 #: squirrelmail/src/options_folder.php:155
+#: squirrelmail/plugins/administrator/defines.php:167
 msgid "Only Unseen"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:158
 #: squirrelmail/src/options_folder.php:156
+#: squirrelmail/plugins/administrator/defines.php:168
 msgid "Unseen and Total"
 msgstr ""
 
@@ -816,177 +1034,163 @@ msgstr ""
 msgid "Memory Search"
 msgstr ""
 
-#: squirrelmail/plugins/sent_subfolders/setup.php:102
 #: squirrelmail/src/options_folder.php:193
+#: squirrelmail/plugins/sent_subfolders/setup.php:102
 msgid "Disabled"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:128
-#: squirrelmail/plugins/filters/options.php:62
-#: squirrelmail/plugins/newmail/newmail_opt.php:34
-#: squirrelmail/plugins/translate/options.php:94
-#: squirrelmail/src/options.php:198 squirrelmail/src/options_highlight.php:62
-#: squirrelmail/src/options_identities.php:44
-#: squirrelmail/src/options_order.php:31
-msgid "Options"
+#: squirrelmail/src/options_highlight.php:72
+#: squirrelmail/plugins/filters/options.php:100
+msgid "New"
 msgstr ""
 
-#: squirrelmail/src/options.php:146 squirrelmail/src/options.php:297
-#: squirrelmail/src/options_highlight.php:62
-msgid "Message Highlighting"
+#: squirrelmail/src/options_highlight.php:73
+#: squirrelmail/plugins/filters/options.php:101
+#: squirrelmail/plugins/filters/spamoptions.php:180
+#: squirrelmail/plugins/mail_fetch/fetch.php:283
+msgid "Done"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:64
-#: squirrelmail/src/options_highlight.php:66
-msgid "New"
+#: squirrelmail/src/options_highlight.php:89
+#: squirrelmail/src/options_highlight.php:378
+#: squirrelmail/plugins/filters/options.php:131
+msgid "To or Cc"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:65
-#: squirrelmail/plugins/filters/spamoptions.php:148
-#: squirrelmail/plugins/mail_fetch/fetch.php:225
-#: squirrelmail/src/options_highlight.php:67
-msgid "Done"
+#: squirrelmail/src/options_highlight.php:92
+msgid "subject"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:152
-#: squirrelmail/plugins/filters/spamoptions.php:147
-#: squirrelmail/src/options_highlight.php:74
+#: squirrelmail/src/options_highlight.php:99
+#: squirrelmail/plugins/filters/options.php:191
+#: squirrelmail/plugins/filters/spamoptions.php:179
 msgid "Edit"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:87
+#: squirrelmail/src/options_highlight.php:115
 msgid "No highlighting is defined"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:259
+#: squirrelmail/src/options_highlight.php:308
 msgid "Identifying name"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:273
+#: squirrelmail/src/options_highlight.php:321
 msgid "Color"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:277
+#: squirrelmail/src/options_highlight.php:324
 msgid "Dark Blue"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:278
+#: squirrelmail/src/options_highlight.php:325
 msgid "Dark Green"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:279
+#: squirrelmail/src/options_highlight.php:326
 msgid "Dark Yellow"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:280
+#: squirrelmail/src/options_highlight.php:327
 msgid "Dark Cyan"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:281
+#: squirrelmail/src/options_highlight.php:328
 msgid "Dark Magenta"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:282
+#: squirrelmail/src/options_highlight.php:329
 msgid "Light Blue"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:283
+#: squirrelmail/src/options_highlight.php:330
 msgid "Light Green"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:284
+#: squirrelmail/src/options_highlight.php:331
 msgid "Light Yellow"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:285
+#: squirrelmail/src/options_highlight.php:332
 msgid "Light Cyan"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:286
+#: squirrelmail/src/options_highlight.php:333
 msgid "Light Magenta"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:287
+#: squirrelmail/src/options_highlight.php:334
 msgid "Dark Gray"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:288
+#: squirrelmail/src/options_highlight.php:335
 msgid "Medium Gray"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:289
+#: squirrelmail/src/options_highlight.php:336
 msgid "Light Gray"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:290
+#: squirrelmail/src/options_highlight.php:337
 msgid "White"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:292
+#: squirrelmail/src/options_highlight.php:339
 msgid "Other:"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:294
+#: squirrelmail/src/options_highlight.php:341
 msgid "Ex: 63aa7f"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:94
-#: squirrelmail/src/options_highlight.php:331
-msgid "To or Cc"
+#: squirrelmail/src/options_highlight.php:383
+msgid "Matches"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:336
-msgid "Matches"
+#: squirrelmail/src/options_identities.php:47
+#, c-format
+msgid "Alternate Identity %d"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:44
+#: squirrelmail/src/options_identities.php:57
 msgid "Advanced Identities"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:55
+#: squirrelmail/src/options_identities.php:63
 msgid "Default Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:66
-#, c-format
-msgid "Alternate Identity %d"
-msgstr ""
-
-#: squirrelmail/src/options_identities.php:76
+#: squirrelmail/src/options_identities.php:67
 msgid "Add a New Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:291
-#: squirrelmail/src/options_personal.php:49
+#: squirrelmail/src/options_identities.php:311
+#: squirrelmail/src/options_personal.php:56
+#: squirrelmail/src/options_personal.php:64
 msgid "Full Name"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:292
+#: squirrelmail/src/options_identities.php:312
 msgid "E-Mail Address"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:293
-#: squirrelmail/src/options_personal.php:65
+#: squirrelmail/src/options_identities.php:313
+#: squirrelmail/src/options_personal.php:91
 msgid "Reply To"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:300
+#: squirrelmail/src/options_identities.php:321
 msgid "Save / Update"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:303
+#: squirrelmail/src/options_identities.php:326
 msgid "Make Default"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:309
+#: squirrelmail/src/options_identities.php:332
 msgid "Move Up"
 msgstr ""
 
-#: squirrelmail/src/options.php:158 squirrelmail/src/options.php:313
-#: squirrelmail/src/options_order.php:31
-msgid "Index Order"
-msgstr ""
-
 #: squirrelmail/src/options_order.php:37
 msgid "Checkbox"
 msgstr ""
@@ -995,394 +1199,336 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:592
 #: squirrelmail/src/options_order.php:42
+#: squirrelmail/functions/mailbox_display.php:820
 msgid "Size"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:85
+#: squirrelmail/src/options_order.php:87
 msgid ""
 "The index order is the order that the columns are arranged in the message "
 "index.  You can add, remove, and move columns around to customize them to "
 "fit your needs."
 msgstr ""
 
-#: squirrelmail/src/options_order.php:94
+#: squirrelmail/src/options_order.php:98
 msgid "up"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:96
+#: squirrelmail/src/options_order.php:100
 msgid "down"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:101
+#: squirrelmail/src/options_order.php:105
 msgid "remove"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:130
+#: squirrelmail/src/options_order.php:136
 msgid "Return to options page"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:41
+#: squirrelmail/src/options_personal.php:43
 msgid "Name and Address Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:57
+#: squirrelmail/src/options_personal.php:74
+#: squirrelmail/src/options_personal.php:82
 msgid "Email Address"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:72
+#: squirrelmail/src/options_personal.php:108
 msgid "Edit Advanced Identities"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:74
+#: squirrelmail/src/options_personal.php:110
 msgid "(discards changes made on this form so far)"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:77
+#: squirrelmail/src/options_personal.php:113
 msgid "Multiple Identities"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:84
+#: squirrelmail/src/options_personal.php:121
+msgid "Same as server"
+msgstr ""
+
+#: squirrelmail/src/options_personal.php:132
+msgid "Timezone Options"
+msgstr ""
+
+#: squirrelmail/src/options_personal.php:137
+msgid "Your current timezone"
+msgstr ""
+
+#: squirrelmail/src/options_personal.php:145
 msgid "Reply Citation Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:89
+#: squirrelmail/src/options_personal.php:150
 msgid "Reply Citation Style"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:92
+#: squirrelmail/src/options_personal.php:153
 msgid "No Citation"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:93
+#: squirrelmail/src/options_personal.php:154
 msgid "AUTHOR Said"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:94
+#: squirrelmail/src/options_personal.php:155
 msgid "Quote Who XML"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:95
+#: squirrelmail/src/options_personal.php:156
 msgid "User-Defined"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:100
+#: squirrelmail/src/options_personal.php:161
 msgid "User-Defined Citation Start"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:108
+#: squirrelmail/src/options_personal.php:169
 msgid "User-Defined Citation End"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:115
+#: squirrelmail/src/options_personal.php:176
 msgid "Signature Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:120
+#: squirrelmail/src/options_personal.php:181
 msgid "Use Signature"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:127
+#: squirrelmail/src/options_personal.php:188
 msgid "Prefix Signature with '-- ' Line"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:134
-msgid "Signature"
-msgstr ""
-
-#: squirrelmail/src/options.php:134 squirrelmail/src/options.php:281
-msgid "Personal Information"
-msgstr ""
-
-#: squirrelmail/src/options.php:140 squirrelmail/src/options.php:289
-msgid "Display Preferences"
-msgstr ""
-
-#: squirrelmail/src/options.php:152 squirrelmail/src/options.php:305
-msgid "Folder Preferences"
-msgstr ""
-
-#: squirrelmail/src/options.php:264
-msgid "Successfully Saved Options"
-msgstr ""
-
-#: squirrelmail/src/options.php:269
-msgid "Refresh Folder List"
-msgstr ""
-
-#: squirrelmail/src/options.php:271
-msgid "Refresh Page"
-msgstr ""
-
-#: squirrelmail/src/options.php:283
-msgid ""
-"This contains personal information about yourself such as your name, your "
-"email address, etc."
-msgstr ""
-
-#: squirrelmail/src/options.php:291
-msgid ""
-"You can change the way that SquirrelMail looks and displays information to "
-"you, such as the colors, the language, and other settings."
-msgstr ""
-
-#: squirrelmail/src/options.php:299
-msgid ""
-"Based upon given criteria, incoming messages can have different background "
-"colors in the message list.  This helps to easily distinguish who the "
-"messages are from, especially for mailing lists."
-msgstr ""
-
-#: squirrelmail/src/options.php:307
-msgid ""
-"These settings change the way your folders are displayed and manipulated."
-msgstr ""
-
-#: squirrelmail/src/options.php:315
-msgid ""
-"The order of the message index can be rearranged and changed to contain the "
-"headers in any order you want."
-msgstr ""
-
-#: squirrelmail/src/printer_friendly_bottom.php:61
+#: squirrelmail/src/printer_friendly_bottom.php:64
 msgid "Message not printable"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:90
+#: squirrelmail/src/printer_friendly_bottom.php:93
 #: squirrelmail/src/printer_friendly_main.php:15
-#: squirrelmail/src/printer_friendly_top.php:21
+#: squirrelmail/src/printer_friendly_top.php:22
 msgid "Printer Friendly"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:98
+#: squirrelmail/src/printer_friendly_bottom.php:108
 msgid "CC"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_top.php:36
+#: squirrelmail/src/printer_friendly_top.php:38
 msgid "Print"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_top.php:37
+#: squirrelmail/src/printer_friendly_top.php:39
+#: squirrelmail/plugins/newmail/newmail.php:33
 msgid "Close Window"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:104
+#: squirrelmail/src/read_body.php:156
 msgid "View Printable Version"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:182
+#: squirrelmail/src/read_body.php:219
 msgid "Your message"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:185
+#: squirrelmail/src/read_body.php:222
 msgid "Sent:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:187
+#: squirrelmail/src/read_body.php:224
 #, c-format
 msgid "Was displayed on %s"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:298
-msgid "Viewing Full Header"
+#: squirrelmail/src/read_body.php:256
+msgid "Read:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:434
-msgid "more"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:435
-msgid "less"
+#: squirrelmail/src/read_body.php:426
+msgid "Viewing Full Header"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:611
+#: squirrelmail/src/read_body.php:721
 msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:623
+#: squirrelmail/src/read_body.php:743
 msgid "Resume Draft"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:660
+#: squirrelmail/src/read_body.php:758
+msgid "Edit Message as New"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:804
+#: squirrelmail/functions/mailbox_display.php:728
 msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:665
+#: squirrelmail/src/read_body.php:819
 msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:670
+#: squirrelmail/src/read_body.php:834
 msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:694 squirrelmail/src/read_body.php:697
+#: squirrelmail/src/read_body.php:855 squirrelmail/src/read_body.php:858
 msgid "View Full Header"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:112
-#: squirrelmail/plugins/calendar/event_delete.php:32
-#: squirrelmail/plugins/calendar/event_edit.php:35
-#: squirrelmail/plugins/calendar/event_edit.php:93
-#: squirrelmail/plugins/calendar/event_edit.php:106
-#: squirrelmail/src/read_body.php:720
-msgid "Date:"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:774
+#: squirrelmail/src/read_body.php:926
 msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:812 squirrelmail/src/read_body.php:822
-#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845
-#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:905
-#: squirrelmail/src/read_body.php:913 squirrelmail/src/read_body.php:927
+#: squirrelmail/src/read_body.php:971 squirrelmail/src/read_body.php:983
+#: squirrelmail/src/read_body.php:994 squirrelmail/src/read_body.php:1016
+#: squirrelmail/src/read_body.php:1058 squirrelmail/src/read_body.php:1073
 msgid "Read receipt"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:815 squirrelmail/src/read_body.php:824
-#: squirrelmail/src/read_body.php:907 squirrelmail/src/read_body.php:915
+#: squirrelmail/src/read_body.php:973 squirrelmail/src/read_body.php:1060
 msgid "send"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:816 squirrelmail/src/read_body.php:907
-msgid "Remove MDN flag"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:835 squirrelmail/src/read_body.php:847
-#: squirrelmail/src/read_body.php:872 squirrelmail/src/read_body.php:929
+#: squirrelmail/src/read_body.php:985 squirrelmail/src/read_body.php:996
+#: squirrelmail/src/read_body.php:1018 squirrelmail/src/read_body.php:1075
 msgid "requested"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:848 squirrelmail/src/read_body.php:873
-#: squirrelmail/src/read_body.php:930
+#: squirrelmail/src/read_body.php:996 squirrelmail/src/read_body.php:1018
+#: squirrelmail/src/read_body.php:1075
 msgid "Send read receipt now"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:860
+#: squirrelmail/src/read_body.php:1008
 msgid ""
 "The message sender has requested a response to indicate that you have read "
 "this message. Would you like to send a receipt?"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
-#: squirrelmail/src/redirect.php:64
+#: squirrelmail/src/redirect.php:64 squirrelmail/src/redirect.php:86
+#: squirrelmail/functions/auth.php:20
 msgid "You must be logged in to access this page."
 msgstr ""
 
-#: squirrelmail/functions/auth.php:34 squirrelmail/src/redirect.php:65
-msgid "Go to the login page"
-msgstr ""
-
-#: squirrelmail/src/redirect.php:85 squirrelmail/src/redirect.php:89
+#: squirrelmail/src/redirect.php:82
 msgid "There was an error contacting the mail server."
 msgstr ""
 
-#: squirrelmail/src/redirect.php:90
+#: squirrelmail/src/redirect.php:84
 msgid "Contact your administrator for help."
 msgstr ""
 
-#: squirrelmail/src/search.php:237
+#: squirrelmail/src/search.php:252
 msgid "edit"
 msgstr ""
 
-#: squirrelmail/src/search.php:244 squirrelmail/src/search.php:283
+#: squirrelmail/src/search.php:259 squirrelmail/src/search.php:305
 msgid "search"
 msgstr ""
 
-#: squirrelmail/src/search.php:247
+#: squirrelmail/src/search.php:262
 msgid "delete"
 msgstr ""
 
-#: squirrelmail/src/search.php:275
+#: squirrelmail/src/search.php:274
+msgid "Recent Searches"
+msgstr ""
+
+#: squirrelmail/src/search.php:297
 msgid "save"
 msgstr ""
 
-#: squirrelmail/src/search.php:286
+#: squirrelmail/src/search.php:308
 msgid "forget"
 msgstr ""
 
-#: squirrelmail/src/search.php:295
+#: squirrelmail/src/search.php:317
 msgid "Current Search"
 msgstr ""
 
-#: squirrelmail/src/search.php:334
+#: squirrelmail/src/search.php:358
 msgid "Body"
 msgstr ""
 
-#: squirrelmail/src/search.php:335
+#: squirrelmail/src/search.php:359
 msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/src/search.php:362 squirrelmail/src/search.php:391
+#: squirrelmail/src/search.php:390 squirrelmail/src/search.php:419
 msgid "Search Results"
 msgstr ""
 
-#: squirrelmail/src/search.php:382
+#: squirrelmail/src/search.php:410
 msgid "No Messages found"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:116 squirrelmail/src/signout.php:72
+#: squirrelmail/src/signout.php:76 squirrelmail/functions/page_header.php:205
 msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/src/signout.php:78
+#: squirrelmail/src/signout.php:79
 msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/signout.php:80
+#: squirrelmail/src/signout.php:81
 msgid "Click here to log back in."
 msgstr ""
 
-#: squirrelmail/src/vcard.php:30
+#: squirrelmail/src/vcard.php:31
 msgid "Viewing a Business Card"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:86 squirrelmail/src/vcard.php:146
+#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:160
 msgid "Title"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:87
+#: squirrelmail/src/vcard.php:91
 msgid "Email"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:88 squirrelmail/src/vcard.php:138
+#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:152
 msgid "Web Page"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:89 squirrelmail/src/vcard.php:150
+#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:164
 msgid "Organization / Department"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:142
+#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:156
 msgid "Address"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:91 squirrelmail/src/vcard.php:159
+#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:173
 msgid "Work Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:163
+#: squirrelmail/src/vcard.php:96 squirrelmail/src/vcard.php:177
 msgid "Home Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:167
+#: squirrelmail/src/vcard.php:97 squirrelmail/src/vcard.php:181
 msgid "Cellular Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:171
+#: squirrelmail/src/vcard.php:98 squirrelmail/src/vcard.php:185
 msgid "Fax"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:175
+#: squirrelmail/src/vcard.php:99 squirrelmail/src/vcard.php:189
 msgid "Note"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:124
+#: squirrelmail/src/vcard.php:129
 msgid "Add to Addressbook"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:155
+#: squirrelmail/src/vcard.php:169
 msgid "Title & Org. / Dept."
 msgstr ""
 
@@ -1406,10 +1552,10 @@ msgstr ""
 #: squirrelmail/functions/abook_database.php:221
 #: squirrelmail/functions/abook_database.php:260
 #: squirrelmail/functions/abook_database.php:293
-#: squirrelmail/functions/abook_local_file.php:239
-#: squirrelmail/functions/abook_local_file.php:260
-#: squirrelmail/functions/abook_local_file.php:285
-#: squirrelmail/functions/abook_local_file.php:317
+#: squirrelmail/functions/abook_local_file.php:243
+#: squirrelmail/functions/abook_local_file.php:267
+#: squirrelmail/functions/abook_local_file.php:292
+#: squirrelmail/functions/abook_local_file.php:324
 #: squirrelmail/functions/addressbook.php:351
 #: squirrelmail/functions/addressbook.php:386
 #: squirrelmail/functions/addressbook.php:439
@@ -1417,13 +1563,13 @@ msgid "Addressbook is read-only"
 msgstr ""
 
 #: squirrelmail/functions/abook_database.php:231
-#: squirrelmail/functions/abook_local_file.php:244
+#: squirrelmail/functions/abook_local_file.php:248
 #, c-format
 msgid "User '%s' already exist"
 msgstr ""
 
 #: squirrelmail/functions/abook_database.php:303
-#: squirrelmail/functions/abook_local_file.php:323
+#: squirrelmail/functions/abook_local_file.php:330
 #, c-format
 msgid "User '%s' does not exist"
 msgstr ""
@@ -1439,7 +1585,7 @@ msgstr ""
 
 #: squirrelmail/functions/abook_global_file.php:69
 #: squirrelmail/functions/abook_local_file.php:104
-#: squirrelmail/functions/abook_local_file.php:139
+#: squirrelmail/functions/abook_local_file.php:140
 msgid "Open failed"
 msgstr ""
 
@@ -1453,13 +1599,13 @@ msgstr ""
 msgid "Not a file name"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:265
-#: squirrelmail/functions/abook_local_file.php:291
-#: squirrelmail/functions/abook_local_file.php:330
+#: squirrelmail/functions/abook_local_file.php:272
+#: squirrelmail/functions/abook_local_file.php:298
+#: squirrelmail/functions/abook_local_file.php:337
 msgid "Could not lock datafile"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:278
+#: squirrelmail/functions/abook_local_file.php:285
 msgid "Write to addressbook failed"
 msgstr ""
 
@@ -1501,161 +1647,156 @@ msgstr ""
 msgid "Nickname contains illegal characters"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:106
-#: squirrelmail/functions/attachment_common.php:131
-#: squirrelmail/functions/attachment_common.php:156
+#: squirrelmail/functions/attachment_common.php:107
+#: squirrelmail/functions/attachment_common.php:128
+#: squirrelmail/functions/attachment_common.php:143
+#: squirrelmail/functions/attachment_common.php:168
 msgid "view"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:173
+#: squirrelmail/functions/attachment_common.php:185
 msgid "Business Card"
 msgstr ""
 
-#: squirrelmail/functions/date.php:91
-#: squirrelmail/plugins/calendar/calendar.php:49
+#: squirrelmail/functions/date.php:92
+#: squirrelmail/plugins/calendar/calendar.php:59
 msgid "Sunday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:94
-#: squirrelmail/plugins/calendar/calendar.php:50
+#: squirrelmail/functions/date.php:95
+#: squirrelmail/plugins/calendar/calendar.php:60
 msgid "Monday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:97
-#: squirrelmail/plugins/calendar/calendar.php:51
+#: squirrelmail/functions/date.php:98
+#: squirrelmail/plugins/calendar/calendar.php:61
 msgid "Tuesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:100
-#: squirrelmail/plugins/calendar/calendar.php:52
+#: squirrelmail/functions/date.php:101
+#: squirrelmail/plugins/calendar/calendar.php:62
 msgid "Wednesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:103
-#: squirrelmail/plugins/calendar/calendar.php:53
+#: squirrelmail/functions/date.php:104
+#: squirrelmail/plugins/calendar/calendar.php:63
 msgid "Thursday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:106
-#: squirrelmail/plugins/calendar/calendar.php:54
+#: squirrelmail/functions/date.php:107
+#: squirrelmail/plugins/calendar/calendar.php:64
 msgid "Friday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:109
-#: squirrelmail/plugins/calendar/calendar.php:55
+#: squirrelmail/functions/date.php:110
+#: squirrelmail/plugins/calendar/calendar.php:65
 msgid "Saturday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:120
+#: squirrelmail/functions/date.php:121
 msgid "January"
 msgstr ""
 
-#: squirrelmail/functions/date.php:123
+#: squirrelmail/functions/date.php:124
 msgid "February"
 msgstr ""
 
-#: squirrelmail/functions/date.php:126
+#: squirrelmail/functions/date.php:127
 msgid "March"
 msgstr ""
 
-#: squirrelmail/functions/date.php:129
+#: squirrelmail/functions/date.php:130
 msgid "April"
 msgstr ""
 
-#: squirrelmail/functions/date.php:132
+#: squirrelmail/functions/date.php:133
 msgid "May"
 msgstr ""
 
-#: squirrelmail/functions/date.php:135
+#: squirrelmail/functions/date.php:136
 msgid "June"
 msgstr ""
 
-#: squirrelmail/functions/date.php:138
+#: squirrelmail/functions/date.php:139
 msgid "July"
 msgstr ""
 
-#: squirrelmail/functions/date.php:141
+#: squirrelmail/functions/date.php:142
 msgid "August"
 msgstr ""
 
-#: squirrelmail/functions/date.php:144
+#: squirrelmail/functions/date.php:145
 msgid "September"
 msgstr ""
 
-#: squirrelmail/functions/date.php:147
+#: squirrelmail/functions/date.php:148
 msgid "October"
 msgstr ""
 
-#: squirrelmail/functions/date.php:150
+#: squirrelmail/functions/date.php:151
 msgid "November"
 msgstr ""
 
-#: squirrelmail/functions/date.php:153
+#: squirrelmail/functions/date.php:154
 msgid "December"
 msgstr ""
 
-#: squirrelmail/functions/date.php:180
+#: squirrelmail/functions/date.php:183
 msgid "D, F j, Y g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:182
+#: squirrelmail/functions/date.php:185
 msgid "D, F j, Y G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:204
+#: squirrelmail/functions/date.php:207
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:206
+#: squirrelmail/functions/date.php:209
 msgid "G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:211
+#: squirrelmail/functions/date.php:214
 msgid "D, g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:213
+#: squirrelmail/functions/date.php:216
 msgid "D, G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:217
+#: squirrelmail/functions/date.php:220
 msgid "M j, Y"
 msgstr ""
 
 #: squirrelmail/functions/db_prefs.php:52
 #: squirrelmail/functions/db_prefs.php:59
-#: squirrelmail/functions/db_prefs.php:102
-#: squirrelmail/functions/db_prefs.php:105
-#: squirrelmail/functions/db_prefs.php:251
+#: squirrelmail/functions/db_prefs.php:122
+#: squirrelmail/functions/db_prefs.php:125
+#: squirrelmail/functions/db_prefs.php:340
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:28
-#: squirrelmail/functions/imap_general.php:245
+#: squirrelmail/functions/display_messages.php:73
+#: squirrelmail/functions/imap_general.php:252
 msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:30
+#: squirrelmail/functions/display_messages.php:75
 msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:44
+#: squirrelmail/functions/display_messages.php:96
 #, c-format
-msgid "Welcome to %s's WebMail system"
-msgstr ""
-
-#: squirrelmail/functions/display_messages.php:56
-#, c-format
-msgid "Running SquirrelMail version %s (c) 1999-2001."
+msgid "Click here to return to %s"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:81
-#, c-format
-msgid "Click here to return to %s"
+#: squirrelmail/functions/display_messages.php:179
+msgid "Go to the login page"
 msgstr ""
 
-#: squirrelmail/functions/file_prefs.php:38
+#: squirrelmail/functions/file_prefs.php:39
 #, c-format
 msgid ""
 "Preference file, %s, does not exist. Log out, and log back in to create a "
@@ -1663,236 +1804,271 @@ msgid ""
 msgstr ""
 
 #: squirrelmail/functions/file_prefs.php:162
-#: squirrelmail/functions/file_prefs.php:167
-msgid "Error opening "
+#, c-format
+msgid "Error opening %s"
 msgstr ""
 
-#: squirrelmail/functions/file_prefs.php:163
+#: squirrelmail/functions/file_prefs.php:165
 msgid "Default preference file not found!"
 msgstr ""
 
-#: squirrelmail/functions/file_prefs.php:164
-#: squirrelmail/functions/file_prefs.php:169
-#: squirrelmail/functions/prefs.php:93
+#: squirrelmail/functions/file_prefs.php:166
+#: squirrelmail/functions/file_prefs.php:179
+#: squirrelmail/functions/prefs.php:94
 msgid "Please contact your system administrator and report this error."
 msgstr ""
 
-#: squirrelmail/functions/file_prefs.php:168
+#: squirrelmail/functions/file_prefs.php:177
 msgid "Could not create initial preference file!"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:156
-#: 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
+#: squirrelmail/functions/file_prefs.php:178
+#, c-format
+msgid "%s should be writable by user %s"
+msgstr ""
+
+#: squirrelmail/functions/imap_general.php:132
+msgid ""
+"Please contact your system administrator and report the following error:"
+msgstr ""
+
+#: squirrelmail/functions/imap_general.php:163
+#: squirrelmail/functions/imap_messages.php:366
+#: squirrelmail/functions/imap_messages.php:374
+#: squirrelmail/functions/imap_messages.php:572
+#: squirrelmail/plugins/filters/filters.php:227
 msgid "ERROR : Could not complete request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:158
-#: squirrelmail/plugins/filters/filters.php:91
+#: squirrelmail/functions/imap_general.php:165
+#: squirrelmail/functions/imap_general.php:176
+msgid "Query:"
+msgstr ""
+
+#: squirrelmail/functions/imap_general.php:167
+#: squirrelmail/plugins/filters/filters.php:229
 msgid "Reason Given: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:165
-#: squirrelmail/plugins/filters/filters.php:98
+#: squirrelmail/functions/imap_general.php:174
+#: squirrelmail/plugins/filters/filters.php:236
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:167
-#: squirrelmail/plugins/filters/filters.php:100
+#: squirrelmail/functions/imap_general.php:178
+#: squirrelmail/plugins/filters/filters.php:238
 msgid "Server responded: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:204
+#: squirrelmail/functions/imap_general.php:211
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:220
+#: squirrelmail/functions/imap_general.php:227
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:222
+#: squirrelmail/functions/imap_general.php:229
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:224
+#: squirrelmail/functions/imap_general.php:231
 msgid "Read data:"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:121
-#: squirrelmail/functions/imap_messages.php:148
-#: squirrelmail/functions/imap_messages.php:270
+#: squirrelmail/functions/imap_messages.php:368
+#: squirrelmail/functions/imap_messages.php:574
 msgid "Unknown response from IMAP server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:129
+#: squirrelmail/functions/imap_messages.php:376
 msgid "Unknown message number in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:157
-msgid "Unknown messagenumber in reply from server: "
-msgstr ""
-
-#: 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:905
+#: squirrelmail/functions/imap_messages.php:396
+#: squirrelmail/functions/imap_messages.php:497
+#: squirrelmail/functions/imap_messages.php:775
+#: squirrelmail/functions/imap_messages.php:839
+#: squirrelmail/functions/imap_parse.php:183
+#: squirrelmail/functions/imap_parse.php:205
+#: squirrelmail/functions/mailbox_display.php:1141
 msgid "(no subject)"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:167
+#: squirrelmail/functions/imap_messages.php:397
 msgid "Unknown Sender"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:222
+#: squirrelmail/functions/imap_messages.php:520
 msgid "No To Address"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:498
+#: squirrelmail/functions/imap_messages.php:842
+#: squirrelmail/functions/imap_parse.php:208
 msgid "(unknown sender)"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:83
+#: squirrelmail/functions/imap_search.php:98
 msgid "No Messages Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:187
-#: squirrelmail/functions/imap_search.php:195
+#: squirrelmail/functions/imap_search.php:206
+#: squirrelmail/functions/imap_search.php:214
 msgid "Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:187
-#: squirrelmail/functions/imap_search.php:195
+#: squirrelmail/functions/imap_search.php:206
+#: squirrelmail/functions/imap_search.php:214
 msgid "messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:156
+#: squirrelmail/functions/imap_search.php:221
+msgid "Folder:"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:196
 msgid "A"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:429
+#: squirrelmail/functions/mailbox_display.php:274
+msgid ""
+"Thread sorting is not supported by your IMAP server.<br>Please report this "
+"to the system administrator."
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:296
+msgid ""
+"Server-side sorting is not supported by your IMAP server.<br>Please report "
+"this to the system administrator."
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:590
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:513
+#: squirrelmail/functions/mailbox_display.php:697
 msgid "Move Selected To:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:516
+#: squirrelmail/functions/mailbox_display.php:702
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:535
+#: squirrelmail/functions/mailbox_display.php:727
+#: squirrelmail/plugins/delete_move_next/setup.php:245
+#: squirrelmail/plugins/delete_move_next/setup.php:269
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:539
+#: squirrelmail/functions/mailbox_display.php:734
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:539
+#: squirrelmail/functions/mailbox_display.php:735
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:541
+#: squirrelmail/functions/mailbox_display.php:737
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:542
+#: squirrelmail/functions/mailbox_display.php:738
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:638
+#: squirrelmail/functions/mailbox_display.php:747
+msgid "Unthread View"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:751
+msgid "Thread View"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:874
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:666
+#: squirrelmail/functions/mailbox_display.php:898
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:668
+#: squirrelmail/functions/mailbox_display.php:900
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:685
+#: squirrelmail/functions/mailbox_display.php:917
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:687
+#: squirrelmail/functions/mailbox_display.php:920
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:872
+#: squirrelmail/functions/mailbox_display.php:1104
 msgid "Paginate"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:879
+#: squirrelmail/functions/mailbox_display.php:1111
 msgid "Show All"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:368
+#: squirrelmail/functions/mime.php:449
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:440
+#: squirrelmail/functions/mime.php:522
 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:442
+#: squirrelmail/functions/mime.php:524
 msgid "Submit message"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:444
+#: squirrelmail/functions/mime.php:526
 msgid "Command:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:445
+#: squirrelmail/functions/mime.php:527
 msgid "Response:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:446
-#: squirrelmail/plugins/calendar/event_create.php:118
-#: squirrelmail/plugins/calendar/event_delete.php:38
-#: squirrelmail/plugins/calendar/event_edit.php:101
-#: squirrelmail/plugins/calendar/event_edit.php:114
+#: squirrelmail/functions/mime.php:528
+#: squirrelmail/plugins/calendar/event_create.php:137
+#: squirrelmail/plugins/calendar/event_delete.php:47
+#: squirrelmail/plugins/calendar/event_edit.php:119
+#: squirrelmail/plugins/calendar/event_edit.php:143
 msgid "Message:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:447
+#: squirrelmail/functions/mime.php:529
 msgid "FETCH line:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:665
-msgid "Attachments"
+#: squirrelmail/functions/mime.php:866
+msgid "Hide Unsafe Images"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:704
-msgid "download"
+#: squirrelmail/functions/mime.php:868
+msgid "View Unsafe Images"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:999
-#: squirrelmail/plugins/calendar/event_create.php:53
-#: squirrelmail/plugins/calendar/event_create.php:116
-#: squirrelmail/plugins/calendar/event_delete.php:36
-#: squirrelmail/plugins/calendar/event_edit.php:71
-#: squirrelmail/plugins/calendar/event_edit.php:99
-#: squirrelmail/plugins/calendar/event_edit.php:112
-msgid "Title:"
+#: squirrelmail/functions/mime.php:903
+msgid "Attachments"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:939 squirrelmail/functions/mime.php:1017
+msgid "download"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:1169
+#: squirrelmail/functions/mime.php:1746 squirrelmail/functions/mime.php:2064
 msgid "sec_remove_eng.png"
 msgstr ""
 
@@ -1902,236 +2078,342 @@ msgid "Option Type '%s' Not Found"
 msgstr ""
 
 #: squirrelmail/functions/options.php:263
+#: squirrelmail/plugins/calendar/event_delete.php:62
+#: squirrelmail/plugins/calendar/event_edit.php:165
 #: squirrelmail/plugins/administrator/options.php:357
-#: squirrelmail/plugins/calendar/event_delete.php:51
-#: squirrelmail/plugins/calendar/event_edit.php:134
 msgid "Yes"
 msgstr ""
 
 #: squirrelmail/functions/options.php:268
+#: squirrelmail/plugins/calendar/event_delete.php:70
+#: squirrelmail/plugins/calendar/event_edit.php:173
 #: squirrelmail/plugins/administrator/options.php:358
-#: squirrelmail/plugins/calendar/event_delete.php:58
-#: squirrelmail/plugins/calendar/event_edit.php:141
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:110
+#: squirrelmail/functions/page_header.php:199
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:122
+#: squirrelmail/functions/page_header.php:212
+#: squirrelmail/functions/page_header.php:215
+#: squirrelmail/functions/page_header.php:258
+#: squirrelmail/functions/page_header.php:285
 msgid "Compose"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:91
+#: squirrelmail/functions/prefs.php:92
 #, c-format
 msgid "Error creating directory %s."
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:92
+#: squirrelmail/functions/prefs.php:93
 msgid "Could not create hashed directory structure!"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:360
+#: squirrelmail/plugins/filters/filters.php:554
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "
 "is a pretty reliable list to scan spam from."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:368
+#: squirrelmail/plugins/filters/filters.php:562
 msgid ""
 "COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to "
 "be relayed through their system will be banned with this.  Another good one "
 "to use."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:376
+#: squirrelmail/plugins/filters/filters.php:570
 msgid ""
 "COMMERCIAL - Dial-up users are often filtered out since they should use "
 "their ISP's mail servers to send mail.  Spammers typically get a dial-up "
 "account and send spam directly from there."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:384
+#: squirrelmail/plugins/filters/filters.php:578
 msgid "COMMERCIAL - RBL+ Blackhole entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:392
+#: squirrelmail/plugins/filters/filters.php:586
 msgid "COMMERCIAL - RBL+ OpenRelay entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:400
+#: squirrelmail/plugins/filters/filters.php:594
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:408
+#: squirrelmail/plugins/filters/filters.php:603
 msgid ""
 "FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to "
 "include servers used by abuse@uunet.net auto-replies too."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:416
+#: squirrelmail/plugins/filters/filters.php:611
 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:424
+#: squirrelmail/plugins/filters/filters.php:619
 msgid ""
 "FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and "
 "have been manually added after multiple nominations. Use with caution. Seems "
 "to catch abuse auto-replies from some ISPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:432
+#: squirrelmail/plugins/filters/filters.php:627
 msgid ""
 "FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for "
 "other mail servers that are not secure."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:440
+#: squirrelmail/plugins/filters/filters.php:635
 msgid ""
 "FREE - Osirusoft Spamware Developers - It is believed that these are IP "
 "ranges of companies that are known to produce spam software. Seems to catch "
 "abuse auto-replies from some ISPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:448
+#: squirrelmail/plugins/filters/filters.php:643
 msgid ""
 "FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
 "users in without confirmation."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:456
+#: squirrelmail/plugins/filters/filters.php:651
 msgid ""
 "FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail."
 "cgi scripts. (planned)."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:464
+#: squirrelmail/plugins/filters/filters.php:659
 msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:472
+#: squirrelmail/plugins/filters/filters.php:667
 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:480
-msgid "FREE - Another ORBS replacement (just the INPUTS database used here)."
-msgstr ""
-
-#: squirrelmail/plugins/filters/filters.php:488
-msgid "FREE - Another ORBS replacement (just the OUTPUTS database used here)."
-msgstr ""
-
-#: squirrelmail/plugins/filters/filters.php:496
+#: squirrelmail/plugins/filters/filters.php:675
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:504
+#: squirrelmail/plugins/filters/filters.php:683
 msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:512
+#: squirrelmail/plugins/filters/filters.php:691
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:520
+#: squirrelmail/plugins/filters/filters.php:699
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:528
+#: squirrelmail/plugins/filters/filters.php:707
 msgid "FREE - Five-Ten-sg.com - Single Stage servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:536
+#: squirrelmail/plugins/filters/filters.php:715
 msgid "FREE - Five-Ten-sg.com - SPAM Support servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:544
+#: squirrelmail/plugins/filters/filters.php:723
 msgid "FREE - Five-Ten-sg.com - Web Form IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:552
+#: squirrelmail/plugins/filters/filters.php:731
 msgid ""
 "FREE - Dorkslayers appears to include only really bad open relays outside "
 "the US to avoid being sued. Interestingly enough, their website recommends "
 "you NOT use their service."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:560
-msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
+#: squirrelmail/plugins/filters/filters.php:739
+msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:747
+#, c-format
+msgid ""
+"FREE, for now - SPAMCOP - An interesting solution that lists servers that "
+"have a very high spam to legit email ratio (85% or more)."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:755
+msgid "FREE - dev.null.dk - I don't have any detailed info on this list."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:763
+msgid "FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:771
+msgid "FREE - 2mbit.com Open Relays - Another list of Open Relays."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:779
+msgid "FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:787
+msgid "FREE - 2mbit.com SPAM ISPs - List of SPAM-friendly ISPs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:795
+msgid ""
+"FREE - Leadmon DUL - Another list of Dial-up or otherwise dynamically "
+"assigned IPs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:803
+msgid ""
+"FREE - Leadmon SPAM Source - List of IPs Leadmon.net has received SPAM "
+"directly from."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:811
+msgid ""
+"FREE - Leadmon Bulk Mailers - Bulk mailers that do not require confirmed opt-"
+"in or that have allowed known spammers to become clients and abuse their "
+"services."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:819
+msgid ""
+"FREE - Leadmon Open Relays - Single Stage Open Relays that are not listed on "
+"other active RBLs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:827
+msgid ""
+"FREE - Leadmon Multi-stage - Multi-Stage Open Relays that are not listed on "
+"other active RBLs and that have sent SPAM to Leadmon.net."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:835
+msgid ""
+"FREE - Leadmon SpamBlock - Sites on this listing have sent Leadmon.net "
+"direct SPAM from IPs in netblocks where the entire block has no DNS "
+"mappings. It's a list of BLOCKS of IPs being used by people who have SPAMmed "
+"Leadmon.net."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:843
+msgid ""
+"FREE, for now - Not Just Another Blacklist - Both Open Relays and Direct "
+"SPAM Sources."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:851
+msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:859
+msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:867
+msgid "FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:875
+msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:60
+msgid "Saved Scan type"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:71
+msgid "Message Filtering"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:80
+#: squirrelmail/plugins/filters/spamoptions.php:115
+msgid "What to Scan:"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:87
+#: squirrelmail/plugins/filters/spamoptions.php:122
+msgid "All messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:568
-#, c-format
-msgid ""
-"FREE, for now - SPAMCOP - An interesting solution that lists servers that "
-"have a very high spam to legit email ratio (85% or more)."
+#: squirrelmail/plugins/filters/options.php:92
+#: squirrelmail/plugins/filters/spamoptions.php:127
+msgid "Only unread messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:62
-msgid "Message Filtering"
+#: squirrelmail/plugins/filters/options.php:95
+#: squirrelmail/plugins/filters/spamoptions.php:168
+msgid "Save"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:78
+#: squirrelmail/plugins/filters/options.php:115
 msgid "Match:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:104
+#: squirrelmail/plugins/filters/options.php:137
+msgid "Header"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:143
 msgid "Contains:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:116
+#: squirrelmail/plugins/filters/options.php:153
+#: squirrelmail/plugins/delete_move_next/setup.php:241
+#: squirrelmail/plugins/delete_move_next/setup.php:265
 msgid "Move to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:158
+#: squirrelmail/plugins/filters/options.php:202
 msgid "Down"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:164
+#: squirrelmail/plugins/filters/options.php:208
 msgid "Up"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:167
+#: squirrelmail/plugins/filters/options.php:213
 #, c-format
 msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:90
+#: squirrelmail/plugins/filters/setup.php:128
 msgid "Message Filters"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:92
+#: squirrelmail/plugins/filters/setup.php:130
 msgid ""
 "Filtering enables messages with different criteria to be automatically "
 "filtered into different folders for easier organization."
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:98
+#: squirrelmail/plugins/filters/setup.php:136
 msgid "SPAM Filters"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:100
+#: squirrelmail/plugins/filters/setup.php:138
 msgid ""
 "SPAM filters allow you to select from various DNS based blacklists to detect "
 "junk email in your INBOX and move it to another folder (like Trash)."
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:53
+#: squirrelmail/plugins/filters/spamoptions.php:59
 msgid "Spam Filtering"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:57
+#: squirrelmail/plugins/filters/spamoptions.php:66
 msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:77
+#: squirrelmail/plugins/filters/spamoptions.php:90
 msgid "Move spam to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:94
+#: squirrelmail/plugins/filters/spamoptions.php:111
 msgid ""
 "Moving spam directly to the trash may not be a good idea at first, since "
 "messages from friends and mailing lists might accidentally be marked as "
@@ -2140,19 +2422,7 @@ msgid ""
 "around."
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:97
-msgid "What to Scan:"
-msgstr ""
-
-#: squirrelmail/plugins/filters/spamoptions.php:102
-msgid "All messages"
-msgstr ""
-
-#: squirrelmail/plugins/filters/spamoptions.php:106
-msgid "Only unread messages"
-msgstr ""
-
-#: squirrelmail/plugins/filters/spamoptions.php:112
+#: squirrelmail/plugins/filters/spamoptions.php:134
 msgid ""
 "The more messages you scan, the longer it takes.  I would suggest that you "
 "scan only new messages.  If you make a change to your filters, I would set "
@@ -2161,37 +2431,33 @@ msgid ""
 "you'll scan even the spam you read with the new filters."
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:138
-msgid "Save"
-msgstr ""
-
-#: squirrelmail/plugins/filters/spamoptions.php:149
+#: squirrelmail/plugins/filters/spamoptions.php:181
 #, c-format
 msgid "Spam is sent to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:149
+#: squirrelmail/plugins/filters/spamoptions.php:181
 msgid "[<i>not set yet</i>]"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:151
+#: squirrelmail/plugins/filters/spamoptions.php:183
 #, c-format
 msgid "Spam scan is limited to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:151
+#: squirrelmail/plugins/filters/spamoptions.php:183
 msgid "New Messages Only"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:151
+#: squirrelmail/plugins/filters/spamoptions.php:183
 msgid "All Messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:161
+#: squirrelmail/plugins/filters/spamoptions.php:194
 msgid "ON"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:163
+#: squirrelmail/plugins/filters/spamoptions.php:196
 msgid "OFF"
 msgstr ""
 
@@ -2209,15 +2475,15 @@ msgstr ""
 msgid "Check Spelling"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:54
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:58
 msgid "Back to &quot;SpellChecker Options&quot; page"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:356
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:361
 msgid "ATTENTION:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:357
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:362
 msgid ""
 "SquirrelSpell was unable to decrypt your personal dictionary. This is most "
 "likely due to the fact that you have changed your mailbox password. In order "
@@ -2229,145 +2495,171 @@ msgid ""
 "it, the encrypted data is no longer accessible."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:363
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:369
 msgid "Delete my dictionary and start a new one"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:364
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:370
 msgid "Decrypt my dictionary with my old password:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:368
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
 msgid "Proceed"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:374
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:383
 msgid "You must make a choice"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:375
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:384
 msgid ""
 "You can either delete your dictionary or type in the old password. Not both."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
 msgid "This will delete your personal dictionary file. Proceed?"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:388
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:394
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:397
 msgid "Error Decrypting Dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:506
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:515
 msgid "Cute."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:196
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:115
+#, c-format
+msgid "I tried to execute '%s', but it returned:"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:121
+msgid "SquirrelSpell is misconfigured."
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:211
 msgid "SquirrelSpell Results"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:256
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:271
 msgid "Spellcheck completed. Commit changes?"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:258
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:273
 msgid "No changes were made."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:260
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:275
 msgid "Now saving your personal dictionary... Please wait."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:281
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:296
 #, c-format
 msgid "Found %s errors"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:302
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:317
 msgid "Line with an error:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:312
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:327
 msgid "Error:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:321
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:336
 msgid "Suggestions:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:328
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:343
 msgid "Suggestions"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:336
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:351
 msgid "Change to:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:345
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:360
 msgid "Occurs times:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:362
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:377
 msgid "Change this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:363
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:378
 msgid "Change"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:365
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:380
 msgid "Change ALL occurances of this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:366
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:381
 msgid "Change All"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:368
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:383
 msgid "Ignore this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:369
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:384
 msgid "Ignore"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:371
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:386
 msgid "Ignore ALL occurances this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:372
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:387
 msgid "Ignore All"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:374
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:389
 msgid "Add this word to your personal dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:375
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:390
 msgid "Add to Dic"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:388
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:403
 msgid "Close and Commit"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:390
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:405
 msgid "The spellcheck is not finished. Really close and commit changes?"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:393
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:408
 msgid "Close and Cancel"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:395
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:410
 msgid "The spellcheck is not finished. Really close and discard changes?"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:414
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:429
 msgid "No errors found"
 msgstr ""
 
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
+msgid ""
+"Your personal dictionary has been <strong>encrypted</strong> and is now "
+"stored in an <strong>encrypted format</strong>."
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
+msgid ""
+"Your personal dictionary has been <strong>decrypted</strong> and is now "
+"stored as <strong>clear text</strong>."
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
+msgid "Personal Dictionary Crypto Settings"
+msgstr ""
+
 #: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:33
 msgid "Your personal dictionary was erased."
 msgstr ""
@@ -2409,23 +2701,6 @@ msgstr ""
 msgid "Dictionary re-encrypted"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
-msgid ""
-"Your personal dictionary has been <strong>encrypted</strong> and is now "
-"stored in an <strong>encrypted format</strong>."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
-msgid ""
-"Your personal dictionary has been <strong>decrypted</strong> and is now "
-"stored as <strong>clear text</strong>."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
-msgid "Personal Dictionary Crypto Settings"
-msgstr ""
-
 #: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:28
 #: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:77
 msgid "Personal Dictionary"
@@ -2542,8 +2817,8 @@ msgid ""
 "message:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/calendar.php:113
 #: squirrelmail/plugins/squirrelspell/modules/init.mod:53
+#: squirrelmail/plugins/calendar/calendar.php:125
 msgid "Go"
 msgstr ""
 
@@ -2962,30 +3237,42 @@ msgstr ""
 msgid "Latin"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:34
+#: squirrelmail/plugins/newmail/newmail.php:20
+msgid "New Mail"
+msgstr ""
+
+#: squirrelmail/plugins/newmail/newmail.php:26
+msgid "SquirrelMail Notice:"
+msgstr ""
+
+#: squirrelmail/plugins/newmail/newmail.php:31
+msgid "You have new mail!"
+msgstr ""
+
+#: squirrelmail/plugins/newmail/newmail_opt.php:38
 msgid "New Mail Notification"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:37
+#: squirrelmail/plugins/newmail/newmail_opt.php:44
 msgid ""
 "Select <b>Enable Media Playing</b> to turn on playing a media file when "
 "unseen mail is in your folders. When enabled, you can specify the media file "
 "to play in the provided file box."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:39
+#: squirrelmail/plugins/newmail/newmail_opt.php:48
 msgid ""
 "The <b>Check all boxes, not just INBOX</b> option will check ALL of your "
 "folders for unseen mail, not just the inbox for notification."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:41
+#: squirrelmail/plugins/newmail/newmail_opt.php:51
 msgid ""
 "Selecting the <b>Show popup</b> option will enable the showing of a popup "
 "window when unseen mail is in your folders (requires JavaScript)."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:43
+#: squirrelmail/plugins/newmail/newmail_opt.php:54
 msgid ""
 "Use the <b>Check RECENT</b> to only check for messages that are recent. "
 "Recent messages are those that have just recently showed up and have not "
@@ -2993,7 +3280,7 @@ msgid ""
 "by sounds or popups for unseen mail."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:45
+#: squirrelmail/plugins/newmail/newmail_opt.php:57
 msgid ""
 "Selecting the <b>Change title</b> option will change the title in some "
 "browsers to let you know when you have new mail (requires JavaScript, and "
@@ -3002,7 +3289,7 @@ msgid ""
 "enabled."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:47
+#: squirrelmail/plugins/newmail/newmail_opt.php:61
 msgid ""
 "Select from the list of <b>server files</b> the media file to play when new "
 "mail arrives.  Selecting <b>local media</b> will play the file specified in "
@@ -3010,63 +3297,51 @@ msgid ""
 "is specified, the system will use a default from the server."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:57
+#: squirrelmail/plugins/newmail/newmail_opt.php:74
 msgid "Enable Media Playing"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:65
+#: squirrelmail/plugins/newmail/newmail_opt.php:84
 msgid "Check all boxes, not just INBOX"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:73
+#: squirrelmail/plugins/newmail/newmail_opt.php:93
 msgid "Count only messages that are RECENT"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:81
+#: squirrelmail/plugins/newmail/newmail_opt.php:102
 msgid "Change title on supported browsers."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:81
-#: squirrelmail/plugins/newmail/newmail_opt.php:89
+#: squirrelmail/plugins/newmail/newmail_opt.php:102
+#: squirrelmail/plugins/newmail/newmail_opt.php:111
 msgid "requires JavaScript to work"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:89
+#: squirrelmail/plugins/newmail/newmail_opt.php:111
 msgid "Show popup window on new mail"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:92
+#: squirrelmail/plugins/newmail/newmail_opt.php:115
 msgid "Select server file:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:94
+#: squirrelmail/plugins/newmail/newmail_opt.php:118
 msgid "(local media)"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:111
+#: squirrelmail/plugins/newmail/newmail_opt.php:135
 msgid "Try"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:119
+#: squirrelmail/plugins/newmail/newmail_opt.php:143
 msgid "Local Media File:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:125
+#: squirrelmail/plugins/newmail/newmail_opt.php:147
 msgid "Current File:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail.php:20
-msgid "New Mail"
-msgstr ""
-
-#: squirrelmail/plugins/newmail/newmail.php:27
-msgid "SquirrelMail Notice:"
-msgstr ""
-
-#: squirrelmail/plugins/newmail/newmail.php:31
-msgid "You have new mail!"
-msgstr ""
-
 #: squirrelmail/plugins/newmail/setup.php:78
 msgid "NewMail Options"
 msgstr ""
@@ -3091,11 +3366,11 @@ msgstr ""
 msgid "%s New Message"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/testsound.php:24
+#: squirrelmail/plugins/newmail/testsound.php:25
 msgid "Test Sound"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/testsound.php:30
+#: squirrelmail/plugins/newmail/testsound.php:33
 msgid "Loading the sound..."
 msgstr ""
 
@@ -3279,123 +3554,142 @@ msgstr ""
 msgid "Command failed "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:54
+#: squirrelmail/plugins/mail_fetch/fetch.php:58
 msgid "Remote POP server Fetching Mail"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:63
+#: squirrelmail/plugins/mail_fetch/fetch.php:68
 msgid "Select Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:65
-msgid "All"
-msgstr ""
-
-#: squirrelmail/plugins/mail_fetch/fetch.php:78
+#: squirrelmail/plugins/mail_fetch/fetch.php:85
 msgid "Password for"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:85
+#: squirrelmail/plugins/mail_fetch/fetch.php:95
 msgid "Fetch Mail"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:117
+#: squirrelmail/plugins/mail_fetch/fetch.php:130
 msgid "Fetching from "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:124
-#: squirrelmail/plugins/mail_fetch/fetch.php:184
+#: squirrelmail/plugins/mail_fetch/fetch.php:140
+#: squirrelmail/plugins/mail_fetch/fetch.php:200
+#: squirrelmail/plugins/mail_fetch/fetch.php:206
 msgid "Oops, "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:128
+#: squirrelmail/plugins/mail_fetch/fetch.php:144
 msgid "Opening IMAP server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:131
+#: squirrelmail/plugins/mail_fetch/fetch.php:147
 msgid "Opening POP server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:134
+#: squirrelmail/plugins/mail_fetch/fetch.php:150
+#: squirrelmail/plugins/mail_fetch/fetch.php:214
 #: squirrelmail/plugins/mail_fetch/setup.php:123
 msgid "Login Failed:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:151
+#: squirrelmail/plugins/mail_fetch/fetch.php:167
 msgid "Login OK: No new messages"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:156
+#: squirrelmail/plugins/mail_fetch/fetch.php:172
 msgid "Login OK: Inbox EMPTY"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:161
+#: squirrelmail/plugins/mail_fetch/fetch.php:177
 msgid "Login OK: Inbox contains ["
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:161
+#: squirrelmail/plugins/mail_fetch/fetch.php:177
 msgid "] messages"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:164
+#: squirrelmail/plugins/mail_fetch/fetch.php:180
 msgid "Fetching UIDL..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:169
+#: squirrelmail/plugins/mail_fetch/fetch.php:185
 #: squirrelmail/plugins/mail_fetch/setup.php:154
 msgid "Server does not support UIDL."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:172
+#: squirrelmail/plugins/mail_fetch/fetch.php:188
 msgid "Leaving Mail on Server..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:174
+#: squirrelmail/plugins/mail_fetch/fetch.php:190
 msgid "Deleting messages from server..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:178
+#: squirrelmail/plugins/mail_fetch/fetch.php:194
 msgid "Fetching message "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:201
-msgid "Message appended to mailbox"
+#: squirrelmail/plugins/mail_fetch/fetch.php:202
+msgid "Server error...Disconnect"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:205
-msgid "Message "
+#: squirrelmail/plugins/mail_fetch/fetch.php:204
+msgid "Re-connect from dead connectoin"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:205
-msgid " deleted from Remote Server!"
+#: squirrelmail/plugins/mail_fetch/fetch.php:207
+#: squirrelmail/plugins/mail_fetch/fetch.php:215
+#: squirrelmail/plugins/mail_fetch/fetch.php:245
+#: squirrelmail/plugins/mail_fetch/fetch.php:268
+#: squirrelmail/plugins/mail_fetch/fetch.php:279
+msgid "Saving UIDL"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:207
-msgid "Delete failed:"
+#: squirrelmail/plugins/mail_fetch/fetch.php:220
+msgid "Re-fetching message "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:212
+#: squirrelmail/plugins/mail_fetch/fetch.php:239
+#: squirrelmail/plugins/mail_fetch/fetch.php:261
 #: squirrelmail/plugins/mail_fetch/setup.php:185
 msgid "Error Appending Message!"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:216
+#: squirrelmail/plugins/mail_fetch/fetch.php:240
+#: squirrelmail/plugins/mail_fetch/fetch.php:262
+#: squirrelmail/plugins/mail_fetch/fetch.php:274
 msgid "Closing POP"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:218
+#: squirrelmail/plugins/mail_fetch/fetch.php:242
+#: squirrelmail/plugins/mail_fetch/fetch.php:264
+#: squirrelmail/plugins/mail_fetch/fetch.php:276
 msgid "Logging out from IMAP"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:221
-msgid "Saving UIDL"
+#: squirrelmail/plugins/mail_fetch/fetch.php:249
+msgid "Message appended to mailbox"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:254
+msgid "Message "
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:254
+msgid " deleted from Remote Server!"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:256
+msgid "Delete failed:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:105
+#: squirrelmail/plugins/mail_fetch/options.php:108
 msgid "Remote POP server settings"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:107
+#: squirrelmail/plugins/mail_fetch/options.php:115
 msgid ""
 "You should be aware that the encryption used to store your password is not "
 "perfectly secure.  However, if you are using pop, there is inherently no "
@@ -3403,103 +3697,103 @@ msgid ""
 "server can be undone by a hacker reading the source to this file."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:109
+#: squirrelmail/plugins/mail_fetch/options.php:120
 msgid "If you leave password empty, it will be required when you fetch mail."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:113
+#: squirrelmail/plugins/mail_fetch/options.php:127
 msgid "Encrypt passwords (informative only)"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:119
-#: squirrelmail/plugins/mail_fetch/options.php:146
+#: squirrelmail/plugins/mail_fetch/options.php:136
+#: squirrelmail/plugins/mail_fetch/options.php:192
 msgid "Add Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:123
-#: squirrelmail/plugins/mail_fetch/options.php:196
+#: squirrelmail/plugins/mail_fetch/options.php:145
+#: squirrelmail/plugins/mail_fetch/options.php:262
 msgid "Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:124
-#: squirrelmail/plugins/mail_fetch/options.php:198
+#: squirrelmail/plugins/mail_fetch/options.php:149
+#: squirrelmail/plugins/mail_fetch/options.php:266
 msgid "Alias:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:125
-#: squirrelmail/plugins/mail_fetch/options.php:200
+#: squirrelmail/plugins/mail_fetch/options.php:153
+#: squirrelmail/plugins/mail_fetch/options.php:270
 msgid "Username:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:127
-#: squirrelmail/plugins/mail_fetch/options.php:204
+#: squirrelmail/plugins/mail_fetch/options.php:161
+#: squirrelmail/plugins/mail_fetch/options.php:278
 msgid "Store in Folder:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:143
-#: squirrelmail/plugins/mail_fetch/options.php:224
+#: squirrelmail/plugins/mail_fetch/options.php:180
+#: squirrelmail/plugins/mail_fetch/options.php:303
 msgid "Leave Mail on Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:144
-#: squirrelmail/plugins/mail_fetch/options.php:226
+#: squirrelmail/plugins/mail_fetch/options.php:184
+#: squirrelmail/plugins/mail_fetch/options.php:310
 msgid "Check mail during login"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:145
-#: squirrelmail/plugins/mail_fetch/options.php:228
+#: squirrelmail/plugins/mail_fetch/options.php:188
+#: squirrelmail/plugins/mail_fetch/options.php:317
 msgid "Check mail during folder refresh"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:152
-#: squirrelmail/plugins/mail_fetch/options.php:229
+#: squirrelmail/plugins/mail_fetch/options.php:201
+#: squirrelmail/plugins/mail_fetch/options.php:322
 msgid "Modify Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:156
+#: squirrelmail/plugins/mail_fetch/options.php:207
 msgid "Server Name:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:162
-#: squirrelmail/plugins/mail_fetch/options.php:185
+#: squirrelmail/plugins/mail_fetch/options.php:213
+#: squirrelmail/plugins/mail_fetch/options.php:244
 msgid "Modify"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:166
+#: squirrelmail/plugins/mail_fetch/options.php:217
 msgid "No-one server in use. Try to add."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:172
-#: squirrelmail/plugins/mail_fetch/options.php:187
-#: squirrelmail/plugins/mail_fetch/options.php:234
+#: squirrelmail/plugins/mail_fetch/options.php:224
+#: squirrelmail/plugins/mail_fetch/options.php:247
+#: squirrelmail/plugins/mail_fetch/options.php:332
 msgid "Fetching Servers"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:176
+#: squirrelmail/plugins/mail_fetch/options.php:230
 msgid "Confirm Deletion of a Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:180
+#: squirrelmail/plugins/mail_fetch/options.php:236
 msgid "Selected Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:181
+#: squirrelmail/plugins/mail_fetch/options.php:237
 msgid "Confirm delete of selected server?"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:182
+#: squirrelmail/plugins/mail_fetch/options.php:238
 msgid "Confirm Delete"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:191
+#: squirrelmail/plugins/mail_fetch/options.php:253
 msgid "Mofify a Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:237
+#: squirrelmail/plugins/mail_fetch/options.php:338
 msgid "Undefined Function"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:239
+#: squirrelmail/plugins/mail_fetch/options.php:339
 msgid "Hey! Wath do You are looking for?"
 msgstr ""
 
@@ -3558,141 +3852,151 @@ msgstr ""
 msgid "Base Sent Folder"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/calendar.php:75
+#: squirrelmail/plugins/calendar/calendar.php:86
 msgid "TODAY"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/day.php:79
+#: squirrelmail/plugins/calendar/day.php:89
 msgid "ADD"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/day.php:93
+#: squirrelmail/plugins/calendar/day.php:108
 msgid "EDIT"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/day.php:95
+#: squirrelmail/plugins/calendar/day.php:110
 msgid "DEL"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:31
+#: squirrelmail/plugins/calendar/event_create.php:33
 msgid "Start time:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:41
-#: squirrelmail/plugins/calendar/event_edit.php:59
+#: squirrelmail/plugins/calendar/event_create.php:44
+#: squirrelmail/plugins/calendar/event_edit.php:63
 msgid "Length:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:47
-#: squirrelmail/plugins/calendar/event_edit.php:65
-#: squirrelmail/plugins/calendar/event_edit.php:97
-#: squirrelmail/plugins/calendar/event_edit.php:110
+#: squirrelmail/plugins/calendar/event_create.php:51
+#: squirrelmail/plugins/calendar/event_edit.php:70
+#: squirrelmail/plugins/calendar/event_edit.php:111
+#: squirrelmail/plugins/calendar/event_edit.php:135
 msgid "Priority:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:61
+#: squirrelmail/plugins/calendar/event_create.php:58
+#: squirrelmail/plugins/calendar/event_create.php:133
+#: squirrelmail/plugins/calendar/event_delete.php:43
+#: squirrelmail/plugins/calendar/event_edit.php:77
+#: squirrelmail/plugins/calendar/event_edit.php:115
+#: squirrelmail/plugins/calendar/event_edit.php:139
+msgid "Title:"
+msgstr ""
+
+#: squirrelmail/plugins/calendar/event_create.php:70
 msgid "Set Event"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:111
+#: squirrelmail/plugins/calendar/event_create.php:122
 msgid "Event Has been added!"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:114
-#: squirrelmail/plugins/calendar/event_delete.php:34
-#: squirrelmail/plugins/calendar/event_edit.php:49
-#: squirrelmail/plugins/calendar/event_edit.php:95
+#: squirrelmail/plugins/calendar/event_create.php:129
+#: squirrelmail/plugins/calendar/event_delete.php:39
+#: squirrelmail/plugins/calendar/event_edit.php:52
+#: squirrelmail/plugins/calendar/event_edit.php:107
+#: squirrelmail/plugins/calendar/event_edit.php:131
 msgid "Time:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:121
-#: squirrelmail/plugins/calendar/event_delete.php:91
-#: squirrelmail/plugins/calendar/event_edit.php:189
-#: squirrelmail/plugins/calendar/functions.php:23
+#: squirrelmail/plugins/calendar/event_create.php:142
+#: squirrelmail/plugins/calendar/event_delete.php:104
+#: squirrelmail/plugins/calendar/event_edit.php:227
+#: squirrelmail/plugins/calendar/functions.php:24
 msgid "Day View"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_delete.php:31
+#: squirrelmail/plugins/calendar/event_delete.php:32
 msgid "Do you really want to delete this event?"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_delete.php:89
+#: squirrelmail/plugins/calendar/event_delete.php:102
 msgid "Event deleted!"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_delete.php:97
+#: squirrelmail/plugins/calendar/event_delete.php:110
 msgid "Nothing to delete!"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_edit.php:79
+#: squirrelmail/plugins/calendar/event_edit.php:87
 msgid "Update Event"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_edit.php:91
+#: squirrelmail/plugins/calendar/event_edit.php:100
 msgid "Do you really want to change this event from:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_edit.php:104
+#: squirrelmail/plugins/calendar/event_edit.php:123
 msgid "to:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_edit.php:187
+#: squirrelmail/plugins/calendar/event_edit.php:222
 msgid "Event updated!"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:21
+#: squirrelmail/plugins/calendar/functions.php:22
 msgid "Month View"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:34
+#: squirrelmail/plugins/calendar/functions.php:35
 msgid "0 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:35
+#: squirrelmail/plugins/calendar/functions.php:36
 msgid "15 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:36
+#: squirrelmail/plugins/calendar/functions.php:37
 msgid "35 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:37
+#: squirrelmail/plugins/calendar/functions.php:38
 msgid "45 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:38
+#: squirrelmail/plugins/calendar/functions.php:39
 msgid "1 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:39
+#: squirrelmail/plugins/calendar/functions.php:40
 msgid "1.5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:40
+#: squirrelmail/plugins/calendar/functions.php:41
 msgid "2 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:41
+#: squirrelmail/plugins/calendar/functions.php:42
 msgid "2.5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:42
+#: squirrelmail/plugins/calendar/functions.php:43
 msgid "3 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:43
+#: squirrelmail/plugins/calendar/functions.php:44
 msgid "3.5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:44
+#: squirrelmail/plugins/calendar/functions.php:45
 msgid "4 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:45
+#: squirrelmail/plugins/calendar/functions.php:46
 msgid "5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:46
+#: squirrelmail/plugins/calendar/functions.php:47
 msgid "6 hr."
 msgstr ""
 
@@ -3700,80 +4004,80 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:19
+#: squirrelmail/plugins/listcommands/mailout.php:22
 msgid "Mailinglist"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:25
+#: squirrelmail/plugins/listcommands/mailout.php:29
 #, c-format
 msgid ""
 "This will send a message to %s requesting help for this list. You will "
 "receive an emailed response at the address below."
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:28
+#: squirrelmail/plugins/listcommands/mailout.php:32
 #, c-format
 msgid ""
 "This will send a message to %s requesting that you will be subscribed to "
 "this list. You will be subscribed with the address below."
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:31
+#: squirrelmail/plugins/listcommands/mailout.php:35
 #, c-format
 msgid ""
 "This will send a message to %s requesting that you will be unsubscribed from "
 "this list. It will try to unsubscribe the adress below."
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:79
+#: squirrelmail/plugins/listcommands/mailout.php:83
 msgid "Send Mail"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:31
+#: squirrelmail/plugins/listcommands/setup.php:33
 msgid "Post to List"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:32
+#: squirrelmail/plugins/listcommands/setup.php:34
 msgid "Reply to List"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:35
+#: squirrelmail/plugins/listcommands/setup.php:37
 msgid "List Archives"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:36
+#: squirrelmail/plugins/listcommands/setup.php:38
 msgid "Contact Listowner"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:105
+#: squirrelmail/plugins/listcommands/setup.php:115
 msgid "Mailing List:"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:159
-#: squirrelmail/plugins/delete_move_next/setup.php:162
+#: squirrelmail/plugins/delete_move_next/setup.php:177
+#: squirrelmail/plugins/delete_move_next/setup.php:180
 msgid "Delete & Prev"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:165
-#: squirrelmail/plugins/delete_move_next/setup.php:167
+#: squirrelmail/plugins/delete_move_next/setup.php:183
+#: squirrelmail/plugins/delete_move_next/setup.php:185
 msgid "Delete & Next"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:290
-msgid "delete_move_next:"
+#: squirrelmail/plugins/delete_move_next/setup.php:306
+msgid "Delete/Move/Next Buttons:"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:296
-msgid "display at top"
+#: squirrelmail/plugins/delete_move_next/setup.php:313
+msgid "Display at top"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:302
-#: squirrelmail/plugins/delete_move_next/setup.php:314
+#: squirrelmail/plugins/delete_move_next/setup.php:319
+#: squirrelmail/plugins/delete_move_next/setup.php:331
 msgid "with move option"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:308
-msgid "display at bottom"
+#: squirrelmail/plugins/delete_move_next/setup.php:325
+msgid "Display at bottom"
 msgstr ""
 
 #: squirrelmail/plugins/administrator/defines.php:48
@@ -3801,235 +4105,271 @@ msgid "Organization Logo"
 msgstr ""
 
 #: squirrelmail/plugins/administrator/defines.php:66
+msgid "Organization Logo Width"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:70
+msgid "Organization Logo Height"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:74
 msgid "Organization Title"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:69
+#: squirrelmail/plugins/administrator/defines.php:77
 msgid "Signout Page"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:72
+#: squirrelmail/plugins/administrator/defines.php:80
 msgid "Default Language"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:76
+#: squirrelmail/plugins/administrator/defines.php:84
 msgid "Top Frame"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:81
+#: squirrelmail/plugins/administrator/defines.php:89
 msgid "Server Settings"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:83
+#: squirrelmail/plugins/administrator/defines.php:91
 msgid "Mail Domain"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:86
+#: squirrelmail/plugins/administrator/defines.php:94
 msgid "IMAP Server Address"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:89
+#: squirrelmail/plugins/administrator/defines.php:97
 msgid "IMAP Server Port"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:91
+#: squirrelmail/plugins/administrator/defines.php:99
 msgid "IMAP Server Type"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:93
+#: squirrelmail/plugins/administrator/defines.php:101
 msgid "Cyrus IMAP server"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:94
+#: squirrelmail/plugins/administrator/defines.php:102
 msgid "University of Washington's IMAP server"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:95
+#: squirrelmail/plugins/administrator/defines.php:103
 msgid "Microsoft Exchange IMAP server"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:96
+#: squirrelmail/plugins/administrator/defines.php:104
 msgid "Courier IMAP server"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:97
+#: squirrelmail/plugins/administrator/defines.php:105
 msgid "Not one of the above servers"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:98
+#: squirrelmail/plugins/administrator/defines.php:106
 msgid "IMAP Folder Delimiter"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:100
+#: squirrelmail/plugins/administrator/defines.php:108
 msgid "Use \"detect\" to auto-detect."
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:103
+#: squirrelmail/plugins/administrator/defines.php:111
 msgid "Use Sendmail"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:105
+#: squirrelmail/plugins/administrator/defines.php:113
 msgid "Sendmail Path"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:108
+#: squirrelmail/plugins/administrator/defines.php:116
 msgid "SMTP Server Address"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:111
+#: squirrelmail/plugins/administrator/defines.php:119
 msgid "SMTP Server Port"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:113
+#: squirrelmail/plugins/administrator/defines.php:121
 msgid "Authenticated SMTP"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:115
+#: squirrelmail/plugins/administrator/defines.php:123
 msgid "Invert Time"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:118
+#: squirrelmail/plugins/administrator/defines.php:125
+msgid "Use Confirmation Flags"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:128
 msgid "Folders Defaults"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:120
+#: squirrelmail/plugins/administrator/defines.php:130
 msgid "Default Folder Prefix"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:123
+#: squirrelmail/plugins/administrator/defines.php:133
 msgid "Show Folder Prefix Option"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:134
+#: squirrelmail/plugins/administrator/defines.php:144
 msgid "By default, move to trash"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:136
+#: squirrelmail/plugins/administrator/defines.php:146
 msgid "By default, move to sent"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:138
+#: squirrelmail/plugins/administrator/defines.php:148
 msgid "By default, save as draft"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:140
+#: squirrelmail/plugins/administrator/defines.php:150
 msgid "List Special Folders First"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:142
+#: squirrelmail/plugins/administrator/defines.php:152
 msgid "Show Special Folders Color"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:144
+#: squirrelmail/plugins/administrator/defines.php:154
 msgid "Auto Expunge"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:146
+#: squirrelmail/plugins/administrator/defines.php:156
 msgid "Default Sub. of INBOX"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:148
+#: squirrelmail/plugins/administrator/defines.php:158
 msgid "Show 'Contain Sub.' Option"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:150
+#: squirrelmail/plugins/administrator/defines.php:160
 msgid "Default Unseen Notify"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:155
+#: squirrelmail/plugins/administrator/defines.php:165
 msgid "Default Unseen Type"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:159
+#: squirrelmail/plugins/administrator/defines.php:169
 msgid "Auto Create Special Folders"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:161
+#: squirrelmail/plugins/administrator/defines.php:171
 msgid "Default Javascript Adrressbook"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:163
+#: squirrelmail/plugins/administrator/defines.php:173
 msgid "Auto delete folders"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:166
+#: squirrelmail/plugins/administrator/defines.php:176
 msgid "General Options"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:168
+#: squirrelmail/plugins/administrator/defines.php:178
 msgid "Default Charset"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:179
+#: squirrelmail/plugins/administrator/defines.php:189
 msgid "Data Directory"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:182
+#: squirrelmail/plugins/administrator/defines.php:192
 msgid "Temp Directory"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:185
+#: squirrelmail/plugins/administrator/defines.php:195
 msgid "Hash Level"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:187
+#: squirrelmail/plugins/administrator/defines.php:197
 msgid "Hash Disabled"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:189
+#: squirrelmail/plugins/administrator/defines.php:199
 msgid "Moderate"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:190
+#: squirrelmail/plugins/administrator/defines.php:200
 msgid "Medium"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:192
+#: squirrelmail/plugins/administrator/defines.php:202
 msgid "Default Left Size"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:195
+#: squirrelmail/plugins/administrator/defines.php:205
 msgid "Usernames in Lowercase"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:197
+#: squirrelmail/plugins/administrator/defines.php:207
 msgid "Allow use of priority"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:199
+#: squirrelmail/plugins/administrator/defines.php:209
 msgid "Hide SM attributions"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:202
-#: squirrelmail/plugins/administrator/defines.php:204
+#: squirrelmail/plugins/administrator/defines.php:211
+msgid "Enable use of delivery receipts"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:213
+msgid "Allow editing of identities"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:215
+msgid "Allow editing of full name"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:218
+#: squirrelmail/plugins/administrator/defines.php:220
 msgid "Message of the Day"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:208
+#: squirrelmail/plugins/administrator/defines.php:224
 msgid "Database"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:210
+#: squirrelmail/plugins/administrator/defines.php:226
 msgid "Address book DSN"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:213
+#: squirrelmail/plugins/administrator/defines.php:229
 msgid "Address book table"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:217
+#: squirrelmail/plugins/administrator/defines.php:233
 msgid "Preferences DSN"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:220
+#: squirrelmail/plugins/administrator/defines.php:236
 msgid "Preferences table"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:225
+#: squirrelmail/plugins/administrator/defines.php:240
+msgid "Preferences username field"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:244
+msgid "Preferences key field"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:248
+msgid "Preferences value field"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:253
 msgid "Themes"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:227
+#: squirrelmail/plugins/administrator/defines.php:255
 msgid "Style Sheet URL (css)"
 msgstr ""
 
@@ -4045,14 +4385,18 @@ msgstr ""
 msgid "Theme Path"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/options.php:418
+#: squirrelmail/plugins/administrator/options.php:420
 msgid "Plugins"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/options.php:480
+#: squirrelmail/plugins/administrator/options.php:482
 msgid "Change Settings"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/options.php:510
+msgid "Config file can't be opened. Please check config.php."
+msgstr ""
+
 #: squirrelmail/plugins/administrator/setup.php:30
 msgid "Administration"
 msgstr ""
@@ -4063,6 +4407,38 @@ msgid ""
 "remotely."
 msgstr ""
 
+#: squirrelmail/plugins/abook_take/setup.php:109
+msgid "Take Address"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:140
+msgid "Address Book Take"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:146
+msgid "Left aligned"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:150
+msgid "Centered"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:154
+msgid "Right aligned"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:155
+msgid "on the Read screen"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:159
+msgid "Hide the box"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:163
+msgid "Try to verify addresses"
+msgstr ""
+
 #: squirrelmail/po/independent_strings.txt:18
 msgid "Delivery error report"
 msgstr ""