Updated main po strings.
[squirrelmail.git] / po / squirrelmail.po
index 99eb8904484aa7bd63c697a092a7636abbe51834..ce890281f15868237dbe89d2db41841875e9f593 100644 (file)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-24 20:10+0100\n"
+"POT-Creation-Date: 2001-12-07 09:12+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,501 +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/addrbook_search_html.php:68
-#: squirrelmail/src/addressbook.php:315 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_html.php:68
-#: squirrelmail/src/addressbook.php:316
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:84
+#: squirrelmail/src/addressbook.php:318
 msgid "E-mail"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:101
-#: squirrelmail/src/addrbook_search_html.php:68
-#: squirrelmail/src/addressbook.php:317
+#: squirrelmail/src/addrbook_search.php:117
+#: squirrelmail/src/addrbook_search_html.php:84
+#: squirrelmail/src/addressbook.php:319
 msgid "Info"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:104
-#: squirrelmail/src/addrbook_search_html.php:71
+#: squirrelmail/src/addrbook_search.php:120
+#: squirrelmail/src/addrbook_search_html.php:87
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:96
+#: squirrelmail/src/addrbook_search_html.php:112
 msgid "Use Addresses"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:115
+#: squirrelmail/src/addrbook_search_html.php:131
 msgid "Address Book Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:167
-#: squirrelmail/src/addrbook_search_html.php:125
+#: 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_html.php:136
+#: 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_html.php:139
+#: 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/addrbook_search_html.php:151
-#: 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:47 squirrelmail/src/search.php:92
 msgid "Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:188
-#: squirrelmail/src/addrbook_search_html.php:153
+#: squirrelmail/src/addrbook_search.php:204
+#: squirrelmail/src/addrbook_search_html.php:169
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:207
-#: squirrelmail/src/addrbook_search_html.php:176
+#: 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_html.php:199
+#: 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/addrbook_search.php:155
-#: squirrelmail/src/addrbook_search.php:236
-#: squirrelmail/src/addrbook_search_html.php:203
+#: 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:212
+#: squirrelmail/src/addrbook_search_html.php:228
 msgid "Return"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:191
+#: squirrelmail/src/addrbook_search.php:207
 msgid "Close window"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:34 squirrelmail/src/addressbook.php:314
+#: squirrelmail/src/addressbook.php:66 squirrelmail/src/addressbook.php:316
 msgid "Nickname"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:40
+#: squirrelmail/src/addressbook.php:67
 msgid "Must be unique"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/src/addressbook.php:68
 msgid "E-mail address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:49
+#: squirrelmail/src/addressbook.php:69
 msgid "First name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:56
+#: squirrelmail/src/addressbook.php:70
 msgid "Last name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:63
+#: squirrelmail/src/addressbook.php:71
 msgid "Additional info"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:82
+#: squirrelmail/src/addressbook.php:85
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:179
+#: squirrelmail/src/addressbook.php:181
 msgid "You can only edit one address at the time"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:194
-#: squirrelmail/src/addressbook.php:223 squirrelmail/src/addressbook.php:226
+#: squirrelmail/src/addressbook.php:193 squirrelmail/src/addressbook.php:196
+#: squirrelmail/src/addressbook.php:225 squirrelmail/src/addressbook.php:228
 msgid "Update address"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:71
-#: squirrelmail/functions/display_messages.php:87
-#: squirrelmail/functions/imap_general.php:225
-#: squirrelmail/src/addressbook.php:214 squirrelmail/src/addressbook.php:264
+#: squirrelmail/functions/display_messages.php:86
+#: squirrelmail/functions/display_messages.php:102
+#: squirrelmail/functions/imap_general.php:226
+#: squirrelmail/src/addressbook.php:216 squirrelmail/src/addressbook.php:266
 msgid "ERROR"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:240
+#: squirrelmail/src/addressbook.php:241
 msgid "Unknown error"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:284 squirrelmail/src/addressbook.php:368
+#: squirrelmail/src/addressbook.php:286 squirrelmail/src/addressbook.php:371
 msgid "Add address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:295 squirrelmail/src/addressbook.php:352
+#: squirrelmail/src/addressbook.php:297 squirrelmail/src/addressbook.php:355
 msgid "Edit selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:297 squirrelmail/src/addressbook.php:354
+#: squirrelmail/src/addressbook.php:299 squirrelmail/src/addressbook.php:357
 msgid "Delete selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:365
+#: squirrelmail/src/addressbook.php:368
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
-#: squirrelmail/src/compose.php:102
+#: 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:565
+#: 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:84
 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:551
+#: 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:85
 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:549
+#: 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:87
 msgid "To"
 msgstr ""
 
-#: squirrelmail/src/compose.php:249 squirrelmail/src/read_body.php:535
+#: squirrelmail/src/compose.php:265 squirrelmail/src/read_body.php:551
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:274 squirrelmail/src/read_body.php:552
+#: squirrelmail/src/compose.php:290 squirrelmail/src/read_body.php:568
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:282
+#: squirrelmail/src/compose.php:298
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:290
+#: squirrelmail/src/compose.php:306
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:298 squirrelmail/src/read_body.php:510
+#: squirrelmail/src/compose.php:314 squirrelmail/src/read_body.php:526
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:340 squirrelmail/src/compose.php:394
+#: squirrelmail/src/compose.php:356 squirrelmail/src/compose.php:410
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:346
+#: squirrelmail/src/compose.php:362
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:350 squirrelmail/src/options_order.php:129
+#: squirrelmail/src/compose.php:366 squirrelmail/src/options_order.php:145
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:365
+#: squirrelmail/src/compose.php:381
 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:403
+#: squirrelmail/src/compose.php:405 squirrelmail/src/compose.php:408
 msgid "Addresses"
 msgstr ""
 
-#: squirrelmail/src/compose.php:397
+#: squirrelmail/src/compose.php:413
 msgid "Save Draft"
 msgstr ""
 
-#: squirrelmail/src/compose.php:403 squirrelmail/src/read_body.php:582
+#: squirrelmail/src/compose.php:419 squirrelmail/src/read_body.php:598
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/src/compose.php:404 squirrelmail/src/read_body.php:417
+#: squirrelmail/src/compose.php:420 squirrelmail/src/read_body.php:433
 msgid "High"
 msgstr ""
 
-#: squirrelmail/src/compose.php:405 squirrelmail/src/read_body.php:420
+#: squirrelmail/src/compose.php:421 squirrelmail/src/read_body.php:436
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/src/compose.php:406 squirrelmail/src/read_body.php:424
+#: squirrelmail/src/compose.php:422 squirrelmail/src/read_body.php:440
 msgid "Low"
 msgstr ""
 
-#: squirrelmail/src/compose.php:425
+#: squirrelmail/src/compose.php:441
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:466
+#: squirrelmail/src/compose.php:482
 msgid "Draft Email Saved"
 msgstr ""
 
-#: squirrelmail/src/compose.php:537 squirrelmail/src/compose.php:574
-#: squirrelmail/src/compose.php:581
+#: squirrelmail/src/compose.php:553 squirrelmail/src/compose.php:590
+#: squirrelmail/src/compose.php:597
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-#: squirrelmail/src/compose.php:643
+#: squirrelmail/src/compose.php:659
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:646
+#: squirrelmail/src/compose.php:662
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:646
+#: squirrelmail/src/compose.php:662
 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:559
+#: 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:521
+#: 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/filters/options.php:136
+#: squirrelmail/plugins/newmail/newmail_opt.php:132
 #: squirrelmail/plugins/translate/options.php:133
-#: squirrelmail/src/folders_rename_getname.php:47
+#: 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:714
+#: squirrelmail/functions/mailbox_display.php:717
+#: squirrelmail/functions/mailbox_display.php:720
+#: 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:715
+#: squirrelmail/functions/mailbox_display.php:718
+#: squirrelmail/functions/mailbox_display.php:721
+#: 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 ""
 
@@ -698,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
@@ -714,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
@@ -749,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/functions/page_header.php:86
+#: squirrelmail/plugins/filters/options.php:60
+#: squirrelmail/plugins/newmail/newmail_opt.php:33
 #: 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/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 ""
@@ -857,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:86
 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 ""
@@ -872,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:571
+#: 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 ""
 
@@ -1024,616 +1024,620 @@ 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:84
 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:85
 msgid "Go to the login page"
 msgstr ""
 
-#: squirrelmail/src/redirect.php:76
+#: squirrelmail/src/redirect.php:108
 msgid "There was an error contacting the mail server."
 msgstr ""
 
-#: squirrelmail/src/redirect.php:77
+#: squirrelmail/src/redirect.php:109
 msgid "Contact your administrator for help."
 msgstr ""
 
-#: squirrelmail/src/search.php:60 squirrelmail/src/search.php:61
+#: squirrelmail/src/search.php:82
 msgid "Body"
 msgstr ""
 
-#: squirrelmail/src/search.php:63 squirrelmail/src/search.php:64
+#: squirrelmail/src/search.php:83
 msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:56 squirrelmail/src/signout.php:66
+#: squirrelmail/functions/page_header.php:72 squirrelmail/src/signout.php:81
 msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/src/signout.php:72
+#: squirrelmail/src/signout.php:87
 msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/signout.php:74
+#: squirrelmail/src/signout.php:89
 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:337
+#: squirrelmail/functions/addressbook.php:368
+#: squirrelmail/functions/addressbook.php:419
 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:77
 msgid "Error initializing addressbook database."
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:73
+#: squirrelmail/functions/addressbook.php:86
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:83
+#: squirrelmail/functions/addressbook.php:96
 msgid "Error initializing global addressbook."
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:99
+#: squirrelmail/functions/addressbook.php:112
 #, c-format
 msgid "Error initializing LDAP server %s:"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:301
-#: squirrelmail/functions/addressbook.php:382
+#: squirrelmail/functions/addressbook.php:314
+#: squirrelmail/functions/addressbook.php:395
 msgid "Invalid input data"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:306
-#: squirrelmail/functions/addressbook.php:387
+#: squirrelmail/functions/addressbook.php:319
+#: squirrelmail/functions/addressbook.php:400
 msgid "Name is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:310
-#: squirrelmail/functions/addressbook.php:391
+#: squirrelmail/functions/addressbook.php:323
+#: squirrelmail/functions/addressbook.php:404
 msgid "E-mail address is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:318
-#: squirrelmail/functions/addressbook.php:396
+#: squirrelmail/functions/addressbook.php:331
+#: squirrelmail/functions/addressbook.php:409
 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:101
 msgid "Sunday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:87
+#: squirrelmail/functions/date.php:104
 msgid "Monday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:90
+#: squirrelmail/functions/date.php:107
 msgid "Tuesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:93
+#: squirrelmail/functions/date.php:110
 msgid "Wednesday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:96
+#: squirrelmail/functions/date.php:113
 msgid "Thursday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:99
+#: squirrelmail/functions/date.php:116
 msgid "Friday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:102
+#: squirrelmail/functions/date.php:119
 msgid "Saturday"
 msgstr ""
 
-#: squirrelmail/functions/date.php:113
+#: squirrelmail/functions/date.php:130
 msgid "January"
 msgstr ""
 
-#: squirrelmail/functions/date.php:116
+#: squirrelmail/functions/date.php:133
 msgid "February"
 msgstr ""
 
-#: squirrelmail/functions/date.php:119
+#: squirrelmail/functions/date.php:136
 msgid "March"
 msgstr ""
 
-#: squirrelmail/functions/date.php:122
+#: squirrelmail/functions/date.php:139
 msgid "April"
 msgstr ""
 
-#: squirrelmail/functions/date.php:125
+#: squirrelmail/functions/date.php:142
 msgid "May"
 msgstr ""
 
-#: squirrelmail/functions/date.php:128
+#: squirrelmail/functions/date.php:145
 msgid "June"
 msgstr ""
 
-#: squirrelmail/functions/date.php:131
+#: squirrelmail/functions/date.php:148
 msgid "July"
 msgstr ""
 
-#: squirrelmail/functions/date.php:134
+#: squirrelmail/functions/date.php:151
 msgid "August"
 msgstr ""
 
-#: squirrelmail/functions/date.php:137
+#: squirrelmail/functions/date.php:154
 msgid "September"
 msgstr ""
 
-#: squirrelmail/functions/date.php:140
+#: squirrelmail/functions/date.php:157
 msgid "October"
 msgstr ""
 
-#: squirrelmail/functions/date.php:143
+#: squirrelmail/functions/date.php:160
 msgid "November"
 msgstr ""
 
-#: squirrelmail/functions/date.php:146
+#: squirrelmail/functions/date.php:163
 msgid "December"
 msgstr ""
 
-#: squirrelmail/functions/date.php:168
+#: squirrelmail/functions/date.php:185
 msgid "D, F j, Y g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:185
+#: squirrelmail/functions/date.php:202
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:188
+#: squirrelmail/functions/date.php:205
 msgid "D, g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:191
+#: squirrelmail/functions/date.php:208
 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/display_messages.php:38
+#: squirrelmail/functions/imap_general.php:234
 msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:25
-#: squirrelmail/functions/imap_general.php:234
+#: squirrelmail/functions/display_messages.php:40
+#: squirrelmail/functions/imap_general.php:235
 msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:40
+#: squirrelmail/functions/display_messages.php:55
 #, c-format
 msgid "Welcome to %s's WebMail system"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:51
+#: squirrelmail/functions/display_messages.php:66
 #, c-format
 msgid "Running SquirrelMail version %s (c) 1999-2000."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:76
+#: squirrelmail/functions/display_messages.php:91
 #, c-format
 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_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/plugins/filters/filters.php:90
 msgid "Reason Given: "
 msgstr ""
 
 #: squirrelmail/functions/imap_general.php:141
-#: squirrelmail/plugins/filters/filters.php:94
+#: 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/plugins/filters/filters.php:99
 msgid "Server responded: "
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:173
+#: squirrelmail/functions/imap_general.php:174
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:190
+#: squirrelmail/functions/imap_general.php:191
 #, c-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:192
+#: squirrelmail/functions/imap_general.php:193
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: squirrelmail/functions/imap_general.php:194
+#: squirrelmail/functions/imap_general.php:195
 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:869
 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:79
 msgid "No Messages Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:148
+#: squirrelmail/functions/imap_search.php:163
 msgid "Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:148
+#: squirrelmail/functions/imap_search.php:163
 msgid "messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:404
+#: squirrelmail/functions/mailbox_display.php:410
 msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:489
+#: squirrelmail/functions/mailbox_display.php:494
 msgid "Move selected to:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:492
+#: squirrelmail/functions/mailbox_display.php:497
 msgid "Transform Selected Messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:508
+#: squirrelmail/functions/mailbox_display.php:513
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:512
+#: squirrelmail/functions/mailbox_display.php:517
 msgid "Expunge"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:512
+#: squirrelmail/functions/mailbox_display.php:517
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:514
+#: squirrelmail/functions/mailbox_display.php:519
 msgid "Read"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:515
+#: squirrelmail/functions/mailbox_display.php:520
 msgid "Unread"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:609
+#: squirrelmail/functions/mailbox_display.php:616
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:628
+#: squirrelmail/functions/mailbox_display.php:634
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:630
+#: squirrelmail/functions/mailbox_display.php:636
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:646
+#: squirrelmail/functions/mailbox_display.php:653
 #, 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:655
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:631
+#: squirrelmail/functions/mailbox_display.php:843
+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:960
 msgid "Title:"
 msgstr ""
 
@@ -1650,217 +1654,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:142
 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 "
@@ -1869,19 +1887,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 "
@@ -1890,18 +1908,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
@@ -2630,30 +2668,30 @@ msgstr ""
 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 "
@@ -2661,7 +2699,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 "
@@ -2670,7 +2708,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 "
@@ -2678,48 +2716,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 ""
 
@@ -2745,16 +2783,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 ""