this is a fix for the LSUB with a % when getting the folder list. This makes the...
[squirrelmail.git] / po / squirrelmail.po
index 1f9e09de279d28b17cf53001f067a0a073bbb69b..1f165b6954a40f7c5f3ff9bbdde0d69b867ae936 100644 (file)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-07 13:20+0100\n"
+"POT-Creation-Date: 2002-05-03 13:21+0200\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"
@@ -41,20 +41,21 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:570
-#: squirrelmail/plugins/filters/options.php:88
+#: squirrelmail/functions/mailbox_display.php:742
+#: squirrelmail/plugins/filters/options.php:120
 #: squirrelmail/src/addrbook_search_html.php:82
-#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:132
-#: squirrelmail/src/download.php:139
-#: squirrelmail/src/options_highlight.php:325
+#: squirrelmail/src/compose.php:436 squirrelmail/src/download.php:311
+#: squirrelmail/src/download.php:318
+#: squirrelmail/src/options_highlight.php:330
 #: squirrelmail/src/printer_friendly_bottom.php:96
-#: squirrelmail/src/search.php:334
+#: squirrelmail/src/search.php:351
 msgid "To"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:91
+#: squirrelmail/plugins/filters/options.php:123
 #: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:333
+#: squirrelmail/src/compose.php:443 squirrelmail/src/options_highlight.php:333
+#: squirrelmail/src/search.php:350
 msgid "Cc"
 msgstr ""
 
@@ -66,62 +67,66 @@ msgstr ""
 msgid "Use Addresses"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:118
+#: squirrelmail/src/addrbook_search_html.php:122
 msgid "Address Book Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:173
-#: squirrelmail/src/addrbook_search_html.php:127
+#: squirrelmail/src/addrbook_search.php:174
+#: squirrelmail/src/addrbook_search_html.php:131
 msgid "Search for"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:179
-#: squirrelmail/src/addrbook_search_html.php:137
+#: squirrelmail/src/addrbook_search.php:180
+#: squirrelmail/src/addrbook_search_html.php:141
 msgid "in"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:180
-#: squirrelmail/src/addrbook_search_html.php:140
+#: squirrelmail/src/addrbook_search.php:181
+#: squirrelmail/src/addrbook_search_html.php:144
 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:196
+#: squirrelmail/functions/page_header.php:142
+#: squirrelmail/src/addrbook_search.php:192
+#: squirrelmail/src/addrbook_search_html.php:155
+#: squirrelmail/src/search.php:187 squirrelmail/src/search.php:191
+#: squirrelmail/src/search.php:211 squirrelmail/src/search.php:355
+#: squirrelmail/src/search.php:386 squirrelmail/src/search.php:407
+#: squirrelmail/src/search.php:417
 msgid "Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:192
-#: squirrelmail/src/addrbook_search_html.php:152
+#: squirrelmail/src/addrbook_search.php:193
+#: squirrelmail/src/addrbook_search_html.php:156
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:213
-#: squirrelmail/src/addrbook_search_html.php:182
+#: squirrelmail/src/addrbook_search.php:214
+#: squirrelmail/src/addrbook_search_html.php:186
 #, 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:240
+#: squirrelmail/src/addrbook_search_html.php:211
 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
+#: squirrelmail/src/addrbook_search.php:160
+#: squirrelmail/src/addrbook_search.php:247
+#: squirrelmail/src/addrbook_search_html.php:216
 msgid "No persons matching your search was found"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:225
+#: squirrelmail/src/addrbook_search_html.php:229
 msgid "Return"
 msgstr ""
 
 #: squirrelmail/plugins/newmail/testsound.php:33
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:412
+#: 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/src/addrbook_search.php:194
+#: squirrelmail/src/addrbook_search.php:195 squirrelmail/src/compose.php:603
 msgid "Close"
 msgstr ""
 
@@ -162,9 +167,10 @@ msgstr ""
 msgid "Update address"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:25
-#: squirrelmail/functions/display_messages.php:76
-#: squirrelmail/functions/display_messages.php:92
+#: squirrelmail/functions/display_messages.php:49
+#: squirrelmail/functions/display_messages.php:68
+#: squirrelmail/functions/display_messages.php:85
+#: squirrelmail/functions/display_messages.php:151
 #: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:239
 msgid "ERROR"
 msgstr ""
@@ -173,144 +179,172 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:258 squirrelmail/src/addressbook.php:341
+#: squirrelmail/src/addressbook.php:258 squirrelmail/src/addressbook.php:344
 msgid "Add address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:323
+#: squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:326
 msgid "Edit selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:272 squirrelmail/src/addressbook.php:325
+#: squirrelmail/src/addressbook.php:272 squirrelmail/src/addressbook.php:328
 msgid "Delete selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:338
+#: squirrelmail/src/addressbook.php:341
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
-#: squirrelmail/src/compose.php:43
+#: squirrelmail/src/compose.php:97
 msgid "Draft Email Saved"
 msgstr ""
 
-#: squirrelmail/src/compose.php:131 squirrelmail/src/compose.php:172
-#: squirrelmail/src/compose.php:183
+#: squirrelmail/src/compose.php:200 squirrelmail/src/compose.php:244
+#: squirrelmail/src/compose.php:254
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-#: squirrelmail/src/compose.php:304
+#: squirrelmail/src/compose.php:431
 msgid "Original Message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:586
-#: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:130
-#: squirrelmail/src/download.php:135
-#: squirrelmail/src/options_highlight.php:334
+#: squirrelmail/functions/mailbox_display.php:759
+#: squirrelmail/plugins/filters/options.php:129
+#: squirrelmail/src/compose.php:432 squirrelmail/src/download.php:309
+#: squirrelmail/src/download.php:314
+#: squirrelmail/src/options_highlight.php:339
 #: squirrelmail/src/options_order.php:40
 #: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/search.php:331
+#: squirrelmail/src/search.php:348
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:572
-#: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:131
-#: squirrelmail/src/download.php:137
-#: squirrelmail/src/options_highlight.php:322
+#: squirrelmail/functions/mailbox_display.php:744
+#: squirrelmail/plugins/filters/options.php:117
+#: squirrelmail/src/compose.php:433 squirrelmail/src/download.php:98
+#: squirrelmail/src/download.php:310 squirrelmail/src/download.php:316
+#: squirrelmail/src/options_highlight.php:327
 #: squirrelmail/src/options_order.php:38
 #: squirrelmail/src/printer_friendly_bottom.php:95
-#: squirrelmail/src/search.php:332
+#: squirrelmail/src/search.php:349
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:580
-#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:133
-#: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
+#: squirrelmail/functions/mailbox_display.php:752
+#: squirrelmail/src/compose.php:434 squirrelmail/src/download.php:312
+#: squirrelmail/src/download.php:320 squirrelmail/src/options_order.php:39
 #: squirrelmail/src/printer_friendly_bottom.php:100
 msgid "Date"
 msgstr ""
 
+#: squirrelmail/src/compose.php:595
+msgid "Draft Saved"
+msgstr ""
+
+#: squirrelmail/src/compose.php:598
+msgid "Your Message has been sent"
+msgstr ""
+
 #: squirrelmail/plugins/listcommands/mailout.php:50
-#: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:566
+#: squirrelmail/src/compose.php:614 squirrelmail/src/read_body.php:808
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:489 squirrelmail/src/read_body.php:583
+#: squirrelmail/src/compose.php:642 squirrelmail/src/download.php:110
+#: squirrelmail/src/read_body.php:220 squirrelmail/src/read_body.php:825
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:497
+#: squirrelmail/src/compose.php:650
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:505
+#: squirrelmail/src/compose.php:658
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:512 squirrelmail/src/read_body.php:537
+#: squirrelmail/src/compose.php:665 squirrelmail/src/download.php:103
+#: squirrelmail/src/read_body.php:221 squirrelmail/src/read_body.php:779
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:557 squirrelmail/src/compose.php:619
+#: squirrelmail/src/compose.php:727 squirrelmail/src/compose.php:818
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:563
+#: squirrelmail/src/compose.php:733
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:126
+#: squirrelmail/src/compose.php:738 squirrelmail/src/options_order.php:126
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:584
+#: squirrelmail/src/compose.php:757
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:609
-#: squirrelmail/src/compose.php:613 squirrelmail/src/compose.php:617
-msgid "Addresses"
-msgstr ""
-
-#: squirrelmail/src/compose.php:622
-msgid "Save Draft"
-msgstr ""
-
-#: squirrelmail/src/compose.php:628 squirrelmail/src/read_body.php:613
+#: squirrelmail/src/compose.php:787 squirrelmail/src/read_body.php:854
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:191
+#: squirrelmail/plugins/administrator/defines.php:201
 #: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
+#: squirrelmail/src/compose.php:788 squirrelmail/src/read_body.php:626
 msgid "High"
 msgstr ""
 
 #: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:630 squirrelmail/src/read_body.php:437
+#: squirrelmail/src/compose.php:789 squirrelmail/src/read_body.php:639
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:188
-#: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
+#: squirrelmail/plugins/administrator/defines.php:198
+#: squirrelmail/src/compose.php:790 squirrelmail/src/read_body.php:632
 msgid "Low"
 msgstr ""
 
-#: squirrelmail/src/compose.php:653
+#: squirrelmail/src/compose.php:796
+msgid "Receipt"
+msgstr ""
+
+#: squirrelmail/src/compose.php:798
+msgid "On read"
+msgstr ""
+
+#: squirrelmail/src/compose.php:800
+msgid "On Delivery"
+msgstr ""
+
+#: squirrelmail/src/compose.php:805
+#: squirrelmail/src/options_identities.php:329
+#: squirrelmail/src/options_personal.php:99
+msgid "Signature"
+msgstr ""
+
+#: squirrelmail/functions/page_header.php:136 squirrelmail/src/compose.php:808
+#: squirrelmail/src/compose.php:812 squirrelmail/src/compose.php:816
+msgid "Addresses"
+msgstr ""
+
+#: squirrelmail/src/compose.php:821
+msgid "Save Draft"
+msgstr ""
+
+#: squirrelmail/src/compose.php:840
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:736
+#: squirrelmail/src/compose.php:932
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:739
+#: squirrelmail/src/compose.php:935
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:739
+#: squirrelmail/src/compose.php:935
 msgid "who"
 msgstr ""
 
@@ -319,27 +353,63 @@ msgid "Viewing a text attachment"
 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:162 squirrelmail/src/vcard.php:35
-#: squirrelmail/src/vcard.php:39
+#: squirrelmail/src/download.php:72 squirrelmail/src/image.php:31
+#: squirrelmail/src/image.php:35 squirrelmail/src/read_body.php:438
+#: squirrelmail/src/vcard.php:35 squirrelmail/src/vcard.php:39
 msgid "View message"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:623 squirrelmail/src/download.php:41
-#: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:196
+#: squirrelmail/functions/mime.php:788 squirrelmail/src/download.php:41
+#: squirrelmail/src/download.php:77 squirrelmail/src/image.php:44
+#: squirrelmail/src/vcard.php:196
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:27
+#: squirrelmail/src/download.php:70
+msgid "Viewing a message attachment"
+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/download.php:116 squirrelmail/src/read_body.php:816
+msgid "Date:"
+msgstr ""
+
+#: squirrelmail/src/download.php:124
+msgid "Cc:"
+msgstr ""
+
+#: squirrelmail/src/download.php:132
+msgid "Bcc:"
+msgstr ""
+
+#: squirrelmail/src/download.php:149 squirrelmail/src/read_body.php:590
+msgid "more"
+msgstr ""
+
+#: squirrelmail/src/download.php:150 squirrelmail/src/read_body.php:591
+msgid "less"
+msgstr ""
+
+#: squirrelmail/src/folders_create.php:29
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:27
+#: squirrelmail/src/folders_create.php:29
+#: squirrelmail/src/folders_delete.php:29
+#: squirrelmail/src/folders_rename_getname.php:23
 msgid "Click here to go back"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:126 squirrelmail/src/folders.php:29
-#: squirrelmail/src/left_main.php:238
+#: squirrelmail/src/folders_delete.php:29
+msgid "You have not selected a folder to delete. Please do so."
+msgstr ""
+
+#: squirrelmail/functions/page_header.php:138 squirrelmail/src/folders.php:29
+#: squirrelmail/src/left_main.php:241
 msgid "Folders"
 msgstr ""
 
@@ -363,7 +433,7 @@ msgstr ""
 msgid "Renamed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:277
+#: squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:280
 msgid "refresh folder list"
 msgstr ""
 
@@ -387,68 +457,76 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: squirrelmail/src/folders.php:108
+#: squirrelmail/src/folders.php:136
 msgid "Rename a Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:131
+#: squirrelmail/src/folders.php:142 squirrelmail/src/folders.php:179
+msgid "Select a folder"
+msgstr ""
+
+#: squirrelmail/src/folders.php:160
 msgid "Rename"
 msgstr ""
 
-#: squirrelmail/src/folders.php:135 squirrelmail/src/folders.php:194
+#: squirrelmail/src/folders.php:164 squirrelmail/src/folders.php:200
 msgid "No folders found"
 msgstr ""
 
-#: squirrelmail/src/folders.php:143
+#: squirrelmail/src/folders.php:172
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:543
-#: squirrelmail/plugins/filters/options.php:154
+#: squirrelmail/functions/mailbox_display.php:693
+#: squirrelmail/plugins/filters/options.php:189
 #: 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:473
+#: squirrelmail/src/folders.php:196 squirrelmail/src/options_highlight.php:76
+#: squirrelmail/src/options_identities.php:341
+#: squirrelmail/src/read_body.php:691
 msgid "Delete"
 msgstr ""
 
 #: squirrelmail/plugins/listcommands/setup.php:34
-#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:220
+#: squirrelmail/src/folders.php:207 squirrelmail/src/folders.php:226
 msgid "Unsubscribe"
 msgstr ""
 
 #: squirrelmail/plugins/listcommands/setup.php:33
-#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:261
+#: squirrelmail/src/folders.php:207 squirrelmail/src/folders.php:267
 msgid "Subscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:224
+#: squirrelmail/src/folders.php:230
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:264
+#: squirrelmail/src/folders.php:270
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:40
+#: squirrelmail/src/folders_rename_getname.php:23
+msgid "You have not selected a folder to rename. Please do so."
+msgstr ""
+
+#: squirrelmail/src/folders_rename_getname.php:48
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:44
+#: squirrelmail/src/folders_rename_getname.php:52
 msgid "New name:"
 msgstr ""
 
 #: squirrelmail/functions/options.php:414
-#: squirrelmail/plugins/filters/options.php:138
-#: squirrelmail/plugins/newmail/newmail_opt.php:133
+#: squirrelmail/plugins/filters/options.php:173
+#: squirrelmail/plugins/newmail/newmail_opt.php:146
 #: squirrelmail/plugins/translate/options.php:160
-#: squirrelmail/src/folders_rename_getname.php:51
-#: squirrelmail/src/options_highlight.php:347
+#: squirrelmail/src/folders_rename_getname.php:59
+#: squirrelmail/src/options_highlight.php:352
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:132
+#: squirrelmail/functions/page_header.php:144
 #: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:91
 msgid "Help"
 msgstr ""
@@ -468,23 +546,23 @@ 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/functions/mailbox_display.php:924
+#: squirrelmail/functions/mailbox_display.php:927
+#: squirrelmail/functions/mailbox_display.php:930
+#: squirrelmail/plugins/delete_move_next/setup.php:166
+#: squirrelmail/plugins/delete_move_next/setup.php:168
 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:495 squirrelmail/src/read_body.php:497
+#: squirrelmail/src/read_body.php:725 squirrelmail/src/read_body.php:727
 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/functions/mailbox_display.php:925
+#: squirrelmail/functions/mailbox_display.php:928
+#: squirrelmail/functions/mailbox_display.php:931
+#: squirrelmail/plugins/delete_move_next/setup.php:171
+#: squirrelmail/plugins/delete_move_next/setup.php:173
 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:501 squirrelmail/src/read_body.php:503
+#: squirrelmail/src/read_body.php:731 squirrelmail/src/read_body.php:733
 msgid "Next"
 msgstr ""
 
@@ -496,179 +574,225 @@ msgstr ""
 msgid "Viewing an image attachment"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:529
-#: squirrelmail/functions/page_header.php:103
+#: squirrelmail/functions/imap_search.php:202
+#: squirrelmail/functions/mailbox_display.php:675
+#: squirrelmail/functions/page_header.php:109
+#: squirrelmail/plugins/delete_move_next/setup.php:218
 #: squirrelmail/plugins/mail_fetch/options.php:137
 #: squirrelmail/plugins/mail_fetch/options.php:214
-#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:300
+#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:312
 msgid "INBOX"
 msgstr ""
 
 #: squirrelmail/src/left_main.php:97
-msgid "empty"
+msgid "purge"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:271
+#: squirrelmail/src/left_main.php:274
 msgid "Last Refresh"
 msgstr ""
 
-#: squirrelmail/src/login.php:97 squirrelmail/src/login.php:141
+#: squirrelmail/src/login.php:102 squirrelmail/src/login.php:156
 msgid "Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:112
+#: squirrelmail/functions/display_messages.php:143
+#: squirrelmail/src/login.php:124
+#, c-format
+msgid "%s Logo"
+msgstr ""
+
+#: squirrelmail/functions/display_messages.php:146
+#: squirrelmail/src/login.php:127
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
-#: squirrelmail/src/login.php:113
+#: squirrelmail/functions/display_messages.php:147
+#: squirrelmail/src/login.php:128
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:119
+#: squirrelmail/src/login.php:134
 #, c-format
 msgid "%s Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:123
+#: squirrelmail/src/login.php:138
 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:144
 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:163
+#: squirrelmail/src/move_messages.php:207
+#: squirrelmail/src/move_messages.php:236
 msgid "No messages were selected."
 msgstr ""
 
-#: squirrelmail/src/options_display.php:32
+#: 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/plugins/administrator/defines.php:42
-#: squirrelmail/src/options_display.php:51
-#: squirrelmail/src/options_display.php:80
+#: squirrelmail/src/options_display.php:52
+#: squirrelmail/src/options_display.php:81
 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: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 ""
@@ -681,7 +805,7 @@ msgstr ""
 msgid "Do not use Trash"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:125
+#: squirrelmail/plugins/administrator/defines.php:135
 #: squirrelmail/src/options_folder.php:67
 msgid "Trash Folder"
 msgstr ""
@@ -690,7 +814,7 @@ msgstr ""
 msgid "Do not use Sent"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:128
+#: squirrelmail/plugins/administrator/defines.php:138
 #: squirrelmail/src/options_folder.php:78
 msgid "Sent Folder"
 msgstr ""
@@ -699,7 +823,7 @@ msgstr ""
 msgid "Do not use Drafts"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:131
+#: squirrelmail/plugins/administrator/defines.php:141
 #: squirrelmail/src/options_folder.php:89
 msgid "Draft Folder"
 msgstr ""
@@ -749,17 +873,17 @@ msgstr ""
 msgid "Enable Unread Message Notification"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:152
+#: squirrelmail/plugins/administrator/defines.php:162
 #: squirrelmail/src/options_folder.php:145
 msgid "No Notification"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:153
+#: squirrelmail/plugins/administrator/defines.php:163
 #: squirrelmail/src/options_folder.php:146
 msgid "Only INBOX"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:154
+#: squirrelmail/plugins/administrator/defines.php:164
 #: squirrelmail/src/options_folder.php:147
 msgid "All Folders"
 msgstr ""
@@ -768,12 +892,12 @@ msgstr ""
 msgid "Unread Message Notification Type"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:157
+#: squirrelmail/plugins/administrator/defines.php:167
 #: squirrelmail/src/options_folder.php:155
 msgid "Only Unseen"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/defines.php:158
+#: squirrelmail/plugins/administrator/defines.php:168
 #: squirrelmail/src/options_folder.php:156
 msgid "Unseen and Total"
 msgstr ""
@@ -811,9 +935,9 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:128
-#: squirrelmail/plugins/filters/options.php:62
-#: squirrelmail/plugins/newmail/newmail_opt.php:34
+#: squirrelmail/functions/page_header.php:140
+#: squirrelmail/plugins/filters/options.php:70
+#: squirrelmail/plugins/newmail/newmail_opt.php:37
 #: squirrelmail/plugins/translate/options.php:94
 #: squirrelmail/src/options.php:198 squirrelmail/src/options_highlight.php:62
 #: squirrelmail/src/options_identities.php:44
@@ -826,20 +950,20 @@ msgstr ""
 msgid "Message Highlighting"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:64
+#: squirrelmail/plugins/filters/options.php:96
 #: squirrelmail/src/options_highlight.php:66
 msgid "New"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:65
-#: squirrelmail/plugins/filters/spamoptions.php:148
+#: squirrelmail/plugins/filters/options.php:97
+#: squirrelmail/plugins/filters/spamoptions.php:159
 #: squirrelmail/plugins/mail_fetch/fetch.php:225
 #: squirrelmail/src/options_highlight.php:67
 msgid "Done"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:152
-#: squirrelmail/plugins/filters/spamoptions.php:147
+#: squirrelmail/plugins/filters/options.php:187
+#: squirrelmail/plugins/filters/spamoptions.php:158
 #: squirrelmail/src/options_highlight.php:74
 msgid "Edit"
 msgstr ""
@@ -920,12 +1044,12 @@ msgstr ""
 msgid "Ex: 63aa7f"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:94
-#: squirrelmail/src/options_highlight.php:331
+#: squirrelmail/plugins/filters/options.php:126
+#: squirrelmail/src/options_highlight.php:336
 msgid "To or Cc"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:336
+#: squirrelmail/src/options_highlight.php:341
 msgid "Matches"
 msgstr ""
 
@@ -946,29 +1070,30 @@ msgstr ""
 msgid "Add a New Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:291
-#: squirrelmail/src/options_personal.php:49
+#: squirrelmail/src/options_identities.php:326
+#: 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:327
 msgid "E-Mail Address"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:293
-#: squirrelmail/src/options_personal.php:65
+#: squirrelmail/src/options_identities.php:328
+#: squirrelmail/src/options_personal.php:91
 msgid "Reply To"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:300
+#: squirrelmail/src/options_identities.php:336
 msgid "Save / Update"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:303
+#: squirrelmail/src/options_identities.php:339
 msgid "Make Default"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:309
+#: squirrelmail/src/options_identities.php:345
 msgid "Move Up"
 msgstr ""
 
@@ -985,7 +1110,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:592
+#: squirrelmail/functions/mailbox_display.php:766
 #: squirrelmail/src/options_order.php:42
 msgid "Size"
 msgstr ""
@@ -1013,74 +1138,83 @@ msgstr ""
 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:120
+msgid "Same as server"
+msgstr ""
+
+#: squirrelmail/src/options_personal.php:131
+msgid "Timezone Options"
+msgstr ""
+
+#: squirrelmail/src/options_personal.php:136
+msgid "Your current timezone"
+msgstr ""
+
+#: squirrelmail/src/options_personal.php:143
 msgid "Reply Citation Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:89
+#: squirrelmail/src/options_personal.php:148
 msgid "Reply Citation Style"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:92
+#: squirrelmail/src/options_personal.php:151
 msgid "No Citation"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:93
+#: squirrelmail/src/options_personal.php:152
 msgid "AUTHOR Said"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:94
+#: squirrelmail/src/options_personal.php:153
 msgid "Quote Who XML"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:95
+#: squirrelmail/src/options_personal.php:154
 msgid "User-Defined"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:100
+#: squirrelmail/src/options_personal.php:159
 msgid "User-Defined Citation Start"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:108
+#: squirrelmail/src/options_personal.php:167
 msgid "User-Defined Citation End"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:115
+#: squirrelmail/src/options_personal.php:174
 msgid "Signature Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:120
+#: squirrelmail/src/options_personal.php:179
 msgid "Use Signature"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:127
+#: squirrelmail/src/options_personal.php:186
 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 ""
@@ -1157,125 +1291,156 @@ msgstr ""
 msgid "Close Window"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:102
+#: squirrelmail/src/read_body.php:155
 msgid "View Printable Version"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:154
-msgid "Viewing Full Header"
+#: squirrelmail/src/read_body.php:219
+msgid "Your message"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:290
-msgid "more"
+#: squirrelmail/src/read_body.php:222
+msgid "Sent:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:291
-msgid "less"
+#: squirrelmail/src/read_body.php:224
+#, c-format
+msgid "Was displayed on %s"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:256
+msgid "Read:"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:427
+msgid "Viewing Full Header"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:465
+#: squirrelmail/src/read_body.php:683
 msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:477
+#: squirrelmail/src/read_body.php:699
 msgid "Resume Draft"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:514
+#: squirrelmail/src/read_body.php:708
+msgid "Edit Message as New"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:682
+#: squirrelmail/src/read_body.php:748
 msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:519
+#: squirrelmail/src/read_body.php:757
 msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:524
+#: squirrelmail/src/read_body.php:766
 msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:548 squirrelmail/src/read_body.php:551
+#: squirrelmail/src/read_body.php:790 squirrelmail/src/read_body.php:793
 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:574
-msgid "Date:"
+#: squirrelmail/src/read_body.php:868
+msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:628
-msgid "Mailer"
+#: squirrelmail/src/read_body.php:918 squirrelmail/src/read_body.php:931
+#: squirrelmail/src/read_body.php:943 squirrelmail/src/read_body.php:968
+#: squirrelmail/src/read_body.php:1012 squirrelmail/src/read_body.php:1028
+msgid "Read receipt"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
-#: squirrelmail/src/redirect.php:64
-msgid "You must be logged in to access this page."
+#: squirrelmail/src/read_body.php:920 squirrelmail/src/read_body.php:1014
+msgid "send"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:34 squirrelmail/src/redirect.php:65
-msgid "Go to the login page"
+#: squirrelmail/src/read_body.php:933 squirrelmail/src/read_body.php:945
+#: squirrelmail/src/read_body.php:970 squirrelmail/src/read_body.php:1030
+msgid "requested"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:946 squirrelmail/src/read_body.php:971
+#: squirrelmail/src/read_body.php:1031
+msgid "Send read receipt now"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:958
+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:20 squirrelmail/src/redirect.php:64
+#: squirrelmail/src/redirect.php:86
+msgid "You must be logged in to access this 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:232
+#: squirrelmail/src/search.php:241
 msgid "edit"
 msgstr ""
 
-#: squirrelmail/src/search.php:239 squirrelmail/src/search.php:278
+#: squirrelmail/src/search.php:248 squirrelmail/src/search.php:290
 msgid "search"
 msgstr ""
 
-#: squirrelmail/src/search.php:242
+#: squirrelmail/src/search.php:251
 msgid "delete"
 msgstr ""
 
-#: squirrelmail/src/search.php:270
+#: squirrelmail/src/search.php:262
+msgid "Recent Searches"
+msgstr ""
+
+#: squirrelmail/src/search.php:282
 msgid "save"
 msgstr ""
 
-#: squirrelmail/src/search.php:281
+#: squirrelmail/src/search.php:293
 msgid "forget"
 msgstr ""
 
-#: squirrelmail/src/search.php:290
+#: squirrelmail/src/search.php:302
 msgid "Current Search"
 msgstr ""
 
-#: squirrelmail/src/search.php:329
+#: squirrelmail/src/search.php:346
 msgid "Body"
 msgstr ""
 
-#: squirrelmail/src/search.php:330
+#: squirrelmail/src/search.php:347
 msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/src/search.php:357 squirrelmail/src/search.php:380
+#: squirrelmail/src/search.php:380 squirrelmail/src/search.php:409
 msgid "Search Results"
 msgstr ""
 
-#: squirrelmail/src/search.php:370
+#: squirrelmail/src/search.php:400
 msgid "No Messages found"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:116 squirrelmail/src/signout.php:72
+#: squirrelmail/functions/page_header.php:122 squirrelmail/src/signout.php:74
 msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/src/signout.php:78
+#: squirrelmail/src/signout.php:80
 msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/signout.php:80
+#: squirrelmail/src/signout.php:82
 msgid "Click here to log back in."
 msgstr ""
 
@@ -1351,10 +1516,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
@@ -1362,13 +1527,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 ""
@@ -1384,7 +1549,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 ""
 
@@ -1398,13 +1563,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 ""
 
@@ -1446,13 +1611,14 @@ 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 ""
 
@@ -1539,68 +1705,62 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: squirrelmail/functions/date.php:180
+#: squirrelmail/functions/date.php:182
 msgid "D, F j, Y g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:182
+#: squirrelmail/functions/date.php:184
 msgid "D, F j, Y G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:204
+#: squirrelmail/functions/date.php:206
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:206
+#: squirrelmail/functions/date.php:208
 msgid "G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:211
+#: squirrelmail/functions/date.php:213
 msgid "D, g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:213
+#: squirrelmail/functions/date.php:215
 msgid "D, G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:217
+#: squirrelmail/functions/date.php:219
 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:243
+#: squirrelmail/functions/db_prefs.php:56
+#: squirrelmail/functions/db_prefs.php:63
+#: squirrelmail/functions/db_prefs.php:126
+#: squirrelmail/functions/db_prefs.php:129
+#: squirrelmail/functions/db_prefs.php:344
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:28
-#: squirrelmail/functions/imap_general.php:228
+#: squirrelmail/functions/display_messages.php:52
+#: squirrelmail/functions/imap_general.php:252
 msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:30
+#: squirrelmail/functions/display_messages.php:54
 msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:44
-#, c-format
-msgid "Welcome to %s's WebMail system"
-msgstr ""
-
-#: squirrelmail/functions/display_messages.php:56
+#: squirrelmail/functions/display_messages.php:75
 #, 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:158
+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 "
@@ -1608,99 +1768,107 @@ 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:176
+#: 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:174
 msgid "Could not create initial preference file!"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:140
-#: 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:175
+#, 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:567
+#: squirrelmail/plugins/filters/filters.php:227
 msgid "ERROR : Could not complete request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:142
-#: 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:149
-#: 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:151
-#: 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:187
+#: squirrelmail/functions/imap_general.php:211
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:203
+#: squirrelmail/functions/imap_general.php:227
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:205
+#: squirrelmail/functions/imap_general.php:229
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:207
+#: 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:569
 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:492
+#: squirrelmail/functions/imap_messages.php:760
+#: squirrelmail/functions/imap_messages.php:824
+#: squirrelmail/functions/mailbox_display.php:1087
 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:515
 msgid "No To Address"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:498
+#: squirrelmail/functions/imap_messages.php:827
 msgid "(unknown sender)"
 msgstr ""
 
@@ -1708,98 +1876,120 @@ msgstr ""
 msgid "No Messages Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:181
-#: squirrelmail/functions/imap_search.php:189
+#: squirrelmail/functions/imap_search.php:191
+#: squirrelmail/functions/imap_search.php:199
 msgid "Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:181
-#: squirrelmail/functions/imap_search.php:189
+#: squirrelmail/functions/imap_search.php:191
+#: squirrelmail/functions/imap_search.php:199
 msgid "messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:156
+#: squirrelmail/functions/imap_search.php:206
+msgid "Folder:"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:185
 msgid "A"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:429
+#: squirrelmail/functions/mailbox_display.php:568
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:513
+#: squirrelmail/functions/mailbox_display.php:658
 msgid "Move Selected To:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:516
+#: squirrelmail/functions/mailbox_display.php:661
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:535
+#: squirrelmail/functions/mailbox_display.php:681
+#: squirrelmail/plugins/delete_move_next/setup.php:244
+#: squirrelmail/plugins/delete_move_next/setup.php:268
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:539
+#: squirrelmail/functions/mailbox_display.php:688
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:539
+#: squirrelmail/functions/mailbox_display.php:689
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:541
+#: squirrelmail/functions/mailbox_display.php:691
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:542
+#: squirrelmail/functions/mailbox_display.php:692
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:638
+#: squirrelmail/functions/mailbox_display.php:701
+msgid "Unthread View"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:705
+msgid "Thread View"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:820
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:666
+#: squirrelmail/functions/mailbox_display.php:844
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:668
+#: squirrelmail/functions/mailbox_display.php:846
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:685
+#: squirrelmail/functions/mailbox_display.php:863
 #, 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:866
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:872
+#: squirrelmail/functions/mailbox_display.php:1050
 msgid "Paginate"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:879
+#: squirrelmail/functions/mailbox_display.php:1057
 msgid "Show All"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:369
+#: squirrelmail/functions/mime.php:425
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:430
+#: squirrelmail/functions/mime.php:499
 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:432
+#: squirrelmail/functions/mime.php:501
+msgid "Submit message"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:503
+msgid "Command:"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:504
 msgid "Response:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:433
+#: squirrelmail/functions/mime.php:505
 #: squirrelmail/plugins/calendar/event_create.php:118
 #: squirrelmail/plugins/calendar/event_delete.php:38
 #: squirrelmail/plugins/calendar/event_edit.php:101
@@ -1807,29 +1997,27 @@ msgstr ""
 msgid "Message:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:434
+#: squirrelmail/functions/mime.php:506
 msgid "FETCH line:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:652
-msgid "Attachments"
+#: squirrelmail/functions/mime.php:791
+msgid "Hide Unsafe Images"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:691
-msgid "download"
+#: squirrelmail/functions/mime.php:793
+msgid "View Unsafe Images"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:978
-#: 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:822
+msgid "Attachments"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:858 squirrelmail/functions/mime.php:936
+msgid "download"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:1148
+#: squirrelmail/functions/mime.php:1662 squirrelmail/functions/mime.php:1969
 msgid "sec_remove_eng.png"
 msgstr ""
 
@@ -1852,233 +2040,317 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:110
+#: squirrelmail/functions/page_header.php:116
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:122
+#: squirrelmail/functions/page_header.php:130
+#: squirrelmail/functions/page_header.php:133
+#: squirrelmail/functions/page_header.php:175
+#: squirrelmail/functions/page_header.php:202
 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 - orbz.gst-group.co.uk - Inputs only."
+#: 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:568
-msgid "FREE - orbz.gst-group.co.uk - Outputs only."
+#: squirrelmail/plugins/filters/filters.php:763
+msgid "FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:576
+#: 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 - orbz.gst-group.co.uk - mailservers that refuse or bounce email "
-"addressed to postmaster@<theirdomain>."
+"FREE - Leadmon DUL - Another list of Dial-up or otherwise dynamically "
+"assigned IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:584
-#, c-format
+#: squirrelmail/plugins/filters/filters.php:803
 msgid ""
-"FREE, for now - SPAMCOP - An interesting solution that lists servers that "
-"have a very high spam to legit email ratio (85% or more)."
+"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/options.php:62
+#: squirrelmail/plugins/filters/filters.php:851
+msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:60
+msgid "Saved Scan type"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:70
 msgid "Message Filtering"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:78
+#: squirrelmail/plugins/filters/options.php:77
+#: squirrelmail/plugins/filters/spamoptions.php:105
+msgid "What to Scan:"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:83
+#: squirrelmail/plugins/filters/spamoptions.php:111
+msgid "All messages"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:88
+#: squirrelmail/plugins/filters/spamoptions.php:116
+msgid "Only unread messages"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:91
+#: squirrelmail/plugins/filters/spamoptions.php:149
+msgid "Save"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:110
 msgid "Match:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:104
+#: squirrelmail/plugins/filters/options.php:132
+msgid "Header"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:139
 msgid "Contains:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:116
+#: squirrelmail/plugins/delete_move_next/setup.php:240
+#: squirrelmail/plugins/delete_move_next/setup.php:264
+#: squirrelmail/plugins/filters/options.php:151
 msgid "Move to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:158
+#: squirrelmail/plugins/filters/options.php:193
 msgid "Down"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:164
+#: squirrelmail/plugins/filters/options.php:199
 msgid "Up"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:167
+#: squirrelmail/plugins/filters/options.php:202
 #, 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:57
 msgid "Spam Filtering"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:57
+#: squirrelmail/plugins/filters/spamoptions.php:62
 msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:77
+#: squirrelmail/plugins/filters/spamoptions.php:84
 msgid "Move spam to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:94
+#: squirrelmail/plugins/filters/spamoptions.php:102
 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 "
@@ -2087,19 +2359,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:122
 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 "
@@ -2108,37 +2368,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:160
 #, c-format
 msgid "Spam is sent to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:149
+#: squirrelmail/plugins/filters/spamoptions.php:160
 msgid "[<i>not set yet</i>]"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:151
+#: squirrelmail/plugins/filters/spamoptions.php:162
 #, c-format
 msgid "Spam scan is limited to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:151
+#: squirrelmail/plugins/filters/spamoptions.php:162
 msgid "New Messages Only"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:151
+#: squirrelmail/plugins/filters/spamoptions.php:162
 msgid "All Messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:161
+#: squirrelmail/plugins/filters/spamoptions.php:172
 msgid "ON"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:163
+#: squirrelmail/plugins/filters/spamoptions.php:174
 msgid "OFF"
 msgstr ""
 
@@ -2268,108 +2524,117 @@ msgstr ""
 msgid "Personal Dictionary Crypto Settings"
 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 ""
 
@@ -2909,30 +3174,30 @@ msgstr ""
 msgid "Latin"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:34
+#: squirrelmail/plugins/newmail/newmail_opt.php:37
 msgid "New Mail Notification"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:37
+#: squirrelmail/plugins/newmail/newmail_opt.php:41
 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:45
 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:47
 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:49
 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 "
@@ -2940,7 +3205,7 @@ msgid ""
 "by sounds or popups for unseen mail."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:45
+#: squirrelmail/plugins/newmail/newmail_opt.php:51
 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 "
@@ -2949,7 +3214,7 @@ msgid ""
 "enabled."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:47
+#: squirrelmail/plugins/newmail/newmail_opt.php:55
 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 "
@@ -2957,48 +3222,48 @@ 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:67
 msgid "Enable Media Playing"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:65
+#: squirrelmail/plugins/newmail/newmail_opt.php:76
 msgid "Check all boxes, not just INBOX"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:73
+#: squirrelmail/plugins/newmail/newmail_opt.php:84
 msgid "Count only messages that are RECENT"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:81
+#: squirrelmail/plugins/newmail/newmail_opt.php:92
 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:92
+#: squirrelmail/plugins/newmail/newmail_opt.php:100
 msgid "requires JavaScript to work"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:89
+#: squirrelmail/plugins/newmail/newmail_opt.php:100
 msgid "Show popup window on new mail"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:92
+#: squirrelmail/plugins/newmail/newmail_opt.php:104
 msgid "Select server file:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:94
+#: squirrelmail/plugins/newmail/newmail_opt.php:106
 msgid "(local media)"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:111
+#: squirrelmail/plugins/newmail/newmail_opt.php:123
 msgid "Try"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:119
+#: squirrelmail/plugins/newmail/newmail_opt.php:131
 msgid "Local Media File:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:125
+#: squirrelmail/plugins/newmail/newmail_opt.php:137
 msgid "Current File:"
 msgstr ""
 
@@ -3537,6 +3802,15 @@ msgstr ""
 msgid "Priority:"
 msgstr ""
 
+#: 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:"
+msgstr ""
+
 #: squirrelmail/plugins/calendar/event_create.php:61
 msgid "Set Event"
 msgstr ""
@@ -3692,35 +3966,35 @@ msgstr ""
 msgid "Contact Listowner"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:105
+#: squirrelmail/plugins/listcommands/setup.php:113
 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:176
+#: squirrelmail/plugins/delete_move_next/setup.php:179
 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:182
+#: squirrelmail/plugins/delete_move_next/setup.php:184
 msgid "Delete & Next"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:290
-msgid "delete_move_next:"
+#: squirrelmail/plugins/delete_move_next/setup.php:305
+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:311
+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:317
+#: squirrelmail/plugins/delete_move_next/setup.php:329
 msgid "with move option"
 msgstr ""
 
-#: squirrelmail/plugins/delete_move_next/setup.php:308
-msgid "display at bottom"
+#: squirrelmail/plugins/delete_move_next/setup.php:323
+msgid "Display at bottom"
 msgstr ""
 
 #: squirrelmail/plugins/administrator/defines.php:48
@@ -3748,235 +4022,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 ""
 
@@ -4000,6 +4310,10 @@ msgstr ""
 msgid "Change Settings"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/options.php:531
+msgid "Config file can't be opened. Please check config.php."
+msgstr ""
+
 #: squirrelmail/plugins/administrator/setup.php:30
 msgid "Administration"
 msgstr ""
@@ -4009,3 +4323,11 @@ msgid ""
 "This module allows administrators to manage SquirrelMail main configuration "
 "remotely."
 msgstr ""
+
+#: squirrelmail/po/independent_strings.txt:18
+msgid "Delivery error report"
+msgstr ""
+
+#: squirrelmail/po/independent_strings.txt:19
+msgid "Undelivered Message Headers"
+msgstr ""