Translation Credits
[squirrelmail.git] / po / squirrelmail.po
index c573e2d701cfb58d374609d0e0e41f64bf803727..897ae3a034b2a81cdf3030dde3b2cec55d4f3b89 100644 (file)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-17 18:18+0100\n"
+"POT-Creation-Date: 2001-12-21 14:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,876 +18,888 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
 msgid "Address Book"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:67
-#: squirrelmail/src/addressbook.php:315 squirrelmail/src/vcard.php:87
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:84
+#: squirrelmail/src/addressbook.php:317 squirrelmail/src/vcard.php:107
 msgid "Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:67
-#: squirrelmail/src/addressbook.php:316
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:84
+#: squirrelmail/src/addressbook.php:318
 msgid "E-mail"
 msgstr ""
 
 msgid "E-mail"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:67
-#: squirrelmail/src/addressbook.php:317
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:84
+#: squirrelmail/src/addressbook.php:319
 msgid "Info"
 msgstr ""
 
 msgid "Info"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:103
-#: squirrelmail/src/addrbook_search_html.php:70
+#: squirrelmail/src/addrbook_search.php:120
+#: squirrelmail/src/addrbook_search_html.php:87
 msgid "Source"
 msgstr ""
 
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:95
+#: squirrelmail/src/addrbook_search_html.php:112
 msgid "Use Addresses"
 msgstr ""
 
 msgid "Use Addresses"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:114
+#: squirrelmail/src/addrbook_search_html.php:131
 msgid "Address Book Search"
 msgstr ""
 
 msgid "Address Book Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:166
-#: squirrelmail/src/addrbook_search_html.php:124
+#: squirrelmail/src/addrbook_search.php:183
+#: squirrelmail/src/addrbook_search_html.php:141
 msgid "Search for"
 msgstr ""
 
 msgid "Search for"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:173
-#: squirrelmail/src/addrbook_search_html.php:135
+#: squirrelmail/src/addrbook_search.php:190
+#: squirrelmail/src/addrbook_search_html.php:152
 msgid "in"
 msgstr ""
 
 msgid "in"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:175
-#: squirrelmail/src/addrbook_search_html.php:138
+#: squirrelmail/src/addrbook_search.php:192
+#: squirrelmail/src/addrbook_search_html.php:155
 msgid "All address books"
 msgstr ""
 
 msgid "All address books"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:73
-#: squirrelmail/src/addrbook_search.php:185
-#: squirrelmail/src/addrbook_search_html.php:150
-#: squirrelmail/src/search.php:17 squirrelmail/src/search.php:73
+#: squirrelmail/functions/page_header.php:88
+#: squirrelmail/src/addrbook_search.php:202
+#: squirrelmail/src/addrbook_search_html.php:167
+#: squirrelmail/src/search.php:32 squirrelmail/src/search.php:79
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:187
-#: squirrelmail/src/addrbook_search_html.php:152
+#: squirrelmail/src/addrbook_search.php:204
+#: squirrelmail/src/addrbook_search_html.php:169
 msgid "List all"
 msgstr ""
 
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:206
-#: squirrelmail/src/addrbook_search_html.php:175
+#: squirrelmail/src/addrbook_search.php:223
+#: squirrelmail/src/addrbook_search_html.php:192
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:228
-#: squirrelmail/src/addrbook_search_html.php:198
+#: squirrelmail/src/addrbook_search.php:245
+#: squirrelmail/src/addrbook_search_html.php:215
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:154
-#: squirrelmail/src/addrbook_search.php:235
-#: squirrelmail/src/addrbook_search_html.php:202
+#: squirrelmail/src/addrbook_search.php:171
+#: squirrelmail/src/addrbook_search.php:252
+#: squirrelmail/src/addrbook_search_html.php:219
 msgid "No persons matching your search was found"
 msgstr ""
 
 msgid "No persons matching your search was found"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:211
+#: squirrelmail/src/addrbook_search_html.php:228
 msgid "Return"
 msgstr ""
 
 msgid "Return"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:190
+#: squirrelmail/src/addrbook_search.php:207
 msgid "Close window"
 msgstr ""
 
 msgid "Close window"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:33 squirrelmail/src/addressbook.php:314
+#: squirrelmail/src/addressbook.php:66 squirrelmail/src/addressbook.php:316
 msgid "Nickname"
 msgstr ""
 
 msgid "Nickname"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:40
+#: squirrelmail/src/addressbook.php:67
 msgid "Must be unique"
 msgstr ""
 
 msgid "Must be unique"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/src/addressbook.php:68
 msgid "E-mail address"
 msgstr ""
 
 msgid "E-mail address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:49
+#: squirrelmail/src/addressbook.php:69
 msgid "First name"
 msgstr ""
 
 msgid "First name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:56
+#: squirrelmail/src/addressbook.php:70
 msgid "Last name"
 msgstr ""
 
 msgid "Last name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:63
+#: squirrelmail/src/addressbook.php:71
 msgid "Additional info"
 msgstr ""
 
 msgid "Additional info"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:82
+#: squirrelmail/src/addressbook.php:85
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:179
+#: squirrelmail/src/addressbook.php:181
 msgid "You can only edit one address at the time"
 msgstr ""
 
 msgid "You can only edit one address at the time"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:194
-#: squirrelmail/src/addressbook.php:223 squirrelmail/src/addressbook.php:226
+#: squirrelmail/src/addressbook.php:193 squirrelmail/src/addressbook.php:196
+#: squirrelmail/src/addressbook.php:225 squirrelmail/src/addressbook.php:228
 msgid "Update address"
 msgstr ""
 
 msgid "Update address"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:66
-#: squirrelmail/functions/display_messages.php:82
-#: squirrelmail/functions/imap_general.php:220
-#: squirrelmail/src/addressbook.php:214 squirrelmail/src/addressbook.php:264
+#: squirrelmail/functions/display_messages.php:20
+#: squirrelmail/functions/display_messages.php:71
+#: squirrelmail/functions/display_messages.php:87
+#: squirrelmail/src/addressbook.php:216 squirrelmail/src/addressbook.php:266
 msgid "ERROR"
 msgstr ""
 
 msgid "ERROR"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:240
+#: squirrelmail/src/addressbook.php:241
 msgid "Unknown error"
 msgstr ""
 
 msgid "Unknown error"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:284 squirrelmail/src/addressbook.php:368
+#: squirrelmail/src/addressbook.php:286 squirrelmail/src/addressbook.php:371
 msgid "Add address"
 msgstr ""
 
 msgid "Add address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:295 squirrelmail/src/addressbook.php:352
+#: squirrelmail/src/addressbook.php:297 squirrelmail/src/addressbook.php:355
 msgid "Edit selected"
 msgstr ""
 
 msgid "Edit selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:297 squirrelmail/src/addressbook.php:354
+#: squirrelmail/src/addressbook.php:299 squirrelmail/src/addressbook.php:357
 msgid "Delete selected"
 msgstr ""
 
 msgid "Delete selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:365
+#: squirrelmail/src/addressbook.php:368
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
-#: squirrelmail/src/compose.php:101
+#: squirrelmail/src/compose.php:118
 msgid "Original Message"
 msgstr ""
 
 msgid "Original Message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:568
-#: squirrelmail/plugins/filters/options.php:189
-#: squirrelmail/src/compose.php:102 squirrelmail/src/download.php:120
-#: squirrelmail/src/download.php:126 squirrelmail/src/options_order.php:42
-#: squirrelmail/src/printer_friendly_bottom.php:82
-#: squirrelmail/src/search.php:58 squirrelmail/src/search.php:59
+#: squirrelmail/functions/mailbox_display.php:564
+#: squirrelmail/plugins/filters/options.php:95
+#: squirrelmail/src/compose.php:119 squirrelmail/src/download.php:137
+#: squirrelmail/src/download.php:143
+#: squirrelmail/src/options_highlight.php:329
+#: squirrelmail/src/options_order.php:59
+#: squirrelmail/src/printer_friendly_bottom.php:97
+#: squirrelmail/src/search.php:71
 msgid "Subject"
 msgstr ""
 
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:554
-#: squirrelmail/plugins/filters/options.php:177
-#: squirrelmail/src/compose.php:103 squirrelmail/src/download.php:121
-#: squirrelmail/src/download.php:128 squirrelmail/src/options_order.php:40
-#: squirrelmail/src/printer_friendly_bottom.php:76
-#: squirrelmail/src/search.php:61 squirrelmail/src/search.php:62
+#: squirrelmail/functions/mailbox_display.php:550
+#: squirrelmail/plugins/filters/options.php:83
+#: squirrelmail/src/compose.php:120 squirrelmail/src/download.php:138
+#: squirrelmail/src/download.php:145
+#: squirrelmail/src/options_highlight.php:317
+#: squirrelmail/src/options_order.php:57
+#: squirrelmail/src/printer_friendly_bottom.php:91
+#: squirrelmail/src/search.php:72
 msgid "From"
 msgstr ""
 
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:552
-#: squirrelmail/plugins/filters/options.php:180
-#: squirrelmail/src/compose.php:104 squirrelmail/src/download.php:122
-#: squirrelmail/src/download.php:130
-#: squirrelmail/src/printer_friendly_bottom.php:77
-#: squirrelmail/src/search.php:67 squirrelmail/src/search.php:68
+#: squirrelmail/functions/mailbox_display.php:548
+#: squirrelmail/plugins/filters/options.php:86
+#: squirrelmail/src/compose.php:121 squirrelmail/src/download.php:139
+#: squirrelmail/src/download.php:147
+#: squirrelmail/src/options_highlight.php:320
+#: squirrelmail/src/printer_friendly_bottom.php:92
+#: squirrelmail/src/search.php:74
 msgid "To"
 msgstr ""
 
 msgid "To"
 msgstr ""
 
-#: squirrelmail/src/compose.php:248 squirrelmail/src/read_body.php:494
+#: squirrelmail/src/compose.php:269 squirrelmail/src/read_body.php:551
 msgid "From:"
 msgstr ""
 
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:273 squirrelmail/src/read_body.php:510
+#: squirrelmail/src/compose.php:294 squirrelmail/src/read_body.php:568
 msgid "To:"
 msgstr ""
 
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:281
+#: squirrelmail/src/compose.php:302
 msgid "CC:"
 msgstr ""
 
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:289
+#: squirrelmail/src/compose.php:310
 msgid "BCC:"
 msgstr ""
 
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:297 squirrelmail/src/read_body.php:476
+#: squirrelmail/src/compose.php:318 squirrelmail/src/read_body.php:526
 msgid "Subject:"
 msgstr ""
 
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:339 squirrelmail/src/compose.php:393
+#: squirrelmail/src/compose.php:360 squirrelmail/src/compose.php:414
 msgid "Send"
 msgstr ""
 
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:345
+#: squirrelmail/src/compose.php:366
 msgid "Attach:"
 msgstr ""
 
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:349 squirrelmail/src/options_order.php:128
+#: squirrelmail/src/compose.php:370 squirrelmail/src/options_order.php:145
 msgid "Add"
 msgstr ""
 
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:364
+#: squirrelmail/src/compose.php:385
 msgid "Delete selected attachments"
 msgstr ""
 
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:67 squirrelmail/src/compose.php:386
-#: squirrelmail/src/compose.php:388 squirrelmail/src/compose.php:391
+#: squirrelmail/functions/page_header.php:82 squirrelmail/src/compose.php:407
+#: squirrelmail/src/compose.php:409 squirrelmail/src/compose.php:412
 msgid "Addresses"
 msgstr ""
 
 msgid "Addresses"
 msgstr ""
 
-#: squirrelmail/src/compose.php:396
+#: squirrelmail/src/compose.php:417
 msgid "Save Draft"
 msgstr ""
 
 msgid "Save Draft"
 msgstr ""
 
-#: squirrelmail/src/compose.php:402 squirrelmail/src/read_body.php:539
+#: squirrelmail/src/compose.php:423 squirrelmail/src/read_body.php:598
 msgid "Priority"
 msgstr ""
 
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/src/compose.php:403 squirrelmail/src/read_body.php:394
+#: squirrelmail/src/compose.php:424 squirrelmail/src/read_body.php:433
 msgid "High"
 msgstr ""
 
 msgid "High"
 msgstr ""
 
-#: squirrelmail/src/compose.php:404 squirrelmail/src/read_body.php:396
+#: squirrelmail/src/compose.php:425 squirrelmail/src/read_body.php:436
 msgid "Normal"
 msgstr ""
 
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/src/compose.php:405 squirrelmail/src/read_body.php:398
+#: squirrelmail/src/compose.php:426 squirrelmail/src/read_body.php:440
 msgid "Low"
 msgstr ""
 
 msgid "Low"
 msgstr ""
 
-#: squirrelmail/src/compose.php:424
+#: squirrelmail/src/compose.php:445
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:465
+#: squirrelmail/src/compose.php:490
 msgid "Draft Email Saved"
 msgstr ""
 
 msgid "Draft Email Saved"
 msgstr ""
 
-#: squirrelmail/src/compose.php:536 squirrelmail/src/compose.php:573
-#: squirrelmail/src/compose.php:580
+#: squirrelmail/src/compose.php:561 squirrelmail/src/compose.php:598
+#: squirrelmail/src/compose.php:605
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-#: squirrelmail/src/compose.php:642
+#: squirrelmail/src/compose.php:670
 msgid "said"
 msgstr ""
 
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:645
+#: squirrelmail/src/compose.php:673
 msgid "quote"
 msgstr ""
 
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:645
+#: squirrelmail/src/compose.php:673
 msgid "who"
 msgstr ""
 
 msgid "who"
 msgstr ""
 
-#: squirrelmail/src/download.php:32
+#: squirrelmail/src/download.php:49
 msgid "Viewing a text attachment"
 msgstr ""
 
 msgid "Viewing a text attachment"
 msgstr ""
 
-#: squirrelmail/src/download.php:35 squirrelmail/src/download.php:37
-#: squirrelmail/src/image.php:28 squirrelmail/src/image.php:32
-#: squirrelmail/src/read_body.php:38 squirrelmail/src/vcard.php:31
-#: squirrelmail/src/vcard.php:35
+#: squirrelmail/src/download.php:52 squirrelmail/src/download.php:54
+#: squirrelmail/src/image.php:47 squirrelmail/src/image.php:51
+#: squirrelmail/src/read_body.php:55 squirrelmail/src/vcard.php:51
+#: squirrelmail/src/vcard.php:55
 msgid "View message"
 msgstr ""
 
 msgid "View message"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:604 squirrelmail/src/download.php:42
-#: squirrelmail/src/image.php:41 squirrelmail/src/vcard.php:192
+#: squirrelmail/functions/mime.php:620 squirrelmail/src/download.php:59
+#: squirrelmail/src/image.php:60 squirrelmail/src/vcard.php:212
 msgid "Download this as a file"
 msgstr ""
 
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:562
-#: squirrelmail/src/download.php:123 squirrelmail/src/download.php:132
-#: squirrelmail/src/options_order.php:41
-#: squirrelmail/src/printer_friendly_bottom.php:81
+#: squirrelmail/functions/mailbox_display.php:558
+#: squirrelmail/src/download.php:140 squirrelmail/src/download.php:149
+#: squirrelmail/src/options_order.php:58
+#: squirrelmail/src/printer_friendly_bottom.php:96
 msgid "Date"
 msgstr ""
 
 msgid "Date"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:24
+#: squirrelmail/src/folders_create.php:41
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
 
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:24
+#: squirrelmail/src/folders_create.php:41
 msgid "Click here to go back"
 msgstr ""
 
 msgid "Click here to go back"
 msgstr ""
 
-#: squirrelmail/functions/imap_mailbox.php:43
-#: squirrelmail/functions/mailbox_display.php:42
-#: squirrelmail/src/folders.php:20 squirrelmail/src/folders.php:124
-#: squirrelmail/src/folders.php:126 squirrelmail/src/options.php:27
-msgid "None"
-msgstr ""
-
-#: squirrelmail/functions/page_header.php:69 squirrelmail/src/folders.php:28
-#: squirrelmail/src/left_main.php:161
+#: squirrelmail/functions/page_header.php:84 squirrelmail/src/folders.php:45
+#: squirrelmail/src/left_main.php:261
 msgid "Folders"
 msgstr ""
 
 msgid "Folders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:41
+#: squirrelmail/src/folders.php:58
 msgid "Subscribed successfully!"
 msgstr ""
 
 msgid "Subscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:43
+#: squirrelmail/src/folders.php:60
 msgid "Unsubscribed successfully!"
 msgstr ""
 
 msgid "Unsubscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:45
+#: squirrelmail/src/folders.php:62
 msgid "Deleted folder successfully!"
 msgstr ""
 
 msgid "Deleted folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:47
+#: squirrelmail/src/folders.php:64
 msgid "Created folder successfully!"
 msgstr ""
 
 msgid "Created folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:49
+#: squirrelmail/src/folders.php:66
 msgid "Renamed successfully!"
 msgstr ""
 
 msgid "Renamed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:52 squirrelmail/src/left_main.php:201
+#: squirrelmail/src/folders.php:69 squirrelmail/src/left_main.php:300
 msgid "refresh folder list"
 msgstr ""
 
 msgid "refresh folder list"
 msgstr ""
 
-#: squirrelmail/src/folders.php:62
+#: squirrelmail/src/folders.php:79
 msgid "Delete Folder"
 msgstr ""
 
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:524
-#: squirrelmail/plugins/filters/options.php:93
-#: squirrelmail/src/folders.php:103 squirrelmail/src/read_body.php:426
+#: squirrelmail/functions/mailbox_display.php:520
+#: squirrelmail/plugins/filters/options.php:152
+#: squirrelmail/plugins/mail_fetch/options.php:168
+#: squirrelmail/plugins/mail_fetch/options.php:175
+#: squirrelmail/src/folders.php:125 squirrelmail/src/options_highlight.php:71
+#: squirrelmail/src/options_identities.php:320
+#: squirrelmail/src/read_body.php:468
 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 
-#: squirrelmail/src/folders.php:107 squirrelmail/src/folders.php:182
+#: squirrelmail/src/folders.php:129 squirrelmail/src/folders.php:205
 msgid "No folders found"
 msgstr ""
 
 msgid "No folders found"
 msgstr ""
 
-#: squirrelmail/src/folders.php:114
+#: squirrelmail/src/folders.php:136
 msgid "Create Folder"
 msgstr ""
 
 msgid "Create Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:119
+#: squirrelmail/src/folders.php:141
 msgid "as a subfolder of"
 msgstr ""
 
 msgid "as a subfolder of"
 msgstr ""
 
-#: squirrelmail/src/folders.php:147
+#: squirrelmail/src/folders.php:146 squirrelmail/src/folders.php:148
+msgid "None"
+msgstr ""
+
+#: squirrelmail/src/folders.php:169
 msgid "Let this folder contain subfolders"
 msgstr ""
 
 msgid "Let this folder contain subfolders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:150
+#: squirrelmail/src/folders.php:172
 msgid "Create"
 msgstr ""
 
 msgid "Create"
 msgstr ""
 
-#: squirrelmail/src/folders.php:157
+#: squirrelmail/src/folders.php:179
 msgid "Rename a Folder"
 msgstr ""
 
 msgid "Rename a Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:178
+#: squirrelmail/src/folders.php:201
 msgid "Rename"
 msgstr ""
 
 msgid "Rename"
 msgstr ""
 
-#: squirrelmail/src/folders.php:191 squirrelmail/src/folders.php:210
+#: squirrelmail/src/folders.php:214 squirrelmail/src/folders.php:234
 msgid "Unsubscribe"
 msgstr ""
 
 msgid "Unsubscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:191 squirrelmail/src/folders.php:251
+#: squirrelmail/src/folders.php:214 squirrelmail/src/folders.php:275
 msgid "Subscribe"
 msgstr ""
 
 msgid "Subscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:214
+#: squirrelmail/src/folders.php:238
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:254
+#: squirrelmail/src/folders.php:278
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:36
+#: squirrelmail/src/folders_rename_getname.php:53
 msgid "Rename a folder"
 msgstr ""
 
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:40
+#: squirrelmail/src/folders_rename_getname.php:57
 msgid "New name:"
 msgstr ""
 
 msgid "New name:"
 msgstr ""
 
-#: squirrelmail/functions/options.php:390
-#: squirrelmail/plugins/filters/options.php:230
-#: squirrelmail/plugins/newmail/newmail_opt.php:139
-#: squirrelmail/plugins/translate/options.php:133
-#: squirrelmail/src/folders_rename_getname.php:46
-#: squirrelmail/src/options_highlight.php:330
+#: squirrelmail/functions/options.php:404
+#: squirrelmail/plugins/filters/options.php:136
+#: squirrelmail/plugins/newmail/newmail_opt.php:132
+#: squirrelmail/plugins/translate/options.php:159
+#: squirrelmail/src/folders_rename_getname.php:63
+#: squirrelmail/src/options_highlight.php:342
 msgid "Submit"
 msgstr ""
 
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:75 squirrelmail/src/help.php:80
+#: squirrelmail/functions/page_header.php:90 squirrelmail/src/help.php:97
 msgid "Help"
 msgstr ""
 
 msgid "Help"
 msgstr ""
 
-#: squirrelmail/src/help.php:114
+#: squirrelmail/src/help.php:131
 #, c-format
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
 "instead."
 msgstr ""
 
 #, c-format
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
 "instead."
 msgstr ""
 
-#: squirrelmail/src/help.php:120
+#: squirrelmail/src/help.php:137
 msgid "Some or all of the help documents are not present!"
 msgstr ""
 
 msgid "Some or all of the help documents are not present!"
 msgstr ""
 
-#: squirrelmail/src/help.php:146 squirrelmail/src/help.php:165
+#: squirrelmail/src/help.php:163 squirrelmail/src/help.php:182
 msgid "Table of Contents"
 msgstr ""
 
 msgid "Table of Contents"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:683
-#: squirrelmail/functions/mailbox_display.php:686
-#: squirrelmail/functions/mailbox_display.php:689
-#: squirrelmail/src/help.php:163 squirrelmail/src/help.php:164
-#: squirrelmail/src/read_body.php:445 squirrelmail/src/read_body.php:447
+#: squirrelmail/functions/mailbox_display.php:713
+#: squirrelmail/functions/mailbox_display.php:716
+#: squirrelmail/functions/mailbox_display.php:719
+#: squirrelmail/src/help.php:180 squirrelmail/src/help.php:181
+#: squirrelmail/src/read_body.php:490 squirrelmail/src/read_body.php:492
 msgid "Previous"
 msgstr ""
 
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:684
-#: squirrelmail/functions/mailbox_display.php:687
-#: squirrelmail/functions/mailbox_display.php:690
-#: squirrelmail/src/help.php:166 squirrelmail/src/help.php:167
-#: squirrelmail/src/read_body.php:449 squirrelmail/src/read_body.php:451
+#: squirrelmail/functions/mailbox_display.php:714
+#: squirrelmail/functions/mailbox_display.php:717
+#: squirrelmail/functions/mailbox_display.php:720
+#: squirrelmail/src/help.php:183 squirrelmail/src/help.php:184
+#: squirrelmail/src/read_body.php:496 squirrelmail/src/read_body.php:498
 msgid "Next"
 msgstr ""
 
 msgid "Next"
 msgstr ""
 
-#: squirrelmail/src/help.php:187
+#: squirrelmail/src/help.php:204
 msgid "Top"
 msgstr ""
 
 msgid "Top"
 msgstr ""
 
-#: squirrelmail/src/image.php:23
+#: squirrelmail/src/image.php:42
 msgid "Viewing an image attachment"
 msgstr ""
 
 msgid "Viewing an image attachment"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:135
+#: squirrelmail/src/left_main.php:115
 msgid "empty"
 msgstr ""
 
 msgid "empty"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:195
+#: squirrelmail/src/left_main.php:294
 msgid "Last Refresh"
 msgstr ""
 
 msgid "Last Refresh"
 msgstr ""
 
-#: squirrelmail/src/login.php:86 squirrelmail/src/login.php:138
+#: squirrelmail/src/login.php:105 squirrelmail/src/login.php:157
 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:109
+#: squirrelmail/src/login.php:128
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
-#: squirrelmail/src/login.php:110
+#: squirrelmail/src/login.php:129
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:116
+#: squirrelmail/src/login.php:135
 #, c-format
 msgid "%s Login"
 msgstr ""
 
 #, c-format
 msgid "%s Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:120
+#: squirrelmail/src/login.php:139
 msgid "Name:"
 msgstr ""
 
 msgid "Name:"
 msgstr ""
 
-#: squirrelmail/src/login.php:126
+#: squirrelmail/plugins/mail_fetch/options.php:126
+#: squirrelmail/plugins/mail_fetch/options.php:207
+#: squirrelmail/src/login.php:145
 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 
-#: squirrelmail/src/move_messages.php:76
-#: squirrelmail/src/move_messages.php:111
-#: squirrelmail/src/move_messages.php:140
+#: squirrelmail/src/move_messages.php:93
+#: squirrelmail/src/move_messages.php:128
+#: squirrelmail/src/move_messages.php:157
 msgid "No messages were selected."
 msgstr ""
 
 msgid "No messages were selected."
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:71
-#: squirrelmail/plugins/filters/options.php:75
-#: squirrelmail/plugins/newmail/newmail_opt.php:41
-#: squirrelmail/plugins/translate/options.php:67
-#: squirrelmail/src/options.php:34 squirrelmail/src/options_display.php:27
-#: squirrelmail/src/options_folder.php:30
-#: squirrelmail/src/options_highlight.php:49
-#: squirrelmail/src/options_identities.php:36
-#: squirrelmail/src/options_order.php:31
-#: squirrelmail/src/options_personal.php:31
-msgid "Options"
-msgstr ""
-
-#: squirrelmail/src/options.php:167 squirrelmail/src/options_display.php:27
-msgid "Display Preferences"
-msgstr ""
-
-#: squirrelmail/src/options_display.php:48
+#: squirrelmail/src/options_display.php:32
 msgid "General Display Options"
 msgstr ""
 
 msgid "General Display Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:58
+#: squirrelmail/src/options_display.php:44
 msgid "Theme"
 msgstr ""
 
 msgid "Theme"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:72
+#: squirrelmail/src/options_display.php:59
 msgid "Language"
 msgstr ""
 
 msgid "Language"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:81
+#: squirrelmail/src/options_display.php:68
 msgid "Use Javascript"
 msgstr ""
 
 msgid "Use Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:84
+#: squirrelmail/src/options_display.php:71
 msgid "Autodetect"
 msgstr ""
 
 msgid "Autodetect"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:85
+#: squirrelmail/src/options_display.php:72
 msgid "Always"
 msgstr ""
 
 msgid "Always"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:86
-#: squirrelmail/src/options_folder.php:132
+#: squirrelmail/src/options_display.php:73
+#: squirrelmail/src/options_folder.php:122
 msgid "Never"
 msgstr ""
 
 msgid "Never"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:98
+#: squirrelmail/src/options_display.php:91
 msgid "Mailbox Display Options"
 msgstr ""
 
 msgid "Mailbox Display Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:103
+#: squirrelmail/src/options_display.php:96
 msgid "Number of Messages to Index"
 msgstr ""
 
 msgid "Number of Messages to Index"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:111
+#: squirrelmail/src/options_display.php:104
 msgid "Enable Alternating Row Colors"
 msgstr ""
 
 msgid "Enable Alternating Row Colors"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:118
+#: squirrelmail/src/options_display.php:111
 msgid "Enable Page Selector"
 msgstr ""
 
 msgid "Enable Page Selector"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:125
+#: squirrelmail/src/options_display.php:118
 msgid "Maximum Number of Pages to Show"
 msgstr ""
 
 msgid "Maximum Number of Pages to Show"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:132
+#: squirrelmail/src/options_display.php:125
 msgid "Message Display and Composition"
 msgstr ""
 
 msgid "Message Display and Composition"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:137
+#: squirrelmail/src/options_display.php:130
 msgid "Wrap Incoming Text At"
 msgstr ""
 
 msgid "Wrap Incoming Text At"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:145
+#: squirrelmail/src/options_display.php:138
 msgid "Size of Editor Window"
 msgstr ""
 
 msgid "Size of Editor Window"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:153
+#: squirrelmail/src/options_display.php:146
 msgid "Location of Buttons when Composing"
 msgstr ""
 
 msgid "Location of Buttons when Composing"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:156
+#: squirrelmail/src/options_display.php:149
 msgid "Before headers"
 msgstr ""
 
 msgid "Before headers"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:157
+#: squirrelmail/src/options_display.php:150
 msgid "Between headers and message body"
 msgstr ""
 
 msgid "Between headers and message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:158
+#: squirrelmail/src/options_display.php:151
 msgid "After message body"
 msgstr ""
 
 msgid "After message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:163
+#: squirrelmail/src/options_display.php:156
 msgid "Addressbook Display Format"
 msgstr ""
 
 msgid "Addressbook Display Format"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:166
+#: squirrelmail/src/options_display.php:159
 msgid "Javascript"
 msgstr ""
 
 msgid "Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:167
+#: squirrelmail/src/options_display.php:160
 msgid "HTML"
 msgstr ""
 
 msgid "HTML"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:172
+#: squirrelmail/src/options_display.php:165
 msgid "Show HTML Version by Default"
 msgstr ""
 
 msgid "Show HTML Version by Default"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:179
+#: squirrelmail/src/options_display.php:172
 msgid "Include Me in CC when I Reply All"
 msgstr ""
 
 msgid "Include Me in CC when I Reply All"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:186
+#: squirrelmail/src/options_display.php:179
 msgid "Enable Mailer Display"
 msgstr ""
 
 msgid "Enable Mailer Display"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:193
-msgid "Enable display of images with email, below attachment box"
+#: squirrelmail/src/options_display.php:186
+msgid "Display Attached Images with Message"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options_display.php:200
-msgid "Printer Friendly: Subtle Link"
+#: squirrelmail/src/options_display.php:193
+msgid "Enable Subtle Printer Friendly Link"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options_display.php:207
-msgid "Printer Friendly: Clean Display"
+#: squirrelmail/src/options_display.php:200
+msgid "Enable Printer Friendly Clean Display"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options.php:183 squirrelmail/src/options_folder.php:30
-msgid "Folder Preferences"
+#: squirrelmail/src/options_folder.php:40
+msgid "Special Folder Options"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:41
+#: squirrelmail/src/options_folder.php:47
 msgid "Folder Path"
 msgstr ""
 
 msgid "Folder Path"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:64
-msgid "Special Folder Options"
-msgstr ""
-
-#: squirrelmail/src/options_folder.php:76
+#: squirrelmail/src/options_folder.php:63
 msgid "Do not use Trash"
 msgstr ""
 
 msgid "Do not use Trash"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:80
+#: squirrelmail/src/options_folder.php:67
 msgid "Trash Folder"
 msgstr ""
 
 msgid "Trash Folder"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:86
+#: squirrelmail/src/options_folder.php:74
 msgid "Do not use Sent"
 msgstr ""
 
 msgid "Do not use Sent"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:90
+#: squirrelmail/src/options_folder.php:78
 msgid "Sent Folder"
 msgstr ""
 
 msgid "Sent Folder"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:96
+#: squirrelmail/src/options_folder.php:85
 msgid "Do not use Drafts"
 msgstr ""
 
 msgid "Do not use Drafts"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:100
+#: squirrelmail/src/options_folder.php:89
 msgid "Draft Folder"
 msgstr ""
 
 msgid "Draft Folder"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:107
+#: squirrelmail/src/options_folder.php:97
 msgid "Folder List Options"
 msgstr ""
 
 msgid "Folder List Options"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:112
+#: squirrelmail/src/options_folder.php:102
 msgid "Location of Folder List"
 msgstr ""
 
 msgid "Location of Folder List"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:115
+#: squirrelmail/src/options_folder.php:105
 msgid "Left"
 msgstr ""
 
 msgid "Left"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:116
+#: squirrelmail/src/options_folder.php:106
 msgid "Right"
 msgstr ""
 
 msgid "Right"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:121
+#: squirrelmail/src/options_folder.php:111
 msgid "pixels"
 msgstr ""
 
 msgid "pixels"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:125
+#: squirrelmail/src/options_folder.php:115
 msgid "Width of Folder List"
 msgstr ""
 
 msgid "Width of Folder List"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:131
+#: squirrelmail/src/options_folder.php:121
 msgid "Minutes"
 msgstr ""
 
 msgid "Minutes"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:135
+#: squirrelmail/src/options_folder.php:125
 msgid "Seconds"
 msgstr ""
 
 msgid "Seconds"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:137
+#: squirrelmail/src/options_folder.php:127
 msgid "Minute"
 msgstr ""
 
 msgid "Minute"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:144
+#: squirrelmail/src/options_folder.php:134
 msgid "Auto Refresh Folder List"
 msgstr ""
 
 msgid "Auto Refresh Folder List"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:152
-msgid "Enable Unseen Message Notification"
+#: squirrelmail/src/options_folder.php:142
+msgid "Enable Unread Message Notification"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:155
+#: squirrelmail/src/options_folder.php:145
 msgid "No Notification"
 msgstr ""
 
 msgid "No Notification"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:156
+#: squirrelmail/src/options_folder.php:146
 msgid "Only INBOX"
 msgstr ""
 
 msgid "Only INBOX"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:157
+#: squirrelmail/src/options_folder.php:147
 msgid "All Folders"
 msgstr ""
 
 msgid "All Folders"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:162
-msgid "Unseen Message Notification Type"
+#: squirrelmail/src/options_folder.php:152
+msgid "Unread Message Notification Type"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:165
+#: squirrelmail/src/options_folder.php:155
 msgid "Only Unseen"
 msgstr ""
 
 msgid "Only Unseen"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:166
+#: squirrelmail/src/options_folder.php:156
 msgid "Unseen and Total"
 msgstr ""
 
 msgid "Unseen and Total"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:171
+#: squirrelmail/src/options_folder.php:161
 msgid "Enable Collapsable Folders"
 msgstr ""
 
 msgid "Enable Collapsable Folders"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:178
+#: squirrelmail/src/options_folder.php:168
 msgid "Show Clock on Folders Panel"
 msgstr ""
 
 msgid "Show Clock on Folders Panel"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:186
+#: squirrelmail/src/options_folder.php:176
 msgid "No Clock"
 msgstr ""
 
 msgid "No Clock"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:191
+#: squirrelmail/src/options_folder.php:181
 msgid "Hour Format"
 msgstr ""
 
 msgid "Hour Format"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:194
+#: squirrelmail/src/options_folder.php:184
 msgid "12-hour clock"
 msgstr ""
 
 msgid "12-hour clock"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:195
+#: squirrelmail/src/options_folder.php:185
 msgid "24-hour clock"
 msgstr ""
 
 msgid "24-hour clock"
 msgstr ""
 
-#: squirrelmail/src/options_folder.php:204
-msgid "Plugin Options"
+#: squirrelmail/functions/page_header.php:86
+#: squirrelmail/plugins/filters/options.php:60
+#: squirrelmail/plugins/newmail/newmail_opt.php:33
+#: squirrelmail/plugins/translate/options.php:93
+#: squirrelmail/src/options.php:158 squirrelmail/src/options_highlight.php:57
+#: squirrelmail/src/options_identities.php:58
+#: squirrelmail/src/options_order.php:48
+msgid "Options"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options.php:175 squirrelmail/src/options_highlight.php:49
+#: squirrelmail/src/options.php:110 squirrelmail/src/options.php:257
+#: squirrelmail/src/options_highlight.php:57
 msgid "Message Highlighting"
 msgstr ""
 
 msgid "Message Highlighting"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:77
-#: squirrelmail/src/options_highlight.php:53
+#: squirrelmail/plugins/filters/options.php:62
+#: squirrelmail/src/options_highlight.php:61
 msgid "New"
 msgstr ""
 
 msgid "New"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:78
-#: squirrelmail/src/options_highlight.php:54
+#: squirrelmail/plugins/filters/options.php:63
+#: squirrelmail/plugins/filters/spamoptions.php:148
+#: squirrelmail/plugins/mail_fetch/fetch.php:225
+#: squirrelmail/src/options_highlight.php:62
 msgid "Done"
 msgstr ""
 
 msgid "Done"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:75
+#: squirrelmail/plugins/filters/options.php:150
+#: squirrelmail/plugins/filters/spamoptions.php:147
+#: squirrelmail/src/options_highlight.php:69
+msgid "Edit"
+msgstr ""
+
+#: squirrelmail/src/options_highlight.php:82
 msgid "No highlighting is defined"
 msgstr ""
 
 msgid "No highlighting is defined"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:247
+#: squirrelmail/src/options_highlight.php:254
 msgid "Identifying name"
 msgstr ""
 
 msgid "Identifying name"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:261
+#: squirrelmail/src/options_highlight.php:268
 msgid "Color"
 msgstr ""
 
 msgid "Color"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:265
+#: squirrelmail/src/options_highlight.php:272
 msgid "Dark Blue"
 msgstr ""
 
 msgid "Dark Blue"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:266
+#: squirrelmail/src/options_highlight.php:273
 msgid "Dark Green"
 msgstr ""
 
 msgid "Dark Green"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:267
+#: squirrelmail/src/options_highlight.php:274
 msgid "Dark Yellow"
 msgstr ""
 
 msgid "Dark Yellow"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:268
+#: squirrelmail/src/options_highlight.php:275
 msgid "Dark Cyan"
 msgstr ""
 
 msgid "Dark Cyan"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:269
+#: squirrelmail/src/options_highlight.php:276
 msgid "Dark Magenta"
 msgstr ""
 
 msgid "Dark Magenta"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:270
+#: squirrelmail/src/options_highlight.php:277
 msgid "Light Blue"
 msgstr ""
 
 msgid "Light Blue"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:271
+#: squirrelmail/src/options_highlight.php:278
 msgid "Light Green"
 msgstr ""
 
 msgid "Light Green"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:272
+#: squirrelmail/src/options_highlight.php:279
 msgid "Light Yellow"
 msgstr ""
 
 msgid "Light Yellow"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:273
+#: squirrelmail/src/options_highlight.php:280
 msgid "Light Cyan"
 msgstr ""
 
 msgid "Light Cyan"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:274
+#: squirrelmail/src/options_highlight.php:281
 msgid "Light Magenta"
 msgstr ""
 
 msgid "Light Magenta"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:275
+#: squirrelmail/src/options_highlight.php:282
 msgid "Dark Gray"
 msgstr ""
 
 msgid "Dark Gray"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:276
+#: squirrelmail/src/options_highlight.php:283
 msgid "Medium Gray"
 msgstr ""
 
 msgid "Medium Gray"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:277
+#: squirrelmail/src/options_highlight.php:284
 msgid "Light Gray"
 msgstr ""
 
 msgid "Light Gray"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:278
+#: squirrelmail/src/options_highlight.php:285
 msgid "White"
 msgstr ""
 
 msgid "White"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:280
+#: squirrelmail/src/options_highlight.php:287
 msgid "Other:"
 msgstr ""
 
 msgid "Other:"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:282
+#: squirrelmail/src/options_highlight.php:289
 msgid "Ex: 63aa7f"
 msgstr ""
 
 msgid "Ex: 63aa7f"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:319
+#: squirrelmail/plugins/filters/options.php:89
+#: squirrelmail/src/options_highlight.php:323 squirrelmail/src/search.php:73
+msgid "Cc"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:92
+#: squirrelmail/src/options_highlight.php:326
+msgid "To or Cc"
+msgstr ""
+
+#: squirrelmail/src/options_highlight.php:331
 msgid "Matches"
 msgstr ""
 
 msgid "Matches"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:36
+#: squirrelmail/src/options_identities.php:58
 msgid "Advanced Identities"
 msgstr ""
 
 msgid "Advanced Identities"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:47
+#: squirrelmail/src/options_identities.php:69
 msgid "Default Identity"
 msgstr ""
 
 msgid "Default Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:58
+#: squirrelmail/src/options_identities.php:80
 #, c-format
 msgid "Alternate Identity %d"
 msgstr ""
 
 #, c-format
 msgid "Alternate Identity %d"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:68
+#: squirrelmail/src/options_identities.php:90
 msgid "Add a New Identity"
 msgstr ""
 
 msgid "Add a New Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:285
-#: squirrelmail/src/options_personal.php:60
+#: squirrelmail/src/options_identities.php:306
+#: squirrelmail/src/options_personal.php:49
 msgid "Full Name"
 msgstr ""
 
 msgid "Full Name"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:294
+#: squirrelmail/src/options_identities.php:307
 msgid "E-Mail Address"
 msgstr ""
 
 msgid "E-Mail Address"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:303
-#: squirrelmail/src/options_personal.php:76
+#: squirrelmail/src/options_identities.php:308
+#: squirrelmail/src/options_personal.php:65
 msgid "Reply To"
 msgstr ""
 
 msgid "Reply To"
 msgstr ""
 
@@ -895,900 +907,990 @@ msgstr ""
 msgid "Save / Update"
 msgstr ""
 
 msgid "Save / Update"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:319
+#: squirrelmail/src/options_identities.php:318
 msgid "Make Default"
 msgstr ""
 
 msgid "Make Default"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:326
+#: squirrelmail/src/options_identities.php:324
 msgid "Move Up"
 msgstr ""
 
 msgid "Move Up"
 msgstr ""
 
-#: squirrelmail/src/options.php:191 squirrelmail/src/options_order.php:31
+#: squirrelmail/src/options.php:120 squirrelmail/src/options.php:273
+#: squirrelmail/src/options_order.php:48
 msgid "Index Order"
 msgstr ""
 
 msgid "Index Order"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:39
+#: squirrelmail/src/options_order.php:56
 msgid "Checkbox"
 msgstr ""
 
 msgid "Checkbox"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:43
+#: squirrelmail/src/options_order.php:60
 msgid "Flags"
 msgstr ""
 
 msgid "Flags"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:574
-#: squirrelmail/src/options_order.php:44
+#: squirrelmail/functions/mailbox_display.php:570
+#: squirrelmail/src/options_order.php:61
 msgid "Size"
 msgstr ""
 
 msgid "Size"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:87
+#: squirrelmail/src/options_order.php:104
 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 ""
 
 msgid ""
 "The index order is the order that the columns are arranged in the message "
 "index.  You can add, remove, and move columns around to customize them to "
 "fit your needs."
 msgstr ""
 
-#: squirrelmail/src/options_order.php:96
+#: squirrelmail/src/options_order.php:113
 msgid "up"
 msgstr ""
 
 msgid "up"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:98
+#: squirrelmail/src/options_order.php:115
 msgid "down"
 msgstr ""
 
 msgid "down"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:103
+#: squirrelmail/src/options_order.php:120
 msgid "remove"
 msgstr ""
 
 msgid "remove"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:132
+#: squirrelmail/src/options_order.php:149
 msgid "Return to options page"
 msgstr ""
 
 msgid "Return to options page"
 msgstr ""
 
-#: squirrelmail/src/options.php:159 squirrelmail/src/options_personal.php:31
-msgid "Personal Information"
-msgstr ""
-
-#: squirrelmail/src/options_personal.php:52
+#: squirrelmail/src/options_personal.php:41
 msgid "Name and Address Options"
 msgstr ""
 
 msgid "Name and Address Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:68
+#: squirrelmail/src/options_personal.php:57
 msgid "Email Address"
 msgstr ""
 
 msgid "Email Address"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:83
+#: squirrelmail/src/options_personal.php:72
 msgid "Edit Advanced Identities"
 msgstr ""
 
 msgid "Edit Advanced Identities"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:85
+#: squirrelmail/src/options_personal.php:74
 msgid "(discards changes made on this form so far)"
 msgstr ""
 
 msgid "(discards changes made on this form so far)"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:88
+#: squirrelmail/src/options_personal.php:77
 msgid "Multiple Identities"
 msgstr ""
 
 msgid "Multiple Identities"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:95
+#: squirrelmail/src/options_personal.php:84
 msgid "Reply Citation Options"
 msgstr ""
 
 msgid "Reply Citation Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:100
+#: squirrelmail/src/options_personal.php:89
 msgid "Reply Citation Style"
 msgstr ""
 
 msgid "Reply Citation Style"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:103
+#: squirrelmail/src/options_personal.php:92
 msgid "No Citation"
 msgstr ""
 
 msgid "No Citation"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:104
+#: squirrelmail/src/options_personal.php:93
 msgid "AUTHOR Said"
 msgstr ""
 
 msgid "AUTHOR Said"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:105
+#: squirrelmail/src/options_personal.php:94
 msgid "Quote Who XML"
 msgstr ""
 
 msgid "Quote Who XML"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:106
+#: squirrelmail/src/options_personal.php:95
 msgid "User-Defined"
 msgstr ""
 
 msgid "User-Defined"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:111
+#: squirrelmail/src/options_personal.php:100
 msgid "User-Defined Citation Start"
 msgstr ""
 
 msgid "User-Defined Citation Start"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:119
+#: squirrelmail/src/options_personal.php:108
 msgid "User-Defined Citation End"
 msgstr ""
 
 msgid "User-Defined Citation End"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:126
+#: squirrelmail/src/options_personal.php:115
 msgid "Signature Options"
 msgstr ""
 
 msgid "Signature Options"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:131
+#: squirrelmail/src/options_personal.php:120
 msgid "Use Signature"
 msgstr ""
 
 msgid "Use Signature"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:138
+#: squirrelmail/src/options_personal.php:127
 msgid "Prefix Signature with '-- ' Line"
 msgstr ""
 
 msgid "Prefix Signature with '-- ' Line"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:145
+#: squirrelmail/src/options_personal.php:134
 msgid "Signature"
 msgstr ""
 
 msgid "Signature"
 msgstr ""
 
-#: squirrelmail/src/options.php:54
-msgid "Successfully saved personal information!"
+#: squirrelmail/src/options.php:100 squirrelmail/src/options.php:241
+msgid "Personal Information"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options.php:100
-msgid "Successfully saved display preferences!"
+#: squirrelmail/src/options.php:105 squirrelmail/src/options.php:249
+msgid "Display Preferences"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options.php:101
-msgid "Refresh Page"
+#: squirrelmail/src/options.php:115 squirrelmail/src/options.php:265
+msgid "Folder Preferences"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options.php:147
-msgid "Successfully saved folder preferences!"
+#: squirrelmail/src/options.php:225
+msgid "Successfully Saved Options"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/options.php:148
+#: squirrelmail/src/options.php:229
 msgid "Refresh Folder List"
 msgstr ""
 
 msgid "Refresh Folder List"
 msgstr ""
 
-#: squirrelmail/src/options.php:161
+#: squirrelmail/src/options.php:231
+msgid "Refresh Page"
+msgstr ""
+
+#: squirrelmail/src/options.php:243
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
 msgstr ""
 
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
 msgstr ""
 
-#: squirrelmail/src/options.php:169
+#: squirrelmail/src/options.php:251
 msgid ""
 "You can change the way that SquirrelMail looks and displays information to "
 "you, such as the colors, the language, and other settings."
 msgstr ""
 
 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:177
+#: squirrelmail/src/options.php:259
 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 ""
 
 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:185
+#: squirrelmail/src/options.php:267
 msgid ""
 "These settings change the way your folders are displayed and manipulated."
 msgstr ""
 
 msgid ""
 "These settings change the way your folders are displayed and manipulated."
 msgstr ""
 
-#: squirrelmail/src/options.php:193
+#: squirrelmail/src/options.php:275
 msgid ""
 "The order of the message index can be rearanged and changed to contain the "
 "headers in any order you want."
 msgstr ""
 
 msgid ""
 "The order of the message index can be rearanged and changed to contain the "
 "headers in any order you want."
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:71
-#: squirrelmail/src/printer_friendly_main.php:15
-#: squirrelmail/src/printer_friendly_top.php:21
+#: squirrelmail/src/printer_friendly_bottom.php:86
+#: squirrelmail/src/printer_friendly_main.php:31
+#: squirrelmail/src/printer_friendly_top.php:37
 msgid "Printer Friendly"
 msgstr ""
 
 msgid "Printer Friendly"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:79
+#: squirrelmail/src/printer_friendly_bottom.php:94
 msgid "CC"
 msgstr ""
 
 msgid "CC"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_top.php:36
+#: squirrelmail/src/printer_friendly_top.php:52
 msgid "Print"
 msgstr ""
 
 msgid "Print"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_top.php:37
+#: squirrelmail/src/printer_friendly_top.php:53
 msgid "Close Window"
 msgstr ""
 
 msgid "Close Window"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:31
-msgid "Viewing full header"
+#: squirrelmail/src/read_body.php:48
+msgid "Viewing Full Header"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/read_body.php:152
-msgid "View printable version"
+#: squirrelmail/src/read_body.php:180
+msgid "View Printable Version"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/read_body.php:281
+#: squirrelmail/src/read_body.php:314
 msgid "more"
 msgstr ""
 
 msgid "more"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:282
+#: squirrelmail/src/read_body.php:315
 msgid "less"
 msgstr ""
 
 msgid "less"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:419
+#: squirrelmail/src/read_body.php:461
 msgid "Message List"
 msgstr ""
 
 msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:430
+#: squirrelmail/src/read_body.php:472
 msgid "Resume Draft"
 msgstr ""
 
 msgid "Resume Draft"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:458
+#: squirrelmail/src/read_body.php:507
 msgid "Forward"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:461
+#: squirrelmail/src/read_body.php:510
 msgid "Reply"
 msgstr ""
 
 msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:464
+#: squirrelmail/src/read_body.php:513
 msgid "Reply All"
 msgstr ""
 
 msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:483 squirrelmail/src/read_body.php:485
-msgid "View full header"
+#: squirrelmail/src/read_body.php:534 squirrelmail/src/read_body.php:536
+msgid "View Full Header"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/src/read_body.php:502
+#: squirrelmail/src/read_body.php:559
 msgid "Date:"
 msgstr ""
 
 msgid "Date:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:555
+#: squirrelmail/src/read_body.php:615
 msgid "Mailer"
 msgstr ""
 
 msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:26 squirrelmail/src/redirect.php:41
+#: squirrelmail/functions/auth.php:44 squirrelmail/src/redirect.php:81
+#: squirrelmail/src/redirect.php:85
 msgid "You must be logged in to access this page."
 msgstr ""
 
 msgid "You must be logged in to access this page."
 msgstr ""
 
-#: squirrelmail/functions/auth.php:27 squirrelmail/src/redirect.php:42
+#: squirrelmail/functions/auth.php:45 squirrelmail/src/redirect.php:86
 msgid "Go to the login page"
 msgstr ""
 
 msgid "Go to the login page"
 msgstr ""
 
-#: squirrelmail/src/redirect.php:75
+#: squirrelmail/src/redirect.php:106 squirrelmail/src/redirect.php:110
 msgid "There was an error contacting the mail server."
 msgstr ""
 
 msgid "There was an error contacting the mail server."
 msgstr ""
 
-#: squirrelmail/src/redirect.php:76
+#: squirrelmail/src/redirect.php:111
 msgid "Contact your administrator for help."
 msgstr ""
 
 msgid "Contact your administrator for help."
 msgstr ""
 
-#: squirrelmail/src/search.php:52 squirrelmail/src/search.php:53
+#: squirrelmail/src/search.php:69
 msgid "Body"
 msgstr ""
 
 msgid "Body"
 msgstr ""
 
-#: squirrelmail/src/search.php:55 squirrelmail/src/search.php:56
+#: squirrelmail/src/search.php:70
 msgid "Everywhere"
 msgstr ""
 
 msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:183 squirrelmail/src/search.php:64
-#: squirrelmail/src/search.php:65
-msgid "Cc"
-msgstr ""
-
-#: squirrelmail/functions/page_header.php:57 squirrelmail/src/signout.php:65
+#: squirrelmail/functions/page_header.php:72 squirrelmail/src/signout.php:83
 msgid "Sign Out"
 msgstr ""
 
 msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/src/signout.php:71
+#: squirrelmail/src/signout.php:89
 msgid "You have been successfully signed out."
 msgstr ""
 
 msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/signout.php:73
+#: squirrelmail/src/signout.php:91
 msgid "Click here to log back in."
 msgstr ""
 
 msgid "Click here to log back in."
 msgstr ""
 
-#: squirrelmail/src/vcard.php:26
+#: squirrelmail/src/vcard.php:46
 msgid "Viewing a Business Card"
 msgstr ""
 
 msgid "Viewing a Business Card"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:88 squirrelmail/src/vcard.php:149
+#: squirrelmail/src/vcard.php:108 squirrelmail/src/vcard.php:169
 msgid "Title"
 msgstr ""
 
 msgid "Title"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:89
+#: squirrelmail/src/vcard.php:109
 msgid "Email"
 msgstr ""
 
 msgid "Email"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:143
+#: squirrelmail/src/vcard.php:110 squirrelmail/src/vcard.php:163
 msgid "Web Page"
 msgstr ""
 
 msgid "Web Page"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:91 squirrelmail/src/vcard.php:152
+#: squirrelmail/src/vcard.php:111 squirrelmail/src/vcard.php:172
 msgid "Organization / Department"
 msgstr ""
 
 msgid "Organization / Department"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:146
+#: squirrelmail/src/vcard.php:112 squirrelmail/src/vcard.php:166
 msgid "Address"
 msgstr ""
 
 msgid "Address"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:159
+#: squirrelmail/src/vcard.php:113 squirrelmail/src/vcard.php:179
 msgid "Work Phone"
 msgstr ""
 
 msgid "Work Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:162
+#: squirrelmail/src/vcard.php:114 squirrelmail/src/vcard.php:182
 msgid "Home Phone"
 msgstr ""
 
 msgid "Home Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:165
+#: squirrelmail/src/vcard.php:115 squirrelmail/src/vcard.php:185
 msgid "Cellular Phone"
 msgstr ""
 
 msgid "Cellular Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:96 squirrelmail/src/vcard.php:168
+#: squirrelmail/src/vcard.php:116 squirrelmail/src/vcard.php:188
 msgid "Fax"
 msgstr ""
 
 msgid "Fax"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:97 squirrelmail/src/vcard.php:171
+#: squirrelmail/src/vcard.php:117 squirrelmail/src/vcard.php:191
 msgid "Note"
 msgstr ""
 
 msgid "Note"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:129
+#: squirrelmail/src/vcard.php:149
 msgid "Add to Addressbook"
 msgstr ""
 
 msgid "Add to Addressbook"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:156
+#: squirrelmail/src/vcard.php:176
 msgid "Title & Org. / Dept."
 msgstr ""
 
 msgid "Title & Org. / Dept."
 msgstr ""
 
-#: squirrelmail/functions/abook_database.php:47
-#: squirrelmail/functions/abook_local_file.php:34
-#: squirrelmail/functions/addressbook.php:139
+#: squirrelmail/functions/abook_database.php:50
+#: squirrelmail/functions/abook_local_file.php:53
+#: squirrelmail/functions/addressbook.php:152
 msgid "Personal address book"
 msgstr ""
 
 msgid "Personal address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_database.php:86
-#: squirrelmail/functions/abook_database.php:122
-#: squirrelmail/functions/abook_database.php:154
-#: squirrelmail/functions/abook_database.php:183
-#: squirrelmail/functions/abook_database.php:229
-#: squirrelmail/functions/abook_database.php:258
-#: squirrelmail/functions/abook_database.php:294
+#: squirrelmail/functions/abook_database.php:96
+#: squirrelmail/functions/abook_database.php:136
+#: squirrelmail/functions/abook_database.php:171
+#: squirrelmail/functions/abook_database.php:201
+#: squirrelmail/functions/abook_database.php:253
+#: squirrelmail/functions/abook_database.php:286
+#: squirrelmail/functions/abook_database.php:327
 #, c-format
 msgid "Database error: %s"
 msgstr ""
 
 #, c-format
 msgid "Database error: %s"
 msgstr ""
 
-#: squirrelmail/functions/abook_database.php:202
-#: squirrelmail/functions/abook_database.php:236
-#: squirrelmail/functions/abook_database.php:265
-#: squirrelmail/functions/abook_local_file.php:228
-#: squirrelmail/functions/abook_local_file.php:248
-#: squirrelmail/functions/abook_local_file.php:271
-#: squirrelmail/functions/abook_local_file.php:301
-#: squirrelmail/functions/addressbook.php:324
-#: squirrelmail/functions/addressbook.php:355
-#: squirrelmail/functions/addressbook.php:406
+#: 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:267
+#: squirrelmail/functions/abook_local_file.php:290
+#: squirrelmail/functions/abook_local_file.php:319
+#: squirrelmail/functions/addressbook.php:349
+#: squirrelmail/functions/addressbook.php:384
+#: squirrelmail/functions/addressbook.php:437
 msgid "Addressbook is read-only"
 msgstr ""
 
 msgid "Addressbook is read-only"
 msgstr ""
 
-#: squirrelmail/functions/abook_database.php:210
-#: squirrelmail/functions/abook_local_file.php:233
+#: squirrelmail/functions/abook_database.php:231
+#: squirrelmail/functions/abook_local_file.php:252
 #, c-format
 msgid "User '%s' already exist"
 msgstr ""
 
 #, c-format
 msgid "User '%s' already exist"
 msgstr ""
 
-#: squirrelmail/functions/abook_database.php:273
-#: squirrelmail/functions/abook_local_file.php:306
+#: squirrelmail/functions/abook_database.php:303
+#: squirrelmail/functions/abook_local_file.php:324
 #, c-format
 msgid "User '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "User '%s' does not exist"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:32
+#: squirrelmail/functions/abook_global_file.php:51
 msgid "Global address book"
 msgstr ""
 
 msgid "Global address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:52
-#: squirrelmail/functions/abook_local_file.php:75
+#: squirrelmail/functions/abook_global_file.php:71
+#: squirrelmail/functions/abook_local_file.php:94
 msgid "No such file or directory"
 msgstr ""
 
 msgid "No such file or directory"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:62
-#: squirrelmail/functions/abook_local_file.php:95
-#: squirrelmail/functions/abook_local_file.php:131
+#: squirrelmail/functions/abook_global_file.php:81
+#: squirrelmail/functions/abook_local_file.php:114
+#: squirrelmail/functions/abook_local_file.php:150
 msgid "Open failed"
 msgstr ""
 
 msgid "Open failed"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:159
-#: squirrelmail/functions/abook_global_file.php:165
-#: squirrelmail/functions/abook_global_file.php:171
+#: squirrelmail/functions/abook_global_file.php:178
+#: squirrelmail/functions/abook_global_file.php:184
+#: squirrelmail/functions/abook_global_file.php:190
 msgid "Can not modify global address book"
 msgstr ""
 
 msgid "Can not modify global address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:42
+#: squirrelmail/functions/abook_local_file.php:61
 msgid "Not a file name"
 msgstr ""
 
 msgid "Not a file name"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:252
-#: squirrelmail/functions/abook_local_file.php:276
-#: squirrelmail/functions/abook_local_file.php:312
+#: squirrelmail/functions/abook_local_file.php:271
+#: squirrelmail/functions/abook_local_file.php:295
+#: squirrelmail/functions/abook_local_file.php:330
 msgid "Could not lock datafile"
 msgstr ""
 
 msgid "Could not lock datafile"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:264
+#: squirrelmail/functions/abook_local_file.php:283
 msgid "Write to addressbook failed"
 msgstr ""
 
 msgid "Write to addressbook failed"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:64
+#: squirrelmail/functions/addressbook.php:70
 msgid "Error initializing addressbook database."
 msgstr ""
 
 msgid "Error initializing addressbook database."
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:73
+#: squirrelmail/functions/addressbook.php:79
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:83
+#: squirrelmail/functions/addressbook.php:89
 msgid "Error initializing global addressbook."
 msgstr ""
 
 msgid "Error initializing global addressbook."
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:99
+#: squirrelmail/functions/addressbook.php:105
 #, c-format
 msgid "Error initializing LDAP server %s:"
 msgstr ""
 
 #, c-format
 msgid "Error initializing LDAP server %s:"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:301
-#: squirrelmail/functions/addressbook.php:382
+#: squirrelmail/functions/addressbook.php:327
+#: squirrelmail/functions/addressbook.php:414
 msgid "Invalid input data"
 msgstr ""
 
 msgid "Invalid input data"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:306
-#: squirrelmail/functions/addressbook.php:387
+#: squirrelmail/functions/addressbook.php:331
+#: squirrelmail/functions/addressbook.php:418
 msgid "Name is missing"
 msgstr ""
 
 msgid "Name is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:310
-#: squirrelmail/functions/addressbook.php:391
+#: squirrelmail/functions/addressbook.php:335
+#: squirrelmail/functions/addressbook.php:422
 msgid "E-mail address is missing"
 msgstr ""
 
 msgid "E-mail address is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:318
-#: squirrelmail/functions/addressbook.php:396
+#: squirrelmail/functions/addressbook.php:343
+#: squirrelmail/functions/addressbook.php:427
 msgid "Nickname contains illegal characters"
 msgstr ""
 
 msgid "Nickname contains illegal characters"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:93
-#: squirrelmail/functions/attachment_common.php:117
-#: squirrelmail/functions/attachment_common.php:141
+#: squirrelmail/functions/attachment_common.php:116
+#: squirrelmail/functions/attachment_common.php:140
+#: squirrelmail/functions/attachment_common.php:164
 msgid "view"
 msgstr ""
 
 msgid "view"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:157
+#: squirrelmail/functions/attachment_common.php:180
 msgid "Business Card"
 msgstr ""
 
 msgid "Business Card"
 msgstr ""
 
-#: squirrelmail/functions/date.php:85
+#: squirrelmail/functions/date.php:91
 msgid "Sunday"
 msgstr ""
 
 msgid "Sunday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:88
+#: squirrelmail/functions/date.php:94
 msgid "Monday"
 msgstr ""
 
 msgid "Monday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:91
+#: squirrelmail/functions/date.php:97
 msgid "Tuesday"
 msgstr ""
 
 msgid "Tuesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:94
+#: squirrelmail/functions/date.php:100
 msgid "Wednesday"
 msgstr ""
 
 msgid "Wednesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:97
+#: squirrelmail/functions/date.php:103
 msgid "Thursday"
 msgstr ""
 
 msgid "Thursday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:100
+#: squirrelmail/functions/date.php:106
 msgid "Friday"
 msgstr ""
 
 msgid "Friday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:103
+#: squirrelmail/functions/date.php:109
 msgid "Saturday"
 msgstr ""
 
 msgid "Saturday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:114
+#: squirrelmail/functions/date.php:120
 msgid "January"
 msgstr ""
 
 msgid "January"
 msgstr ""
 
-#: squirrelmail/functions/date.php:117
+#: squirrelmail/functions/date.php:123
 msgid "February"
 msgstr ""
 
 msgid "February"
 msgstr ""
 
-#: squirrelmail/functions/date.php:120
+#: squirrelmail/functions/date.php:126
 msgid "March"
 msgstr ""
 
 msgid "March"
 msgstr ""
 
-#: squirrelmail/functions/date.php:123
+#: squirrelmail/functions/date.php:129
 msgid "April"
 msgstr ""
 
 msgid "April"
 msgstr ""
 
-#: squirrelmail/functions/date.php:126
+#: squirrelmail/functions/date.php:132
 msgid "May"
 msgstr ""
 
 msgid "May"
 msgstr ""
 
-#: squirrelmail/functions/date.php:129
+#: squirrelmail/functions/date.php:135
 msgid "June"
 msgstr ""
 
 msgid "June"
 msgstr ""
 
-#: squirrelmail/functions/date.php:132
+#: squirrelmail/functions/date.php:138
 msgid "July"
 msgstr ""
 
 msgid "July"
 msgstr ""
 
-#: squirrelmail/functions/date.php:135
+#: squirrelmail/functions/date.php:141
 msgid "August"
 msgstr ""
 
 msgid "August"
 msgstr ""
 
-#: squirrelmail/functions/date.php:138
+#: squirrelmail/functions/date.php:144
 msgid "September"
 msgstr ""
 
 msgid "September"
 msgstr ""
 
-#: squirrelmail/functions/date.php:141
+#: squirrelmail/functions/date.php:147
 msgid "October"
 msgstr ""
 
 msgid "October"
 msgstr ""
 
-#: squirrelmail/functions/date.php:144
+#: squirrelmail/functions/date.php:150
 msgid "November"
 msgstr ""
 
 msgid "November"
 msgstr ""
 
-#: squirrelmail/functions/date.php:147
+#: squirrelmail/functions/date.php:153
 msgid "December"
 msgstr ""
 
 msgid "December"
 msgstr ""
 
-#: squirrelmail/functions/date.php:169
+#: squirrelmail/functions/date.php:178
 msgid "D, F j, Y g:i a"
 msgstr ""
 
 msgid "D, F j, Y g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:186
+#: squirrelmail/functions/date.php:180
+msgid "D, F j, Y G:i"
+msgstr ""
+
+#: squirrelmail/functions/date.php:202
 msgid "g:i a"
 msgstr ""
 
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:189
+#: squirrelmail/functions/date.php:204
+msgid "G:i"
+msgstr ""
+
+#: squirrelmail/functions/date.php:209
 msgid "D, g:i a"
 msgstr ""
 
 msgid "D, g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:192
+#: squirrelmail/functions/date.php:211
+msgid "D, G:i"
+msgstr ""
+
+#: squirrelmail/functions/date.php:215
 msgid "M j, Y"
 msgstr ""
 
 msgid "M j, Y"
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:67
-#: squirrelmail/functions/db_prefs.php:70
-#: squirrelmail/functions/db_prefs.php:189
+#: squirrelmail/functions/db_prefs.php:82
+#: squirrelmail/functions/db_prefs.php:85
+#: squirrelmail/functions/db_prefs.php:204
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:22
-#: squirrelmail/functions/imap_general.php:228
+#: squirrelmail/functions/display_messages.php:23
+#: squirrelmail/functions/imap_general.php:206
 msgid "Unknown user or password incorrect."
 msgstr ""
 
 msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:22
-#: squirrelmail/functions/imap_general.php:229
+#: squirrelmail/functions/display_messages.php:25
 msgid "Click here to try again"
 msgstr ""
 
 msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:35
+#: squirrelmail/functions/display_messages.php:39
 #, c-format
 msgid "Welcome to %s's WebMail system"
 msgstr ""
 
 #, c-format
 msgid "Welcome to %s's WebMail system"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:46
+#: squirrelmail/functions/display_messages.php:51
 #, c-format
 #, c-format
-msgid "Running SquirrelMail version %s (c) 1999-2000."
+msgid "Running SquirrelMail version %s (c) 1999-2001."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:71
+#: squirrelmail/functions/display_messages.php:76
 #, c-format
 msgid "Click here to return to %s"
 msgstr ""
 
 #, c-format
 msgid "Click here to return to %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:127
-#: squirrelmail/functions/imap_messages.php:116
-#: squirrelmail/functions/imap_messages.php:124
-#: squirrelmail/functions/imap_messages.php:143
-#: squirrelmail/functions/imap_messages.php:152
-#: squirrelmail/functions/imap_messages.php:264
+#: squirrelmail/functions/imap_general.php:119
+#: squirrelmail/functions/imap_messages.php:132
+#: squirrelmail/functions/imap_messages.php:140
+#: squirrelmail/functions/imap_messages.php:159
+#: squirrelmail/functions/imap_messages.php:168
+#: squirrelmail/functions/imap_messages.php:280
+#: squirrelmail/plugins/filters/filters.php:88
 msgid "ERROR : Could not complete request."
 msgstr ""
 
 msgid "ERROR : Could not complete request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:129
+#: squirrelmail/functions/imap_general.php:121
+#: squirrelmail/plugins/filters/filters.php:90
 msgid "Reason Given: "
 msgstr ""
 
 msgid "Reason Given: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:136
+#: squirrelmail/functions/imap_general.php:128
+#: squirrelmail/plugins/filters/filters.php:97
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:138
+#: squirrelmail/functions/imap_general.php:130
+#: squirrelmail/plugins/filters/filters.php:99
 msgid "Server responded: "
 msgstr ""
 
 msgid "Server responded: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:168
+#: squirrelmail/functions/imap_general.php:166
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:185
+#: squirrelmail/functions/imap_general.php:183
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:187
+#: squirrelmail/functions/imap_general.php:185
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:189
+#: squirrelmail/functions/imap_general.php:187
 msgid "Read data:"
 msgstr ""
 
 msgid "Read data:"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:118
-#: squirrelmail/functions/imap_messages.php:145
-#: squirrelmail/functions/imap_messages.php:266
+#: squirrelmail/functions/imap_messages.php:134
+#: squirrelmail/functions/imap_messages.php:161
+#: squirrelmail/functions/imap_messages.php:282
 msgid "Unknown response from IMAP server: "
 msgstr ""
 
 msgid "Unknown response from IMAP server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:126
+#: squirrelmail/functions/imap_messages.php:142
 msgid "Unknown message number in reply from server: "
 msgstr ""
 
 msgid "Unknown message number in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:154
+#: squirrelmail/functions/imap_messages.php:170
 msgid "Unknown messagenumber in reply from server: "
 msgstr ""
 
 msgid "Unknown messagenumber in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:163
-#: squirrelmail/functions/imap_messages.php:192
-#: squirrelmail/functions/imap_messages.php:436
-#: squirrelmail/functions/imap_messages.php:486
-#: squirrelmail/functions/mailbox_display.php:737
+#: squirrelmail/functions/imap_messages.php:179
+#: squirrelmail/functions/imap_messages.php:208
+#: squirrelmail/functions/imap_messages.php:452
+#: squirrelmail/functions/imap_messages.php:502
+#: squirrelmail/functions/mailbox_display.php:868
 msgid "(no subject)"
 msgstr ""
 
 msgid "(no subject)"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:164
+#: squirrelmail/functions/imap_messages.php:180
 msgid "Unknown Sender"
 msgstr ""
 
 msgid "Unknown Sender"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:217
+#: squirrelmail/functions/imap_messages.php:233
 msgid "No To Address"
 msgstr ""
 
 msgid "No To Address"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:489
+#: squirrelmail/functions/imap_messages.php:505
 msgid "(unknown sender)"
 msgstr ""
 
 msgid "(unknown sender)"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:146
+#: squirrelmail/functions/imap_search.php:62
+msgid "No Messages Found"
+msgstr ""
+
+#: squirrelmail/functions/imap_search.php:150
 msgid "Found"
 msgstr ""
 
 msgid "Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:146
+#: squirrelmail/functions/imap_search.php:150
 msgid "messages"
 msgstr ""
 
 msgid "messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:407
+#: squirrelmail/functions/mailbox_display.php:409
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:497
+#: squirrelmail/functions/mailbox_display.php:493
 msgid "Move selected to:"
 msgstr ""
 
 msgid "Move selected to:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:500
+#: squirrelmail/functions/mailbox_display.php:496
 msgid "Transform Selected Messages"
 msgstr ""
 
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:516
+#: squirrelmail/functions/mailbox_display.php:512
 msgid "Move"
 msgstr ""
 
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:520
+#: squirrelmail/functions/mailbox_display.php:516
 msgid "Expunge"
 msgstr ""
 
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:520
+#: squirrelmail/functions/mailbox_display.php:516
 msgid "mailbox"
 msgstr ""
 
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:522
+#: squirrelmail/functions/mailbox_display.php:518
 msgid "Read"
 msgstr ""
 
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:523
+#: squirrelmail/functions/mailbox_display.php:519
 msgid "Unread"
 msgstr ""
 
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:617
+#: squirrelmail/functions/mailbox_display.php:615
 msgid "Toggle All"
 msgstr ""
 
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:636
+#: squirrelmail/functions/mailbox_display.php:633
 msgid "Unselect All"
 msgstr ""
 
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:638
+#: squirrelmail/functions/mailbox_display.php:635
 msgid "Select All"
 msgstr ""
 
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:654
+#: squirrelmail/functions/mailbox_display.php:652
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr ""
 
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:656
+#: squirrelmail/functions/mailbox_display.php:654
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:631
+#: squirrelmail/functions/mailbox_display.php:842
+msgid "Show All"
+msgstr ""
+
+#: squirrelmail/functions/mime.php:647
 msgid "Attachments"
 msgstr ""
 
 msgid "Attachments"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:670
+#: squirrelmail/functions/mime.php:686
 msgid "download"
 msgstr ""
 
 msgid "download"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:934
+#: squirrelmail/functions/mime.php:956
 msgid "Title:"
 msgstr ""
 
 msgid "Title:"
 msgstr ""
 
-#: squirrelmail/functions/options.php:135
+#: squirrelmail/functions/options.php:167
 #, c-format
 msgid "Option Type '%s' Not Found"
 msgstr ""
 
 #, c-format
 msgid "Option Type '%s' Not Found"
 msgstr ""
 
-#: squirrelmail/functions/options.php:218
+#: squirrelmail/functions/options.php:253
 msgid "Yes"
 msgstr ""
 
 msgid "Yes"
 msgstr ""
 
-#: squirrelmail/functions/options.php:223
+#: squirrelmail/functions/options.php:258
 msgid "No"
 msgstr ""
 
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:59
+#: squirrelmail/functions/page_header.php:74
 msgid "Current Folder"
 msgstr ""
 
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:65
+#: squirrelmail/functions/page_header.php:80
 msgid "Compose"
 msgstr ""
 
 msgid "Compose"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:29
+#: squirrelmail/functions/prefs.php:33
 #, c-format
 msgid ""
 "Preference file, %s, does not exist. Log out, and log back in to create a "
 "default preference file."
 msgstr ""
 
 #, 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:124
+#: squirrelmail/functions/prefs.php:144
 msgid "Error opening "
 msgstr ""
 
 msgid "Error opening "
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:258
+#: squirrelmail/plugins/filters/filters.php:359
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "
 "is a pretty reliable list to scan spam from."
 msgstr ""
 
 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:265
+#: squirrelmail/plugins/filters/filters.php:367
 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 ""
 
 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:272
+#: squirrelmail/plugins/filters/filters.php:375
 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 ""
 
 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:279
-msgid "COMMERCIAL - RBL+ is a combination of RSS, DUL, and RBL."
+#: squirrelmail/plugins/filters/filters.php:383
+msgid "COMMERCIAL - RBL+ Blackhole entries."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:391
+msgid "COMMERCIAL - RBL+ OpenRelay entries."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:399
+msgid "COMMERCIAL - RBL+ Dial-up entries."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:407
+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:415
+msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:423
+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:431
+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:439
+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 ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:286
+#: squirrelmail/plugins/filters/filters.php:447
 msgid ""
 msgid ""
-"FREE - Osirusoft - Very thorough, but also rejects replies from many ISP's "
-"abuse@domain.name email messages for some reason."
+"FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
+"users in without confirmation."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:293
+#: squirrelmail/plugins/filters/filters.php:455
 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."
 msgstr ""
 
 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:300
+#: squirrelmail/plugins/filters/filters.php:463
 msgid "FREE - Another ORBS replacement (just the INPUTS database used here)."
 msgstr ""
 
 msgid "FREE - Another ORBS replacement (just the INPUTS database used here)."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:307
-msgid "FREE - Five-Ten-sg.com has SPAM source, OpenRelay, and Dialup IPs."
+#: squirrelmail/plugins/filters/filters.php:471
+msgid "FREE - Another ORBS replacement (just the OUTPUTS database used here)."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:479
+msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:487
+msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:314
+#: squirrelmail/plugins/filters/filters.php:495
+msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:503
+msgid "FREE - Five-Ten-sg.com - Other misc. servers."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:511
+msgid "FREE - Five-Ten-sg.com - Single Stage servers."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:519
+msgid "FREE - Five-Ten-sg.com - SPAM Support servers."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:527
+msgid "FREE - Five-Ten-sg.com - Web Form IPs."
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:535
 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 ""
 
 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:321
+#: squirrelmail/plugins/filters/filters.php:543
 msgid ""
 "FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be "
 "SLOOOOOOW!"
 msgstr ""
 
 msgid ""
 "FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be "
 "SLOOOOOOW!"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:328
-msgid ""
-"FREE - orbz.gst-group.co.uk lists not only open relays, but also mailservers "
-"that refuse or bounce email addressed to postmaster@<theirdomain>."
+#: squirrelmail/plugins/filters/filters.php:551
+msgid "FREE - orbz.gst-group.co.uk - Inputs only."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:75
-msgid "Message Filtering"
+#: squirrelmail/plugins/filters/filters.php:559
+msgid "FREE - orbz.gst-group.co.uk - Outputs only."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:91
-#: squirrelmail/plugins/filters/options.php:123
-msgid "Edit"
+#: squirrelmail/plugins/filters/filters.php:567
+msgid ""
+"FREE - orbz.gst-group.co.uk - mailservers that refuse or bounce email "
+"addressed to postmaster@<theirdomain>."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:97
-msgid "Down"
+#: squirrelmail/plugins/filters/filters.php:575
+#, c-format
+msgid ""
+"FREE, for now - SPAMCOP - An interesting solution that lists servers that "
+"have a very high spam to legit email ratio (85% or more)."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:103
-msgid "Up"
+#: squirrelmail/plugins/filters/options.php:60
+msgid "Message Filtering"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:106
-#, c-format
-msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
+#: squirrelmail/plugins/filters/options.php:76
+msgid "Match:"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:119
-msgid "Spam Filtering"
+#: squirrelmail/plugins/filters/options.php:102
+msgid "Contains:"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:124
-#, c-format
-msgid "Spam is sent to <b>%s</b>"
+#: squirrelmail/plugins/filters/options.php:114
+msgid "Move to:"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:124
-msgid "[<i>not set yet</i>]"
+#: squirrelmail/plugins/filters/options.php:156
+msgid "Down"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:126
-#, c-format
-msgid "Spam scan is limited to <b>%s</b>"
+#: squirrelmail/plugins/filters/options.php:162
+msgid "Up"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:126
-msgid "New Messages Only"
+#: squirrelmail/plugins/filters/options.php:165
+#, c-format
+msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:126
-msgid "All Messages"
+#: squirrelmail/plugins/filters/setup.php:79
+msgid "Message Filters"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:136
-msgid "ON"
+#: squirrelmail/plugins/filters/setup.php:81
+msgid ""
+"Filtering enables messages with different criteria to be automatically "
+"filtered into different folders for easier organization."
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:138
-msgid "OFF"
+#: squirrelmail/plugins/filters/setup.php:87
+msgid "SPAM Filters"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:186
-msgid "To or Cc"
+#: squirrelmail/plugins/filters/setup.php:89
+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 ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:196
-msgid "Contains:"
+#: squirrelmail/plugins/filters/spamoptions.php:52
+msgid "Spam Filtering"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:208
-msgid "Move to:"
+#: squirrelmail/plugins/filters/spamoptions.php:56
+msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:251
+#: squirrelmail/plugins/filters/spamoptions.php:76
 msgid "Move spam to:"
 msgstr ""
 
 msgid "Move spam to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:268
+#: squirrelmail/plugins/filters/spamoptions.php:93
 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 "
 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 "
@@ -1797,19 +1899,19 @@ msgid ""
 "around."
 msgstr ""
 
 "around."
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:271
+#: squirrelmail/plugins/filters/spamoptions.php:96
 msgid "What to Scan:"
 msgstr ""
 
 msgid "What to Scan:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:276
+#: squirrelmail/plugins/filters/spamoptions.php:101
 msgid "All messages"
 msgstr ""
 
 msgid "All messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:280
+#: squirrelmail/plugins/filters/spamoptions.php:105
 msgid "Only unread messages"
 msgstr ""
 
 msgid "Only unread messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:286
+#: squirrelmail/plugins/filters/spamoptions.php:111
 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 "
 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 "
@@ -1818,28 +1920,48 @@ msgid ""
 "you'll scan even the spam you read with the new filters."
 msgstr ""
 
 "you'll scan even the spam you read with the new filters."
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:312
+#: squirrelmail/plugins/filters/spamoptions.php:137
 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:77
-msgid "Message Filters"
+#: squirrelmail/plugins/filters/spamoptions.php:149
+#, c-format
+msgid "Spam is sent to <b>%s</b>"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:79
-msgid ""
-"Filtering enables messages with different criteria to be automatically "
-"filtered into different folders for easier organization."
+#: squirrelmail/plugins/filters/spamoptions.php:149
+msgid "[<i>not set yet</i>]"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/setup.php:46
-msgid "SpellChecker Options"
+#: squirrelmail/plugins/filters/spamoptions.php:151
+#, c-format
+msgid "Spam scan is limited to <b>%s</b>"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/setup.php:48
-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."
+#: squirrelmail/plugins/filters/spamoptions.php:151
+msgid "New Messages Only"
+msgstr ""
+
+#: squirrelmail/plugins/filters/spamoptions.php:151
+msgid "All Messages"
+msgstr ""
+
+#: squirrelmail/plugins/filters/spamoptions.php:161
+msgid "ON"
+msgstr ""
+
+#: squirrelmail/plugins/filters/spamoptions.php:163
+msgid "OFF"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/setup.php:46
+msgid "SpellChecker Options"
+msgstr ""
+
+#: squirrelmail/plugins/squirrelspell/setup.php:48
+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:64
 msgstr ""
 
 #: squirrelmail/plugins/squirrelspell/setup.php:64
@@ -2206,382 +2328,382 @@ msgstr ""
 msgid "SquirrelSpell Options Menu"
 msgstr ""
 
 msgid "SquirrelSpell Options Menu"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:67
+#: squirrelmail/plugins/translate/options.php:93
 msgid "Translator"
 msgstr ""
 
 msgid "Translator"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:70
+#: squirrelmail/plugins/translate/options.php:96
 msgid "Your server options are as follows:"
 msgstr ""
 
 msgid "Your server options are as follows:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:75
+#: squirrelmail/plugins/translate/options.php:101
 msgid ""
 "13 language pairs, maximum of 1000 characters translated, powered by Systran"
 msgstr ""
 
 msgid ""
 "13 language pairs, maximum of 1000 characters translated, powered by Systran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:78
+#: squirrelmail/plugins/translate/options.php:104
 msgid ""
 "10 language pairs, maximum of 25 kilobytes translated, powered by Systran"
 msgstr ""
 
 msgid ""
 "10 language pairs, maximum of 25 kilobytes translated, powered by Systran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:81
+#: squirrelmail/plugins/translate/options.php:107
 msgid "12 language pairs, no known limits, powered by Systran"
 msgstr ""
 
 msgid "12 language pairs, no known limits, powered by Systran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:84
+#: squirrelmail/plugins/translate/options.php:110
 msgid ""
 "767 language pairs, no known limits, powered by Translation Experts's "
 "InterTran"
 msgstr ""
 
 msgid ""
 "767 language pairs, no known limits, powered by Translation Experts's "
 "InterTran"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:87
+#: squirrelmail/plugins/translate/options.php:113
 msgid ""
 "8 language pairs, no known limits, powered by GPLTrans (free, open source)"
 msgstr ""
 
 msgid ""
 "8 language pairs, no known limits, powered by GPLTrans (free, open source)"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:93
+#: squirrelmail/plugins/translate/options.php:119
 msgid ""
 "You also decide if you want the translation box displayed, and where it will "
 "be located."
 msgstr ""
 
 msgid ""
 "You also decide if you want the translation box displayed, and where it will "
 "be located."
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:98
+#: squirrelmail/plugins/translate/options.php:123
 msgid "Select your translator:"
 msgstr ""
 
 msgid "Select your translator:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:109
+#: squirrelmail/plugins/translate/options.php:135
 msgid "When reading:"
 msgstr ""
 
 msgid "When reading:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:114
+#: squirrelmail/plugins/translate/options.php:140
 msgid "Show translation box"
 msgstr ""
 
 msgid "Show translation box"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:116
+#: squirrelmail/plugins/translate/options.php:142
 msgid "to the left"
 msgstr ""
 
 msgid "to the left"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:117
+#: squirrelmail/plugins/translate/options.php:143
 msgid "in the center"
 msgstr ""
 
 msgid "in the center"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:118
+#: squirrelmail/plugins/translate/options.php:144
 msgid "to the right"
 msgstr ""
 
 msgid "to the right"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:123
+#: squirrelmail/plugins/translate/options.php:149
 msgid "Translate inside the SquirrelMail frames"
 msgstr ""
 
 msgid "Translate inside the SquirrelMail frames"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:126
+#: squirrelmail/plugins/translate/options.php:152
 msgid "When composing:"
 msgstr ""
 
 msgid "When composing:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:130
+#: squirrelmail/plugins/translate/options.php:156
 msgid "Not yet functional, currently does nothing"
 msgstr ""
 
 msgid "Not yet functional, currently does nothing"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:96
+#: squirrelmail/plugins/translate/setup.php:95
 msgid "Translation Options"
 msgstr ""
 
 msgid "Translation Options"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:98
+#: squirrelmail/plugins/translate/setup.php:97
 msgid ""
 "Which translator should be used when you get messages in a different "
 "language?"
 msgstr ""
 
 msgid ""
 "Which translator should be used when you get messages in a different "
 "language?"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:266
-#: squirrelmail/plugins/translate/setup.php:270
-#: squirrelmail/plugins/translate/setup.php:274
-#: squirrelmail/plugins/translate/setup.php:278
-#: squirrelmail/plugins/translate/setup.php:282
-#: squirrelmail/plugins/translate/setup.php:286
-#: squirrelmail/plugins/translate/setup.php:290
-#: squirrelmail/plugins/translate/setup.php:294
-#: squirrelmail/plugins/translate/setup.php:298
-#: squirrelmail/plugins/translate/setup.php:302
-#: squirrelmail/plugins/translate/setup.php:306
-#: squirrelmail/plugins/translate/setup.php:310
-#: squirrelmail/plugins/translate/setup.php:314
-#: squirrelmail/plugins/translate/setup.php:329
-#: squirrelmail/plugins/translate/setup.php:333
-#: squirrelmail/plugins/translate/setup.php:337
-#: squirrelmail/plugins/translate/setup.php:341
-#: squirrelmail/plugins/translate/setup.php:345
-#: squirrelmail/plugins/translate/setup.php:349
-#: squirrelmail/plugins/translate/setup.php:353
-#: squirrelmail/plugins/translate/setup.php:357
-#: squirrelmail/plugins/translate/setup.php:361
-#: squirrelmail/plugins/translate/setup.php:365
-#: squirrelmail/plugins/translate/setup.php:440
-#: squirrelmail/plugins/translate/setup.php:473
-#: squirrelmail/plugins/translate/setup.php:477
-#: squirrelmail/plugins/translate/setup.php:481
-#: squirrelmail/plugins/translate/setup.php:485
-#: squirrelmail/plugins/translate/setup.php:489
-#: squirrelmail/plugins/translate/setup.php:493
-#: squirrelmail/plugins/translate/setup.php:497
-#: squirrelmail/plugins/translate/setup.php:501
-#: squirrelmail/plugins/translate/setup.php:505
-#: squirrelmail/plugins/translate/setup.php:509
-#: squirrelmail/plugins/translate/setup.php:513
-#: squirrelmail/plugins/translate/setup.php:517
-#, c-format
-msgid "%s to %s"
-msgstr ""
-
-#: squirrelmail/plugins/translate/setup.php:267
-#: squirrelmail/plugins/translate/setup.php:271
-#: squirrelmail/plugins/translate/setup.php:275
-#: squirrelmail/plugins/translate/setup.php:279
-#: squirrelmail/plugins/translate/setup.php:283
+#: squirrelmail/plugins/translate/setup.php:221
+#: squirrelmail/plugins/translate/setup.php:225
+#: squirrelmail/plugins/translate/setup.php:229
+#: squirrelmail/plugins/translate/setup.php:233
+#: squirrelmail/plugins/translate/setup.php:237
+#: squirrelmail/plugins/translate/setup.php:241
+#: squirrelmail/plugins/translate/setup.php:245
+#: squirrelmail/plugins/translate/setup.php:249
+#: squirrelmail/plugins/translate/setup.php:253
+#: squirrelmail/plugins/translate/setup.php:257
+#: squirrelmail/plugins/translate/setup.php:261
+#: squirrelmail/plugins/translate/setup.php:265
+#: squirrelmail/plugins/translate/setup.php:269
+#: squirrelmail/plugins/translate/setup.php:284
 #: squirrelmail/plugins/translate/setup.php:288
 #: squirrelmail/plugins/translate/setup.php:292
 #: squirrelmail/plugins/translate/setup.php:296
 #: squirrelmail/plugins/translate/setup.php:300
 #: squirrelmail/plugins/translate/setup.php:304
 #: squirrelmail/plugins/translate/setup.php:288
 #: squirrelmail/plugins/translate/setup.php:292
 #: squirrelmail/plugins/translate/setup.php:296
 #: squirrelmail/plugins/translate/setup.php:300
 #: squirrelmail/plugins/translate/setup.php:304
+#: squirrelmail/plugins/translate/setup.php:308
+#: squirrelmail/plugins/translate/setup.php:312
 #: squirrelmail/plugins/translate/setup.php:316
 #: squirrelmail/plugins/translate/setup.php:316
-#: squirrelmail/plugins/translate/setup.php:330
-#: squirrelmail/plugins/translate/setup.php:334
-#: squirrelmail/plugins/translate/setup.php:338
-#: squirrelmail/plugins/translate/setup.php:342
-#: squirrelmail/plugins/translate/setup.php:346
-#: squirrelmail/plugins/translate/setup.php:351
-#: squirrelmail/plugins/translate/setup.php:355
-#: squirrelmail/plugins/translate/setup.php:359
-#: squirrelmail/plugins/translate/setup.php:363
-#: squirrelmail/plugins/translate/setup.php:367
-#: squirrelmail/plugins/translate/setup.php:388
-#: squirrelmail/plugins/translate/setup.php:418
+#: squirrelmail/plugins/translate/setup.php:320
+#: squirrelmail/plugins/translate/setup.php:395
+#: squirrelmail/plugins/translate/setup.php:428
+#: squirrelmail/plugins/translate/setup.php:432
+#: squirrelmail/plugins/translate/setup.php:436
+#: squirrelmail/plugins/translate/setup.php:440
+#: squirrelmail/plugins/translate/setup.php:444
+#: squirrelmail/plugins/translate/setup.php:448
+#: squirrelmail/plugins/translate/setup.php:452
+#: squirrelmail/plugins/translate/setup.php:456
+#: squirrelmail/plugins/translate/setup.php:460
+#: squirrelmail/plugins/translate/setup.php:464
+#: squirrelmail/plugins/translate/setup.php:468
+#: squirrelmail/plugins/translate/setup.php:472
+#, c-format
+msgid "%s to %s"
+msgstr ""
+
+#: squirrelmail/plugins/translate/setup.php:222
+#: squirrelmail/plugins/translate/setup.php:226
+#: squirrelmail/plugins/translate/setup.php:230
+#: squirrelmail/plugins/translate/setup.php:234
+#: squirrelmail/plugins/translate/setup.php:238
+#: squirrelmail/plugins/translate/setup.php:243
+#: squirrelmail/plugins/translate/setup.php:247
+#: squirrelmail/plugins/translate/setup.php:251
+#: squirrelmail/plugins/translate/setup.php:255
+#: squirrelmail/plugins/translate/setup.php:259
+#: squirrelmail/plugins/translate/setup.php:271
+#: squirrelmail/plugins/translate/setup.php:285
+#: squirrelmail/plugins/translate/setup.php:289
+#: squirrelmail/plugins/translate/setup.php:293
+#: squirrelmail/plugins/translate/setup.php:297
+#: squirrelmail/plugins/translate/setup.php:301
+#: squirrelmail/plugins/translate/setup.php:306
+#: squirrelmail/plugins/translate/setup.php:310
+#: squirrelmail/plugins/translate/setup.php:314
+#: squirrelmail/plugins/translate/setup.php:318
+#: squirrelmail/plugins/translate/setup.php:322
+#: squirrelmail/plugins/translate/setup.php:343
+#: squirrelmail/plugins/translate/setup.php:373
+#: squirrelmail/plugins/translate/setup.php:429
+#: squirrelmail/plugins/translate/setup.php:433
+#: squirrelmail/plugins/translate/setup.php:437
+#: squirrelmail/plugins/translate/setup.php:441
+#: squirrelmail/plugins/translate/setup.php:445
+#: squirrelmail/plugins/translate/setup.php:450
+#: squirrelmail/plugins/translate/setup.php:462
+#: squirrelmail/plugins/translate/setup.php:466
+#: squirrelmail/plugins/translate/setup.php:470
 #: squirrelmail/plugins/translate/setup.php:474
 #: squirrelmail/plugins/translate/setup.php:474
-#: squirrelmail/plugins/translate/setup.php:478
-#: squirrelmail/plugins/translate/setup.php:482
-#: squirrelmail/plugins/translate/setup.php:486
-#: squirrelmail/plugins/translate/setup.php:490
-#: squirrelmail/plugins/translate/setup.php:495
-#: squirrelmail/plugins/translate/setup.php:507
-#: squirrelmail/plugins/translate/setup.php:511
-#: squirrelmail/plugins/translate/setup.php:515
-#: squirrelmail/plugins/translate/setup.php:519
 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:268
-#: squirrelmail/plugins/translate/setup.php:287
-#: squirrelmail/plugins/translate/setup.php:308
-#: squirrelmail/plugins/translate/setup.php:311
-#: squirrelmail/plugins/translate/setup.php:335
-#: squirrelmail/plugins/translate/setup.php:354
-#: squirrelmail/plugins/translate/setup.php:391
-#: squirrelmail/plugins/translate/setup.php:421
+#: squirrelmail/plugins/translate/setup.php:223
+#: squirrelmail/plugins/translate/setup.php:242
+#: squirrelmail/plugins/translate/setup.php:263
+#: squirrelmail/plugins/translate/setup.php:266
+#: squirrelmail/plugins/translate/setup.php:290
+#: squirrelmail/plugins/translate/setup.php:309
+#: squirrelmail/plugins/translate/setup.php:346
+#: squirrelmail/plugins/translate/setup.php:376
+#: squirrelmail/plugins/translate/setup.php:408
+#: squirrelmail/plugins/translate/setup.php:430
+#: squirrelmail/plugins/translate/setup.php:449
 #: squirrelmail/plugins/translate/setup.php:453
 #: squirrelmail/plugins/translate/setup.php:453
-#: squirrelmail/plugins/translate/setup.php:475
-#: squirrelmail/plugins/translate/setup.php:494
-#: squirrelmail/plugins/translate/setup.php:498
-#: squirrelmail/plugins/translate/setup.php:503
+#: squirrelmail/plugins/translate/setup.php:458
 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:272
-#: squirrelmail/plugins/translate/setup.php:291
-#: squirrelmail/plugins/translate/setup.php:307
-#: squirrelmail/plugins/translate/setup.php:312
-#: squirrelmail/plugins/translate/setup.php:339
-#: squirrelmail/plugins/translate/setup.php:358
-#: squirrelmail/plugins/translate/setup.php:392
-#: squirrelmail/plugins/translate/setup.php:422
+#: squirrelmail/plugins/translate/setup.php:227
+#: squirrelmail/plugins/translate/setup.php:246
+#: squirrelmail/plugins/translate/setup.php:262
+#: squirrelmail/plugins/translate/setup.php:267
+#: squirrelmail/plugins/translate/setup.php:294
+#: squirrelmail/plugins/translate/setup.php:313
+#: squirrelmail/plugins/translate/setup.php:347
+#: squirrelmail/plugins/translate/setup.php:377
+#: squirrelmail/plugins/translate/setup.php:409
+#: squirrelmail/plugins/translate/setup.php:434
 #: squirrelmail/plugins/translate/setup.php:454
 #: squirrelmail/plugins/translate/setup.php:454
-#: squirrelmail/plugins/translate/setup.php:479
-#: squirrelmail/plugins/translate/setup.php:499
-#: squirrelmail/plugins/translate/setup.php:502
-#: squirrelmail/plugins/translate/setup.php:506
+#: squirrelmail/plugins/translate/setup.php:457
+#: squirrelmail/plugins/translate/setup.php:461
 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:276
-#: squirrelmail/plugins/translate/setup.php:295
-#: squirrelmail/plugins/translate/setup.php:343
-#: squirrelmail/plugins/translate/setup.php:362
-#: squirrelmail/plugins/translate/setup.php:396
-#: squirrelmail/plugins/translate/setup.php:426
-#: squirrelmail/plugins/translate/setup.php:456
-#: squirrelmail/plugins/translate/setup.php:483
-#: squirrelmail/plugins/translate/setup.php:510
+#: squirrelmail/plugins/translate/setup.php:231
+#: squirrelmail/plugins/translate/setup.php:250
+#: squirrelmail/plugins/translate/setup.php:298
+#: squirrelmail/plugins/translate/setup.php:317
+#: squirrelmail/plugins/translate/setup.php:351
+#: squirrelmail/plugins/translate/setup.php:381
+#: squirrelmail/plugins/translate/setup.php:411
+#: squirrelmail/plugins/translate/setup.php:438
+#: squirrelmail/plugins/translate/setup.php:465
 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:280
-#: squirrelmail/plugins/translate/setup.php:299
-#: squirrelmail/plugins/translate/setup.php:347
-#: squirrelmail/plugins/translate/setup.php:366
-#: squirrelmail/plugins/translate/setup.php:401
-#: squirrelmail/plugins/translate/setup.php:431
-#: squirrelmail/plugins/translate/setup.php:458
-#: squirrelmail/plugins/translate/setup.php:487
-#: squirrelmail/plugins/translate/setup.php:514
+#: squirrelmail/plugins/translate/setup.php:235
+#: squirrelmail/plugins/translate/setup.php:254
+#: squirrelmail/plugins/translate/setup.php:302
+#: squirrelmail/plugins/translate/setup.php:321
+#: squirrelmail/plugins/translate/setup.php:356
+#: squirrelmail/plugins/translate/setup.php:386
+#: squirrelmail/plugins/translate/setup.php:413
+#: squirrelmail/plugins/translate/setup.php:442
+#: squirrelmail/plugins/translate/setup.php:469
 msgid "Portuguese"
 msgstr ""
 
 msgid "Portuguese"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:284
-#: squirrelmail/plugins/translate/setup.php:303
-#: squirrelmail/plugins/translate/setup.php:331
-#: squirrelmail/plugins/translate/setup.php:350
-#: squirrelmail/plugins/translate/setup.php:406
-#: squirrelmail/plugins/translate/setup.php:436
-#: squirrelmail/plugins/translate/setup.php:459
-#: squirrelmail/plugins/translate/setup.php:491
-#: squirrelmail/plugins/translate/setup.php:518
+#: squirrelmail/plugins/translate/setup.php:239
+#: squirrelmail/plugins/translate/setup.php:258
+#: squirrelmail/plugins/translate/setup.php:286
+#: squirrelmail/plugins/translate/setup.php:305
+#: squirrelmail/plugins/translate/setup.php:361
+#: squirrelmail/plugins/translate/setup.php:391
+#: squirrelmail/plugins/translate/setup.php:414
+#: squirrelmail/plugins/translate/setup.php:446
+#: squirrelmail/plugins/translate/setup.php:473
 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:315
-#: squirrelmail/plugins/translate/setup.php:403
-#: squirrelmail/plugins/translate/setup.php:433
+#: squirrelmail/plugins/translate/setup.php:270
+#: squirrelmail/plugins/translate/setup.php:358
+#: squirrelmail/plugins/translate/setup.php:388
 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:318
-#: squirrelmail/plugins/translate/setup.php:370
-#: squirrelmail/plugins/translate/setup.php:441
-#: squirrelmail/plugins/translate/setup.php:462
-#: squirrelmail/plugins/translate/setup.php:521
+#: squirrelmail/plugins/translate/setup.php:273
+#: squirrelmail/plugins/translate/setup.php:325
+#: squirrelmail/plugins/translate/setup.php:396
+#: squirrelmail/plugins/translate/setup.php:417
+#: squirrelmail/plugins/translate/setup.php:476
 msgid "Translate"
 msgstr ""
 
 msgid "Translate"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:382
-#: squirrelmail/plugins/translate/setup.php:412
+#: squirrelmail/plugins/translate/setup.php:337
+#: squirrelmail/plugins/translate/setup.php:367
 msgid "Brazilian Portuguese"
 msgstr ""
 
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:383
-#: squirrelmail/plugins/translate/setup.php:413
+#: squirrelmail/plugins/translate/setup.php:338
+#: squirrelmail/plugins/translate/setup.php:368
 msgid "Bulgarian"
 msgstr ""
 
 msgid "Bulgarian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:384
-#: squirrelmail/plugins/translate/setup.php:414
+#: squirrelmail/plugins/translate/setup.php:339
+#: squirrelmail/plugins/translate/setup.php:369
 msgid "Croatian"
 msgstr ""
 
 msgid "Croatian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:385
-#: squirrelmail/plugins/translate/setup.php:415
+#: squirrelmail/plugins/translate/setup.php:340
+#: squirrelmail/plugins/translate/setup.php:370
 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:386
-#: squirrelmail/plugins/translate/setup.php:416
+#: squirrelmail/plugins/translate/setup.php:341
+#: squirrelmail/plugins/translate/setup.php:371
 msgid "Danish"
 msgstr ""
 
 msgid "Danish"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:387
-#: squirrelmail/plugins/translate/setup.php:417
-#: squirrelmail/plugins/translate/setup.php:452
+#: squirrelmail/plugins/translate/setup.php:342
+#: squirrelmail/plugins/translate/setup.php:372
+#: squirrelmail/plugins/translate/setup.php:407
 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:389
-#: squirrelmail/plugins/translate/setup.php:419
+#: squirrelmail/plugins/translate/setup.php:344
+#: squirrelmail/plugins/translate/setup.php:374
 msgid "European Spanish"
 msgstr ""
 
 msgid "European Spanish"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:390
-#: squirrelmail/plugins/translate/setup.php:420
+#: squirrelmail/plugins/translate/setup.php:345
+#: squirrelmail/plugins/translate/setup.php:375
 msgid "Finnish"
 msgstr ""
 
 msgid "Finnish"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:393
-#: squirrelmail/plugins/translate/setup.php:423
+#: squirrelmail/plugins/translate/setup.php:348
+#: squirrelmail/plugins/translate/setup.php:378
 msgid "Greek"
 msgstr ""
 
 msgid "Greek"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:394
-#: squirrelmail/plugins/translate/setup.php:424
+#: squirrelmail/plugins/translate/setup.php:349
+#: squirrelmail/plugins/translate/setup.php:379
 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:395
-#: squirrelmail/plugins/translate/setup.php:425
+#: squirrelmail/plugins/translate/setup.php:350
+#: squirrelmail/plugins/translate/setup.php:380
 msgid "Icelandic"
 msgstr ""
 
 msgid "Icelandic"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:397
-#: squirrelmail/plugins/translate/setup.php:427
+#: squirrelmail/plugins/translate/setup.php:352
+#: squirrelmail/plugins/translate/setup.php:382
 msgid "Japanese"
 msgstr ""
 
 msgid "Japanese"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:398
-#: squirrelmail/plugins/translate/setup.php:428
+#: squirrelmail/plugins/translate/setup.php:353
+#: squirrelmail/plugins/translate/setup.php:383
 msgid "Latin American Spanish"
 msgstr ""
 
 msgid "Latin American Spanish"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:399
-#: squirrelmail/plugins/translate/setup.php:429
+#: squirrelmail/plugins/translate/setup.php:354
+#: squirrelmail/plugins/translate/setup.php:384
 msgid "Norwegian"
 msgstr ""
 
 msgid "Norwegian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:400
-#: squirrelmail/plugins/translate/setup.php:430
+#: squirrelmail/plugins/translate/setup.php:355
+#: squirrelmail/plugins/translate/setup.php:385
 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:402
-#: squirrelmail/plugins/translate/setup.php:432
+#: squirrelmail/plugins/translate/setup.php:357
+#: squirrelmail/plugins/translate/setup.php:387
 msgid "Romanian"
 msgstr ""
 
 msgid "Romanian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:404
-#: squirrelmail/plugins/translate/setup.php:434
+#: squirrelmail/plugins/translate/setup.php:359
+#: squirrelmail/plugins/translate/setup.php:389
 msgid "Serbian"
 msgstr ""
 
 msgid "Serbian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:405
-#: squirrelmail/plugins/translate/setup.php:435
+#: squirrelmail/plugins/translate/setup.php:360
+#: squirrelmail/plugins/translate/setup.php:390
 msgid "Slovenian"
 msgstr ""
 
 msgid "Slovenian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:407
-#: squirrelmail/plugins/translate/setup.php:437
+#: squirrelmail/plugins/translate/setup.php:362
+#: squirrelmail/plugins/translate/setup.php:392
 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:408
-#: squirrelmail/plugins/translate/setup.php:438
+#: squirrelmail/plugins/translate/setup.php:363
+#: squirrelmail/plugins/translate/setup.php:393
 msgid "Welsh"
 msgstr ""
 
 msgid "Welsh"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:455
+#: squirrelmail/plugins/translate/setup.php:410
 msgid "Indonesian"
 msgstr ""
 
 msgid "Indonesian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:457
+#: squirrelmail/plugins/translate/setup.php:412
 msgid "Latin"
 msgstr ""
 
 msgid "Latin"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:41
+#: squirrelmail/plugins/newmail/newmail_opt.php:33
 msgid "New Mail Notification"
 msgstr ""
 
 msgid "New Mail Notification"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:44
+#: squirrelmail/plugins/newmail/newmail_opt.php:36
 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 ""
 
 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:46
+#: squirrelmail/plugins/newmail/newmail_opt.php:38
 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 ""
 
 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:48
+#: squirrelmail/plugins/newmail/newmail_opt.php:40
 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 ""
 
 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:50
+#: squirrelmail/plugins/newmail/newmail_opt.php:42
 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 "
 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 "
@@ -2589,7 +2711,7 @@ msgid ""
 "by sounds or popups for unseen mail."
 msgstr ""
 
 "by sounds or popups for unseen mail."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:52
+#: squirrelmail/plugins/newmail/newmail_opt.php:44
 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 "
 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 "
@@ -2598,7 +2720,7 @@ msgid ""
 "enabled."
 msgstr ""
 
 "enabled."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:54
+#: squirrelmail/plugins/newmail/newmail_opt.php:46
 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 "
 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 "
@@ -2606,51 +2728,48 @@ msgid ""
 "is specified, the system will use a default from the server."
 msgstr ""
 
 "is specified, the system will use a default from the server."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:64
+#: squirrelmail/plugins/newmail/newmail_opt.php:56
 msgid "Enable Media Playing"
 msgstr ""
 
 msgid "Enable Media Playing"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:72
+#: squirrelmail/plugins/newmail/newmail_opt.php:64
 msgid "Check all boxes, not just INBOX"
 msgstr ""
 
 msgid "Check all boxes, not just INBOX"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:80
+#: squirrelmail/plugins/newmail/newmail_opt.php:72
 msgid "Count only messages that are RECENT"
 msgstr ""
 
 msgid "Count only messages that are RECENT"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:88
+#: squirrelmail/plugins/newmail/newmail_opt.php:80
 msgid "Change title on supported browsers."
 msgstr ""
 
 msgid "Change title on supported browsers."
 msgstr ""
 
+#: squirrelmail/plugins/newmail/newmail_opt.php:80
 #: squirrelmail/plugins/newmail/newmail_opt.php:88
 #: squirrelmail/plugins/newmail/newmail_opt.php:88
-msgid "requires IE and JavaScript to work"
+msgid "requires JavaScript to work"
 msgstr ""
 
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:96
+#: squirrelmail/plugins/newmail/newmail_opt.php:88
 msgid "Show popup window on new mail"
 msgstr ""
 
 msgid "Show popup window on new mail"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:96
-msgid "requires JavaScript to work"
-msgstr ""
-
-#: squirrelmail/plugins/newmail/newmail_opt.php:99
+#: squirrelmail/plugins/newmail/newmail_opt.php:91
 msgid "Select server file:"
 msgstr ""
 
 msgid "Select server file:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:101
+#: squirrelmail/plugins/newmail/newmail_opt.php:93
 msgid "(local media)"
 msgstr ""
 
 msgid "(local media)"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:118
+#: squirrelmail/plugins/newmail/newmail_opt.php:110
 msgid "Try"
 msgstr ""
 
 msgid "Try"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:126
+#: squirrelmail/plugins/newmail/newmail_opt.php:118
 msgid "Local Media File:"
 msgstr ""
 
 msgid "Local Media File:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:132
+#: squirrelmail/plugins/newmail/newmail_opt.php:124
 msgid "Current File:"
 msgstr ""
 
 msgid "Current File:"
 msgstr ""
 
@@ -2666,11 +2785,11 @@ msgstr ""
 msgid "You have new mail!"
 msgstr ""
 
 msgid "You have new mail!"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:77
+#: squirrelmail/plugins/newmail/setup.php:76
 msgid "NewMail Options"
 msgstr ""
 
 msgid "NewMail Options"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:79
+#: squirrelmail/plugins/newmail/setup.php:78
 msgid ""
 "This configures settings for playing sounds and/or showing popup windows "
 "when new mail arrives."
 msgid ""
 "This configures settings for playing sounds and/or showing popup windows "
 "when new mail arrives."
@@ -2680,12 +2799,12 @@ msgstr ""
 msgid "New Mail Notification options saved"
 msgstr ""
 
 msgid "New Mail Notification options saved"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:203
+#: squirrelmail/plugins/newmail/setup.php:200
 #, c-format
 msgid "%s New Messages"
 msgstr ""
 
 #, c-format
 msgid "%s New Messages"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:205
+#: squirrelmail/plugins/newmail/setup.php:204
 #, c-format
 msgid "%s New Message"
 msgstr ""
 #, c-format
 msgid "%s New Message"
 msgstr ""
@@ -2697,3 +2816,430 @@ msgstr ""
 #: squirrelmail/plugins/newmail/testsound.php:30
 msgid "Loading the sound..."
 msgstr ""
 #: squirrelmail/plugins/newmail/testsound.php:30
 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
+msgid "POP3 connect:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:82
+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
+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
+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
+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
+msgid "POP3 user:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:133
+msgid "no login ID submitted"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:136
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:156
+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
+msgid "POP3 pass:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:153
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:195
+msgid "No password submitted"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:161
+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: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
+msgid "No login ID submitted"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:200
+msgid "No server banner"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:200
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
+msgid "abort"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
+msgid "apop authentication failed"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:235
+msgid "POP3 login:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:260
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:276
+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
+msgid "POP3 pop_list:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:353
+msgid "Premature end of list"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:376
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:389
+msgid "POP3 get:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:415
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:422
+msgid "POP3 last:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:445
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:455
+msgid "POP3 reset:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:479
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:485
+msgid "POP3 send_cmd:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:485
+msgid "Empty command string"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:505
+msgid "POP3 quit:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:505
+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
+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
+msgid "POP3 delete:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:615
+msgid "No msg number submitted"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:621
+msgid "Command failed "
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:54
+msgid "Remote POP server Fetching Mail"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:63
+msgid "Select Server:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:65
+msgid "All"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:78
+msgid "Password for"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:85
+msgid "Fetch Mail"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:117
+msgid "Fetching from "
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:124
+#: squirrelmail/plugins/mail_fetch/fetch.php:184
+msgid "Oops, "
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:128
+msgid "Opening IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:131
+msgid "Opening POP server"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:134
+#: squirrelmail/plugins/mail_fetch/setup.php:123
+msgid "Login Failed:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:151
+msgid "Login OK: No new messages"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:156
+msgid "Login OK: Inbox EMPTY"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:161
+msgid "Login OK: Inbox contains ["
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:161
+msgid "] messages"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:164
+msgid "Fetching UIDL..."
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:169
+#: squirrelmail/plugins/mail_fetch/setup.php:154
+msgid "Server does not support UIDL."
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:172
+msgid "Leaving Mail on Server..."
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:174
+msgid "Deleting messages from server..."
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:178
+msgid "Fetching message "
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:201
+msgid "Message appended to mailbox"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:205
+msgid "Message "
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:205
+msgid " deleted from Remote Server!"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:207
+msgid "Delete failed:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:212
+#: squirrelmail/plugins/mail_fetch/setup.php:185
+msgid "Error Appending Message!"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:216
+msgid "Closing POP"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:218
+msgid "Logging out from IMAP"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:221
+msgid "Saving UIDL"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:105
+msgid "Remote POP server settings"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:107
+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 "
+"encryption anyway. Additionally, the encryption that we do to save it on the "
+"server can be undone by a hacker reading the source to this file."
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:109
+msgid "If you leave password empty, it will be required when you fetch mail."
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:113
+msgid "Encrypt passwords (informative only)"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:119
+#: squirrelmail/plugins/mail_fetch/options.php:151
+msgid "Add Server"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:123
+#: squirrelmail/plugins/mail_fetch/options.php:201
+msgid "Server:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:124
+#: squirrelmail/plugins/mail_fetch/options.php:203
+msgid "Alias:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:125
+#: squirrelmail/plugins/mail_fetch/options.php:205
+msgid "Username:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:127
+#: squirrelmail/plugins/mail_fetch/options.php:209
+msgid "Store in Folder:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:148
+#: squirrelmail/plugins/mail_fetch/options.php:233
+msgid "Leave Mail on Server"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:149
+#: squirrelmail/plugins/mail_fetch/options.php:235
+msgid "Check mail during login"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:150
+#: squirrelmail/plugins/mail_fetch/options.php:237
+msgid "Check mail during folder refresh"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:157
+#: squirrelmail/plugins/mail_fetch/options.php:238
+msgid "Modify Server"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:161
+msgid "Server Name:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:167
+#: squirrelmail/plugins/mail_fetch/options.php:190
+msgid "Modify"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:171
+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
+msgid "Fetching Servers"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:181
+msgid "Confirm Deletion of a Server"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:185
+msgid "Selected Server:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:186
+msgid "Confirm delete of selected server?"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:187
+msgid "Confirm Delete"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:196
+msgid "Mofify a Server"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:246
+msgid "Undefined Function"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/options.php:248
+msgid "Hey! Wath do You are looking for?"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/setup.php:30
+msgid "Fetch"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/setup.php:115
+#: squirrelmail/plugins/mail_fetch/setup.php:162
+msgid "Warning, "
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/setup.php:198
+msgid "Mail Fetch Result:"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/setup.php:224
+msgid "Simple POP3 Fetch Mail"
+msgstr ""
+
+#: squirrelmail/plugins/mail_fetch/setup.php:226
+msgid ""
+"This configures settings for downloading email from a pop3 mailbox to your "
+"account on this server."
+msgstr ""