spanish
[squirrelmail.git] / po / squirrelmail.po
index 40810d10892e5c3174a3c51b9cda93c25f0ad781..6908c84eba331fcfabd2745fb4c22337e4999e0b 100644 (file)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-22 10:12+0100\n"
+"POT-Creation-Date: 2002-09-20 14:24+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"
@@ -14,1261 +14,1145 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: squirrelmail/src/addrbook_popup.php:22
+#: squirrelmail/src/addrbook_popup.php:26
 msgid "Address Book"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:97
-#: squirrelmail/src/addrbook_search_html.php:66
-#: squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:107
+#: squirrelmail/plugins/mail_fetch/fetch.php:71
+#: squirrelmail/src/addrbook_search_html.php:85
+#: squirrelmail/src/addrbook_search_html.php:87
+#: squirrelmail/src/addrbook_search_html.php:89
+msgid "All"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search.php:104
+#: squirrelmail/src/addrbook_search_html.php:94
+#: squirrelmail/src/addressbook.php:310 squirrelmail/src/vcard.php:83
 msgid "Name"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:98
-#: squirrelmail/src/addrbook_search_html.php:67
-#: squirrelmail/src/addressbook.php:286
+#: squirrelmail/src/addrbook_search.php:105
+#: squirrelmail/src/addrbook_search_html.php:95
+#: squirrelmail/src/addressbook.php:311
 msgid "E-mail"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:99
-#: squirrelmail/src/addrbook_search_html.php:68
-#: squirrelmail/src/addressbook.php:287
+#: squirrelmail/src/addrbook_search.php:106
+#: squirrelmail/src/addrbook_search_html.php:96
+#: squirrelmail/src/addressbook.php:312
 msgid "Info"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:102
-#: squirrelmail/src/addrbook_search_html.php:71
+#: squirrelmail/src/addrbook_search.php:109
+#: squirrelmail/src/addrbook_search_html.php:99
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:98
+#: squirrelmail/functions/mailbox_display.php:812
+#: squirrelmail/plugins/filters/options.php:128
+#: squirrelmail/src/addrbook_search_html.php:111
+#: squirrelmail/src/compose.php:89 squirrelmail/src/compose.php:103
+#: squirrelmail/src/options_highlight.php:86
+#: squirrelmail/src/options_highlight.php:375
+#: squirrelmail/src/printer_friendly_bottom.php:113
+#: squirrelmail/src/read_body.php:418 squirrelmail/src/search.php:444
+msgid "To"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:131
+#: squirrelmail/src/addrbook_search_html.php:113
+#: squirrelmail/src/compose.php:90 squirrelmail/src/compose.php:106
+#: squirrelmail/src/options_highlight.php:89
+#: squirrelmail/src/options_highlight.php:378
+#: squirrelmail/src/read_body.php:419 squirrelmail/src/search.php:443
+msgid "Cc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:115
+#: squirrelmail/src/read_body.php:420
+msgid "Bcc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:131
 msgid "Use Addresses"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:117
+#: squirrelmail/src/addrbook_search_html.php:155
 msgid "Address Book Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:172
-#: squirrelmail/src/addrbook_search_html.php:126
+#: squirrelmail/src/addrbook_search.php:185
+#: squirrelmail/src/addrbook_search_html.php:167
 msgid "Search for"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:178
-#: squirrelmail/src/addrbook_search_html.php:136
+#: squirrelmail/src/addrbook_search.php:192
+#: squirrelmail/src/addrbook_search_html.php:177
 msgid "in"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:179
-#: squirrelmail/src/addrbook_search_html.php:139
+#: squirrelmail/src/addrbook_search.php:193
+#: squirrelmail/src/addrbook_search_html.php:180
 msgid "All address books"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:124
-#: squirrelmail/src/addrbook_search.php:189
-#: squirrelmail/src/addrbook_search_html.php:150
-#: squirrelmail/src/search.php:45 squirrelmail/src/search.php:124
+#: squirrelmail/functions/page_header.php:225
+#: squirrelmail/src/addrbook_search.php:207
+#: squirrelmail/src/addrbook_search_html.php:195
+#: squirrelmail/src/search.php:254 squirrelmail/src/search.php:258
+#: squirrelmail/src/search.php:277 squirrelmail/src/search.php:447
+#: squirrelmail/src/search.php:477 squirrelmail/src/search.php:499
+#: squirrelmail/src/search.php:514
 msgid "Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:190
-#: squirrelmail/src/addrbook_search_html.php:151
+#: squirrelmail/src/addrbook_search.php:208
+#: squirrelmail/src/addrbook_search_html.php:196
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:212
-#: squirrelmail/src/addrbook_search_html.php:176
+#: squirrelmail/src/addrbook_search.php:231
+#: squirrelmail/src/addrbook_search_html.php:226
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:235
-#: squirrelmail/src/addrbook_search_html.php:201
+#: squirrelmail/src/addrbook_search.php:257
+#: squirrelmail/src/addrbook_search_html.php:251
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:158
-#: squirrelmail/src/addrbook_search.php:242
-#: squirrelmail/src/addrbook_search_html.php:206
+#: squirrelmail/src/addrbook_search.php:170
+#: squirrelmail/src/addrbook_search.php:266
+#: squirrelmail/src/addrbook_search_html.php:258
 msgid "No persons matching your search was found"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:219
+#: squirrelmail/src/addrbook_search_html.php:272
 msgid "Return"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:193
-msgid "Close window"
+#: squirrelmail/plugins/newmail/testsound.php:36
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:429
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
+#: squirrelmail/src/addrbook_search.php:210 squirrelmail/src/compose.php:786
+#: squirrelmail/src/printer_friendly_top.php:43
+msgid "Close"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:39 squirrelmail/src/addressbook.php:285
+#: squirrelmail/plugins/abook_take/take.php:39
+#: squirrelmail/src/addressbook.php:45 squirrelmail/src/addressbook.php:309
 msgid "Nickname"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:40
+#: squirrelmail/plugins/abook_take/take.php:41
+#: squirrelmail/src/addressbook.php:46
 msgid "Must be unique"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:41
+#: squirrelmail/plugins/abook_take/take.php:45
+#: squirrelmail/src/addressbook.php:47
 msgid "E-mail address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/plugins/abook_take/take.php:64
+#: squirrelmail/src/addressbook.php:48
 msgid "First name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:43
+#: squirrelmail/plugins/abook_take/take.php:68
+#: squirrelmail/src/addressbook.php:49
 msgid "Last name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:44
+#: squirrelmail/plugins/abook_take/take.php:72
+#: squirrelmail/src/addressbook.php:50
 msgid "Additional info"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:58
+#: squirrelmail/src/addressbook.php:65
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:154
+#: squirrelmail/src/addressbook.php:162
 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:176 squirrelmail/src/addressbook.php:180
+#: squirrelmail/src/addressbook.php:213 squirrelmail/src/addressbook.php:217
 msgid "Update address"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:20
-#: squirrelmail/functions/display_messages.php:71
-#: squirrelmail/functions/display_messages.php:87
-#: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:239
+#: squirrelmail/functions/display_messages.php:70
+#: squirrelmail/functions/display_messages.php:89
+#: squirrelmail/functions/display_messages.php:106
+#: squirrelmail/functions/display_messages.php:172
+#: squirrelmail/src/addressbook.php:202 squirrelmail/src/addressbook.php:256
 msgid "ERROR"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:214
+#: squirrelmail/src/addressbook.php:229
 msgid "Unknown error"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:258 squirrelmail/src/addressbook.php:341
+#: squirrelmail/plugins/abook_take/take.php:77
+#: squirrelmail/src/addressbook.php:276 squirrelmail/src/addressbook.php:379
 msgid "Add address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:323
+#: squirrelmail/src/addressbook.php:290 squirrelmail/src/addressbook.php:357
 msgid "Edit selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:272 squirrelmail/src/addressbook.php:325
+#: squirrelmail/src/addressbook.php:292 squirrelmail/src/addressbook.php:359
 msgid "Delete selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:338
+#: squirrelmail/plugins/abook_take/take.php:33
+#: squirrelmail/src/addressbook.php:374
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
-#: squirrelmail/src/compose.php:43
-msgid "Draft Email Saved"
+#: squirrelmail/functions/mailbox_display.php:832
+#: squirrelmail/plugins/filters/options.php:137
+#: squirrelmail/src/compose.php:86 squirrelmail/src/compose.php:97
+#: squirrelmail/src/options_highlight.php:384
+#: squirrelmail/src/options_order.php:44
+#: squirrelmail/src/printer_friendly_bottom.php:105
+#: squirrelmail/src/read_body.php:408 squirrelmail/src/search.php:441
+msgid "Subject"
 msgstr ""
 
-#: squirrelmail/src/compose.php:131 squirrelmail/src/compose.php:172
-#: squirrelmail/src/compose.php:183
-msgid "Could not move/copy file. File not attached"
+#: squirrelmail/functions/mailbox_display.php:815
+#: squirrelmail/plugins/filters/options.php:125
+#: squirrelmail/src/compose.php:87 squirrelmail/src/compose.php:99
+#: squirrelmail/src/options_highlight.php:83
+#: squirrelmail/src/options_highlight.php:372
+#: squirrelmail/src/options_order.php:42
+#: squirrelmail/src/printer_friendly_bottom.php:101
+#: squirrelmail/src/read_body.php:416 squirrelmail/src/search.php:442
+msgid "From"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:824
+#: squirrelmail/src/compose.php:88 squirrelmail/src/compose.php:101
+#: squirrelmail/src/options_order.php:43
+#: squirrelmail/src/printer_friendly_bottom.php:109
+#: squirrelmail/src/read_body.php:417
+msgid "Date"
 msgstr ""
 
-#: squirrelmail/src/compose.php:304
+#: squirrelmail/src/compose.php:96
 msgid "Original Message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:581
-#: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:143
-#: squirrelmail/src/download.php:149
-#: squirrelmail/src/options_highlight.php:334
-#: squirrelmail/src/options_order.php:57
-#: squirrelmail/src/printer_friendly_bottom.php:118
-#: squirrelmail/src/search.php:116
-msgid "Subject"
+#: squirrelmail/src/compose.php:200
+msgid "Draft Email Saved"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:567
-#: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:144
-#: squirrelmail/src/download.php:151
-#: squirrelmail/src/options_highlight.php:322
-#: squirrelmail/src/options_order.php:55
-#: squirrelmail/src/printer_friendly_bottom.php:112
-#: squirrelmail/src/search.php:117
-msgid "From"
+#: squirrelmail/src/compose.php:294 squirrelmail/src/compose.php:337
+#: squirrelmail/src/compose.php:347
+msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:575
-#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:146
-#: squirrelmail/src/download.php:155 squirrelmail/src/options_order.php:56
-#: squirrelmail/src/printer_friendly_bottom.php:117
-msgid "Date"
+#: squirrelmail/src/compose.php:778
+msgid "Draft Saved"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:565
-#: squirrelmail/plugins/filters/options.php:88
-#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:145
-#: squirrelmail/src/download.php:153
-#: squirrelmail/src/options_highlight.php:325
-#: squirrelmail/src/printer_friendly_bottom.php:113
-#: squirrelmail/src/search.php:119
-msgid "To"
+#: squirrelmail/src/compose.php:781
+msgid "Your Message has been sent"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:47
-#: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:566
+#: squirrelmail/plugins/listcommands/mailout.php:56
+#: squirrelmail/src/compose.php:797
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:489 squirrelmail/src/read_body.php:583
+#: squirrelmail/src/compose.php:825 squirrelmail/src/read_body.php:215
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:497
+#: squirrelmail/src/compose.php:833
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:505
+#: squirrelmail/src/compose.php:841
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:512 squirrelmail/src/read_body.php:537
+#: squirrelmail/src/compose.php:848 squirrelmail/src/read_body.php:216
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:557 squirrelmail/src/compose.php:619
+#: squirrelmail/src/compose.php:898 squirrelmail/src/compose.php:1008
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:563
+#: squirrelmail/src/compose.php:911
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:143
+#: squirrelmail/src/compose.php:916 squirrelmail/src/options_order.php:136
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:584
+#: squirrelmail/src/compose.php:939
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:118 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:972 squirrelmail/src/read_body.php:422
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
+#: squirrelmail/functions/mime.php:238
+#: squirrelmail/plugins/administrator/defines.php:202
+#: squirrelmail/plugins/calendar/functions.php:102
+#: squirrelmail/src/compose.php:973
 msgid "High"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:630 squirrelmail/src/read_body.php:437
+#: squirrelmail/functions/mime.php:251
+#: squirrelmail/plugins/calendar/functions.php:101
+#: squirrelmail/src/compose.php:974
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
+#: squirrelmail/functions/mime.php:244
+#: squirrelmail/plugins/administrator/defines.php:199
+#: squirrelmail/src/compose.php:975
 msgid "Low"
 msgstr ""
 
-#: squirrelmail/src/compose.php:653
-msgid "You have not filled in the \"To:\" field."
+#: squirrelmail/src/compose.php:981
+msgid "Receipt"
 msgstr ""
 
-#: squirrelmail/src/compose.php:736
-msgid "said"
+#: squirrelmail/src/compose.php:983
+msgid "On Read"
 msgstr ""
 
-#: squirrelmail/src/compose.php:739
-msgid "quote"
+#: squirrelmail/src/compose.php:985
+msgid "On Delivery"
 msgstr ""
 
-#: squirrelmail/src/compose.php:739
-msgid "who"
+#: squirrelmail/src/compose.php:990
+#: squirrelmail/src/options_identities.php:318
+msgid "Signature"
 msgstr ""
 
-#: squirrelmail/src/download.php:49
-msgid "Viewing a text attachment"
+#: squirrelmail/functions/page_header.php:219 squirrelmail/src/compose.php:993
+#: squirrelmail/src/compose.php:997 squirrelmail/src/compose.php:1001
+msgid "Addresses"
 msgstr ""
 
-#: squirrelmail/src/download.php:52 squirrelmail/src/download.php:54
-#: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
-#: squirrelmail/src/read_body.php:162 squirrelmail/src/vcard.php:51
-#: squirrelmail/src/vcard.php:55
-msgid "View message"
+#: squirrelmail/src/compose.php:1005
+msgid "Save Draft"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:620 squirrelmail/src/download.php:59
-#: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:212
-msgid "Download this as a file"
+#: squirrelmail/src/compose.php:1025
+msgid "You have not filled in the \"To:\" field."
+msgstr ""
+
+#: squirrelmail/src/compose.php:1095
+msgid "said"
+msgstr ""
+
+#: squirrelmail/src/compose.php:1098
+msgid "quote"
+msgstr ""
+
+#: squirrelmail/src/compose.php:1098
+msgid "who"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:1220
+#: squirrelmail/functions/page_header.php:193
+#: squirrelmail/plugins/delete_move_next/setup.php:227
+#: squirrelmail/plugins/mail_fetch/options.php:173
+#: squirrelmail/plugins/mail_fetch/options.php:291
+#: squirrelmail/src/download.php:33 squirrelmail/src/left_main.php:66
+#: squirrelmail/src/search.php:171 squirrelmail/src/search.php:410
+msgid "INBOX"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:25
+#: squirrelmail/src/folders_create.php:33
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:25
+#: squirrelmail/src/folders_create.php:33
+#: squirrelmail/src/folders_delete.php:33
+#: squirrelmail/src/folders_rename_getname.php:28
 msgid "Click here to go back"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:120 squirrelmail/src/folders.php:29
-#: squirrelmail/src/left_main.php:234
+#: squirrelmail/src/folders_delete.php:33
+msgid "You have not selected a folder to delete. Please do so."
+msgstr ""
+
+#: squirrelmail/functions/page_header.php:221 squirrelmail/src/folders.php:32
+#: squirrelmail/src/left_main.php:806
 msgid "Folders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:42
+#: squirrelmail/src/folders.php:41
 msgid "Subscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:44
+#: squirrelmail/src/folders.php:43
 msgid "Unsubscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:46
+#: squirrelmail/src/folders.php:45
 msgid "Deleted folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:48
+#: squirrelmail/src/folders.php:47
 msgid "Created folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:50
+#: squirrelmail/src/folders.php:49
 msgid "Renamed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:273
+#: squirrelmail/src/folders.php:52
+msgid "Subscription Unsuccessful - Folder does not exist."
+msgstr ""
+
+#: squirrelmail/src/folders.php:59 squirrelmail/src/left_main.php:845
 msgid "refresh folder list"
 msgstr ""
 
-#: squirrelmail/src/folders.php:65
+#: squirrelmail/src/folders.php:72
 msgid "Create Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:70
+#: squirrelmail/src/folders.php:79
 msgid "as a subfolder of"
 msgstr ""
 
-#: squirrelmail/src/folders.php:74 squirrelmail/src/folders.php:76
+#: squirrelmail/src/folders.php:83 squirrelmail/src/folders.php:85
 msgid "None"
 msgstr ""
 
-#: squirrelmail/src/folders.php:98
+#: squirrelmail/src/folders.php:110
 msgid "Let this folder contain subfolders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:101
+#: squirrelmail/src/folders.php:113
 msgid "Create"
 msgstr ""
 
-#: squirrelmail/src/folders.php:108
+#: squirrelmail/src/folders.php:149
 msgid "Rename a Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:131
+#: squirrelmail/src/folders.php:157 squirrelmail/src/folders.php:198
+msgid "Select a folder"
+msgstr ""
+
+#: squirrelmail/src/folders.php:176
 msgid "Rename"
 msgstr ""
 
-#: squirrelmail/src/folders.php:135 squirrelmail/src/folders.php:194
+#: squirrelmail/src/folders.php:180 squirrelmail/src/folders.php:220
 msgid "No folders found"
 msgstr ""
 
-#: squirrelmail/src/folders.php:143
+#: squirrelmail/src/folders.php:190
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:538
-#: squirrelmail/plugins/filters/options.php:154
-#: squirrelmail/plugins/mail_fetch/options.php:168
-#: squirrelmail/plugins/mail_fetch/options.php:175
-#: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
-#: squirrelmail/src/options_identities.php:320
-#: squirrelmail/src/read_body.php:473
+#: squirrelmail/functions/mailbox_display.php:726
+#: squirrelmail/plugins/filters/options.php:198
+#: squirrelmail/plugins/mail_fetch/options.php:215
+#: squirrelmail/plugins/mail_fetch/options.php:222
+#: squirrelmail/src/folders.php:216 squirrelmail/src/options_highlight.php:104
+#: squirrelmail/src/options_identities.php:332
+#: squirrelmail/src/read_body.php:506
 msgid "Delete"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:31
-#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:220
+#: squirrelmail/plugins/listcommands/setup.php:34
+#: squirrelmail/src/folders.php:231 squirrelmail/src/folders.php:253
 msgid "Unsubscribe"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:32
-#: squirrelmail/src/folders.php:201 squirrelmail/src/folders.php:261
+#: squirrelmail/plugins/listcommands/setup.php:33
+#: squirrelmail/src/folders.php:231 squirrelmail/src/folders.php:296
+#: squirrelmail/src/folders.php:306
 msgid "Subscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:224
+#: squirrelmail/src/folders.php:257
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:264
+#: squirrelmail/src/folders.php:299
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:42
+#: squirrelmail/src/folders.php:304
+msgid "Subscribe to:"
+msgstr ""
+
+#: squirrelmail/src/folders_rename_getname.php:28
+msgid "You have not selected a folder to rename. Please do so."
+msgstr ""
+
+#: squirrelmail/src/folders_rename_getname.php:54
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:46
+#: squirrelmail/src/folders_rename_getname.php:59
 msgid "New name:"
 msgstr ""
 
-#: squirrelmail/functions/options.php:404
-#: squirrelmail/plugins/filters/options.php:138
-#: squirrelmail/plugins/newmail/newmail_opt.php:133
-#: squirrelmail/plugins/translate/options.php:163
-#: squirrelmail/src/folders_rename_getname.php:53
-#: squirrelmail/src/options_highlight.php:347
+#: squirrelmail/functions/options.php:419
+#: squirrelmail/plugins/filters/options.php:177
+#: squirrelmail/plugins/newmail/newmail_opt.php:155
+#: squirrelmail/plugins/translate/options.php:164
+#: squirrelmail/src/folders_rename_getname.php:66
+#: squirrelmail/src/options_highlight.php:397
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:126
-#: squirrelmail/plugins/listcommands/setup.php:30 squirrelmail/src/help.php:91
+#: squirrelmail/src/help.php:75 squirrelmail/src/help.php:83
+msgid "ERROR: Help files are not in the right format!"
+msgstr ""
+
+#: squirrelmail/functions/page_header.php:227
+#: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:95
 msgid "Help"
 msgstr ""
 
-#: squirrelmail/src/help.php:131
+#: squirrelmail/src/help.php:134
 #, 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:140
 msgid "Some or all of the help documents are not present!"
 msgstr ""
 
-#: squirrelmail/src/help.php:170 squirrelmail/src/help.php:193
+#: squirrelmail/src/help.php:178 squirrelmail/src/help.php:200
 msgid "Table of Contents"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:735
-#: squirrelmail/functions/mailbox_display.php:738
-#: squirrelmail/functions/mailbox_display.php:741
-#: squirrelmail/src/help.php:187 squirrelmail/src/help.php:191
-#: squirrelmail/src/read_body.php:495 squirrelmail/src/read_body.php:497
+#: squirrelmail/functions/mailbox_display.php:1014
+#: squirrelmail/functions/mailbox_display.php:1017
+#: squirrelmail/functions/mailbox_display.php:1020
+#: squirrelmail/src/help.php:194 squirrelmail/src/help.php:198
+#: squirrelmail/src/read_body.php:542 squirrelmail/src/read_body.php:544
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:736
-#: squirrelmail/functions/mailbox_display.php:739
-#: squirrelmail/functions/mailbox_display.php:742
-#: squirrelmail/src/help.php:195 squirrelmail/src/help.php:198
-#: squirrelmail/src/read_body.php:501 squirrelmail/src/read_body.php:503
+#: squirrelmail/functions/mailbox_display.php:1015
+#: squirrelmail/functions/mailbox_display.php:1018
+#: squirrelmail/functions/mailbox_display.php:1021
+#: squirrelmail/src/help.php:202 squirrelmail/src/help.php:205
+#: squirrelmail/src/read_body.php:551 squirrelmail/src/read_body.php:553
 msgid "Next"
 msgstr ""
 
-#: squirrelmail/src/help.php:221
+#: squirrelmail/src/help.php:226
 msgid "Top"
 msgstr ""
 
-#: squirrelmail/src/image.php:26
+#: squirrelmail/src/image.php:31
 msgid "Viewing an image attachment"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:93
-msgid "empty"
+#: squirrelmail/src/image.php:35 squirrelmail/src/vcard.php:37
+#: squirrelmail/src/view_header.php:92 squirrelmail/src/view_text.php:56
+msgid "View message"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:94 squirrelmail/src/image.php:44
+#: squirrelmail/src/vcard.php:194 squirrelmail/src/view_text.php:60
+msgid "Download this as a file"
+msgstr ""
+
+#: squirrelmail/src/left_main.php:90 squirrelmail/src/left_main.php:321
+#: squirrelmail/src/left_main.php:409
+msgid "purge"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:267
+#: squirrelmail/src/left_main.php:839
 msgid "Last Refresh"
 msgstr ""
 
-#: squirrelmail/src/login.php:97 squirrelmail/src/login.php:141
+#: squirrelmail/src/left_main.php:919
+msgid "Save folder tree"
+msgstr ""
+
+#: squirrelmail/src/login.php:66 squirrelmail/src/login.php:128
 msgid "Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:112
+#: squirrelmail/functions/display_messages.php:164
+#: squirrelmail/src/login.php:91
+#, c-format
+msgid "%s Logo"
+msgstr ""
+
+#: squirrelmail/functions/display_messages.php:167
+#: squirrelmail/src/login.php:94
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
-#: squirrelmail/src/login.php:113
+#: squirrelmail/functions/display_messages.php:168
+#: squirrelmail/src/login.php:95
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:119
+#: squirrelmail/src/login.php:99
 #, c-format
 msgid "%s Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:123
+#: squirrelmail/src/login.php:107
 msgid "Name:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:126
-#: squirrelmail/plugins/mail_fetch/options.php:207
-#: squirrelmail/src/login.php:129
+#: squirrelmail/plugins/mail_fetch/options.php:158
+#: squirrelmail/plugins/mail_fetch/options.php:275
+#: squirrelmail/src/login.php:115
 msgid "Password:"
 msgstr ""
 
-#: squirrelmail/src/move_messages.php:93
-#: squirrelmail/src/move_messages.php:128
-#: squirrelmail/src/move_messages.php:157
+#: squirrelmail/src/move_messages.php:158
+#: squirrelmail/src/move_messages.php:209
+#: squirrelmail/src/move_messages.php:244
 msgid "No messages were selected."
 msgstr ""
 
-#: squirrelmail/src/options_display.php:32
-msgid "General Display Options"
+#: squirrelmail/functions/page_header.php:223
+#: squirrelmail/plugins/filters/options.php:74
+#: squirrelmail/plugins/newmail/newmail_opt.php:38
+#: squirrelmail/plugins/translate/options.php:98
+#: squirrelmail/src/options.php:211 squirrelmail/src/options_highlight.php:68
+#: squirrelmail/src/options_identities.php:61
+#: squirrelmail/src/options_order.php:36 squirrelmail/src/read_body.php:598
+msgid "Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:44
-msgid "Theme"
+#: squirrelmail/src/options.php:156 squirrelmail/src/options.php:311
+#: squirrelmail/src/options_highlight.php:68
+msgid "Message Highlighting"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:51
-#: squirrelmail/src/options_display.php:80
-msgid "Default"
+#: squirrelmail/plugins/filters/options.php:103
+#: squirrelmail/src/options_highlight.php:75
+msgid "New"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:64
-msgid "Custom Stylesheet"
+#: squirrelmail/plugins/filters/options.php:104
+#: squirrelmail/plugins/filters/spamoptions.php:183
+#: squirrelmail/plugins/mail_fetch/fetch.php:283
+#: squirrelmail/src/options_highlight.php:76
+msgid "Done"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:83
-msgid "Language"
+#: squirrelmail/plugins/filters/options.php:134
+#: squirrelmail/src/options_highlight.php:92
+#: squirrelmail/src/options_highlight.php:381
+msgid "To or Cc"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:92
-msgid "Use Javascript"
+#: squirrelmail/src/options_highlight.php:95
+msgid "subject"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:95
-msgid "Autodetect"
+#: squirrelmail/plugins/filters/options.php:193
+#: squirrelmail/plugins/filters/spamoptions.php:182
+#: squirrelmail/src/options_highlight.php:102
+msgid "Edit"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:96
-msgid "Always"
+#: squirrelmail/src/options_highlight.php:118
+msgid "No highlighting is defined"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:97
-#: squirrelmail/src/options_folder.php:122
-msgid "Never"
+#: squirrelmail/src/options_highlight.php:311
+msgid "Identifying name"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:115
-msgid "Mailbox Display Options"
+#: squirrelmail/src/options_highlight.php:324
+msgid "Color"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:120
-msgid "Number of Messages to Index"
+#: squirrelmail/src/options_highlight.php:327
+msgid "Dark Blue"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:128
-msgid "Enable Alternating Row Colors"
+#: squirrelmail/src/options_highlight.php:328
+msgid "Dark Green"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:135
-msgid "Enable Page Selector"
+#: squirrelmail/src/options_highlight.php:329
+msgid "Dark Yellow"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:142
-msgid "Maximum Number of Pages to Show"
+#: squirrelmail/src/options_highlight.php:330
+msgid "Dark Cyan"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:149
-msgid "Message Display and Composition"
+#: squirrelmail/src/options_highlight.php:331
+msgid "Dark Magenta"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:154
-msgid "Wrap Incoming Text At"
+#: squirrelmail/src/options_highlight.php:332
+msgid "Light Blue"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:162
-msgid "Size of Editor Window"
+#: squirrelmail/src/options_highlight.php:333
+msgid "Light Green"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:170
-msgid "Location of Buttons when Composing"
+#: squirrelmail/src/options_highlight.php:334
+msgid "Light Yellow"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:173
-msgid "Before headers"
+#: squirrelmail/src/options_highlight.php:335
+msgid "Light Cyan"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:174
-msgid "Between headers and message body"
+#: squirrelmail/src/options_highlight.php:336
+msgid "Light Magenta"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:175
-msgid "After message body"
+#: squirrelmail/src/options_highlight.php:337
+msgid "Dark Gray"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:180
-msgid "Addressbook Display Format"
+#: squirrelmail/src/options_highlight.php:338
+msgid "Medium Gray"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:183
-msgid "Javascript"
+#: squirrelmail/src/options_highlight.php:339
+msgid "Light Gray"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:184
-msgid "HTML"
+#: squirrelmail/src/options_highlight.php:340
+msgid "White"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:189
-msgid "Show HTML Version by Default"
+#: squirrelmail/src/options_highlight.php:342
+msgid "Other:"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:196
-msgid "Include Me in CC when I Reply All"
+#: squirrelmail/src/options_highlight.php:344
+msgid "Ex: 63aa7f"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:203
-msgid "Enable Mailer Display"
+#: squirrelmail/src/options_highlight.php:386
+msgid "Matches"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:210
-msgid "Display Attached Images with Message"
+#: squirrelmail/src/options_identities.php:51
+#, c-format
+msgid "Alternate Identity %d"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:217
-msgid "Enable Subtle Printer Friendly Link"
+#: squirrelmail/src/options_identities.php:61
+msgid "Advanced Identities"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:224
-msgid "Enable Printer Friendly Clean Display"
+#: squirrelmail/src/options_identities.php:67
+msgid "Default Identity"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:40
-msgid "Special Folder Options"
+#: squirrelmail/src/options_identities.php:71
+msgid "Add a New Identity"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:47
-msgid "Folder Path"
+#: squirrelmail/src/options_identities.php:315
+msgid "Full Name"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:63
-msgid "Do not use Trash"
+#: squirrelmail/src/options_identities.php:316
+msgid "E-Mail Address"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:67
-msgid "Trash Folder"
+#: squirrelmail/src/options_identities.php:317
+msgid "Reply To"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:74
-msgid "Do not use Sent"
+#: squirrelmail/src/options_identities.php:325
+msgid "Save / Update"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:78
-msgid "Sent Folder"
+#: squirrelmail/src/options_identities.php:330
+msgid "Make Default"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:85
-msgid "Do not use Drafts"
+#: squirrelmail/src/options_identities.php:336
+msgid "Move Up"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:89
-msgid "Draft Folder"
+#: squirrelmail/src/options.php:168 squirrelmail/src/options.php:327
+#: squirrelmail/src/options_order.php:36
+msgid "Index Order"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:97
-msgid "Folder List Options"
+#: squirrelmail/src/options_order.php:41
+msgid "Checkbox"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:102
-msgid "Location of Folder List"
+#: squirrelmail/src/options_order.php:45
+msgid "Flags"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:105
-msgid "Left"
+#: squirrelmail/functions/mailbox_display.php:839
+#: squirrelmail/src/options_order.php:46
+msgid "Size"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:106
-msgid "Right"
+#: squirrelmail/src/options_order.php:91
+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_folder.php:111
-msgid "pixels"
+#: squirrelmail/src/options_order.php:102
+msgid "up"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:115
-msgid "Width of Folder List"
+#: squirrelmail/src/options_order.php:104
+msgid "down"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:121
-msgid "Minutes"
+#: squirrelmail/src/options_order.php:109
+msgid "remove"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:125
-msgid "Seconds"
+#: squirrelmail/src/options_order.php:140
+msgid "Return to options page"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:127
-msgid "Minute"
+#: squirrelmail/src/options.php:144 squirrelmail/src/options.php:295
+msgid "Personal Information"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:134
-msgid "Auto Refresh Folder List"
+#: squirrelmail/src/options.php:150 squirrelmail/src/options.php:303
+msgid "Display Preferences"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:142
-msgid "Enable Unread Message Notification"
+#: squirrelmail/src/options.php:162 squirrelmail/src/options.php:319
+msgid "Folder Preferences"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:145
-msgid "No Notification"
+#: squirrelmail/src/options.php:278
+msgid "Successfully Saved Options"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:146
-msgid "Only INBOX"
+#: squirrelmail/src/options.php:283
+msgid "Refresh Folder List"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:147
-msgid "All Folders"
+#: squirrelmail/src/options.php:285
+msgid "Refresh Page"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:152
-msgid "Unread Message Notification Type"
+#: squirrelmail/src/options.php:297
+msgid ""
+"This contains personal information about yourself such as your name, your "
+"email address, etc."
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:155
-msgid "Only Unseen"
+#: squirrelmail/src/options.php:305
+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_folder.php:156
-msgid "Unseen and Total"
+#: squirrelmail/src/options.php:313
+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_folder.php:161
-msgid "Enable Collapsable Folders"
+#: squirrelmail/src/options.php:321
+msgid ""
+"These settings change the way your folders are displayed and manipulated."
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:168
-msgid "Show Clock on Folders Panel"
+#: squirrelmail/src/options.php:329
+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_folder.php:176
-msgid "No Clock"
+#: squirrelmail/src/printer_friendly_bottom.php:66
+msgid "Message not printable"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:181
-msgid "Hour Format"
+#: squirrelmail/src/printer_friendly_bottom.php:95
+#: squirrelmail/src/printer_friendly_main.php:19
+#: squirrelmail/src/printer_friendly_top.php:26
+msgid "Printer Friendly"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:184
-msgid "12-hour clock"
+#: squirrelmail/src/printer_friendly_bottom.php:118
+msgid "CC"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:185
-msgid "24-hour clock"
+#: squirrelmail/src/printer_friendly_top.php:42
+msgid "Print"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:190
-msgid "Memory Search"
+#: squirrelmail/src/read_body.php:132
+msgid "View Printable Version"
 msgstr ""
 
-#: squirrelmail/plugins/sent_subfolders/setup.php:102
-#: squirrelmail/src/options_folder.php:193
-msgid "Disabled"
+#: squirrelmail/src/read_body.php:178
+msgid "Read:"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:122
-#: squirrelmail/plugins/filters/options.php:62
-#: squirrelmail/plugins/newmail/newmail_opt.php:34
-#: squirrelmail/plugins/translate/options.php:97
-#: squirrelmail/src/options.php:165 squirrelmail/src/options_highlight.php:62
-#: squirrelmail/src/options_identities.php:58
-#: squirrelmail/src/options_order.php:48
-msgid "Options"
+#: squirrelmail/src/read_body.php:214
+msgid "Your message"
 msgstr ""
 
-#: squirrelmail/src/options.php:113 squirrelmail/src/options.php:264
-#: squirrelmail/src/options_highlight.php:62
-msgid "Message Highlighting"
+#: squirrelmail/src/read_body.php:217
+msgid "Sent:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:64
-#: squirrelmail/src/options_highlight.php:66
-msgid "New"
+#: squirrelmail/src/read_body.php:219
+#, c-format
+msgid "Was displayed on %s"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:65
-#: squirrelmail/plugins/filters/spamoptions.php:149
-#: squirrelmail/plugins/mail_fetch/fetch.php:225
-#: squirrelmail/src/options_highlight.php:67
-msgid "Done"
+#: squirrelmail/src/read_body.php:388
+msgid "less"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:152
-#: squirrelmail/plugins/filters/spamoptions.php:148
-#: squirrelmail/src/options_highlight.php:74
-msgid "Edit"
+#: squirrelmail/src/read_body.php:390
+msgid "more"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:87
-msgid "No highlighting is defined"
+#: squirrelmail/functions/mime.php:414 squirrelmail/src/read_body.php:413
+msgid "Unknown sender"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:259
-msgid "Identifying name"
+#: squirrelmail/src/read_body.php:425
+msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:273
-msgid "Color"
+#: squirrelmail/src/read_body.php:431 squirrelmail/src/read_body.php:433
+#: squirrelmail/src/read_body.php:451
+msgid "Read receipt"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:277
-msgid "Dark Blue"
+#: squirrelmail/src/read_body.php:431
+msgid "send"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:278
-msgid "Dark Green"
+#: squirrelmail/src/read_body.php:433
+msgid "requested"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:279
-msgid "Dark Yellow"
+#: squirrelmail/src/read_body.php:443
+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/src/options_highlight.php:280
-msgid "Dark Cyan"
+#: squirrelmail/src/read_body.php:452
+msgid "Send read receipt now"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:281
-msgid "Dark Magenta"
+#: squirrelmail/src/read_body.php:489
+msgid "Search results"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:282
-msgid "Light Blue"
+#: squirrelmail/src/read_body.php:493
+msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:283
-msgid "Light Green"
+#: squirrelmail/src/read_body.php:523
+msgid "Resume Draft"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:284
-msgid "Light Yellow"
+#: squirrelmail/src/read_body.php:526
+msgid "Edit Message as New"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:285
-msgid "Light Cyan"
+#: squirrelmail/src/read_body.php:558
+msgid "View Message"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:286
-msgid "Light Magenta"
+#: squirrelmail/plugins/filters/options.php:210
+#: squirrelmail/src/read_body.php:564
+msgid "Up"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:287
-msgid "Dark Gray"
+#: squirrelmail/functions/mailbox_display.php:714
+#: squirrelmail/src/read_body.php:570
+msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:288
-msgid "Medium Gray"
+#: squirrelmail/src/read_body.php:575
+msgid "Forward as Attachment"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:289
-msgid "Light Gray"
+#: squirrelmail/src/read_body.php:580
+msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:290
-msgid "White"
+#: squirrelmail/src/read_body.php:584
+msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:292
-msgid "Other:"
+#: squirrelmail/src/read_body.php:600
+msgid "View Full Header"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:294
-msgid "Ex: 63aa7f"
+#: squirrelmail/src/read_body.php:748
+msgid "Attachments"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:91
-#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:118
-msgid "Cc"
+#: squirrelmail/functions/auth.php:34 squirrelmail/src/redirect.php:69
+msgid "You must be logged in to access this page."
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:94
-#: squirrelmail/src/options_highlight.php:331
-msgid "To or Cc"
+#: squirrelmail/src/redirect.php:90
+msgid "There was an error contacting the mail server."
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:336
-msgid "Matches"
+#: squirrelmail/src/redirect.php:92
+msgid "Contact your administrator for help."
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:58
-msgid "Advanced Identities"
+#: squirrelmail/src/search.php:175
+msgid "Folder:"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:69
-msgid "Default Identity"
+#: squirrelmail/src/search.php:311
+msgid "edit"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:80
-#, c-format
-msgid "Alternate Identity %d"
+#: squirrelmail/src/search.php:318 squirrelmail/src/search.php:363
+msgid "search"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:90
-msgid "Add a New Identity"
+#: squirrelmail/src/search.php:321
+msgid "delete"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:306
-#: squirrelmail/src/options_personal.php:49
-msgid "Full Name"
+#: squirrelmail/src/search.php:332
+msgid "Recent Searches"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:307
-msgid "E-Mail Address"
+#: squirrelmail/src/search.php:355
+msgid "save"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:308
-#: squirrelmail/src/options_personal.php:65
-msgid "Reply To"
+#: squirrelmail/src/search.php:366
+msgid "forget"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:315
-msgid "Save / Update"
+#: squirrelmail/src/search.php:398
+msgid "Current Search"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:318
-msgid "Make Default"
+#: squirrelmail/src/search.php:439
+msgid "Body"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:324
-msgid "Move Up"
+#: squirrelmail/src/search.php:440
+msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/src/options.php:125 squirrelmail/src/options.php:280
-#: squirrelmail/src/options_order.php:48
-msgid "Index Order"
+#: squirrelmail/src/search.php:471 squirrelmail/src/search.php:501
+msgid "Search Results"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:54
-msgid "Checkbox"
+#: squirrelmail/src/search.php:493 squirrelmail/src/search.php:508
+msgid "No Messages Found"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:58
-msgid "Flags"
+#: squirrelmail/functions/page_header.php:206 squirrelmail/src/signout.php:80
+msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:587
-#: squirrelmail/src/options_order.php:59
-msgid "Size"
+#: squirrelmail/src/signout.php:83
+msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/options_order.php:102
-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."
+#: squirrelmail/src/signout.php:85
+msgid "Click here to log back in."
 msgstr ""
 
-#: squirrelmail/src/options_order.php:111
-msgid "up"
-msgstr ""
-
-#: squirrelmail/src/options_order.php:113
-msgid "down"
-msgstr ""
-
-#: squirrelmail/src/options_order.php:118
-msgid "remove"
-msgstr ""
-
-#: squirrelmail/src/options_order.php:147
-msgid "Return to options page"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:41
-msgid "Name and Address Options"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:57
-msgid "Email Address"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:72
-msgid "Edit Advanced Identities"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:74
-msgid "(discards changes made on this form so far)"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:77
-msgid "Multiple Identities"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:84
-msgid "Reply Citation Options"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:89
-msgid "Reply Citation Style"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:92
-msgid "No Citation"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:93
-msgid "AUTHOR Said"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:94
-msgid "Quote Who XML"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:95
-msgid "User-Defined"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:100
-msgid "User-Defined Citation Start"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:108
-msgid "User-Defined Citation End"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:115
-msgid "Signature Options"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:120
-msgid "Use Signature"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:127
-msgid "Prefix Signature with '-- ' Line"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:134
-msgid "Signature"
-msgstr ""
-
-#: squirrelmail/src/options.php:101 squirrelmail/src/options.php:248
-msgid "Personal Information"
-msgstr ""
-
-#: squirrelmail/src/options.php:107 squirrelmail/src/options.php:256
-msgid "Display Preferences"
-msgstr ""
-
-#: squirrelmail/src/options.php:119 squirrelmail/src/options.php:272
-msgid "Folder Preferences"
-msgstr ""
-
-#: squirrelmail/src/options.php:232
-msgid "Successfully Saved Options"
-msgstr ""
-
-#: squirrelmail/src/options.php:236
-msgid "Refresh Folder List"
-msgstr ""
-
-#: squirrelmail/src/options.php:238
-msgid "Refresh Page"
-msgstr ""
-
-#: squirrelmail/src/options.php:250
-msgid ""
-"This contains personal information about yourself such as your name, your "
-"email address, etc."
-msgstr ""
-
-#: squirrelmail/src/options.php:258
-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:266
-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:274
-msgid ""
-"These settings change the way your folders are displayed and manipulated."
-msgstr ""
-
-#: squirrelmail/src/options.php:282
-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:78
-msgid "Message not printable"
-msgstr ""
-
-#: squirrelmail/src/printer_friendly_bottom.php:107
-#: squirrelmail/src/printer_friendly_main.php:15
-#: squirrelmail/src/printer_friendly_top.php:21
-msgid "Printer Friendly"
-msgstr ""
-
-#: squirrelmail/src/printer_friendly_bottom.php:115
-msgid "CC"
-msgstr ""
-
-#: squirrelmail/src/printer_friendly_top.php:36
-msgid "Print"
-msgstr ""
-
-#: squirrelmail/src/printer_friendly_top.php:37
-msgid "Close Window"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:102
-msgid "View Printable Version"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:154
-msgid "Viewing Full Header"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:290
-msgid "more"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:291
-msgid "less"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:465
-msgid "Message List"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:477
-msgid "Resume Draft"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:514
-msgid "Forward"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:519
-msgid "Reply"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:524
-msgid "Reply All"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:548 squirrelmail/src/read_body.php:551
-msgid "View Full Header"
-msgstr ""
-
-#: squirrelmail/plugins/calendar/event_create.php:107
-#: squirrelmail/plugins/calendar/event_delete.php:32
-#: squirrelmail/plugins/calendar/event_edit.php:36
-#: squirrelmail/plugins/calendar/event_edit.php:94
-#: squirrelmail/plugins/calendar/event_edit.php:107
-#: squirrelmail/src/read_body.php:574
-msgid "Date:"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:628
-msgid "Mailer"
-msgstr ""
-
-#: squirrelmail/functions/auth.php:29 squirrelmail/src/redirect.php:60
-#: squirrelmail/src/redirect.php:64
-msgid "You must be logged in to access this page."
-msgstr ""
-
-#: squirrelmail/functions/auth.php:30 squirrelmail/src/redirect.php:65
-msgid "Go to the login page"
-msgstr ""
-
-#: squirrelmail/src/redirect.php:85 squirrelmail/src/redirect.php:89
-msgid "There was an error contacting the mail server."
-msgstr ""
-
-#: squirrelmail/src/redirect.php:90
-msgid "Contact your administrator for help."
-msgstr ""
-
-#: squirrelmail/src/search.php:114
-msgid "Body"
-msgstr ""
-
-#: squirrelmail/src/search.php:115
-msgid "Everywhere"
-msgstr ""
-
-#: squirrelmail/functions/page_header.php:110 squirrelmail/src/signout.php:84
-msgid "Sign Out"
-msgstr ""
-
-#: squirrelmail/src/signout.php:90
-msgid "You have been successfully signed out."
-msgstr ""
-
-#: squirrelmail/src/signout.php:92
-msgid "Click here to log back in."
-msgstr ""
-
-#: squirrelmail/src/vcard.php:46
+#: squirrelmail/src/vcard.php:34
 msgid "Viewing a Business Card"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:108 squirrelmail/src/vcard.php:169
+#: squirrelmail/src/vcard.php:84 squirrelmail/src/vcard.php:144
 msgid "Title"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:109
+#: squirrelmail/src/vcard.php:85
 msgid "Email"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:110 squirrelmail/src/vcard.php:163
+#: squirrelmail/src/vcard.php:86 squirrelmail/src/vcard.php:136
 msgid "Web Page"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:111 squirrelmail/src/vcard.php:172
+#: squirrelmail/src/vcard.php:87 squirrelmail/src/vcard.php:148
 msgid "Organization / Department"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:112 squirrelmail/src/vcard.php:166
+#: squirrelmail/src/vcard.php:88 squirrelmail/src/vcard.php:140
 msgid "Address"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:113 squirrelmail/src/vcard.php:179
+#: squirrelmail/src/vcard.php:89 squirrelmail/src/vcard.php:157
 msgid "Work Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:114 squirrelmail/src/vcard.php:182
+#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:161
 msgid "Home Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:115 squirrelmail/src/vcard.php:185
+#: squirrelmail/src/vcard.php:91 squirrelmail/src/vcard.php:165
 msgid "Cellular Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:116 squirrelmail/src/vcard.php:188
+#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:169
 msgid "Fax"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:117 squirrelmail/src/vcard.php:191
+#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:173
 msgid "Note"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:149
+#: squirrelmail/src/vcard.php:122
 msgid "Add to Addressbook"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:176
+#: squirrelmail/src/vcard.php:153
 msgid "Title & Org. / Dept."
 msgstr ""
 
+#: squirrelmail/src/view_header.php:89
+msgid "Viewing Full Header"
+msgstr ""
+
+#: squirrelmail/src/view_text.php:55
+msgid "Viewing a text attachment"
+msgstr ""
+
 #: squirrelmail/functions/abook_database.php:50
-#: squirrelmail/functions/abook_local_file.php:53
-#: squirrelmail/functions/addressbook.php:152
+#: squirrelmail/functions/abook_local_file.php:37
+#: squirrelmail/functions/addressbook.php:155
 msgid "Personal address book"
 msgstr ""
 
@@ -1286,721 +1170,858 @@ 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:247
+#: squirrelmail/functions/abook_local_file.php:243
 #: squirrelmail/functions/abook_local_file.php:267
-#: squirrelmail/functions/abook_local_file.php:290
-#: squirrelmail/functions/abook_local_file.php:319
-#: squirrelmail/functions/addressbook.php:348
-#: squirrelmail/functions/addressbook.php:383
-#: squirrelmail/functions/addressbook.php:436
+#: squirrelmail/functions/abook_local_file.php:292
+#: squirrelmail/functions/abook_local_file.php:324
+#: squirrelmail/functions/addressbook.php:371
+#: squirrelmail/functions/addressbook.php:406
+#: squirrelmail/functions/addressbook.php:459
 msgid "Addressbook is read-only"
 msgstr ""
 
 #: squirrelmail/functions/abook_database.php:231
-#: squirrelmail/functions/abook_local_file.php:252
+#: 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:324
+#: squirrelmail/functions/abook_local_file.php:330
 #, c-format
 msgid "User '%s' does not exist"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:51
+#: squirrelmail/functions/abook_global_file.php:35
 msgid "Global address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:71
-#: squirrelmail/functions/abook_local_file.php:94
+#: squirrelmail/functions/abook_global_file.php:56
+#: squirrelmail/functions/abook_local_file.php:83
 msgid "No such file or directory"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:81
-#: squirrelmail/functions/abook_local_file.php:114
-#: squirrelmail/functions/abook_local_file.php:150
+#: squirrelmail/functions/abook_global_file.php:69
+#: squirrelmail/functions/abook_local_file.php:104
+#: squirrelmail/functions/abook_local_file.php:140
 msgid "Open failed"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:178
-#: squirrelmail/functions/abook_global_file.php:184
-#: squirrelmail/functions/abook_global_file.php:190
+#: squirrelmail/functions/abook_global_file.php:171
+#: squirrelmail/functions/abook_global_file.php:177
+#: squirrelmail/functions/abook_global_file.php:183
 msgid "Can not modify global address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:61
+#: squirrelmail/functions/abook_local_file.php:46
 msgid "Not a file name"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:271
-#: squirrelmail/functions/abook_local_file.php:295
-#: 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:283
+#: squirrelmail/functions/abook_local_file.php:285
 msgid "Write to addressbook failed"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:70
+#: squirrelmail/functions/addressbook.php:73
 msgid "Error initializing addressbook database."
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:79
+#: squirrelmail/functions/addressbook.php:82
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:89
+#: squirrelmail/functions/addressbook.php:92
 msgid "Error initializing global addressbook."
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:105
+#: squirrelmail/functions/addressbook.php:108
 #, c-format
 msgid "Error initializing LDAP server %s:"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:326
-#: squirrelmail/functions/addressbook.php:413
+#: squirrelmail/functions/addressbook.php:349
+#: squirrelmail/functions/addressbook.php:436
 msgid "Invalid input data"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:330
-#: squirrelmail/functions/addressbook.php:417
+#: squirrelmail/functions/addressbook.php:353
+#: squirrelmail/functions/addressbook.php:440
 msgid "Name is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:334
-#: squirrelmail/functions/addressbook.php:421
+#: squirrelmail/functions/addressbook.php:357
+#: squirrelmail/functions/addressbook.php:444
 msgid "E-mail address is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:342
-#: squirrelmail/functions/addressbook.php:426
+#: squirrelmail/functions/addressbook.php:365
+#: squirrelmail/functions/addressbook.php:449
 msgid "Nickname contains illegal characters"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:116
+#: squirrelmail/functions/attachment_common.php:105
+#: squirrelmail/functions/attachment_common.php:125
 #: squirrelmail/functions/attachment_common.php:141
-#: squirrelmail/functions/attachment_common.php:166
+#: squirrelmail/functions/attachment_common.php:162
 msgid "view"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:183
+#: squirrelmail/functions/attachment_common.php:177
 msgid "Business Card"
 msgstr ""
 
-#: squirrelmail/functions/date.php:91
-#: squirrelmail/plugins/calendar/calendar.php:48
+#: squirrelmail/functions/date.php:113
+#: squirrelmail/plugins/calendar/calendar.php:64
 msgid "Sunday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:94
-#: squirrelmail/plugins/calendar/calendar.php:49
+#: squirrelmail/functions/date.php:116
+#: squirrelmail/plugins/calendar/calendar.php:65
 msgid "Monday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:97
-#: squirrelmail/plugins/calendar/calendar.php:50
+#: squirrelmail/functions/date.php:119
+#: squirrelmail/plugins/calendar/calendar.php:66
 msgid "Tuesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:100
-#: squirrelmail/plugins/calendar/calendar.php:51
+#: squirrelmail/functions/date.php:122
+#: squirrelmail/plugins/calendar/calendar.php:67
 msgid "Wednesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:103
-#: squirrelmail/plugins/calendar/calendar.php:52
+#: squirrelmail/functions/date.php:125
+#: squirrelmail/plugins/calendar/calendar.php:68
 msgid "Thursday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:106
-#: squirrelmail/plugins/calendar/calendar.php:53
+#: squirrelmail/functions/date.php:128
+#: squirrelmail/plugins/calendar/calendar.php:69
 msgid "Friday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:109
-#: squirrelmail/plugins/calendar/calendar.php:54
+#: squirrelmail/functions/date.php:131
+#: squirrelmail/plugins/calendar/calendar.php:70
 msgid "Saturday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:120
+#: squirrelmail/functions/date.php:142
 msgid "January"
 msgstr ""
 
-#: squirrelmail/functions/date.php:123
+#: squirrelmail/functions/date.php:145
 msgid "February"
 msgstr ""
 
-#: squirrelmail/functions/date.php:126
+#: squirrelmail/functions/date.php:148
 msgid "March"
 msgstr ""
 
-#: squirrelmail/functions/date.php:129
+#: squirrelmail/functions/date.php:151
 msgid "April"
 msgstr ""
 
-#: squirrelmail/functions/date.php:132
+#: squirrelmail/functions/date.php:154
 msgid "May"
 msgstr ""
 
-#: squirrelmail/functions/date.php:135
+#: squirrelmail/functions/date.php:157
 msgid "June"
 msgstr ""
 
-#: squirrelmail/functions/date.php:138
+#: squirrelmail/functions/date.php:160
 msgid "July"
 msgstr ""
 
-#: squirrelmail/functions/date.php:141
+#: squirrelmail/functions/date.php:163
 msgid "August"
 msgstr ""
 
-#: squirrelmail/functions/date.php:144
+#: squirrelmail/functions/date.php:166
 msgid "September"
 msgstr ""
 
-#: squirrelmail/functions/date.php:147
+#: squirrelmail/functions/date.php:169
 msgid "October"
 msgstr ""
 
-#: squirrelmail/functions/date.php:150
+#: squirrelmail/functions/date.php:172
 msgid "November"
 msgstr ""
 
-#: squirrelmail/functions/date.php:153
+#: squirrelmail/functions/date.php:175
 msgid "December"
 msgstr ""
 
-#: squirrelmail/functions/date.php:180
+#: squirrelmail/functions/date.php:208
 msgid "D, F j, Y g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:182
+#: squirrelmail/functions/date.php:210
 msgid "D, F j, Y G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:204
+#: squirrelmail/functions/date.php:236
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:206
+#: squirrelmail/functions/date.php:238
 msgid "G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:211
+#: squirrelmail/functions/date.php:243
 msgid "D, g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:213
+#: squirrelmail/functions/date.php:245
 msgid "D, G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:217
+#: squirrelmail/functions/date.php:249
 msgid "M j, Y"
 msgstr ""
 
+#: squirrelmail/functions/db_prefs.php:52
 #: squirrelmail/functions/db_prefs.php:59
-#: squirrelmail/functions/db_prefs.php:66
-#: squirrelmail/functions/db_prefs.php:104
-#: squirrelmail/functions/db_prefs.php:107
-#: squirrelmail/functions/db_prefs.php:241
+#: 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/db_prefs.php:377
-#: squirrelmail/functions/prefs.php:268
-#, c-format
-msgid "Error creating directory %s."
+#: squirrelmail/functions/display_messages.php:73
+#: squirrelmail/functions/imap_general.php:238
+msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:378
-#: squirrelmail/functions/prefs.php:269
-msgid "Could not create hashed directory structure!"
+#: squirrelmail/functions/display_messages.php:75
+msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:379
-#: squirrelmail/functions/prefs.php:171 squirrelmail/functions/prefs.php:176
-#: squirrelmail/functions/prefs.php:270
-msgid "Please contact your system administrator and report this error."
+#: squirrelmail/functions/display_messages.php:96
+#, c-format
+msgid "Click here to return to %s"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:23
-#: squirrelmail/functions/imap_general.php:224
-msgid "Unknown user or password incorrect."
+#: squirrelmail/functions/display_messages.php:179
+msgid "Go to the login page"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:25
-msgid "Click here to try again"
+#: squirrelmail/functions/file_prefs.php:39
+#, c-format
+msgid ""
+"Preference file, %s, does not exist. Log out, and log back in to create a "
+"default preference file."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:39
+#: squirrelmail/functions/file_prefs.php:47
+#: squirrelmail/functions/file_prefs.php:107
 #, c-format
-msgid "Welcome to %s's WebMail system"
+msgid ""
+"Preference file, %s, could not be opened. Contact your system administrator "
+"to resolve this issue."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:51
+#: squirrelmail/functions/file_prefs.php:175
 #, c-format
-msgid "Running SquirrelMail version %s (c) 1999-2001."
+msgid "Error opening %s"
+msgstr ""
+
+#: squirrelmail/functions/file_prefs.php:178
+msgid "Default preference file not found!"
+msgstr ""
+
+#: squirrelmail/functions/file_prefs.php:179
+#: squirrelmail/functions/file_prefs.php:192
+#: squirrelmail/functions/prefs.php:94
+msgid "Please contact your system administrator and report this error."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:76
+#: squirrelmail/functions/file_prefs.php:190
+msgid "Could not create initial preference file!"
+msgstr ""
+
+#: squirrelmail/functions/file_prefs.php:191
 #, c-format
-msgid "Click here to return to %s"
+msgid "%s should be writable by user %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:136
-#: squirrelmail/functions/imap_messages.php:119
-#: squirrelmail/functions/imap_messages.php:127
-#: squirrelmail/functions/imap_messages.php:146
-#: squirrelmail/functions/imap_messages.php:155
-#: squirrelmail/functions/imap_messages.php:268
-#: squirrelmail/plugins/filters/filters.php:89
+#: squirrelmail/functions/file_prefs.php:209
+#: squirrelmail/functions/file_prefs.php:227
+#, c-format
+msgid ""
+"Signature file, %s, could not be opened. Contact your system administrator "
+"to resolve this issue."
+msgstr ""
+
+#: squirrelmail/functions/i18n.php:827
+msgid ""
+"You need to have php4 installed with the multibyte string function enabled "
+"(using configure option --with-mbstring)."
+msgstr ""
+
+#: squirrelmail/functions/imap_general.php:125
+#: squirrelmail/functions/imap_messages.php:427
+#: squirrelmail/functions/imap_messages.php:434
+#: squirrelmail/functions/imap_messages.php:445
+#: squirrelmail/functions/imap_messages.php:452
+#: squirrelmail/functions/imap_messages.php:652
+#: squirrelmail/functions/imap_messages.php:663
 msgid "ERROR : Could not complete request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:138
-#: squirrelmail/plugins/filters/filters.php:91
+#: squirrelmail/functions/imap_general.php:127
+#: squirrelmail/functions/imap_general.php:139
+msgid "Query:"
+msgstr ""
+
+#: squirrelmail/functions/imap_general.php:129
 msgid "Reason Given: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:145
-#: squirrelmail/plugins/filters/filters.php:98
+#: squirrelmail/functions/imap_general.php:137
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:147
-#: squirrelmail/plugins/filters/filters.php:100
+#: squirrelmail/functions/imap_general.php:141
 msgid "Server responded: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:183
+#: squirrelmail/functions/imap_general.php:197
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:199
+#: squirrelmail/functions/imap_general.php:213
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:201
+#: squirrelmail/functions/imap_general.php:215
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:203
+#: squirrelmail/functions/imap_general.php:217
 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:429
+#: squirrelmail/functions/imap_messages.php:447
+#: squirrelmail/functions/imap_messages.php:654
+#: squirrelmail/functions/imap_messages.php:665
 msgid "Unknown response from IMAP server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:129
+#: squirrelmail/functions/imap_messages.php:436
+#: squirrelmail/functions/imap_messages.php:454
 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:894
+#: squirrelmail/functions/imap_messages.php:476
+#: squirrelmail/functions/imap_messages.php:579
+#: squirrelmail/functions/imap_parse.php:183
+#: squirrelmail/functions/imap_parse.php:205
+#: squirrelmail/functions/mailbox_display.php:1178
 msgid "(no subject)"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:167
+#: squirrelmail/functions/imap_messages.php:477
 msgid "Unknown Sender"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:222
-msgid "No To Address"
-msgstr ""
-
-#: squirrelmail/functions/imap_messages.php:498
+#: squirrelmail/functions/imap_parse.php:208
 msgid "(unknown sender)"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:61
-msgid "No Messages Found"
+#: squirrelmail/functions/mailbox_display.php:203
+msgid "A"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:151
-msgid "Found"
+#: squirrelmail/functions/mailbox_display.php:389
+msgid ""
+"Thread sorting is not supported by your IMAP server.<br>Please report this "
+"to the system administrator."
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:151
-msgid "messages"
+#: squirrelmail/functions/mailbox_display.php:408
+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:427
+#: squirrelmail/functions/mailbox_display.php:609
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:511
-msgid "Move Selected To:"
+#: squirrelmail/functions/mailbox_display.php:707
+msgid "Move Selected To"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:514
+#: squirrelmail/functions/mailbox_display.php:708
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:530
+#: squirrelmail/functions/mailbox_display.php:713
+#: squirrelmail/plugins/delete_move_next/setup.php:253
+#: squirrelmail/plugins/delete_move_next/setup.php:277
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:534
+#: squirrelmail/functions/mailbox_display.php:720
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:534
+#: squirrelmail/functions/mailbox_display.php:721
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:536
+#: squirrelmail/functions/mailbox_display.php:724
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:537
+#: squirrelmail/functions/mailbox_display.php:725
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:633
+#: squirrelmail/functions/mailbox_display.php:740
+msgid "Unthread View"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:744
+msgid "Thread View"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:895
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:655
+#: squirrelmail/functions/mailbox_display.php:919
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:657
+#: squirrelmail/functions/mailbox_display.php:921
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:674
+#: squirrelmail/functions/mailbox_display.php:938
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:676
+#: squirrelmail/functions/mailbox_display.php:941
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:861
+#: squirrelmail/functions/mailbox_display.php:1140
 msgid "Paginate"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:868
+#: squirrelmail/functions/mailbox_display.php:1147
 msgid "Show All"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:370
-msgid "Error decoding mime structure.  Report this as a bug!"
+#: squirrelmail/functions/mime.php:41
+msgid "Squirrelmail could not decode the bodystructure of the message"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:431
+#: squirrelmail/functions/mime.php:42
+msgid "the provided bodystructure by your imap-server"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:137
 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:433
+#: squirrelmail/functions/mime.php:139
+msgid "Submit message"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:141
+msgid "Command:"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:142
 msgid "Response:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:434
-#: squirrelmail/plugins/calendar/event_create.php:113
-#: squirrelmail/plugins/calendar/event_delete.php:38
-#: squirrelmail/plugins/calendar/event_edit.php:102
-#: squirrelmail/plugins/calendar/event_edit.php:115
+#: squirrelmail/functions/mime.php:143
+#: squirrelmail/plugins/calendar/event_create.php:143
+#: squirrelmail/plugins/calendar/event_delete.php:53
+#: squirrelmail/plugins/calendar/event_edit.php:125
+#: squirrelmail/plugins/calendar/event_edit.php:149
 msgid "Message:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:435
+#: squirrelmail/functions/mime.php:144
 msgid "FETCH line:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:649
-msgid "Attachments"
+#: squirrelmail/functions/mime.php:369
+msgid "Hide Unsafe Images"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:688
-msgid "download"
+#: squirrelmail/functions/mime.php:371
+msgid "View Unsafe Images"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:967
-#: squirrelmail/plugins/calendar/event_create.php:53
-#: squirrelmail/plugins/calendar/event_create.php:111
-#: squirrelmail/plugins/calendar/event_delete.php:36
-#: squirrelmail/plugins/calendar/event_edit.php:72
-#: squirrelmail/plugins/calendar/event_edit.php:100
-#: squirrelmail/plugins/calendar/event_edit.php:113
-msgid "Title:"
+#: squirrelmail/functions/mime.php:401
+msgid "download"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:1137
+#: squirrelmail/functions/mime.php:1204 squirrelmail/functions/mime.php:1530
 msgid "sec_remove_eng.png"
 msgstr ""
 
-#: squirrelmail/functions/options.php:167
+#: squirrelmail/functions/options.php:168
 #, c-format
 msgid "Option Type '%s' Not Found"
 msgstr ""
 
-#: squirrelmail/functions/options.php:253
-#: squirrelmail/plugins/calendar/event_edit.php:135
+#: squirrelmail/functions/options.php:263
+#: squirrelmail/plugins/administrator/options.php:359
+#: squirrelmail/plugins/calendar/event_delete.php:68
+#: squirrelmail/plugins/calendar/event_edit.php:171
 msgid "Yes"
 msgstr ""
 
-#: squirrelmail/functions/options.php:258
-#: squirrelmail/plugins/calendar/event_edit.php:142
+#: squirrelmail/functions/options.php:268
+#: squirrelmail/plugins/administrator/options.php:360
+#: squirrelmail/plugins/calendar/event_delete.php:76
+#: squirrelmail/plugins/calendar/event_edit.php:179
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:107
+#: squirrelmail/functions/page_header.php:200
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:116
+#: squirrelmail/functions/page_header.php:213
+#: squirrelmail/functions/page_header.php:216
+#: squirrelmail/functions/page_header.php:259
+#: squirrelmail/functions/page_header.php:286
 msgid "Compose"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:46
+#: squirrelmail/functions/prefs.php:92
 #, c-format
-msgid ""
-"Preference file, %s, does not exist. Log out, and log back in to create a "
-"default preference file."
-msgstr ""
-
-#: squirrelmail/functions/prefs.php:169 squirrelmail/functions/prefs.php:174
-msgid "Error opening "
-msgstr ""
-
-#: squirrelmail/functions/prefs.php:170
-msgid "Default preference file not found!"
+msgid "Error creating directory %s."
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:175
-msgid "Could not create initial preference file!"
+#: squirrelmail/functions/prefs.php:93
+msgid "Could not create hashed directory structure!"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:360
+#: squirrelmail/plugins/filters/filters.php:467
 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:475
 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:483
 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:491
 msgid "COMMERCIAL - RBL+ Blackhole entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:392
+#: squirrelmail/plugins/filters/filters.php:499
 msgid "COMMERCIAL - RBL+ OpenRelay entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:400
+#: squirrelmail/plugins/filters/filters.php:507
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:408
+#: squirrelmail/plugins/filters/filters.php:516
 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:524
 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:424
+#: squirrelmail/plugins/filters/filters.php:532
 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:540
 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:548
 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:556
 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:564
 msgid ""
-"FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
-"false positives than ORBS did though."
+"FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail."
+"cgi scripts. (planned)."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:464
-msgid "FREE - Another ORBS replacement (just the INPUTS database used here)."
+#: squirrelmail/plugins/filters/filters.php:572
+msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:472
-msgid "FREE - Another ORBS replacement (just the OUTPUTS database used here)."
+#: squirrelmail/plugins/filters/filters.php:580
+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
+#: squirrelmail/plugins/filters/filters.php:588
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:488
+#: squirrelmail/plugins/filters/filters.php:596
 msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:496
+#: squirrelmail/plugins/filters/filters.php:604
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:504
+#: squirrelmail/plugins/filters/filters.php:612
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:512
+#: squirrelmail/plugins/filters/filters.php:620
 msgid "FREE - Five-Ten-sg.com - Single Stage servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:520
+#: squirrelmail/plugins/filters/filters.php:628
 msgid "FREE - Five-Ten-sg.com - SPAM Support servers."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:528
+#: squirrelmail/plugins/filters/filters.php:636
 msgid "FREE - Five-Ten-sg.com - Web Form IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:536
+#: squirrelmail/plugins/filters/filters.php:644
 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:544
+#: squirrelmail/plugins/filters/filters.php:652
+msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:660
+#, c-format
 msgid ""
-"FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be "
-"SLOOOOOOW!"
+"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:668
+msgid "FREE - dev.null.dk - I don't have any detailed info on this list."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:552
-msgid "FREE - orbz.gst-group.co.uk - Inputs only."
+#: squirrelmail/plugins/filters/filters.php:676
+msgid "FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:560
-msgid "FREE - orbz.gst-group.co.uk - Outputs only."
+#: squirrelmail/plugins/filters/filters.php:684
+msgid "FREE - 2mbit.com Open Relays - Another list of Open Relays."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:568
+#: squirrelmail/plugins/filters/filters.php:692
+msgid "FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:700
+msgid "FREE - 2mbit.com SPAM ISPs - List of SPAM-friendly ISPs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:708
 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:576
-#, c-format
+#: squirrelmail/plugins/filters/filters.php:716
 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:724
+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:732
+msgid ""
+"FREE - Leadmon Open Relays - Single Stage Open Relays that are not listed on "
+"other active RBLs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:740
+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:748
+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:756
+msgid ""
+"FREE, for now - Not Just Another Blacklist - Both Open Relays and Direct "
+"SPAM Sources."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:764
+msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:772
+msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:780
+msgid "FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:788
+msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:62
+#: squirrelmail/plugins/filters/options.php:64
+msgid "Saved Scan type"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:74
 msgid "Message Filtering"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:78
+#: squirrelmail/plugins/filters/options.php:83
+#: squirrelmail/plugins/filters/spamoptions.php:118
+msgid "What to Scan:"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:90
+#: squirrelmail/plugins/filters/spamoptions.php:125
+msgid "All messages"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:95
+#: squirrelmail/plugins/filters/spamoptions.php:130
+msgid "Only unread messages"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:98
+#: squirrelmail/plugins/filters/spamoptions.php:171
+msgid "Save"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:118
 msgid "Match:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:104
+#: squirrelmail/plugins/filters/options.php:140
+msgid "Header"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:146
 msgid "Contains:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:116
+#: squirrelmail/plugins/delete_move_next/setup.php:249
+#: squirrelmail/plugins/delete_move_next/setup.php:273
+#: squirrelmail/plugins/filters/options.php:156
 msgid "Move to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:158
+#: squirrelmail/plugins/filters/options.php:204
 msgid "Down"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:164
-msgid "Up"
-msgstr ""
-
-#: squirrelmail/plugins/filters/options.php:167
+#: squirrelmail/plugins/filters/options.php:215
 #, c-format
 msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:78
+#: squirrelmail/plugins/filters/setup.php:132
 msgid "Message Filters"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:80
+#: squirrelmail/plugins/filters/setup.php:134
 msgid ""
 "Filtering enables messages with different criteria to be automatically "
 "filtered into different folders for easier organization."
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:86
+#: squirrelmail/plugins/filters/setup.php:140
 msgid "SPAM Filters"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:88
+#: squirrelmail/plugins/filters/setup.php:142
 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:62
 msgid "Spam Filtering"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:57
+#: squirrelmail/plugins/filters/spamoptions.php:69
 msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:77
+#: squirrelmail/plugins/filters/spamoptions.php:93
 msgid "Move spam to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:94
+#: squirrelmail/plugins/filters/spamoptions.php:114
 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 "
@@ -2009,19 +2030,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:137
 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 "
@@ -2030,63 +2039,59 @@ 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:150
+#: squirrelmail/plugins/filters/spamoptions.php:184
 #, c-format
 msgid "Spam is sent to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:150
+#: squirrelmail/plugins/filters/spamoptions.php:184
 msgid "[<i>not set yet</i>]"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:152
+#: squirrelmail/plugins/filters/spamoptions.php:186
 #, c-format
 msgid "Spam scan is limited to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:152
+#: squirrelmail/plugins/filters/spamoptions.php:186
 msgid "New Messages Only"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:152
+#: squirrelmail/plugins/filters/spamoptions.php:186
 msgid "All Messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:162
+#: squirrelmail/plugins/filters/spamoptions.php:197
 msgid "ON"
 msgstr ""
 
-#: squirrelmail/plugins/filters/spamoptions.php:164
+#: squirrelmail/plugins/filters/spamoptions.php:199
 msgid "OFF"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/setup.php:31
+#: squirrelmail/plugins/squirrelspell/setup.php:49
 msgid "SpellChecker Options"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/setup.php:33
+#: squirrelmail/plugins/squirrelspell/setup.php:51
 msgid ""
 "Here you may set up how your personal dictionary is stored, edit it, or "
 "choose which languages should be available to you when spell-checking."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/setup.php:49
+#: squirrelmail/plugins/squirrelspell/setup.php:77
 msgid "Check Spelling"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:35
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:58
 msgid "Back to &quot;SpellChecker Options&quot; page"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:210
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:361
 msgid "ATTENTION:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:211
+#: 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 "
@@ -2098,207 +2103,256 @@ msgid ""
 "it, the encrypted data is no longer accessible."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:217
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:369
 msgid "Delete my dictionary and start a new one"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:218
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:370
 msgid "Decrypt my dictionary with my old password:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:221
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
 msgid "Proceed"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:227
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:229
-msgid "Error Decrypting Dictionary"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/sqspell_interface.php:43
-#: squirrelmail/plugins/squirrelspell/sqspell_options.php:41
-msgid "SECURITY BREACH ON DECK 5! CMDR TUVOK AND SECURITY TEAM REQUESTED."
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:383
+msgid "You must make a choice"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:24
-msgid "Your personal dictionary was erased."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:25
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:32
-msgid "Dictionary Erased"
+#: 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/modules/crypto_badkey.mod.php:30
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:57
-msgid "Close this Window"
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
+msgid "This will delete your personal dictionary file. Proceed?"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:48
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Now return to the "
-"&quot;SpellChecker options&quot; menu and make your selection again."
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:394
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:397
+msgid "Error Decrypting Dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:51
-msgid "Successful Re-encryption"
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:515
+msgid "Cute."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:54
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Please close this "
-"window and click \"Check Spelling\" button again to start your spellcheck "
-"over."
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:115
+#, c-format
+msgid "I tried to execute '%s', but it returned:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:59
-msgid "Dictionary re-encrypted"
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:121
+msgid "SquirrelSpell is misconfigured."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:25
-msgid ""
-"Your personal dictionary has been <strong>encrypted</strong> and is now "
-"stored in an <strong>encrypted format</strong>."
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:213
+msgid "SquirrelSpell Results"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:36
-msgid ""
-"Your personal dictionary has been <strong>decrypted</strong> and is now "
-"stored as <strong>clear text</strong>."
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:273
+msgid "Spellcheck completed. Commit changes?"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:44
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:45
-msgid "Personal Dictionary Crypto Settings"
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:275
+msgid "No changes were made."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:121
-msgid "SquirrelSpell Results"
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:277
+msgid "Now saving your personal dictionary... Please wait."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:170
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:298
 #, c-format
 msgid "Found %s errors"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:183
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:319
 msgid "Line with an error:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:192
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:329
 msgid "Error:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:200
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:338
 msgid "Suggestions:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:206
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:345
 msgid "Suggestions"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:214
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:353
 msgid "Change to:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:223
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:362
 msgid "Occurs times:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:239
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:379
 msgid "Change this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:240
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:380
 msgid "Change"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:242
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:382
 msgid "Change ALL occurances of this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:243
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:383
 msgid "Change All"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:245
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:385
 msgid "Ignore this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:246
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:386
 msgid "Ignore"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:248
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:388
 msgid "Ignore ALL occurances this word"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:249
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:389
 msgid "Ignore All"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:251
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:391
 msgid "Add this word to your personal dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:252
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:392
 msgid "Add to Dic"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:264
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:405
 msgid "Close and Commit"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:266
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:407
 msgid "The spellcheck is not finished. Really close and commit changes?"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:269
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:410
 msgid "Close and Cancel"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:271
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:412
 msgid "The spellcheck is not finished. Really close and discard changes?"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/testsound.php:33
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:285
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:50
-msgid "Close"
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:431
+msgid "No errors found"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:286
-msgid "No errors found"
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:33
+msgid "Your personal dictionary was erased."
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:34
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:47
+msgid "Dictionary Erased"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:41
+msgid ""
+"Your personal dictionary was erased. Please close this window and click "
+"\"Check Spelling\" button again to start your spellcheck over."
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:45
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:77
+msgid "Close this Window"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:70
+msgid ""
+"Your personal dictionary was re-encrypted successfully. Now return to the "
+"&quot;SpellChecker options&quot; menu and make your selection again."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:21
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:56
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:72
+msgid "Successful Re-encryption"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:75
+msgid ""
+"Your personal dictionary was re-encrypted successfully. Please close this "
+"window and click \"Check Spelling\" button again to start your spellcheck "
+"over."
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:79
+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"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:21
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:61
+#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:29
+#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:99
 msgid "No words in your personal dictionary."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:24
+#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:36
 msgid "Please check any words you wish to delete from your dictionary."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:35
+#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:58
 #, c-format
 msgid "%s dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:54
+#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:89
 msgid "Delete checked words"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:65
+#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:103
 msgid "Edit your Personal Dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:22
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:25
+msgid "Please make your selection first."
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:27
+msgid ""
+"This will encrypt your personal dictionary and store it in an encrypted "
+"format. Proceed?"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:30
+msgid ""
+"This will decrypt your personal dictionary and store it in a clear-text "
+"format. Proceed?"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:47
 msgid ""
 "<p>Your personal dictionary is <strong>currently encrypted</strong>. This "
 "helps protect your privacy in case the web-mail system gets compromized and "
@@ -2311,17 +2365,17 @@ msgid ""
 "old password in order to re-encrypt the dictionary with a new key.</p>"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:26
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:52
 msgid ""
 "Please decrypt my personal dictionary and store it in a clear-text format."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:29
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:42
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:55
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:73
 msgid "Change crypto settings"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:35
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:65
 msgid ""
 "<p>Your personal dictionary is <strong>currently not encrypted</strong>. You "
 "may wish to encrypt your personal dictionary to protect your privacy in case "
@@ -2338,179 +2392,179 @@ msgid ""
 "new value.</p>"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:39
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:70
 msgid ""
 "Please encrypt my personal dictionary and store it in an encrypted format."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:22
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:28
 #, c-format
 msgid "Deleting the following entries from <strong>%s</strong> dictionary:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:52
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:71
 msgid "All done!"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:53
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:51
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:72
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:71
 msgid "Personal Dictionary Updated"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:56
+#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:78
 msgid "No changes requested."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:25
+#: squirrelmail/plugins/squirrelspell/modules/init.mod:33
 msgid "Please wait, communicating with the server..."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:32
+#: squirrelmail/plugins/squirrelspell/modules/init.mod:42
 msgid ""
 "Please choose which dictionary you would like to use to spellcheck this "
 "message:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/calendar.php:112
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:44
+#: squirrelmail/plugins/calendar/calendar.php:130
+#: squirrelmail/plugins/squirrelspell/modules/init.mod:53
 msgid "Go"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:48
+#: squirrelmail/plugins/squirrelspell/modules/init.mod:57
 msgid "SquirrelSpell Initiating"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:56
+#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:72
 #, c-format
 msgid ""
 "Settings adjusted to: <strong>%s</strong> with <strong>%s</strong> as "
 "default dictionary."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:61
+#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:79
 #, c-format
 msgid "Using <strong>%s</strong> dictionary (system default) for spellcheck."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:69
+#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:90
 msgid "International Dictionaries Preferences Updated"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:19
+#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod:22
 msgid ""
 "Please check any available international dictionaries which you would like "
 "to use when spellchecking:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:26
+#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod:32
 msgid "Make this dictionary my default selection:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:41
+#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod:49
 msgid "Make these changes"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:42
+#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod:50
 msgid "Add International Dictionaries"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:18
+#: squirrelmail/plugins/squirrelspell/modules/options_main.mod:19
 msgid "Please choose which options you wish to set up:"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:22
+#: squirrelmail/plugins/squirrelspell/modules/options_main.mod:23
 msgid "Edit your personal dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:27
+#: squirrelmail/plugins/squirrelspell/modules/options_main.mod:30
 msgid "Set up international dictionaries"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:35
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:39
+#: squirrelmail/plugins/squirrelspell/modules/options_main.mod:40
+#: squirrelmail/plugins/squirrelspell/modules/options_main.mod:44
 msgid "Encrypt or decrypt your personal dictionary"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:39
+#: squirrelmail/plugins/squirrelspell/modules/options_main.mod:45
 msgid "not available"
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:43
+#: squirrelmail/plugins/squirrelspell/modules/options_main.mod:48
 msgid "SquirrelSpell Options Menu"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:97
+#: squirrelmail/plugins/translate/options.php:98
 msgid "Translator"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:100
+#: squirrelmail/plugins/translate/options.php:101
 msgid "Your server options are as follows:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:105
+#: squirrelmail/plugins/translate/options.php:106
 msgid ""
 "13 language pairs, maximum of 1000 characters translated, powered by Systran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:108
+#: squirrelmail/plugins/translate/options.php:109
 msgid ""
 "10 language pairs, maximum of 25 kilobytes translated, powered by Systran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:111
+#: squirrelmail/plugins/translate/options.php:112
 msgid "12 language pairs, no known limits, powered by Systran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:114
+#: squirrelmail/plugins/translate/options.php:115
 msgid ""
 "767 language pairs, no known limits, powered by Translation Experts's "
 "InterTran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:117
+#: squirrelmail/plugins/translate/options.php:118
 msgid ""
 "8 language pairs, no known limits, powered by GPLTrans (free, open source)"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:123
+#: squirrelmail/plugins/translate/options.php:124
 msgid ""
 "You also decide if you want the translation box displayed, and where it will "
 "be located."
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:127
+#: squirrelmail/plugins/translate/options.php:128
 msgid "Select your translator:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:139
+#: squirrelmail/plugins/translate/options.php:140
 msgid "When reading:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:144
+#: squirrelmail/plugins/translate/options.php:145
 msgid "Show translation box"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:146
+#: squirrelmail/plugins/translate/options.php:147
 msgid "to the left"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:147
+#: squirrelmail/plugins/translate/options.php:148
 msgid "in the center"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:148
+#: squirrelmail/plugins/translate/options.php:149
 msgid "to the right"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:153
+#: squirrelmail/plugins/translate/options.php:154
 msgid "Translate inside the SquirrelMail frames"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:156
+#: squirrelmail/plugins/translate/options.php:157
 msgid "When composing:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:160
+#: squirrelmail/plugins/translate/options.php:161
 msgid "Not yet functional, currently does nothing"
 msgstr ""
 
@@ -2791,30 +2845,30 @@ msgstr ""
 msgid "Latin"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:34
+#: 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 "
@@ -2822,7 +2876,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 "
@@ -2831,7 +2885,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 "
@@ -2839,52 +2893,52 @@ 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
+#: squirrelmail/plugins/newmail/newmail.php:21
 msgid "New Mail"
 msgstr ""
 
@@ -2892,339 +2946,351 @@ msgstr ""
 msgid "SquirrelMail Notice:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail.php:31
+#: squirrelmail/plugins/newmail/newmail.php:32
 msgid "You have new mail!"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:78
+#: squirrelmail/plugins/newmail/newmail.php:34
+msgid "Close Window"
+msgstr ""
+
+#: squirrelmail/plugins/newmail/setup.php:79
 msgid "NewMail Options"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:80
+#: squirrelmail/plugins/newmail/setup.php:81
 msgid ""
 "This configures settings for playing sounds and/or showing popup windows "
 "when new mail arrives."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:129
+#: squirrelmail/plugins/newmail/setup.php:130
 msgid "New Mail Notification options saved"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:202
+#: squirrelmail/plugins/newmail/setup.php:211
 #, c-format
 msgid "%s New Messages"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:206
+#: squirrelmail/plugins/newmail/setup.php:215
 #, c-format
 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 ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:82
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:90
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:102
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:79
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:87
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:99
 msgid "POP3 connect:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:82
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:79
 msgid "No server specified"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:90
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:102
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:141
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:276
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:330
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:341
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:389
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:422
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:455
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:554
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:577
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:87
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:99
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:132
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:255
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:309
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:320
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:368
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:401
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:434
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:533
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:556
 msgid "Error "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:110
-msgid "POP3: premature NOOP OK, NOT an RFC 1939 Compliant server"
-msgstr ""
-
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:120
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:111
 msgid "POP3 noop:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:120
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:186
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:235
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:260
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:302
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:376
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:415
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:445
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:479
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:542
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:610
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:111
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:171
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:214
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:239
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:281
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:355
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:394
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:424
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:458
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:521
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:589
 msgid "No connection to server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:133
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:136
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:141
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:124
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:127
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:132
 msgid "POP3 user:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:133
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:124
 msgid "no login ID submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:136
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:156
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:127
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:147
 msgid "connection not established"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:153
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:156
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:161
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:170
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:144
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:147
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:152
 msgid "POP3 pass:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:153
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:195
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:144
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:180
 msgid "No password submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:161
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:152
 msgid "authentication failed "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:170
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:219
-msgid "NOOP failed. Server not RFC 1939 compliant"
-msgstr ""
-
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:186
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:192
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:171
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:177
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:180
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:185
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:195
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:200
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:219
 msgid "POP3 apop:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:192
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:177
 msgid "No login ID submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:200
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:185
 msgid "No server banner"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:200
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:185
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:195
 msgid "abort"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:195
 msgid "apop authentication failed"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:235
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:214
 msgid "POP3 login:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:260
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:276
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:239
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:255
 msgid "POP3 top:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:302
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:330
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:341
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:353
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:281
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:309
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:320
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:332
 msgid "POP3 pop_list:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:353
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:332
 msgid "Premature end of list"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:376
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:389
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:355
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:368
 msgid "POP3 get:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:415
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:422
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:394
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:401
 msgid "POP3 last:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:445
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:455
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:424
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:434
 msgid "POP3 reset:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:479
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:485
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:458
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:464
 msgid "POP3 send_cmd:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:485
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:464
 msgid "Empty command string"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:505
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:484
 msgid "POP3 quit:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:505
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:484
 msgid "connection does not exist"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:542
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:554
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:577
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:521
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:533
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:556
 msgid "POP3 uidl:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:610
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:615
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:621
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:589
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:594
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:600
 msgid "POP3 delete:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:615
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:594
 msgid "No msg number submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:621
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:600
 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/setup.php:123
+#: squirrelmail/plugins/mail_fetch/fetch.php:150
+#: squirrelmail/plugins/mail_fetch/fetch.php:214
+#: squirrelmail/plugins/mail_fetch/setup.php:124
 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/setup.php:154
+#: squirrelmail/plugins/mail_fetch/fetch.php:185
+#: squirrelmail/plugins/mail_fetch/setup.php:155
 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 "Reconnect from dead connection"
 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 "Refetching message "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:212
-#: squirrelmail/plugins/mail_fetch/setup.php:185
+#: squirrelmail/plugins/mail_fetch/fetch.php:239
+#: squirrelmail/plugins/mail_fetch/fetch.php:261
+#: squirrelmail/plugins/mail_fetch/setup.php:186
 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/options.php:105
+#: squirrelmail/plugins/mail_fetch/fetch.php:256
+msgid "Delete failed:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:109
 msgid "Remote POP server settings"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:107
+#: squirrelmail/plugins/mail_fetch/options.php:116
 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 "
@@ -3232,124 +3298,124 @@ 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:121
 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:128
 msgid "Encrypt passwords (informative only)"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:119
-#: squirrelmail/plugins/mail_fetch/options.php:151
+#: squirrelmail/plugins/mail_fetch/options.php:137
+#: squirrelmail/plugins/mail_fetch/options.php:193
 msgid "Add Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:123
-#: squirrelmail/plugins/mail_fetch/options.php:201
+#: squirrelmail/plugins/mail_fetch/options.php:146
+#: squirrelmail/plugins/mail_fetch/options.php:263
 msgid "Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:124
-#: squirrelmail/plugins/mail_fetch/options.php:203
+#: squirrelmail/plugins/mail_fetch/options.php:150
+#: squirrelmail/plugins/mail_fetch/options.php:267
 msgid "Alias:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:125
-#: squirrelmail/plugins/mail_fetch/options.php:205
+#: squirrelmail/plugins/mail_fetch/options.php:154
+#: squirrelmail/plugins/mail_fetch/options.php:271
 msgid "Username:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:127
-#: squirrelmail/plugins/mail_fetch/options.php:209
+#: squirrelmail/plugins/mail_fetch/options.php:162
+#: squirrelmail/plugins/mail_fetch/options.php:279
 msgid "Store in Folder:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:148
-#: squirrelmail/plugins/mail_fetch/options.php:233
+#: squirrelmail/plugins/mail_fetch/options.php:181
+#: squirrelmail/plugins/mail_fetch/options.php:304
 msgid "Leave Mail on Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:149
-#: squirrelmail/plugins/mail_fetch/options.php:235
+#: squirrelmail/plugins/mail_fetch/options.php:185
+#: squirrelmail/plugins/mail_fetch/options.php:311
 msgid "Check mail during login"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:150
-#: squirrelmail/plugins/mail_fetch/options.php:237
+#: squirrelmail/plugins/mail_fetch/options.php:189
+#: squirrelmail/plugins/mail_fetch/options.php:318
 msgid "Check mail during folder refresh"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:157
-#: squirrelmail/plugins/mail_fetch/options.php:238
+#: squirrelmail/plugins/mail_fetch/options.php:202
+#: squirrelmail/plugins/mail_fetch/options.php:323
 msgid "Modify Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:161
+#: squirrelmail/plugins/mail_fetch/options.php:208
 msgid "Server Name:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:167
-#: squirrelmail/plugins/mail_fetch/options.php:190
+#: squirrelmail/plugins/mail_fetch/options.php:214
+#: squirrelmail/plugins/mail_fetch/options.php:245
 msgid "Modify"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:171
+#: squirrelmail/plugins/mail_fetch/options.php:218
 msgid "No-one server in use. Try to add."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:177
-#: squirrelmail/plugins/mail_fetch/options.php:192
-#: squirrelmail/plugins/mail_fetch/options.php:243
+#: squirrelmail/plugins/mail_fetch/options.php:225
+#: squirrelmail/plugins/mail_fetch/options.php:248
+#: squirrelmail/plugins/mail_fetch/options.php:333
 msgid "Fetching Servers"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:181
+#: squirrelmail/plugins/mail_fetch/options.php:231
 msgid "Confirm Deletion of a Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:185
+#: squirrelmail/plugins/mail_fetch/options.php:237
 msgid "Selected Server:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:186
+#: squirrelmail/plugins/mail_fetch/options.php:238
 msgid "Confirm delete of selected server?"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:187
+#: squirrelmail/plugins/mail_fetch/options.php:239
 msgid "Confirm Delete"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:196
+#: squirrelmail/plugins/mail_fetch/options.php:254
 msgid "Mofify a Server"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:246
+#: squirrelmail/plugins/mail_fetch/options.php:339
 msgid "Undefined Function"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/options.php:248
+#: squirrelmail/plugins/mail_fetch/options.php:340
 msgid "Hey! Wath do You are looking for?"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:30
+#: squirrelmail/plugins/mail_fetch/setup.php:31
 msgid "Fetch"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:115
-#: squirrelmail/plugins/mail_fetch/setup.php:162
+#: squirrelmail/plugins/mail_fetch/setup.php:116
+#: squirrelmail/plugins/mail_fetch/setup.php:163
 msgid "Warning, "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:198
+#: squirrelmail/plugins/mail_fetch/setup.php:199
 msgid "Mail Fetch Result:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:223
+#: squirrelmail/plugins/mail_fetch/setup.php:222
 msgid "Simple POP3 Fetch Mail"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/setup.php:225
+#: squirrelmail/plugins/mail_fetch/setup.php:224
 msgid ""
 "This configures settings for downloading email from a pop3 mailbox to your "
 "account on this server."
@@ -3371,6 +3437,10 @@ msgstr ""
 msgid "Use Sent Subfolders"
 msgstr ""
 
+#: squirrelmail/plugins/sent_subfolders/setup.php:102
+msgid "Disabled"
+msgstr ""
+
 #: squirrelmail/plugins/sent_subfolders/setup.php:103
 msgid "Monthly"
 msgstr ""
@@ -3387,187 +3457,652 @@ msgstr ""
 msgid "Base Sent Folder"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/calendar.php:74
+#: squirrelmail/plugins/calendar/calendar.php:91
 msgid "TODAY"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/day.php:79
+#: squirrelmail/plugins/calendar/day.php:43
+#: squirrelmail/plugins/calendar/event_create.php:107
+#: squirrelmail/plugins/calendar/event_delete.php:104
+#: squirrelmail/plugins/calendar/event_edit.php:210
+msgid "l, F j Y"
+msgstr ""
+
+#: squirrelmail/plugins/calendar/day.php:95
 msgid "ADD"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/day.php:93
+#: squirrelmail/plugins/calendar/day.php:114
 msgid "EDIT"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/day.php:95
+#: squirrelmail/plugins/calendar/day.php:116
 msgid "DEL"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:31
+#: squirrelmail/plugins/calendar/event_create.php:39
 msgid "Start time:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:41
-#: squirrelmail/plugins/calendar/event_edit.php:60
+#: squirrelmail/plugins/calendar/event_create.php:50
+#: squirrelmail/plugins/calendar/event_edit.php:69
 msgid "Length:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:47
-#: squirrelmail/plugins/calendar/event_edit.php:66
-#: squirrelmail/plugins/calendar/event_edit.php:98
-#: squirrelmail/plugins/calendar/event_edit.php:111
+#: squirrelmail/plugins/calendar/event_create.php:57
+#: squirrelmail/plugins/calendar/event_edit.php:76
+#: squirrelmail/plugins/calendar/event_edit.php:117
+#: squirrelmail/plugins/calendar/event_edit.php:141
 msgid "Priority:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:61
+#: squirrelmail/plugins/calendar/event_create.php:64
+#: squirrelmail/plugins/calendar/event_create.php:139
+#: squirrelmail/plugins/calendar/event_delete.php:49
+#: squirrelmail/plugins/calendar/event_edit.php:83
+#: squirrelmail/plugins/calendar/event_edit.php:121
+#: squirrelmail/plugins/calendar/event_edit.php:145
+msgid "Title:"
+msgstr ""
+
+#: squirrelmail/plugins/calendar/event_create.php:76
 msgid "Set Event"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:106
+#: squirrelmail/plugins/calendar/event_create.php:128
 msgid "Event Has been added!"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:109
-#: squirrelmail/plugins/calendar/event_delete.php:34
-#: squirrelmail/plugins/calendar/event_edit.php:50
-#: squirrelmail/plugins/calendar/event_edit.php:96
+#: squirrelmail/plugins/calendar/event_create.php:131
+#: squirrelmail/plugins/calendar/event_delete.php:41
+#: squirrelmail/plugins/calendar/event_edit.php:43
+#: squirrelmail/plugins/calendar/event_edit.php:109
+#: squirrelmail/plugins/calendar/event_edit.php:133
+msgid "Date:"
+msgstr ""
+
+#: squirrelmail/plugins/calendar/event_create.php:135
+#: squirrelmail/plugins/calendar/event_delete.php:45
+#: squirrelmail/plugins/calendar/event_edit.php:58
+#: squirrelmail/plugins/calendar/event_edit.php:113
+#: squirrelmail/plugins/calendar/event_edit.php:137
 msgid "Time:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_create.php:116
-#: squirrelmail/plugins/calendar/functions.php:23
+#: squirrelmail/plugins/calendar/event_create.php:148
+#: squirrelmail/plugins/calendar/event_delete.php:110
+#: squirrelmail/plugins/calendar/event_edit.php:233
+#: squirrelmail/plugins/calendar/functions.php:27
 msgid "Day View"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_delete.php:31
+#: squirrelmail/plugins/calendar/event_delete.php:38
 msgid "Do you really want to delete this event?"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_delete.php:89
+#: squirrelmail/plugins/calendar/event_delete.php:108
 msgid "Event deleted!"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_delete.php:96
+#: squirrelmail/plugins/calendar/event_delete.php:116
 msgid "Nothing to delete!"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_edit.php:80
+#: squirrelmail/plugins/calendar/event_edit.php:93
 msgid "Update Event"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_edit.php:92
+#: squirrelmail/plugins/calendar/event_edit.php:106
 msgid "Do you really want to change this event from:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/event_edit.php:105
+#: squirrelmail/plugins/calendar/event_edit.php:129
 msgid "to:"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:21
+#: squirrelmail/plugins/calendar/event_edit.php:228
+msgid "Event updated!"
+msgstr ""
+
+#: squirrelmail/plugins/calendar/functions.php:25
 msgid "Month View"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:34
+#: squirrelmail/plugins/calendar/functions.php:38
 msgid "0 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:35
+#: squirrelmail/plugins/calendar/functions.php:39
 msgid "15 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:36
+#: squirrelmail/plugins/calendar/functions.php:40
 msgid "35 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:37
+#: squirrelmail/plugins/calendar/functions.php:41
 msgid "45 min."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:38
+#: squirrelmail/plugins/calendar/functions.php:42
 msgid "1 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:39
+#: squirrelmail/plugins/calendar/functions.php:43
 msgid "1.5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:40
+#: squirrelmail/plugins/calendar/functions.php:44
 msgid "2 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:41
+#: squirrelmail/plugins/calendar/functions.php:45
 msgid "2.5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:42
+#: squirrelmail/plugins/calendar/functions.php:46
 msgid "3 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:43
+#: squirrelmail/plugins/calendar/functions.php:47
 msgid "3.5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:44
+#: squirrelmail/plugins/calendar/functions.php:48
 msgid "4 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:45
+#: squirrelmail/plugins/calendar/functions.php:49
 msgid "5 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/functions.php:46
+#: squirrelmail/plugins/calendar/functions.php:50
 msgid "6 hr."
 msgstr ""
 
-#: squirrelmail/plugins/calendar/setup.php:20
+#: squirrelmail/plugins/calendar/setup.php:23
 msgid "Calendar"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:16
+#: squirrelmail/plugins/listcommands/mailout.php:24
 msgid "Mailinglist"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/mailout.php:22
+#: squirrelmail/plugins/listcommands/mailout.php:31
 #, 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:25
+#: squirrelmail/plugins/listcommands/mailout.php:34
 #, 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:28
+#: squirrelmail/plugins/listcommands/mailout.php:37
 #, 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:76
+#: squirrelmail/plugins/listcommands/mailout.php:85
 msgid "Send Mail"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:33
-msgid "Post to the list"
+#: squirrelmail/plugins/listcommands/setup.php:31
+msgid "Post to List"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:34
-msgid "List Archives"
+#: squirrelmail/plugins/listcommands/setup.php:32
+msgid "Reply to List"
 msgstr ""
 
 #: squirrelmail/plugins/listcommands/setup.php:35
+msgid "List Archives"
+msgstr ""
+
+#: squirrelmail/plugins/listcommands/setup.php:36
 msgid "Contact Listowner"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:37
-msgid "Reply to the list"
+#: squirrelmail/plugins/listcommands/setup.php:90
+msgid "Mailing List"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:185
+#: squirrelmail/plugins/delete_move_next/setup.php:188
+msgid "Delete & Prev"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:191
+#: squirrelmail/plugins/delete_move_next/setup.php:193
+msgid "Delete & Next"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:314
+msgid "Delete/Move/Next Buttons:"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:320
+msgid "Display at top"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:326
+#: squirrelmail/plugins/delete_move_next/setup.php:338
+msgid "with move option"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:332
+msgid "Display at bottom"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:42
+msgid "Default"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:45
+msgid "pixels"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:48
+msgid "Config File Version"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:51
+msgid "Squirrelmail Version"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:54
+msgid "PHP Version"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:58
+msgid "Organization Preferences"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:60
+msgid "Organization Name"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:63
+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:77
+msgid "Signout Page"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:80
+msgid "Default Language"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:84
+msgid "Top Frame"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:89
+msgid "Server Settings"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:91
+msgid "Mail Domain"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:94
+msgid "IMAP Server Address"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:97
+msgid "IMAP Server Port"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:99
+msgid "IMAP Server Type"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:101
+msgid "Cyrus IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:102
+msgid "University of Washington's IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:103
+msgid "Microsoft Exchange IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:104
+msgid "Courier IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:105
+msgid "Not one of the above servers"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:106
+msgid "IMAP Folder Delimiter"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:108
+msgid "Use \"detect\" to auto-detect."
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:111
+msgid "Use Sendmail"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:113
+msgid "Sendmail Path"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:116
+msgid "SMTP Server Address"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:119
+msgid "SMTP Server Port"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:121
+msgid "Authenticated SMTP"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:123
+msgid "Invert Time"
+msgstr ""
+
+#: 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:130
+msgid "Default Folder Prefix"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:133
+msgid "Show Folder Prefix Option"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:135
+msgid "Trash Folder"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:138
+msgid "Sent Folder"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:141
+msgid "Draft Folder"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:144
+msgid "By default, move to trash"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:146
+msgid "By default, move to sent"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:148
+msgid "By default, save as draft"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:150
+msgid "List Special Folders First"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:152
+msgid "Show Special Folders Color"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:154
+msgid "Auto Expunge"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:156
+msgid "Default Sub. of INBOX"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:158
+msgid "Show 'Contain Sub.' Option"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:160
+msgid "Default Unseen Notify"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:162
+msgid "No Notification"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:163
+msgid "Only INBOX"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:164
+msgid "All Folders"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:165
+msgid "Default Unseen Type"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:167
+msgid "Only Unseen"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:168
+msgid "Unseen and Total"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:169
+msgid "Auto Create Special Folders"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:171
+msgid "Default Javascript Adrressbook"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:173
+msgid "Auto delete folders"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:176
+msgid "General Options"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:178
+msgid "Default Charset"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:190
+msgid "Data Directory"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:193
+msgid "Temp Directory"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:196
+msgid "Hash Level"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:198
+msgid "Hash Disabled"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:200
+msgid "Moderate"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:201
+msgid "Medium"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:203
+msgid "Default Left Size"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:206
+msgid "Usernames in Lowercase"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:208
+msgid "Allow use of priority"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:210
+msgid "Hide SM attributions"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:212
+msgid "Enable use of delivery receipts"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:214
+msgid "Allow editing of identities"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:216
+msgid "Allow editing of full name"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:219
+#: squirrelmail/plugins/administrator/defines.php:221
+msgid "Message of the Day"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:225
+msgid "Database"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:227
+msgid "Address book DSN"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:230
+msgid "Address book table"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:234
+msgid "Preferences DSN"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:237
+msgid "Preferences table"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:241
+msgid "Preferences username field"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:245
+msgid "Preferences key field"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:249
+msgid "Preferences value field"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:254
+msgid "Themes"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:256
+msgid "Style Sheet URL (css)"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:188
+msgid "Configuration Administrator"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:381
+msgid "Theme Name"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:382
+msgid "Theme Path"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:422
+msgid "Plugins"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:484
+msgid "Change Settings"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:512
+msgid "Config file can't be opened. Please check config.php."
+msgstr ""
+
+#: squirrelmail/plugins/administrator/setup.php:30
+msgid "Administration"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/setup.php:32
+msgid ""
+"This module allows administrators to manage SquirrelMail main configuration "
+"remotely."
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:112
+msgid "Take Address"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:143
+msgid "Address Book Take"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:149
+msgid "Left aligned"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:153
+msgid "Centered"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:157
+msgid "Right aligned"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:158
+msgid "on the Read screen"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:162
+msgid "Hide the box"
+msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:166
+msgid "Try to verify addresses"
+msgstr ""
+
+#: squirrelmail/po/independent_strings.txt:18
+msgid "Delivery error report"
 msgstr ""
 
-#: squirrelmail/plugins/listcommands/setup.php:88
-msgid "Mailinglist options:"
+#: squirrelmail/po/independent_strings.txt:19
+msgid "Undelivered Message Headers"
 msgstr ""