X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=po%2Fsquirrelmail.po;h=897ae3a034b2a81cdf3030dde3b2cec55d4f3b89;hb=6337ece3e68b918f70a02d6fddb02f44667aff03;hp=a278359edb8530838e02eece72134219f0597b83;hpb=e697b6cc39af08f80d3ee3743c9d4088791af634;p=squirrelmail.git

diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index a278359e..897ae3a0 100644
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-24 19:36+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"
@@ -14,409 +14,501 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: squirrelmail/src/addrbook_popup.php:23
+#: squirrelmail/src/addrbook_popup.php:22
 msgid "Address Book"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:101 squirrelmail/src/vcard.php:91
+#: 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 ""
 
-#: squirrelmail/src/addrbook_search.php:101
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:84
+#: squirrelmail/src/addressbook.php:318
 msgid "E-mail"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:101
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:84
+#: squirrelmail/src/addressbook.php:319
 msgid "Info"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:104
+#: squirrelmail/src/addrbook_search.php:120
+#: squirrelmail/src/addrbook_search_html.php:87
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:155
-#: squirrelmail/src/addrbook_search.php:236
-msgid "No persons matching your search was found"
+#: squirrelmail/src/addrbook_search_html.php:112
+msgid "Use Addresses"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:131
+msgid "Address Book Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:167
+#: squirrelmail/src/addrbook_search.php:183
+#: squirrelmail/src/addrbook_search_html.php:141
 msgid "Search for"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:174
+#: squirrelmail/src/addrbook_search.php:190
+#: squirrelmail/src/addrbook_search_html.php:152
 msgid "in"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:176
+#: squirrelmail/src/addrbook_search.php:192
+#: squirrelmail/src/addrbook_search_html.php:155
 msgid "All address books"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:72
-#: squirrelmail/src/addrbook_search.php:186 squirrelmail/src/search.php:25
-#: squirrelmail/src/search.php:81
+#: 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 ""
 
-#: squirrelmail/src/addrbook_search.php:188
+#: squirrelmail/src/addrbook_search.php:204
+#: squirrelmail/src/addrbook_search_html.php:169
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:191
-msgid "Close window"
-msgstr ""
-
-#: squirrelmail/src/addrbook_search.php:207
+#: squirrelmail/src/addrbook_search.php:223
+#: squirrelmail/src/addrbook_search_html.php:192
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:229
+#: squirrelmail/src/addrbook_search.php:245
+#: squirrelmail/src/addrbook_search_html.php:215
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
-#: squirrelmail/src/compose.php:102
+#: 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 ""
+
+#: squirrelmail/src/addrbook_search_html.php:228
+msgid "Return"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search.php:207
+msgid "Close window"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:66 squirrelmail/src/addressbook.php:316
+msgid "Nickname"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:67
+msgid "Must be unique"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:68
+msgid "E-mail address"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:69
+msgid "First name"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:70
+msgid "Last name"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:71
+msgid "Additional info"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:85
+msgid "No personal address book is defined. Contact administrator."
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:181
+msgid "You can only edit one address at the time"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:193 squirrelmail/src/addressbook.php:196
+#: squirrelmail/src/addressbook.php:225 squirrelmail/src/addressbook.php:228
+msgid "Update address"
+msgstr ""
+
+#: squirrelmail/functions/display_messages.php:20
+#: squirrelmail/functions/display_messages.php:71
+#: squirrelmail/functions/display_messages.php:87
+#: squirrelmail/src/addressbook.php:216 squirrelmail/src/addressbook.php:266
+msgid "ERROR"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:241
+msgid "Unknown error"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:286 squirrelmail/src/addressbook.php:371
+msgid "Add address"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:297 squirrelmail/src/addressbook.php:355
+msgid "Edit selected"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:299 squirrelmail/src/addressbook.php:357
+msgid "Delete selected"
+msgstr ""
+
+#: squirrelmail/src/addressbook.php:368
+#, c-format
+msgid "Add to %s"
+msgstr ""
+
+#: squirrelmail/src/compose.php:118
 msgid "Original Message"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:560
-#: squirrelmail/plugins/filters/options.php:182
-#: squirrelmail/src/compose.php:103 squirrelmail/src/download.php:121
-#: squirrelmail/src/download.php:127
+#: 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:43
-#: squirrelmail/src/printer_friendly_bottom.php:82
-#: squirrelmail/src/search.php:66 squirrelmail/src/search.php:67
+#: squirrelmail/src/options_order.php:59
+#: squirrelmail/src/printer_friendly_bottom.php:97
+#: squirrelmail/src/search.php:71
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:546
-#: squirrelmail/plugins/filters/options.php:170
-#: squirrelmail/src/compose.php:104 squirrelmail/src/download.php:122
-#: squirrelmail/src/download.php:129
+#: 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:41
-#: squirrelmail/src/printer_friendly_bottom.php:76
-#: squirrelmail/src/search.php:69 squirrelmail/src/search.php:70
+#: squirrelmail/src/options_order.php:57
+#: squirrelmail/src/printer_friendly_bottom.php:91
+#: squirrelmail/src/search.php:72
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:544
-#: squirrelmail/plugins/filters/options.php:173
-#: squirrelmail/src/compose.php:105 squirrelmail/src/download.php:123
-#: squirrelmail/src/download.php:131
+#: 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:77
-#: squirrelmail/src/search.php:75 squirrelmail/src/search.php:76
+#: squirrelmail/src/printer_friendly_bottom.php:92
+#: squirrelmail/src/search.php:74
 msgid "To"
 msgstr ""
 
-#: squirrelmail/src/compose.php:249 squirrelmail/src/read_body.php:535
+#: squirrelmail/src/compose.php:269 squirrelmail/src/read_body.php:551
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:274 squirrelmail/src/read_body.php:552
+#: squirrelmail/src/compose.php:294 squirrelmail/src/read_body.php:568
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:282
+#: squirrelmail/src/compose.php:302
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:290
+#: squirrelmail/src/compose.php:310
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:298 squirrelmail/src/read_body.php:510
+#: squirrelmail/src/compose.php:318 squirrelmail/src/read_body.php:526
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:340 squirrelmail/src/compose.php:394
+#: squirrelmail/src/compose.php:360 squirrelmail/src/compose.php:414
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:346
+#: squirrelmail/src/compose.php:366
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:350 squirrelmail/src/options_order.php:129
+#: squirrelmail/src/compose.php:370 squirrelmail/src/options_order.php:145
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:365
+#: squirrelmail/src/compose.php:385
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:66 squirrelmail/src/compose.php:387
-#: squirrelmail/src/compose.php:389 squirrelmail/src/compose.php:392
+#: squirrelmail/functions/page_header.php:82 squirrelmail/src/compose.php:407
+#: squirrelmail/src/compose.php:409 squirrelmail/src/compose.php:412
 msgid "Addresses"
 msgstr ""
 
-#: squirrelmail/src/compose.php:397
+#: squirrelmail/src/compose.php:417
 msgid "Save Draft"
 msgstr ""
 
-#: squirrelmail/src/compose.php:403 squirrelmail/src/read_body.php:582
+#: squirrelmail/src/compose.php:423 squirrelmail/src/read_body.php:598
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/src/compose.php:404 squirrelmail/src/read_body.php:417
+#: squirrelmail/src/compose.php:424 squirrelmail/src/read_body.php:433
 msgid "High"
 msgstr ""
 
-#: squirrelmail/src/compose.php:405 squirrelmail/src/read_body.php:420
+#: squirrelmail/src/compose.php:425 squirrelmail/src/read_body.php:436
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/src/compose.php:406 squirrelmail/src/read_body.php:424
+#: squirrelmail/src/compose.php:426 squirrelmail/src/read_body.php:440
 msgid "Low"
 msgstr ""
 
-#: squirrelmail/src/compose.php:425
+#: squirrelmail/src/compose.php:445
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:466
+#: squirrelmail/src/compose.php:490
 msgid "Draft Email Saved"
 msgstr ""
 
-#: squirrelmail/src/compose.php:537 squirrelmail/src/compose.php:574
-#: squirrelmail/src/compose.php:581
+#: 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 ""
 
-#: squirrelmail/src/compose.php:643
+#: squirrelmail/src/compose.php:670
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:646
+#: squirrelmail/src/compose.php:673
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:646
+#: squirrelmail/src/compose.php:673
 msgid "who"
 msgstr ""
 
-#: squirrelmail/src/download.php:33
+#: squirrelmail/src/download.php:49
 msgid "Viewing a text attachment"
 msgstr ""
 
-#: squirrelmail/src/download.php:36 squirrelmail/src/download.php:38
-#: squirrelmail/src/image.php:32 squirrelmail/src/image.php:36
-#: squirrelmail/src/read_body.php:39 squirrelmail/src/vcard.php:35
-#: squirrelmail/src/vcard.php:39
+#: 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 ""
 
-#: squirrelmail/functions/mime.php:604 squirrelmail/src/download.php:43
-#: squirrelmail/src/image.php:45 squirrelmail/src/vcard.php:196
+#: 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 ""
 
-#: squirrelmail/functions/mailbox_display.php:554
-#: squirrelmail/src/download.php:124 squirrelmail/src/download.php:133
-#: squirrelmail/src/options_order.php:42
-#: 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 ""
 
-#: squirrelmail/src/folders_create.php:25
+#: squirrelmail/src/folders_create.php:41
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:25
+#: squirrelmail/src/folders_create.php:41
 msgid "Click here to go back"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:68 squirrelmail/src/folders.php:29
-#: squirrelmail/src/left_main.php:245
+#: squirrelmail/functions/page_header.php:84 squirrelmail/src/folders.php:45
+#: squirrelmail/src/left_main.php:261
 msgid "Folders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:42
+#: squirrelmail/src/folders.php:58
 msgid "Subscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:44
+#: squirrelmail/src/folders.php:60
 msgid "Unsubscribed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:46
+#: squirrelmail/src/folders.php:62
 msgid "Deleted folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:48
+#: squirrelmail/src/folders.php:64
 msgid "Created folder successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:50
+#: squirrelmail/src/folders.php:66
 msgid "Renamed successfully!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:284
+#: squirrelmail/src/folders.php:69 squirrelmail/src/left_main.php:300
 msgid "refresh folder list"
 msgstr ""
 
-#: squirrelmail/src/folders.php:63
+#: squirrelmail/src/folders.php:79
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:516
-#: squirrelmail/plugins/filters/options.php:86
+#: 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:104 squirrelmail/src/options_highlight.php:71
-#: squirrelmail/src/options_identities.php:304
-#: squirrelmail/src/read_body.php:452
+#: 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 ""
 
-#: squirrelmail/src/folders.php:108 squirrelmail/src/folders.php:183
+#: squirrelmail/src/folders.php:129 squirrelmail/src/folders.php:205
 msgid "No folders found"
 msgstr ""
 
-#: squirrelmail/src/folders.php:115
+#: squirrelmail/src/folders.php:136
 msgid "Create Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:120
+#: squirrelmail/src/folders.php:141
 msgid "as a subfolder of"
 msgstr ""
 
-#: squirrelmail/src/folders.php:125 squirrelmail/src/folders.php:127
+#: squirrelmail/src/folders.php:146 squirrelmail/src/folders.php:148
 msgid "None"
 msgstr ""
 
-#: squirrelmail/src/folders.php:148
+#: squirrelmail/src/folders.php:169
 msgid "Let this folder contain subfolders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:151
+#: squirrelmail/src/folders.php:172
 msgid "Create"
 msgstr ""
 
-#: squirrelmail/src/folders.php:158
+#: squirrelmail/src/folders.php:179
 msgid "Rename a Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:179
+#: squirrelmail/src/folders.php:201
 msgid "Rename"
 msgstr ""
 
-#: squirrelmail/src/folders.php:192 squirrelmail/src/folders.php:211
+#: squirrelmail/src/folders.php:214 squirrelmail/src/folders.php:234
 msgid "Unsubscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:192 squirrelmail/src/folders.php:252
+#: squirrelmail/src/folders.php:214 squirrelmail/src/folders.php:275
 msgid "Subscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:215
+#: squirrelmail/src/folders.php:238
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:255
+#: squirrelmail/src/folders.php:278
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:37
+#: squirrelmail/src/folders_rename_getname.php:53
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:41
+#: squirrelmail/src/folders_rename_getname.php:57
 msgid "New name:"
 msgstr ""
 
 #: squirrelmail/functions/options.php:404
-#: squirrelmail/plugins/filters/options.php:223
-#: squirrelmail/plugins/newmail/newmail_opt.php:139
-#: squirrelmail/plugins/translate/options.php:133
-#: squirrelmail/src/folders_rename_getname.php:47
+#: 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 ""
 
-#: squirrelmail/functions/page_header.php:74 squirrelmail/src/help.php:81
+#: squirrelmail/functions/page_header.php:90 squirrelmail/src/help.php:97
 msgid "Help"
 msgstr ""
 
-#: squirrelmail/src/help.php:115
+#: squirrelmail/src/help.php:131
 #, c-format
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
 "instead."
 msgstr ""
 
-#: squirrelmail/src/help.php:121
+#: squirrelmail/src/help.php:137
 msgid "Some or all of the help documents are not present!"
 msgstr ""
 
-#: squirrelmail/src/help.php:147 squirrelmail/src/help.php:166
+#: squirrelmail/src/help.php:163 squirrelmail/src/help.php:182
 msgid "Table of Contents"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:675
-#: squirrelmail/functions/mailbox_display.php:678
-#: squirrelmail/functions/mailbox_display.php:681
-#: squirrelmail/src/help.php:164 squirrelmail/src/help.php:165
-#: squirrelmail/src/read_body.php:474 squirrelmail/src/read_body.php:476
+#: 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 ""
 
-#: squirrelmail/functions/mailbox_display.php:676
-#: squirrelmail/functions/mailbox_display.php:679
-#: squirrelmail/functions/mailbox_display.php:682
-#: squirrelmail/src/help.php:167 squirrelmail/src/help.php:168
-#: squirrelmail/src/read_body.php:480 squirrelmail/src/read_body.php:482
+#: 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 ""
 
-#: squirrelmail/src/help.php:188
+#: squirrelmail/src/help.php:204
 msgid "Top"
 msgstr ""
 
-#: squirrelmail/src/image.php:27
+#: squirrelmail/src/image.php:42
 msgid "Viewing an image attachment"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:99
+#: squirrelmail/src/left_main.php:115
 msgid "empty"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:278
+#: squirrelmail/src/left_main.php:294
 msgid "Last Refresh"
 msgstr ""
 
-#: squirrelmail/src/login.php:87 squirrelmail/src/login.php:139
+#: squirrelmail/src/login.php:105 squirrelmail/src/login.php:157
 msgid "Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:110
+#: squirrelmail/src/login.php:128
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
-#: squirrelmail/src/login.php:111
+#: squirrelmail/src/login.php:129
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:117
+#: squirrelmail/src/login.php:135
 #, c-format
 msgid "%s Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:121
+#: squirrelmail/src/login.php:139
 msgid "Name:"
 msgstr ""
 
 #: squirrelmail/plugins/mail_fetch/options.php:126
 #: squirrelmail/plugins/mail_fetch/options.php:207
-#: squirrelmail/src/login.php:127
+#: squirrelmail/src/login.php:145
 msgid "Password:"
 msgstr ""
 
-#: squirrelmail/src/move_messages.php:77
-#: squirrelmail/src/move_messages.php:112
-#: squirrelmail/src/move_messages.php:141
+#: squirrelmail/src/move_messages.php:93
+#: squirrelmail/src/move_messages.php:128
+#: squirrelmail/src/move_messages.php:157
 msgid "No messages were selected."
 msgstr ""
 
@@ -424,112 +516,112 @@ msgstr ""
 msgid "General Display Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:42
+#: squirrelmail/src/options_display.php:44
 msgid "Theme"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:57
+#: squirrelmail/src/options_display.php:59
 msgid "Language"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:66
+#: squirrelmail/src/options_display.php:68
 msgid "Use Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:69
+#: squirrelmail/src/options_display.php:71
 msgid "Autodetect"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:70
+#: squirrelmail/src/options_display.php:72
 msgid "Always"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:71
+#: squirrelmail/src/options_display.php:73
 #: squirrelmail/src/options_folder.php:122
 msgid "Never"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:89
+#: squirrelmail/src/options_display.php:91
 msgid "Mailbox Display Options"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:94
+#: squirrelmail/src/options_display.php:96
 msgid "Number of Messages to Index"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:102
+#: squirrelmail/src/options_display.php:104
 msgid "Enable Alternating Row Colors"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:109
+#: squirrelmail/src/options_display.php:111
 msgid "Enable Page Selector"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:116
+#: squirrelmail/src/options_display.php:118
 msgid "Maximum Number of Pages to Show"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:123
+#: squirrelmail/src/options_display.php:125
 msgid "Message Display and Composition"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:128
+#: squirrelmail/src/options_display.php:130
 msgid "Wrap Incoming Text At"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:136
+#: squirrelmail/src/options_display.php:138
 msgid "Size of Editor Window"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:144
+#: squirrelmail/src/options_display.php:146
 msgid "Location of Buttons when Composing"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:147
+#: squirrelmail/src/options_display.php:149
 msgid "Before headers"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:148
+#: squirrelmail/src/options_display.php:150
 msgid "Between headers and message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:149
+#: squirrelmail/src/options_display.php:151
 msgid "After message body"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:154
+#: squirrelmail/src/options_display.php:156
 msgid "Addressbook Display Format"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:157
+#: squirrelmail/src/options_display.php:159
 msgid "Javascript"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:158
+#: squirrelmail/src/options_display.php:160
 msgid "HTML"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:163
+#: squirrelmail/src/options_display.php:165
 msgid "Show HTML Version by Default"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:170
+#: squirrelmail/src/options_display.php:172
 msgid "Include Me in CC when I Reply All"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:177
+#: squirrelmail/src/options_display.php:179
 msgid "Enable Mailer Display"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:184
+#: squirrelmail/src/options_display.php:186
 msgid "Display Attached Images with Message"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:191
+#: squirrelmail/src/options_display.php:193
 msgid "Enable Subtle Printer Friendly Link"
 msgstr ""
 
-#: squirrelmail/src/options_display.php:198
+#: squirrelmail/src/options_display.php:200
 msgid "Enable Printer Friendly Clean Display"
 msgstr ""
 
@@ -606,7 +698,7 @@ msgid "Auto Refresh Folder List"
 msgstr ""
 
 #: squirrelmail/src/options_folder.php:142
-msgid "Enable Unseen Message Notification"
+msgid "Enable Unread Message Notification"
 msgstr ""
 
 #: squirrelmail/src/options_folder.php:145
@@ -622,7 +714,7 @@ msgid "All Folders"
 msgstr ""
 
 #: squirrelmail/src/options_folder.php:152
-msgid "Unseen Message Notification Type"
+msgid "Unread Message Notification Type"
 msgstr ""
 
 #: squirrelmail/src/options_folder.php:155
@@ -657,34 +749,35 @@ msgstr ""
 msgid "24-hour clock"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:70
-#: squirrelmail/plugins/filters/options.php:73
-#: squirrelmail/plugins/newmail/newmail_opt.php:41
-#: squirrelmail/plugins/translate/options.php:67
-#: squirrelmail/src/options.php:157 squirrelmail/src/options_highlight.php:57
-#: squirrelmail/src/options_identities.php:42
-#: squirrelmail/src/options_order.php:32
+#: 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 ""
 
-#: squirrelmail/src/options.php:110 squirrelmail/src/options.php:255
+#: squirrelmail/src/options.php:110 squirrelmail/src/options.php:257
 #: squirrelmail/src/options_highlight.php:57
 msgid "Message Highlighting"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:75
+#: squirrelmail/plugins/filters/options.php:62
 #: squirrelmail/src/options_highlight.php:61
 msgid "New"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:76
+#: 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 ""
 
-#: squirrelmail/plugins/filters/options.php:84
-#: squirrelmail/plugins/filters/options.php:116
+#: squirrelmail/plugins/filters/options.php:150
+#: squirrelmail/plugins/filters/spamoptions.php:147
 #: squirrelmail/src/options_highlight.php:69
 msgid "Edit"
 msgstr ""
@@ -765,13 +858,12 @@ msgstr ""
 msgid "Ex: 63aa7f"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:176
-#: squirrelmail/src/options_highlight.php:323 squirrelmail/src/search.php:72
-#: squirrelmail/src/search.php:73
+#: 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:179
+#: squirrelmail/plugins/filters/options.php:92
 #: squirrelmail/src/options_highlight.php:326
 msgid "To or Cc"
 msgstr ""
@@ -780,87 +872,87 @@ msgstr ""
 msgid "Matches"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:42
+#: squirrelmail/src/options_identities.php:58
 msgid "Advanced Identities"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:53
+#: squirrelmail/src/options_identities.php:69
 msgid "Default Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:64
+#: squirrelmail/src/options_identities.php:80
 #, c-format
 msgid "Alternate Identity %d"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:74
+#: squirrelmail/src/options_identities.php:90
 msgid "Add a New Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:290
+#: squirrelmail/src/options_identities.php:306
 #: squirrelmail/src/options_personal.php:49
 msgid "Full Name"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:291
+#: squirrelmail/src/options_identities.php:307
 msgid "E-Mail Address"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:292
+#: squirrelmail/src/options_identities.php:308
 #: squirrelmail/src/options_personal.php:65
 msgid "Reply To"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:299
+#: squirrelmail/src/options_identities.php:315
 msgid "Save / Update"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:302
+#: squirrelmail/src/options_identities.php:318
 msgid "Make Default"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:308
+#: squirrelmail/src/options_identities.php:324
 msgid "Move Up"
 msgstr ""
 
-#: squirrelmail/src/options.php:120 squirrelmail/src/options.php:271
-#: squirrelmail/src/options_order.php:32
+#: squirrelmail/src/options.php:120 squirrelmail/src/options.php:273
+#: squirrelmail/src/options_order.php:48
 msgid "Index Order"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:40
+#: squirrelmail/src/options_order.php:56
 msgid "Checkbox"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:44
+#: squirrelmail/src/options_order.php:60
 msgid "Flags"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:566
-#: squirrelmail/src/options_order.php:45
+#: squirrelmail/functions/mailbox_display.php:570
+#: squirrelmail/src/options_order.php:61
 msgid "Size"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:88
+#: 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 ""
 
-#: squirrelmail/src/options_order.php:97
+#: squirrelmail/src/options_order.php:113
 msgid "up"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:99
+#: squirrelmail/src/options_order.php:115
 msgid "down"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:104
+#: squirrelmail/src/options_order.php:120
 msgid "remove"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:133
+#: squirrelmail/src/options_order.php:149
 msgid "Return to options page"
 msgstr ""
 
@@ -932,462 +1024,468 @@ msgstr ""
 msgid "Signature"
 msgstr ""
 
-#: squirrelmail/src/options.php:100 squirrelmail/src/options.php:239
+#: squirrelmail/src/options.php:100 squirrelmail/src/options.php:241
 msgid "Personal Information"
 msgstr ""
 
-#: squirrelmail/src/options.php:105 squirrelmail/src/options.php:247
+#: squirrelmail/src/options.php:105 squirrelmail/src/options.php:249
 msgid "Display Preferences"
 msgstr ""
 
-#: squirrelmail/src/options.php:115 squirrelmail/src/options.php:263
+#: squirrelmail/src/options.php:115 squirrelmail/src/options.php:265
 msgid "Folder Preferences"
 msgstr ""
 
-#: squirrelmail/src/options.php:223
+#: squirrelmail/src/options.php:225
 msgid "Successfully Saved Options"
 msgstr ""
 
-#: squirrelmail/src/options.php:227
+#: squirrelmail/src/options.php:229
 msgid "Refresh Folder List"
 msgstr ""
 
-#: squirrelmail/src/options.php:229
+#: squirrelmail/src/options.php:231
 msgid "Refresh Page"
 msgstr ""
 
-#: squirrelmail/src/options.php:241
+#: squirrelmail/src/options.php:243
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
 msgstr ""
 
-#: squirrelmail/src/options.php:249
+#: 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 ""
 
-#: squirrelmail/src/options.php:257
+#: 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 ""
 
-#: squirrelmail/src/options.php:265
+#: squirrelmail/src/options.php:267
 msgid ""
 "These settings change the way your folders are displayed and manipulated."
 msgstr ""
 
-#: squirrelmail/src/options.php:273
+#: 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 ""
 
-#: 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 ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:79
+#: squirrelmail/src/printer_friendly_bottom.php:94
 msgid "CC"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_top.php:36
+#: squirrelmail/src/printer_friendly_top.php:52
 msgid "Print"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_top.php:37
+#: squirrelmail/src/printer_friendly_top.php:53
 msgid "Close Window"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:32
+#: squirrelmail/src/read_body.php:48
 msgid "Viewing Full Header"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:164
+#: squirrelmail/src/read_body.php:180
 msgid "View Printable Version"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:298
+#: squirrelmail/src/read_body.php:314
 msgid "more"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:299
+#: squirrelmail/src/read_body.php:315
 msgid "less"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:445
+#: squirrelmail/src/read_body.php:461
 msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:456
+#: squirrelmail/src/read_body.php:472
 msgid "Resume Draft"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:491
+#: squirrelmail/src/read_body.php:507
 msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:494
+#: squirrelmail/src/read_body.php:510
 msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:497
+#: squirrelmail/src/read_body.php:513
 msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:518 squirrelmail/src/read_body.php:520
+#: squirrelmail/src/read_body.php:534 squirrelmail/src/read_body.php:536
 msgid "View Full Header"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:543
+#: squirrelmail/src/read_body.php:559
 msgid "Date:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:599
+#: squirrelmail/src/read_body.php:615
 msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:28 squirrelmail/src/redirect.php:42
+#: 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 ""
 
-#: squirrelmail/functions/auth.php:29 squirrelmail/src/redirect.php:43
+#: squirrelmail/functions/auth.php:45 squirrelmail/src/redirect.php:86
 msgid "Go to the login page"
 msgstr ""
 
-#: squirrelmail/src/redirect.php:76
+#: squirrelmail/src/redirect.php:106 squirrelmail/src/redirect.php:110
 msgid "There was an error contacting the mail server."
 msgstr ""
 
-#: squirrelmail/src/redirect.php:77
+#: squirrelmail/src/redirect.php:111
 msgid "Contact your administrator for help."
 msgstr ""
 
-#: squirrelmail/src/search.php:60 squirrelmail/src/search.php:61
+#: squirrelmail/src/search.php:69
 msgid "Body"
 msgstr ""
 
-#: squirrelmail/src/search.php:63 squirrelmail/src/search.php:64
+#: squirrelmail/src/search.php:70
 msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:56 squirrelmail/src/signout.php:66
+#: squirrelmail/functions/page_header.php:72 squirrelmail/src/signout.php:83
 msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/src/signout.php:72
+#: squirrelmail/src/signout.php:89
 msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/signout.php:74
+#: squirrelmail/src/signout.php:91
 msgid "Click here to log back in."
 msgstr ""
 
-#: squirrelmail/src/vcard.php:30
+#: squirrelmail/src/vcard.php:46
 msgid "Viewing a Business Card"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:153
+#: squirrelmail/src/vcard.php:108 squirrelmail/src/vcard.php:169
 msgid "Title"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:93
+#: squirrelmail/src/vcard.php:109
 msgid "Email"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:147
+#: squirrelmail/src/vcard.php:110 squirrelmail/src/vcard.php:163
 msgid "Web Page"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:156
+#: squirrelmail/src/vcard.php:111 squirrelmail/src/vcard.php:172
 msgid "Organization / Department"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:96 squirrelmail/src/vcard.php:150
+#: squirrelmail/src/vcard.php:112 squirrelmail/src/vcard.php:166
 msgid "Address"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:97 squirrelmail/src/vcard.php:163
+#: squirrelmail/src/vcard.php:113 squirrelmail/src/vcard.php:179
 msgid "Work Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:98 squirrelmail/src/vcard.php:166
+#: squirrelmail/src/vcard.php:114 squirrelmail/src/vcard.php:182
 msgid "Home Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:99 squirrelmail/src/vcard.php:169
+#: squirrelmail/src/vcard.php:115 squirrelmail/src/vcard.php:185
 msgid "Cellular Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:100 squirrelmail/src/vcard.php:172
+#: squirrelmail/src/vcard.php:116 squirrelmail/src/vcard.php:188
 msgid "Fax"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:101 squirrelmail/src/vcard.php:175
+#: squirrelmail/src/vcard.php:117 squirrelmail/src/vcard.php:191
 msgid "Note"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:133
+#: squirrelmail/src/vcard.php:149
 msgid "Add to Addressbook"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:160
+#: squirrelmail/src/vcard.php:176
 msgid "Title & Org. / Dept."
 msgstr ""
 
 #: squirrelmail/functions/abook_database.php:50
-#: squirrelmail/functions/abook_local_file.php:37
-#: squirrelmail/functions/addressbook.php:139
+#: squirrelmail/functions/abook_local_file.php:53
+#: squirrelmail/functions/addressbook.php:152
 msgid "Personal address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_database.php:89
-#: squirrelmail/functions/abook_database.php:125
-#: squirrelmail/functions/abook_database.php:157
-#: squirrelmail/functions/abook_database.php:186
-#: squirrelmail/functions/abook_database.php:232
-#: squirrelmail/functions/abook_database.php:261
-#: squirrelmail/functions/abook_database.php:297
+#: 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 ""
 
-#: squirrelmail/functions/abook_database.php:205
-#: squirrelmail/functions/abook_database.php:239
-#: squirrelmail/functions/abook_database.php:268
-#: squirrelmail/functions/abook_local_file.php:231
-#: squirrelmail/functions/abook_local_file.php:251
-#: squirrelmail/functions/abook_local_file.php:274
-#: squirrelmail/functions/abook_local_file.php:303
-#: 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 ""
 
-#: squirrelmail/functions/abook_database.php:213
-#: squirrelmail/functions/abook_local_file.php:236
+#: squirrelmail/functions/abook_database.php:231
+#: squirrelmail/functions/abook_local_file.php:252
 #, c-format
 msgid "User '%s' already exist"
 msgstr ""
 
-#: squirrelmail/functions/abook_database.php:276
-#: squirrelmail/functions/abook_local_file.php:308
+#: squirrelmail/functions/abook_database.php:303
+#: squirrelmail/functions/abook_local_file.php:324
 #, c-format
 msgid "User '%s' does not exist"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:35
+#: squirrelmail/functions/abook_global_file.php:51
 msgid "Global address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:55
-#: squirrelmail/functions/abook_local_file.php:78
+#: squirrelmail/functions/abook_global_file.php:71
+#: squirrelmail/functions/abook_local_file.php:94
 msgid "No such file or directory"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:65
-#: squirrelmail/functions/abook_local_file.php:98
-#: squirrelmail/functions/abook_local_file.php:134
+#: 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 ""
 
-#: squirrelmail/functions/abook_global_file.php:162
-#: squirrelmail/functions/abook_global_file.php:168
-#: squirrelmail/functions/abook_global_file.php:174
+#: 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 ""
 
-#: squirrelmail/functions/abook_local_file.php:45
+#: squirrelmail/functions/abook_local_file.php:61
 msgid "Not a file name"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:255
-#: squirrelmail/functions/abook_local_file.php:279
-#: squirrelmail/functions/abook_local_file.php:314
+#: 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 ""
 
-#: squirrelmail/functions/abook_local_file.php:267
+#: squirrelmail/functions/abook_local_file.php:283
 msgid "Write to addressbook failed"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:64
+#: squirrelmail/functions/addressbook.php:70
 msgid "Error initializing addressbook database."
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:73
+#: squirrelmail/functions/addressbook.php:79
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:83
+#: squirrelmail/functions/addressbook.php:89
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: squirrelmail/functions/attachment_common.php:99
-#: squirrelmail/functions/attachment_common.php:123
-#: squirrelmail/functions/attachment_common.php:147
+#: squirrelmail/functions/attachment_common.php:116
+#: squirrelmail/functions/attachment_common.php:140
+#: squirrelmail/functions/attachment_common.php:164
 msgid "view"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:163
+#: squirrelmail/functions/attachment_common.php:180
 msgid "Business Card"
 msgstr ""
 
-#: squirrelmail/functions/date.php:84
+#: squirrelmail/functions/date.php:91
 msgid "Sunday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:87
+#: squirrelmail/functions/date.php:94
 msgid "Monday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:90
+#: squirrelmail/functions/date.php:97
 msgid "Tuesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:93
+#: squirrelmail/functions/date.php:100
 msgid "Wednesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:96
+#: squirrelmail/functions/date.php:103
 msgid "Thursday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:99
+#: squirrelmail/functions/date.php:106
 msgid "Friday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:102
+#: squirrelmail/functions/date.php:109
 msgid "Saturday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:113
+#: squirrelmail/functions/date.php:120
 msgid "January"
 msgstr ""
 
-#: squirrelmail/functions/date.php:116
+#: squirrelmail/functions/date.php:123
 msgid "February"
 msgstr ""
 
-#: squirrelmail/functions/date.php:119
+#: squirrelmail/functions/date.php:126
 msgid "March"
 msgstr ""
 
-#: squirrelmail/functions/date.php:122
+#: squirrelmail/functions/date.php:129
 msgid "April"
 msgstr ""
 
-#: squirrelmail/functions/date.php:125
+#: squirrelmail/functions/date.php:132
 msgid "May"
 msgstr ""
 
-#: squirrelmail/functions/date.php:128
+#: squirrelmail/functions/date.php:135
 msgid "June"
 msgstr ""
 
-#: squirrelmail/functions/date.php:131
+#: squirrelmail/functions/date.php:138
 msgid "July"
 msgstr ""
 
-#: squirrelmail/functions/date.php:134
+#: squirrelmail/functions/date.php:141
 msgid "August"
 msgstr ""
 
-#: squirrelmail/functions/date.php:137
+#: squirrelmail/functions/date.php:144
 msgid "September"
 msgstr ""
 
-#: squirrelmail/functions/date.php:140
+#: squirrelmail/functions/date.php:147
 msgid "October"
 msgstr ""
 
-#: squirrelmail/functions/date.php:143
+#: squirrelmail/functions/date.php:150
 msgid "November"
 msgstr ""
 
-#: squirrelmail/functions/date.php:146
+#: squirrelmail/functions/date.php:153
 msgid "December"
 msgstr ""
 
-#: squirrelmail/functions/date.php:168
+#: squirrelmail/functions/date.php:178
 msgid "D, F j, Y g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:185
+#: squirrelmail/functions/date.php:180
+msgid "D, F j, Y G:i"
+msgstr ""
+
+#: squirrelmail/functions/date.php:202
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:188
+#: squirrelmail/functions/date.php:204
+msgid "G:i"
+msgstr ""
+
+#: squirrelmail/functions/date.php:209
 msgid "D, g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:191
+#: squirrelmail/functions/date.php:211
+msgid "D, G:i"
+msgstr ""
+
+#: squirrelmail/functions/date.php:215
 msgid "M j, Y"
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:66
-#: squirrelmail/functions/db_prefs.php:69
-#: squirrelmail/functions/db_prefs.php:188
+#: 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 ""
 
 #: squirrelmail/functions/display_messages.php:23
-#: squirrelmail/functions/imap_general.php:233
+#: squirrelmail/functions/imap_general.php:206
 msgid "Unknown user or password incorrect."
 msgstr ""
 
 #: squirrelmail/functions/display_messages.php:25
-#: squirrelmail/functions/imap_general.php:234
 msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:40
+#: squirrelmail/functions/display_messages.php:39
 #, c-format
 msgid "Welcome to %s's WebMail system"
 msgstr ""
 
 #: squirrelmail/functions/display_messages.php:51
 #, c-format
-msgid "Running SquirrelMail version %s (c) 1999-2000."
-msgstr ""
-
-#: squirrelmail/functions/display_messages.php:71
-#: squirrelmail/functions/display_messages.php:87
-#: squirrelmail/functions/imap_general.php:225
-msgid "ERROR"
+msgid "Running SquirrelMail version %s (c) 1999-2001."
 msgstr ""
 
 #: squirrelmail/functions/display_messages.php:76
@@ -1395,159 +1493,163 @@ msgstr ""
 msgid "Click here to return to %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:132
-#: squirrelmail/functions/imap_messages.php:115
-#: squirrelmail/functions/imap_messages.php:123
-#: squirrelmail/functions/imap_messages.php:142
-#: squirrelmail/functions/imap_messages.php:151
-#: squirrelmail/functions/imap_messages.php:263
-#: squirrelmail/plugins/filters/filters.php:85
+#: 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 ""
 
-#: squirrelmail/functions/imap_general.php:134
-#: squirrelmail/plugins/filters/filters.php:87
+#: squirrelmail/functions/imap_general.php:121
+#: squirrelmail/plugins/filters/filters.php:90
 msgid "Reason Given: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:141
-#: squirrelmail/plugins/filters/filters.php:94
+#: squirrelmail/functions/imap_general.php:128
+#: squirrelmail/plugins/filters/filters.php:97
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:143
-#: squirrelmail/plugins/filters/filters.php:96
+#: squirrelmail/functions/imap_general.php:130
+#: squirrelmail/plugins/filters/filters.php:99
 msgid "Server responded: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:173
+#: squirrelmail/functions/imap_general.php:166
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:190
+#: squirrelmail/functions/imap_general.php:183
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:192
+#: squirrelmail/functions/imap_general.php:185
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:194
+#: squirrelmail/functions/imap_general.php:187
 msgid "Read data:"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:117
-#: squirrelmail/functions/imap_messages.php:144
-#: squirrelmail/functions/imap_messages.php:265
+#: 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 ""
 
-#: squirrelmail/functions/imap_messages.php:125
+#: squirrelmail/functions/imap_messages.php:142
 msgid "Unknown message number in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:153
+#: squirrelmail/functions/imap_messages.php:170
 msgid "Unknown messagenumber in reply from server: "
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:162
-#: squirrelmail/functions/imap_messages.php:191
-#: squirrelmail/functions/imap_messages.php:435
-#: squirrelmail/functions/imap_messages.php:485
-#: squirrelmail/functions/mailbox_display.php:729
+#: 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 ""
 
-#: squirrelmail/functions/imap_messages.php:163
+#: squirrelmail/functions/imap_messages.php:180
 msgid "Unknown Sender"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:216
+#: squirrelmail/functions/imap_messages.php:233
 msgid "No To Address"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:488
+#: squirrelmail/functions/imap_messages.php:505
 msgid "(unknown sender)"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:64
+#: squirrelmail/functions/imap_search.php:62
 msgid "No Messages Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:148
+#: squirrelmail/functions/imap_search.php:150
 msgid "Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:148
+#: squirrelmail/functions/imap_search.php:150
 msgid "messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:404
+#: squirrelmail/functions/mailbox_display.php:409
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:489
+#: squirrelmail/functions/mailbox_display.php:493
 msgid "Move selected to:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:492
+#: squirrelmail/functions/mailbox_display.php:496
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:508
+#: squirrelmail/functions/mailbox_display.php:512
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:512
+#: squirrelmail/functions/mailbox_display.php:516
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:512
+#: squirrelmail/functions/mailbox_display.php:516
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:514
+#: squirrelmail/functions/mailbox_display.php:518
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:515
+#: squirrelmail/functions/mailbox_display.php:519
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:609
+#: squirrelmail/functions/mailbox_display.php:615
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:628
+#: squirrelmail/functions/mailbox_display.php:633
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:630
+#: squirrelmail/functions/mailbox_display.php:635
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:646
+#: squirrelmail/functions/mailbox_display.php:652
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:648
+#: squirrelmail/functions/mailbox_display.php:654
 #, 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 ""
 
-#: squirrelmail/functions/mime.php:670
+#: squirrelmail/functions/mime.php:686
 msgid "download"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:944
+#: squirrelmail/functions/mime.php:956
 msgid "Title:"
 msgstr ""
 
@@ -1564,217 +1666,231 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:58
+#: squirrelmail/functions/page_header.php:74
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:64
+#: squirrelmail/functions/page_header.php:80
 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 ""
 
-#: squirrelmail/functions/prefs.php:124
+#: squirrelmail/functions/prefs.php:144
 msgid "Error opening "
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:345
+#: 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 ""
 
-#: squirrelmail/plugins/filters/filters.php:353
+#: 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 ""
 
-#: squirrelmail/plugins/filters/filters.php:361
+#: 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 ""
 
-#: squirrelmail/plugins/filters/filters.php:369
+#: squirrelmail/plugins/filters/filters.php:383
 msgid "COMMERCIAL - RBL+ Blackhole entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:377
+#: squirrelmail/plugins/filters/filters.php:391
 msgid "COMMERCIAL - RBL+ OpenRelay entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:385
+#: squirrelmail/plugins/filters/filters.php:399
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:393
+#: 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:401
+#: squirrelmail/plugins/filters/filters.php:415
 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:409
+#: 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:417
+#: 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:425
+#: 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 ""
 
-#: squirrelmail/plugins/filters/filters.php:433
+#: squirrelmail/plugins/filters/filters.php:447
 msgid ""
 "FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
 "users in without confirmation."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:441
+#: 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 ""
 
-#: squirrelmail/plugins/filters/filters.php:449
+#: squirrelmail/plugins/filters/filters.php:463
 msgid "FREE - Another ORBS replacement (just the INPUTS database used here)."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:457
+#: squirrelmail/plugins/filters/filters.php:471
 msgid "FREE - Another ORBS replacement (just the OUTPUTS database used here)."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:465
+#: squirrelmail/plugins/filters/filters.php:479
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:473
+#: squirrelmail/plugins/filters/filters.php:487
 msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:481
+#: 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:497
+#: 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 ""
 
-#: squirrelmail/plugins/filters/filters.php:505
+#: squirrelmail/plugins/filters/filters.php:543
 msgid ""
 "FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be "
 "SLOOOOOOW!"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:513
+#: squirrelmail/plugins/filters/filters.php:551
 msgid "FREE - orbz.gst-group.co.uk - Inputs only."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:521
+#: squirrelmail/plugins/filters/filters.php:559
 msgid "FREE - orbz.gst-group.co.uk - Outputs only."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:529
+#: squirrelmail/plugins/filters/filters.php:567
 msgid ""
 "FREE - orbz.gst-group.co.uk - mailservers that refuse or bounce email "
 "addressed to postmaster@<theirdomain>."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:537
+#: 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 ""
 
-#: squirrelmail/plugins/filters/options.php:73
+#: squirrelmail/plugins/filters/options.php:60
 msgid "Message Filtering"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:90
-msgid "Down"
-msgstr ""
-
-#: squirrelmail/plugins/filters/options.php:96
-msgid "Up"
+#: squirrelmail/plugins/filters/options.php:76
+msgid "Match:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:99
-#, c-format
-msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
+#: squirrelmail/plugins/filters/options.php:102
+msgid "Contains:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:112
-msgid "Spam Filtering"
+#: squirrelmail/plugins/filters/options.php:114
+msgid "Move to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:117
-#, c-format
-msgid "Spam is sent to <b>%s</b>"
+#: squirrelmail/plugins/filters/options.php:156
+msgid "Down"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:117
-msgid "[<i>not set yet</i>]"
+#: squirrelmail/plugins/filters/options.php:162
+msgid "Up"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:119
+#: squirrelmail/plugins/filters/options.php:165
 #, c-format
-msgid "Spam scan is limited to <b>%s</b>"
+msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:119
-msgid "New Messages Only"
+#: squirrelmail/plugins/filters/setup.php:79
+msgid "Message Filters"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:119
-msgid "All Messages"
+#: squirrelmail/plugins/filters/setup.php:81
+msgid ""
+"Filtering enables messages with different criteria to be automatically "
+"filtered into different folders for easier organization."
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:129
-msgid "ON"
+#: squirrelmail/plugins/filters/setup.php:87
+msgid "SPAM Filters"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:131
-msgid "OFF"
+#: 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 ""
 
-#: squirrelmail/plugins/filters/options.php:189
-msgid "Contains:"
+#: squirrelmail/plugins/filters/spamoptions.php:52
+msgid "Spam Filtering"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:201
-msgid "Move to:"
+#: squirrelmail/plugins/filters/spamoptions.php:56
+msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:244
+#: squirrelmail/plugins/filters/spamoptions.php:76
 msgid "Move spam to:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:261
+#: 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 "
@@ -1783,19 +1899,19 @@ msgid ""
 "around."
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:264
+#: squirrelmail/plugins/filters/spamoptions.php:96
 msgid "What to Scan:"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:269
+#: squirrelmail/plugins/filters/spamoptions.php:101
 msgid "All messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:273
+#: squirrelmail/plugins/filters/spamoptions.php:105
 msgid "Only unread messages"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:279
+#: 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 "
@@ -1804,18 +1920,38 @@ msgid ""
 "you'll scan even the spam you read with the new filters."
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:305
+#: squirrelmail/plugins/filters/spamoptions.php:137
 msgid "Save"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:78
-msgid "Message Filters"
+#: squirrelmail/plugins/filters/spamoptions.php:149
+#, c-format
+msgid "Spam is sent to <b>%s</b>"
 msgstr ""
 
-#: squirrelmail/plugins/filters/setup.php:80
-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 ""
+
+#: squirrelmail/plugins/filters/spamoptions.php:151
+#, c-format
+msgid "Spam scan is limited to <b>%s</b>"
+msgstr ""
+
+#: 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
@@ -2192,382 +2328,382 @@ msgstr ""
 msgid "SquirrelSpell Options Menu"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:67
+#: squirrelmail/plugins/translate/options.php:93
 msgid "Translator"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:70
+#: squirrelmail/plugins/translate/options.php:96
 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 ""
 
-#: 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 ""
 
-#: squirrelmail/plugins/translate/options.php:81
+#: squirrelmail/plugins/translate/options.php:107
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: squirrelmail/plugins/translate/options.php:98
+#: squirrelmail/plugins/translate/options.php:123
 msgid "Select your translator:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:109
+#: squirrelmail/plugins/translate/options.php:135
 msgid "When reading:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:114
+#: squirrelmail/plugins/translate/options.php:140
 msgid "Show translation box"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:116
+#: squirrelmail/plugins/translate/options.php:142
 msgid "to the left"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:117
+#: squirrelmail/plugins/translate/options.php:143
 msgid "in the center"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:118
+#: squirrelmail/plugins/translate/options.php:144
 msgid "to the right"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:123
+#: squirrelmail/plugins/translate/options.php:149
 msgid "Translate inside the SquirrelMail frames"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:126
+#: squirrelmail/plugins/translate/options.php:152
 msgid "When composing:"
 msgstr ""
 
-#: squirrelmail/plugins/translate/options.php:130
+#: squirrelmail/plugins/translate/options.php:156
 msgid "Not yet functional, currently does nothing"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:96
+#: squirrelmail/plugins/translate/setup.php:95
 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 ""
 
-#: 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:308
+#: squirrelmail/plugins/translate/setup.php:312
 #: 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: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 ""
 
-#: 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: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 ""
 
-#: 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: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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: squirrelmail/plugins/translate/setup.php:455
+#: squirrelmail/plugins/translate/setup.php:410
 msgid "Indonesian"
 msgstr ""
 
-#: squirrelmail/plugins/translate/setup.php:457
+#: squirrelmail/plugins/translate/setup.php:412
 msgid "Latin"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:41
+#: squirrelmail/plugins/newmail/newmail_opt.php:33
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "
@@ -2575,7 +2711,7 @@ msgid ""
 "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 "
@@ -2584,7 +2720,7 @@ msgid ""
 "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 "
@@ -2592,48 +2728,48 @@ msgid ""
 "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 ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:72
+#: squirrelmail/plugins/newmail/newmail_opt.php:64
 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 ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:88
+#: squirrelmail/plugins/newmail/newmail_opt.php:80
 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:96
 msgid "requires JavaScript to work"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:96
+#: squirrelmail/plugins/newmail/newmail_opt.php:88
 msgid "Show popup window on new mail"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:99
+#: squirrelmail/plugins/newmail/newmail_opt.php:91
 msgid "Select server file:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:101
+#: squirrelmail/plugins/newmail/newmail_opt.php:93
 msgid "(local media)"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:118
+#: squirrelmail/plugins/newmail/newmail_opt.php:110
 msgid "Try"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:126
+#: squirrelmail/plugins/newmail/newmail_opt.php:118
 msgid "Local Media File:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:132
+#: squirrelmail/plugins/newmail/newmail_opt.php:124
 msgid "Current File:"
 msgstr ""
 
@@ -2659,16 +2795,16 @@ msgid ""
 "when new mail arrives."
 msgstr ""
 
-#: squirrelmail/plugins/newmail/setup.php:126
+#: squirrelmail/plugins/newmail/setup.php:127
 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 ""
 
-#: squirrelmail/plugins/newmail/setup.php:207
+#: squirrelmail/plugins/newmail/setup.php:204
 #, c-format
 msgid "%s New Message"
 msgstr ""
@@ -2681,183 +2817,183 @@ msgstr ""
 msgid "Loading the sound..."
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:81
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:89
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:101
+#: 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:81
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:82
 msgid "No server specified"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:89
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:101
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:140
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:275
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:329
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:340
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:388
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:421
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:454
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:553
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:576
+#: 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:109
+#: 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:119
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:120
 msgid "POP3 noop:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:119
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:185
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:234
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:259
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:301
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:375
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:414
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:444
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:478
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:541
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:609
+#: 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:132
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:135
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:140
+#: 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:132
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:133
 msgid "no login ID submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:135
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:155
+#: 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:152
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:155
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:160
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:169
+#: 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:152
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:194
+#: 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:160
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:161
 msgid "authentication failed "
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:169
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:218
+#: 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:185
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:191
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:194
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:199
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:209
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:218
+#: 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:191
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:192
 msgid "No login ID submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:199
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:200
 msgid "No server banner"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:199
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:209
+#: 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:209
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:210
 msgid "apop authentication failed"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:234
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:235
 msgid "POP3 login:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:259
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:275
+#: 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:301
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:329
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:340
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:352
+#: 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:352
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:353
 msgid "Premature end of list"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:375
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:388
+#: 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:414
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:421
+#: 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:444
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:454
+#: 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:478
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:484
+#: 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:484
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:485
 msgid "Empty command string"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:504
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:505
 msgid "POP3 quit:"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:504
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:505
 msgid "connection does not exist"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:541
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:553
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:576
+#: 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:609
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:614
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:620
+#: 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:614
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:615
 msgid "No msg number submitted"
 msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/class.POP3.php:620
+#: squirrelmail/plugins/mail_fetch/class.POP3.php:621
 msgid "Command failed "
 msgstr ""