Generating new POT.

3 files changed, 401 insertions, 360 deletions

diff --git a/messages/docstring.files b/messages/docstring.files
index e7b766c7..787d3a32 100644
--- a/messages/docstring.files
+++ b/messages/docstring.files
@@ -8,6 +8,7 @@ bin/cleanarch
 bin/clone_member
 bin/config_list
 bin/convert.py
+bin/discard
 bin/dumpdb
 bin/find_member
 bin/fix_url.py
@@ -17,23 +18,21 @@ bin/list_admins
 bin/list_lists
 bin/list_members
 bin/list_owners
+bin/newlist
 bin/mailmanctl
 bin/mmsitepass
-bin/newlist
+bin/msgfmt.py
 bin/qrunner
+bin/rb-archfix
 bin/remove_members
 bin/rmlist
+bin/show_qfiles
 bin/sync_members
 bin/transcheck
 bin/unshunt
 bin/update
 bin/version
 bin/withlist
-bin/rb-archfix
-bin/rb-archfix.~1~
-bin/msgfmt.py
-bin/show_qfiles
-bin/discard
 cron/bumpdigests
 cron/checkdbs
 cron/disabled
diff --git a/messages/mailman.pot b/messages/mailman.pot
index 76dc487c..22d01f80 100644
--- a/messages/mailman.pot
+++ b/messages/mailman.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Mon Mar 15 22:04:14 2004\n"
+"POT-Creation-Date: Sun Oct 10 22:30:10 2004\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"
@@ -15,150 +15,150 @@ msgstr ""
 "Generated-By: pygettext.py 1.4\n"
 
 
-#: Mailman/Archiver/HyperArch.py:119
+#: Mailman/Archiver/HyperArch.py:120
 msgid "size not available"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:125
+#: Mailman/Archiver/HyperArch.py:126
 msgid " %(size)i bytes "
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:279 Mailman/Archiver/HyperArch.py:438
-#: Mailman/Archiver/HyperArch.py:1006 Mailman/Archiver/HyperArch.py:1132
+#: Mailman/Archiver/HyperArch.py:280 Mailman/Archiver/HyperArch.py:442
+#: Mailman/Archiver/HyperArch.py:1011 Mailman/Archiver/HyperArch.py:1140
 msgid " at "
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:467
+#: Mailman/Archiver/HyperArch.py:471
 msgid "Previous message:"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:489
+#: Mailman/Archiver/HyperArch.py:493
 msgid "Next message:"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:648 Mailman/Archiver/HyperArch.py:684
+#: Mailman/Archiver/HyperArch.py:652 Mailman/Archiver/HyperArch.py:688
 msgid "thread"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:649 Mailman/Archiver/HyperArch.py:685
+#: Mailman/Archiver/HyperArch.py:653 Mailman/Archiver/HyperArch.py:689
 msgid "subject"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:650 Mailman/Archiver/HyperArch.py:686
+#: Mailman/Archiver/HyperArch.py:654 Mailman/Archiver/HyperArch.py:690
 msgid "author"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:651 Mailman/Archiver/HyperArch.py:687
+#: Mailman/Archiver/HyperArch.py:655 Mailman/Archiver/HyperArch.py:691
 msgid "date"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:723
+#: Mailman/Archiver/HyperArch.py:727
 msgid "<P>Currently, there are no archives. </P>"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:761
+#: Mailman/Archiver/HyperArch.py:765
 msgid "Gzip'd Text%(sz)s"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:766
+#: Mailman/Archiver/HyperArch.py:770
 msgid "Text%(sz)s"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:856
+#: Mailman/Archiver/HyperArch.py:860
 msgid ""
 "figuring article archives\n"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:866
+#: Mailman/Archiver/HyperArch.py:870
 msgid "April"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:866
+#: Mailman/Archiver/HyperArch.py:870
 msgid "February"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:866
+#: Mailman/Archiver/HyperArch.py:870
 msgid "January"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:866
+#: Mailman/Archiver/HyperArch.py:870
 msgid "March"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:867
+#: Mailman/Archiver/HyperArch.py:871
 msgid "August"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:867
+#: Mailman/Archiver/HyperArch.py:871
 msgid "July"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:867
+#: Mailman/Archiver/HyperArch.py:871
 msgid "June"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:867 Mailman/i18n.py:102
+#: Mailman/Archiver/HyperArch.py:871 Mailman/i18n.py:102
 msgid "May"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:868
+#: Mailman/Archiver/HyperArch.py:872
 msgid "December"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:868
+#: Mailman/Archiver/HyperArch.py:872
 msgid "November"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:868
+#: Mailman/Archiver/HyperArch.py:872
 msgid "October"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:868
+#: Mailman/Archiver/HyperArch.py:872
 msgid "September"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:876
+#: Mailman/Archiver/HyperArch.py:880
 msgid "First"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:876
+#: Mailman/Archiver/HyperArch.py:880
 msgid "Fourth"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:876
+#: Mailman/Archiver/HyperArch.py:880
 msgid "Second"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:876
+#: Mailman/Archiver/HyperArch.py:880
 msgid "Third"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:878
+#: Mailman/Archiver/HyperArch.py:882
 msgid "%(ord)s quarter %(year)i"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:885
+#: Mailman/Archiver/HyperArch.py:889
 msgid "%(month)s %(year)i"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:890
+#: Mailman/Archiver/HyperArch.py:894
 msgid "The Week Of Monday %(day)i %(month)s %(year)i"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:894
+#: Mailman/Archiver/HyperArch.py:898
 msgid "%(day)i %(month)s %(year)i"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:994
+#: Mailman/Archiver/HyperArch.py:998
 msgid ""
 "Computing threaded index\n"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:1255
+#: Mailman/Archiver/HyperArch.py:1263
 msgid "Updating HTML for article %(seq)s"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:1262
+#: Mailman/Archiver/HyperArch.py:1270
 msgid "article file %(filename)s is missing!"
 msgstr ""
 
@@ -220,13 +220,13 @@ msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 
 #: Mailman/Bouncer.py:270 Mailman/Deliverer.py:136
-#: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:233
+#: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:265
 #: Mailman/Handlers/Hold.py:205 Mailman/Handlers/ToDigest.py:217
-#: Mailman/ListAdmin.py:215
+#: Mailman/ListAdmin.py:223
 msgid "(no subject)"
 msgstr ""
 
-#: Mailman/Bouncer.py:272
+#: Mailman/Bouncer.py:274
 msgid "[No bounce details are available]"
 msgstr ""
 
@@ -498,15 +498,15 @@ msgstr ""
 msgid "Spam Filter Regexp:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:763 Mailman/Cgi/admindb.py:289
-#: Mailman/Cgi/admindb.py:348 Mailman/Cgi/admindb.py:391
-#: Mailman/Cgi/admindb.py:625
+#: Mailman/Cgi/admin.py:763 Mailman/Cgi/admindb.py:299
+#: Mailman/Cgi/admindb.py:358 Mailman/Cgi/admindb.py:401
+#: Mailman/Cgi/admindb.py:635
 msgid "Defer"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:763 Mailman/Cgi/admindb.py:291
-#: Mailman/Cgi/admindb.py:350 Mailman/Cgi/admindb.py:391
-#: Mailman/Cgi/admindb.py:625 Mailman/Gui/ContentFilter.py:37
+#: Mailman/Cgi/admin.py:763 Mailman/Cgi/admindb.py:301
+#: Mailman/Cgi/admindb.py:360 Mailman/Cgi/admindb.py:401
+#: Mailman/Cgi/admindb.py:635 Mailman/Gui/ContentFilter.py:37
 #: Mailman/Gui/Privacy.py:216 Mailman/Gui/Privacy.py:290
 msgid "Reject"
 msgstr ""
@@ -516,19 +516,19 @@ msgstr ""
 msgid "Hold"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/admindb.py:292
-#: Mailman/Cgi/admindb.py:351 Mailman/Cgi/admindb.py:391
-#: Mailman/Cgi/admindb.py:625 Mailman/Gui/ContentFilter.py:37
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/admindb.py:302
+#: Mailman/Cgi/admindb.py:361 Mailman/Cgi/admindb.py:401
+#: Mailman/Cgi/admindb.py:635 Mailman/Gui/ContentFilter.py:37
 #: Mailman/Gui/Privacy.py:216 Mailman/Gui/Privacy.py:290
 msgid "Discard"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/admindb.py:391
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/admindb.py:401
 #: Mailman/Gui/Privacy.py:290
 msgid "Accept"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:767 Mailman/Cgi/admindb.py:631
+#: Mailman/Cgi/admin.py:767 Mailman/Cgi/admindb.py:641
 msgid "Action:"
 msgstr ""
 
@@ -762,20 +762,21 @@ msgstr ""
 #: Mailman/Gui/Autoresponse.py:71 Mailman/Gui/Bounce.py:77
 #: Mailman/Gui/Bounce.py:120 Mailman/Gui/Bounce.py:146
 #: Mailman/Gui/Bounce.py:155 Mailman/Gui/ContentFilter.py:70
-#: Mailman/Gui/ContentFilter.py:103 Mailman/Gui/Digest.py:46
+#: Mailman/Gui/ContentFilter.py:112 Mailman/Gui/Digest.py:46
 #: Mailman/Gui/Digest.py:62 Mailman/Gui/Digest.py:84 Mailman/Gui/Digest.py:89
-#: Mailman/Gui/General.py:150 Mailman/Gui/General.py:156
-#: Mailman/Gui/General.py:234 Mailman/Gui/General.py:261
-#: Mailman/Gui/General.py:288 Mailman/Gui/General.py:299
-#: Mailman/Gui/General.py:302 Mailman/Gui/General.py:312
-#: Mailman/Gui/General.py:317 Mailman/Gui/General.py:327
-#: Mailman/Gui/General.py:347 Mailman/Gui/General.py:375
-#: Mailman/Gui/General.py:398 Mailman/Gui/NonDigest.py:44
-#: Mailman/Gui/NonDigest.py:52 Mailman/Gui/Privacy.py:110
-#: Mailman/Gui/Privacy.py:116 Mailman/Gui/Privacy.py:149
-#: Mailman/Gui/Privacy.py:197 Mailman/Gui/Privacy.py:305
-#: Mailman/Gui/Privacy.py:318 Mailman/Gui/Usenet.py:52
-#: Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93 Mailman/Gui/Usenet.py:105
+#: Mailman/Gui/General.py:154 Mailman/Gui/General.py:160
+#: Mailman/Gui/General.py:238 Mailman/Gui/General.py:265
+#: Mailman/Gui/General.py:292 Mailman/Gui/General.py:303
+#: Mailman/Gui/General.py:306 Mailman/Gui/General.py:316
+#: Mailman/Gui/General.py:321 Mailman/Gui/General.py:331
+#: Mailman/Gui/General.py:351 Mailman/Gui/General.py:379
+#: Mailman/Gui/General.py:402 Mailman/Gui/NonDigest.py:44
+#: Mailman/Gui/NonDigest.py:52 Mailman/Gui/NonDigest.py:139
+#: Mailman/Gui/Privacy.py:110 Mailman/Gui/Privacy.py:116
+#: Mailman/Gui/Privacy.py:149 Mailman/Gui/Privacy.py:197
+#: Mailman/Gui/Privacy.py:305 Mailman/Gui/Privacy.py:318
+#: Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93
+#: Mailman/Gui/Usenet.py:105
 msgid "No"
 msgstr ""
 
@@ -787,21 +788,21 @@ msgstr ""
 #: Mailman/Gui/Autoresponse.py:54 Mailman/Gui/Autoresponse.py:62
 #: Mailman/Gui/Bounce.py:77 Mailman/Gui/Bounce.py:120
 #: Mailman/Gui/Bounce.py:146 Mailman/Gui/Bounce.py:155
-#: Mailman/Gui/ContentFilter.py:70 Mailman/Gui/ContentFilter.py:103
+#: Mailman/Gui/ContentFilter.py:70 Mailman/Gui/ContentFilter.py:112
 #: Mailman/Gui/Digest.py:46 Mailman/Gui/Digest.py:62 Mailman/Gui/Digest.py:84
-#: Mailman/Gui/Digest.py:89 Mailman/Gui/General.py:150
-#: Mailman/Gui/General.py:156 Mailman/Gui/General.py:234
-#: Mailman/Gui/General.py:261 Mailman/Gui/General.py:288
-#: Mailman/Gui/General.py:299 Mailman/Gui/General.py:302
-#: Mailman/Gui/General.py:312 Mailman/Gui/General.py:317
-#: Mailman/Gui/General.py:327 Mailman/Gui/General.py:347
-#: Mailman/Gui/General.py:375 Mailman/Gui/General.py:398
+#: Mailman/Gui/Digest.py:89 Mailman/Gui/General.py:154
+#: Mailman/Gui/General.py:160 Mailman/Gui/General.py:238
+#: Mailman/Gui/General.py:265 Mailman/Gui/General.py:292
+#: Mailman/Gui/General.py:303 Mailman/Gui/General.py:306
+#: Mailman/Gui/General.py:316 Mailman/Gui/General.py:321
+#: Mailman/Gui/General.py:331 Mailman/Gui/General.py:351
+#: Mailman/Gui/General.py:379 Mailman/Gui/General.py:402
 #: Mailman/Gui/NonDigest.py:44 Mailman/Gui/NonDigest.py:52
-#: Mailman/Gui/Privacy.py:110 Mailman/Gui/Privacy.py:116
-#: Mailman/Gui/Privacy.py:149 Mailman/Gui/Privacy.py:197
-#: Mailman/Gui/Privacy.py:305 Mailman/Gui/Privacy.py:318
-#: Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93
-#: Mailman/Gui/Usenet.py:105
+#: Mailman/Gui/NonDigest.py:139 Mailman/Gui/Privacy.py:110
+#: Mailman/Gui/Privacy.py:116 Mailman/Gui/Privacy.py:149
+#: Mailman/Gui/Privacy.py:197 Mailman/Gui/Privacy.py:305
+#: Mailman/Gui/Privacy.py:318 Mailman/Gui/Usenet.py:52
+#: Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93 Mailman/Gui/Usenet.py:105
 msgid "Yes"
 msgstr ""
 
@@ -966,206 +967,210 @@ msgstr ""
 msgid "Administrative requests for mailing list:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:191 Mailman/Cgi/admindb.py:234
+#: Mailman/Cgi/admindb.py:191 Mailman/Cgi/admindb.py:244
 msgid "Submit All Data"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:204
-msgid "all of %(esender)s's held messages."
+#: Mailman/Cgi/admindb.py:195 Mailman/Cgi/admindb.py:242
+msgid "Discard all messages marked <em>Defer</em>"
 msgstr ""
 
 #: Mailman/Cgi/admindb.py:209
-msgid "a single held message."
+msgid "all of %(esender)s's held messages."
 msgstr ""
 
 #: Mailman/Cgi/admindb.py:214
+msgid "a single held message."
+msgstr ""
+
+#: Mailman/Cgi/admindb.py:219
 msgid "all held messages."
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:249
+#: Mailman/Cgi/admindb.py:259
 msgid "Mailman Administrative Database Error"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:254
+#: Mailman/Cgi/admindb.py:264
 msgid "list of available mailing lists."
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:255
+#: Mailman/Cgi/admindb.py:265
 msgid "You must specify a list name.  Here is the %(link)s"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:268
+#: Mailman/Cgi/admindb.py:278
 msgid "Subscription Requests"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:270
+#: Mailman/Cgi/admindb.py:280
 msgid "Address/name"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:271 Mailman/Cgi/admindb.py:322
+#: Mailman/Cgi/admindb.py:281 Mailman/Cgi/admindb.py:332
 msgid "Your decision"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:272 Mailman/Cgi/admindb.py:323
+#: Mailman/Cgi/admindb.py:282 Mailman/Cgi/admindb.py:333
 msgid "Reason for refusal"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:290 Mailman/Cgi/admindb.py:349
-#: Mailman/Cgi/admindb.py:625
+#: Mailman/Cgi/admindb.py:300 Mailman/Cgi/admindb.py:359
+#: Mailman/Cgi/admindb.py:635
 msgid "Approve"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:300
+#: Mailman/Cgi/admindb.py:310
 msgid "Permanently ban from this list"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:321
+#: Mailman/Cgi/admindb.py:331
 msgid "User address/name"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:361
+#: Mailman/Cgi/admindb.py:371
 msgid "Unsubscription Requests"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:384 Mailman/Cgi/admindb.py:608
+#: Mailman/Cgi/admindb.py:394 Mailman/Cgi/admindb.py:618
 msgid "From:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:387
+#: Mailman/Cgi/admindb.py:397
 msgid "Action to take on all these held messages:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:399
+#: Mailman/Cgi/admindb.py:409
 msgid "Preserve messages for the site administrator"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:405
+#: Mailman/Cgi/admindb.py:415
 msgid "Forward messages (individually) to:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:423
+#: Mailman/Cgi/admindb.py:433
 msgid "Clear this member's <em>moderate</em> flag"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:427
+#: Mailman/Cgi/admindb.py:437
 msgid "<em>The sender is now a member of this list</em>"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:436
+#: Mailman/Cgi/admindb.py:446
 msgid "Add <b>%(esender)s</b> to one of these sender filters:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:441
+#: Mailman/Cgi/admindb.py:451
 msgid "Accepts"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:441
+#: Mailman/Cgi/admindb.py:451
 msgid "Discards"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:441
+#: Mailman/Cgi/admindb.py:451
 msgid "Holds"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:441
+#: Mailman/Cgi/admindb.py:451
 msgid "Rejects"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:450
+#: Mailman/Cgi/admindb.py:460
 msgid ""
 "Ban <b>%(esender)s</b> from ever subscribing to this\n"
 "                    mailing list"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:455
+#: Mailman/Cgi/admindb.py:465
 msgid ""
 "Click on the message number to view the individual\n"
 "            message, or you can "
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:457
+#: Mailman/Cgi/admindb.py:467
 msgid "view all messages from %(esender)s"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:479 Mailman/Cgi/admindb.py:611
+#: Mailman/Cgi/admindb.py:489 Mailman/Cgi/admindb.py:621
 msgid "Subject:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:482
+#: Mailman/Cgi/admindb.py:492
 msgid " bytes"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:482
+#: Mailman/Cgi/admindb.py:492
 msgid "Size:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:486 Mailman/Handlers/Decorate.py:56
-#: Mailman/Handlers/Scrubber.py:268 Mailman/Handlers/Scrubber.py:269
+#: Mailman/Cgi/admindb.py:496 Mailman/Handlers/Scrubber.py:199
+#: Mailman/Handlers/Scrubber.py:295 Mailman/Handlers/Scrubber.py:296
 msgid "not available"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:487 Mailman/Cgi/admindb.py:614
+#: Mailman/Cgi/admindb.py:497 Mailman/Cgi/admindb.py:624
 msgid "Reason:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:491 Mailman/Cgi/admindb.py:618
+#: Mailman/Cgi/admindb.py:501 Mailman/Cgi/admindb.py:628
 msgid "Received:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:549
+#: Mailman/Cgi/admindb.py:559
 msgid "Posting Held for Approval"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:551
+#: Mailman/Cgi/admindb.py:561
 msgid " (%(count)d of %(total)d)"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:562
+#: Mailman/Cgi/admindb.py:572
 msgid "<em>Message with id #%(id)d was lost."
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:571
+#: Mailman/Cgi/admindb.py:581
 msgid "<em>Message with id #%(id)d is corrupted."
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:635
+#: Mailman/Cgi/admindb.py:645
 msgid "Preserve message for site administrator"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:639
+#: Mailman/Cgi/admindb.py:649
 msgid "Additionally, forward this message to: "
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:643
+#: Mailman/Cgi/admindb.py:653
 msgid "[No explanation given]"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:645
+#: Mailman/Cgi/admindb.py:655
 msgid "If you reject this post,<br>please explain (optional):"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:651
+#: Mailman/Cgi/admindb.py:661
 msgid "Message Headers:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:656
+#: Mailman/Cgi/admindb.py:666
 msgid "Message Excerpt:"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:689 Mailman/Deliverer.py:134
+#: Mailman/Cgi/admindb.py:706 Mailman/Deliverer.py:134
 msgid "No reason given"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:750 Mailman/ListAdmin.py:288
-#: Mailman/ListAdmin.py:406
+#: Mailman/Cgi/admindb.py:767 Mailman/ListAdmin.py:296
+#: Mailman/ListAdmin.py:414
 msgid "[No reason given]"
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:779
+#: Mailman/Cgi/admindb.py:796
 msgid "Database Updated..."
 msgstr ""
 
-#: Mailman/Cgi/admindb.py:782
+#: Mailman/Cgi/admindb.py:799
 msgid " is already a member"
 msgstr ""
 
@@ -1974,8 +1979,8 @@ msgstr ""
 msgid "Passwords did not match!"
 msgstr ""
 
-#: Mailman/Cgi/options.py:414 Mailman/Commands/cmd_password.py:79
-#: Mailman/Commands/cmd_password.py:105
+#: Mailman/Cgi/options.py:414 Mailman/Commands/cmd_password.py:83
+#: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr ""
 
@@ -2518,24 +2523,24 @@ msgid ""
 "        response is always sent to the subscribed address.\n"
 msgstr ""
 
-#: Mailman/Commands/cmd_password.py:51 Mailman/Commands/cmd_password.py:64
+#: Mailman/Commands/cmd_password.py:51 Mailman/Commands/cmd_password.py:66
 msgid "Your password is: %(password)s"
 msgstr ""
 
-#: Mailman/Commands/cmd_password.py:55 Mailman/Commands/cmd_password.py:68
-#: Mailman/Commands/cmd_password.py:91 Mailman/Commands/cmd_password.py:117
+#: Mailman/Commands/cmd_password.py:57 Mailman/Commands/cmd_password.py:72
+#: Mailman/Commands/cmd_password.py:95 Mailman/Commands/cmd_password.py:121
 #: Mailman/Commands/cmd_set.py:149 Mailman/Commands/cmd_set.py:219
 msgid "You are not a member of the %(listname)s mailing list"
 msgstr ""
 
-#: Mailman/Commands/cmd_password.py:81 Mailman/Commands/cmd_password.py:107
+#: Mailman/Commands/cmd_password.py:85 Mailman/Commands/cmd_password.py:111
 msgid ""
 "You did not give the correct old password, so your password has not been\n"
 "changed.  Use the no argument version of the password command to retrieve your\n"
 "current password, then try again."
 msgstr ""
 
-#: Mailman/Commands/cmd_password.py:85 Mailman/Commands/cmd_password.py:111
+#: Mailman/Commands/cmd_password.py:89 Mailman/Commands/cmd_password.py:115
 msgid ""
 "\n"
 "Usage:"
@@ -2890,119 +2895,123 @@ msgstr ""
 msgid "Digest members:"
 msgstr ""
 
-#: Mailman/Defaults.py:1249
+#: Mailman/Defaults.py:1279
 msgid "Catalan"
 msgstr ""
 
-#: Mailman/Defaults.py:1250
+#: Mailman/Defaults.py:1280
 msgid "Czech"
 msgstr ""
 
-#: Mailman/Defaults.py:1251
+#: Mailman/Defaults.py:1281
 msgid "Danish"
 msgstr ""
 
-#: Mailman/Defaults.py:1252
+#: Mailman/Defaults.py:1282
 msgid "German"
 msgstr ""
 
-#: Mailman/Defaults.py:1253
+#: Mailman/Defaults.py:1283
 msgid "English (USA)"
 msgstr ""
 
-#: Mailman/Defaults.py:1254
+#: Mailman/Defaults.py:1284
 msgid "Spanish (Spain)"
 msgstr ""
 
-#: Mailman/Defaults.py:1255
+#: Mailman/Defaults.py:1285
 msgid "Estonian"
 msgstr ""
 
-#: Mailman/Defaults.py:1256
+#: Mailman/Defaults.py:1286
 msgid "Euskara"
 msgstr ""
 
-#: Mailman/Defaults.py:1257
+#: Mailman/Defaults.py:1287
 msgid "Finnish"
 msgstr ""
 
-#: Mailman/Defaults.py:1258
+#: Mailman/Defaults.py:1288
 msgid "French"
 msgstr ""
 
-#: Mailman/Defaults.py:1259
+#: Mailman/Defaults.py:1289
 msgid "Croatian"
 msgstr ""
 
-#: Mailman/Defaults.py:1260
+#: Mailman/Defaults.py:1290
 msgid "Hungarian"
 msgstr ""
 
-#: Mailman/Defaults.py:1261
+#: Mailman/Defaults.py:1291
 msgid "Italian"
 msgstr ""
 
-#: Mailman/Defaults.py:1262
+#: Mailman/Defaults.py:1292
 msgid "Japanese"
 msgstr ""
 
-#: Mailman/Defaults.py:1263
+#: Mailman/Defaults.py:1293
 msgid "Korean"
 msgstr ""
 
-#: Mailman/Defaults.py:1264
+#: Mailman/Defaults.py:1294
 msgid "Lithuanian"
 msgstr ""
 
-#: Mailman/Defaults.py:1265
+#: Mailman/Defaults.py:1295
 msgid "Dutch"
 msgstr ""
 
-#: Mailman/Defaults.py:1266
+#: Mailman/Defaults.py:1296
 msgid "Norwegian"
 msgstr ""
 
-#: Mailman/Defaults.py:1267
+#: Mailman/Defaults.py:1297
 msgid "Polish"
 msgstr ""
 
-#: Mailman/Defaults.py:1268
+#: Mailman/Defaults.py:1298
 msgid "Portuguese"
 msgstr ""
 
-#: Mailman/Defaults.py:1269
+#: Mailman/Defaults.py:1299
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: Mailman/Defaults.py:1270
+#: Mailman/Defaults.py:1300
 msgid "Romanian"
 msgstr ""
 
-#: Mailman/Defaults.py:1271
+#: Mailman/Defaults.py:1301
 msgid "Russian"
 msgstr ""
 
-#: Mailman/Defaults.py:1272
+#: Mailman/Defaults.py:1302
 msgid "Serbian"
 msgstr ""
 
-#: Mailman/Defaults.py:1273
+#: Mailman/Defaults.py:1303
 msgid "Slovenian"
 msgstr ""
 
-#: Mailman/Defaults.py:1274
+#: Mailman/Defaults.py:1304
 msgid "Swedish"
 msgstr ""
 
-#: Mailman/Defaults.py:1275
+#: Mailman/Defaults.py:1305
+msgid "Turkish"
+msgstr ""
+
+#: Mailman/Defaults.py:1306
 msgid "Ukrainian"
 msgstr ""
 
-#: Mailman/Defaults.py:1276
+#: Mailman/Defaults.py:1307
 msgid "Chinese (China)"
 msgstr ""
 
-#: Mailman/Defaults.py:1277
+#: Mailman/Defaults.py:1308
 msgid "Chinese (Taiwan)"
 msgstr ""
 
@@ -3289,7 +3298,7 @@ msgid ""
 "             Is Disabled</em> warnings.  This value must be an integer."
 msgstr ""
 
-#: Mailman/Gui/Bounce.py:117 Mailman/Gui/General.py:259
+#: Mailman/Gui/Bounce.py:117 Mailman/Gui/General.py:263
 msgid "Notifications"
 msgstr ""
 
@@ -3448,18 +3457,31 @@ msgstr ""
 
 #: Mailman/Gui/ContentFilter.py:104
 msgid ""
+"Remove message attachments that have a matching filename\n"
+"             extension."
+msgstr ""
+
+#: Mailman/Gui/ContentFilter.py:108
+msgid ""
+"Remove message attachments that don't have a matching\n"
+"             filename extension.  Leave this field blank to skip this filter\n"
+"             test."
+msgstr ""
+
+#: Mailman/Gui/ContentFilter.py:113
+msgid ""
 "Should Mailman convert <tt>text/html</tt> parts to plain\n"
 "             text?  This conversion happens after MIME attachments have been\n"
 "             stripped."
 msgstr ""
 
-#: Mailman/Gui/ContentFilter.py:110
+#: Mailman/Gui/ContentFilter.py:119
 msgid ""
 "Action to take when a message matches the content filtering\n"
 "             rules."
 msgstr ""
 
-#: Mailman/Gui/ContentFilter.py:113
+#: Mailman/Gui/ContentFilter.py:122
 msgid ""
 "One of these actions is take when the message matches one of\n"
 "             the content filtering rules, meaning, the top-level\n"
@@ -3486,7 +3508,7 @@ msgid ""
 "             administrator."
 msgstr ""
 
-#: Mailman/Gui/ContentFilter.py:154
+#: Mailman/Gui/ContentFilter.py:163
 msgid "Bad MIME type ignored: %(spectype)s"
 msgstr ""
 
@@ -3759,20 +3781,24 @@ msgid ""
 "             posted to the list, to distinguish mailing list messages in in\n"
 "             mailbox summaries.  Brevity is premium here, it's ok to shorten\n"
 "             long mailing list names to something more concise, as long as it\n"
-"             still identifies the mailing list."
+"             still identifies the mailing list.\n"
+"             You can also add a sequencial number by %%d substitution\n"
+"             directive. eg.; [listname %%d] -> [listname 123]\n"
+"                            (listname %%05d) -> (listname 00123)\n"
+"             "
 msgstr ""
 
-#: Mailman/Gui/General.py:151
+#: Mailman/Gui/General.py:155
 msgid ""
 "Hide the sender of a message, replacing it with the list\n"
 "             address (Removes From, Sender and Reply-To fields)"
 msgstr ""
 
-#: Mailman/Gui/General.py:154
+#: Mailman/Gui/General.py:158
 msgid "<tt>Reply-To:</tt> header munging"
 msgstr ""
 
-#: Mailman/Gui/General.py:157
+#: Mailman/Gui/General.py:161
 msgid ""
 "Should any existing <tt>Reply-To:</tt> header found in the\n"
 "             original message be stripped?  If so, this will be done\n"
@@ -3780,26 +3806,26 @@ msgid ""
 "             added by Mailman or not."
 msgstr ""
 
-#: Mailman/Gui/General.py:163
+#: Mailman/Gui/General.py:167
 msgid "Explicit address"
 msgstr ""
 
-#: Mailman/Gui/General.py:163
+#: Mailman/Gui/General.py:167
 msgid "Poster"
 msgstr ""
 
-#: Mailman/Gui/General.py:163
+#: Mailman/Gui/General.py:167
 msgid "This list"
 msgstr ""
 
-#: Mailman/Gui/General.py:164
+#: Mailman/Gui/General.py:168
 msgid ""
 "Where are replies to list messages directed?\n"
 "             <tt>Poster</tt> is <em>strongly</em> recommended for most mailing\n"
 "             lists."
 msgstr ""
 
-#: Mailman/Gui/General.py:169
+#: Mailman/Gui/General.py:173
 msgid ""
 "This option controls what Mailman does to the\n"
 "             <tt>Reply-To:</tt> header in messages flowing through this\n"
@@ -3833,11 +3859,11 @@ msgid ""
 "             list."
 msgstr ""
 
-#: Mailman/Gui/General.py:201
+#: Mailman/Gui/General.py:205
 msgid "Explicit <tt>Reply-To:</tt> header."
 msgstr ""
 
-#: Mailman/Gui/General.py:203
+#: Mailman/Gui/General.py:207
 msgid ""
 "This is the address set in the <tt>Reply-To:</tt> header\n"
 "             when the <a\n"
@@ -3869,17 +3895,17 @@ msgid ""
 "             <tt>Reply-To:</tt> header, it will not be changed."
 msgstr ""
 
-#: Mailman/Gui/General.py:232
+#: Mailman/Gui/General.py:236
 msgid "Umbrella list settings"
 msgstr ""
 
-#: Mailman/Gui/General.py:235
+#: Mailman/Gui/General.py:239
 msgid ""
 "Send password reminders to, eg, \"-owner\" address instead of\n"
 "             directly to user."
 msgstr ""
 
-#: Mailman/Gui/General.py:238
+#: Mailman/Gui/General.py:242
 msgid ""
 "Set this to yes when this list is intended to cascade only\n"
 "             to other mailing lists.  When set, meta notices like\n"
@@ -3889,14 +3915,14 @@ msgid ""
 "             account name."
 msgstr ""
 
-#: Mailman/Gui/General.py:246
+#: Mailman/Gui/General.py:250
 msgid ""
 "Suffix for use when this list is an umbrella for other\n"
 "             lists, according to setting of previous \"umbrella_list\"\n"
 "             setting."
 msgstr ""
 
-#: Mailman/Gui/General.py:250
+#: Mailman/Gui/General.py:254
 msgid ""
 "When \"umbrella_list\" is set to indicate that this list has\n"
 "             other mailing lists as members, then administrative notices like\n"
@@ -3908,24 +3934,24 @@ msgid ""
 "             is \"No\"."
 msgstr ""
 
-#: Mailman/Gui/General.py:262
+#: Mailman/Gui/General.py:266
 msgid "Send monthly password reminders?"
 msgstr ""
 
-#: Mailman/Gui/General.py:264
+#: Mailman/Gui/General.py:268
 msgid ""
 "Turn this on if you want password reminders to be sent once\n"
 "             per month to your members.  Note that members may disable their\n"
 "             own individual password reminders."
 msgstr ""
 
-#: Mailman/Gui/General.py:269
+#: Mailman/Gui/General.py:273
 msgid ""
 "List-specific text prepended to new-subscriber welcome\n"
 "             message"
 msgstr ""
 
-#: Mailman/Gui/General.py:272
+#: Mailman/Gui/General.py:276
 msgid ""
 "This value, if any, will be added to the front of the\n"
 "             new-subscriber welcome message.  The rest of the welcome message\n"
@@ -3944,11 +3970,11 @@ msgid ""
 "             </ul>"
 msgstr ""
 
-#: Mailman/Gui/General.py:289
+#: Mailman/Gui/General.py:293
 msgid "Send welcome message to newly subscribed members?"
 msgstr ""
 
-#: Mailman/Gui/General.py:290
+#: Mailman/Gui/General.py:294
 msgid ""
 "Turn this off only if you plan on subscribing people manually\n"
 "             and don't want them to know that you did so.  This option is most\n"
@@ -3956,23 +3982,23 @@ msgid ""
 "             list manager to Mailman."
 msgstr ""
 
-#: Mailman/Gui/General.py:296
+#: Mailman/Gui/General.py:300
 msgid ""
 "Text sent to people leaving the list.  If empty, no special\n"
 "             text will be added to the unsubscribe message."
 msgstr ""
 
-#: Mailman/Gui/General.py:300
+#: Mailman/Gui/General.py:304
 msgid "Send goodbye message to members when they are unsubscribed?"
 msgstr ""
 
-#: Mailman/Gui/General.py:303
+#: Mailman/Gui/General.py:307
 msgid ""
 "Should the list moderators get immediate notice of new\n"
 "             requests, as well as daily notices about collected ones?"
 msgstr ""
 
-#: Mailman/Gui/General.py:306
+#: Mailman/Gui/General.py:310
 msgid ""
 "List moderators (and list administrators) are sent daily\n"
 "             reminders of requests pending approval, like subscriptions to a\n"
@@ -3981,17 +4007,17 @@ msgid ""
 "             immediately on the arrival of new requests as well."
 msgstr ""
 
-#: Mailman/Gui/General.py:313
+#: Mailman/Gui/General.py:317
 msgid ""
 "Should administrator get notices of subscribes and\n"
 "             unsubscribes?"
 msgstr ""
 
-#: Mailman/Gui/General.py:318
+#: Mailman/Gui/General.py:322
 msgid "Send mail to poster when their posting is held for approval?"
 msgstr ""
 
-#: Mailman/Gui/General.py:320
+#: Mailman/Gui/General.py:324
 msgid ""
 "Approval notices are sent when mail triggers certain of the\n"
 "             limits <em>except</em> routine list moderation and spam filters,\n"
@@ -3999,15 +4025,15 @@ msgid ""
 "             ever sending the notice."
 msgstr ""
 
-#: Mailman/Gui/General.py:325
+#: Mailman/Gui/General.py:329
 msgid "Additional settings"
 msgstr ""
 
-#: Mailman/Gui/General.py:328
+#: Mailman/Gui/General.py:332
 msgid "Emergency moderation of all list traffic."
 msgstr ""
 
-#: Mailman/Gui/General.py:329
+#: Mailman/Gui/General.py:333
 msgid ""
 "When this option is enabled, all list traffic is emergency\n"
 "             moderated, i.e. held for moderation.  Turn this option on when\n"
@@ -4015,25 +4041,25 @@ msgid ""
 "             period."
 msgstr ""
 
-#: Mailman/Gui/General.py:341
+#: Mailman/Gui/General.py:345
 msgid ""
 "Default options for new members joining this list.<input\n"
 "             type=\"hidden\" name=\"new_member_options\" value=\"ignore\">"
 msgstr ""
 
-#: Mailman/Gui/General.py:344
+#: Mailman/Gui/General.py:348
 msgid ""
 "When a new member is subscribed to this list, their initial\n"
 "             set of options is taken from the this variable's setting."
 msgstr ""
 
-#: Mailman/Gui/General.py:348
+#: Mailman/Gui/General.py:352
 msgid ""
 "(Administrivia filter) Check postings and intercept ones\n"
 "             that seem to be administrative requests?"
 msgstr ""
 
-#: Mailman/Gui/General.py:351
+#: Mailman/Gui/General.py:355
 msgid ""
 "Administrivia tests will check postings to see whether it's\n"
 "             really meant as an administrative request (like subscribe,\n"
@@ -4042,17 +4068,17 @@ msgid ""
 "             in the process."
 msgstr ""
 
-#: Mailman/Gui/General.py:358
+#: Mailman/Gui/General.py:362
 msgid ""
 "Maximum length in kilobytes (KB) of a message body.  Use 0\n"
 "             for no limit."
 msgstr ""
 
-#: Mailman/Gui/General.py:362
+#: Mailman/Gui/General.py:366
 msgid "Host name this list prefers for email."
 msgstr ""
 
-#: Mailman/Gui/General.py:364
+#: Mailman/Gui/General.py:368
 msgid ""
 "The \"host_name\" is the preferred name for email to\n"
 "             mailman-related addresses on this host, and generally should be\n"
@@ -4061,7 +4087,7 @@ msgid ""
 "             multiple addresses."
 msgstr ""
 
-#: Mailman/Gui/General.py:376
+#: Mailman/Gui/General.py:380
 msgid ""
 "Should messages from this mailing list include the\n"
 "                 <a href=\"http://www.faqs.org/rfcs/rfc2369.html\">RFC 2369</a>\n"
@@ -4069,7 +4095,7 @@ msgid ""
 "                 recommended."
 msgstr ""
 
-#: Mailman/Gui/General.py:381
+#: Mailman/Gui/General.py:385
 msgid ""
 "RFC 2369 defines a set of List-* headers that are\n"
 "                 normally added to every message sent to the list membership.\n"
@@ -4086,11 +4112,11 @@ msgid ""
 "                 these headers may eventually go away)."
 msgstr ""
 
-#: Mailman/Gui/General.py:399
+#: Mailman/Gui/General.py:403
 msgid "Should postings include the <tt>List-Post:</tt> header?"
 msgstr ""
 
-#: Mailman/Gui/General.py:400
+#: Mailman/Gui/General.py:404
 msgid ""
 "The <tt>List-Post:</tt> header is one of the headers\n"
 "             recommended by\n"
@@ -4104,14 +4130,20 @@ msgid ""
 "             headers.)"
 msgstr ""
 
-#: Mailman/Gui/General.py:418
+#: Mailman/Gui/General.py:419
+msgid ""
+"Discard held messages older than this number of days.\n"
+"            Use 0 for no automatic discarding."
+msgstr ""
+
+#: Mailman/Gui/General.py:429
 msgid ""
 "<b>real_name</b> attribute not\n"
 "            changed!  It must differ from the list's name by case\n"
 "            only."
 msgstr ""
 
-#: Mailman/Gui/General.py:448
+#: Mailman/Gui/General.py:459
 msgid ""
 "You cannot add a Reply-To: to an explicit\n"
 "            address if that address is blank.  Resetting these values."
@@ -4318,6 +4350,18 @@ msgid ""
 "             message. "
 msgstr ""
 
+#: Mailman/Gui/NonDigest.py:140
+msgid "Scrub attachments of regular delivery message?"
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:141
+msgid ""
+"When you scrub attachments, they are stored in archive\n"
+"             area and links are made in the message so that the member can\n"
+"             access via web browser. If you want the attachments totally\n"
+"             disappear, you can use content filter options."
+msgstr ""
+
 #: Mailman/Gui/Passwords.py:27
 msgid "Passwords"
 msgstr ""
@@ -4785,18 +4829,24 @@ msgid ""
 "\n"
 "             You can have more than one filter rule for your list.  In that\n"
 "             case, each rule is matched in turn, with processing stopped after\n"
-"             the first match."
+"             the first match.\n"
+"\n"
+"             Note that headers are collected from all the attachments \n"
+"             (except for the mailman administrivia message) and\n"
+"             matched against the regular expressions. With this feature,\n"
+"             you can effectively sort out messages with dangerous file\n"
+"             types or file name extensions."
 msgstr ""
 
-#: Mailman/Gui/Privacy.py:389
+#: Mailman/Gui/Privacy.py:395
 msgid "Legacy anti-spam filters"
 msgstr ""
 
-#: Mailman/Gui/Privacy.py:392
+#: Mailman/Gui/Privacy.py:398
 msgid "Hold posts with header value matching a specified regexp."
 msgstr ""
 
-#: Mailman/Gui/Privacy.py:393
+#: Mailman/Gui/Privacy.py:399
 msgid ""
 "Use this option to prohibit posts according to specific\n"
 "             header values.  The target value is a regular-expression for\n"
@@ -4813,13 +4863,13 @@ msgid ""
 "             bracketing it."
 msgstr ""
 
-#: Mailman/Gui/Privacy.py:465
+#: Mailman/Gui/Privacy.py:472
 msgid ""
 "Header filter rules require a pattern.\n"
 "                Incomplete filter rules will be ignored."
 msgstr ""
 
-#: Mailman/Gui/Privacy.py:473
+#: Mailman/Gui/Privacy.py:480
 msgid ""
 "The header filter rule pattern\n"
 "                '%(safepattern)s' is not a legal regular expression.  This\n"
@@ -5392,19 +5442,27 @@ msgid ""
 "also appear in the first line of the body of the reply."
 msgstr ""
 
-#: Mailman/Handlers/MimeDel.py:56
+#: Mailman/Handlers/MimeDel.py:58
 msgid "The message's content type was explicitly disallowed"
 msgstr ""
 
-#: Mailman/Handlers/MimeDel.py:61
+#: Mailman/Handlers/MimeDel.py:63
 msgid "The message's content type was not explicitly allowed"
 msgstr ""
 
-#: Mailman/Handlers/MimeDel.py:73
+#: Mailman/Handlers/MimeDel.py:71
+msgid "The message's file extension was explicitly disallowed"
+msgstr ""
+
+#: Mailman/Handlers/MimeDel.py:74
+msgid "The message's file extension was not explicitly allowed"
+msgstr ""
+
+#: Mailman/Handlers/MimeDel.py:86
 msgid "After content filtering, the message was empty"
 msgstr ""
 
-#: Mailman/Handlers/MimeDel.py:208
+#: Mailman/Handlers/MimeDel.py:229
 msgid ""
 "The attached message matched the %(listname)s mailing list's content filtering\n"
 "rules and was prevented from being forwarded on to the list membership.  You\n"
@@ -5412,7 +5470,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Mailman/Handlers/MimeDel.py:214
+#: Mailman/Handlers/MimeDel.py:235
 msgid "Content filtered message notification"
 msgstr ""
 
@@ -5439,29 +5497,36 @@ msgstr ""
 msgid "The Mailman Replybot"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:188
+#: Mailman/Handlers/Scrubber.py:203
+msgid ""
+"An embedded and charset-unspecified text was scrubbed...\n"
+"Name: %(filename)s\n"
+"Url: %(url)s\n"
+msgstr ""
+
+#: Mailman/Handlers/Scrubber.py:214
 msgid "HTML attachment scrubbed and removed"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:205 Mailman/Handlers/Scrubber.py:231
+#: Mailman/Handlers/Scrubber.py:232 Mailman/Handlers/Scrubber.py:258
 msgid ""
 "An HTML attachment was scrubbed...\n"
 "URL: %(url)s\n"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:243
+#: Mailman/Handlers/Scrubber.py:270
 msgid "no subject"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:244
+#: Mailman/Handlers/Scrubber.py:271
 msgid "no date"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:245
+#: Mailman/Handlers/Scrubber.py:272
 msgid "unknown sender"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:248
+#: Mailman/Handlers/Scrubber.py:275
 msgid ""
 "An embedded message was scrubbed...\n"
 "From: %(who)s\n"
@@ -5471,7 +5536,7 @@ msgid ""
 "Url: %(url)s\n"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:272
+#: Mailman/Handlers/Scrubber.py:300
 msgid ""
 "A non-text attachment was scrubbed...\n"
 "Name: %(filename)s\n"
@@ -5481,11 +5546,12 @@ msgid ""
 "Url : %(url)s\n"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:301
-msgid "Skipped content of type %(partctype)s"
+#: Mailman/Handlers/Scrubber.py:331
+msgid ""
+"Skipped content of type %(partctype)s\n"
 msgstr ""
 
-#: Mailman/Handlers/Scrubber.py:327
+#: Mailman/Handlers/Scrubber.py:366
 msgid ""
 "-------------- next part --------------\n"
 msgstr ""
@@ -5494,7 +5560,7 @@ msgstr ""
 msgid "The message headers matched a filter rule"
 msgstr ""
 
-#: Mailman/Handlers/SpamDetect.py:121
+#: Mailman/Handlers/SpamDetect.py:131
 msgid "Message rejected by filter rule match"
 msgstr ""
 
@@ -5535,35 +5601,35 @@ msgstr ""
 msgid "End of "
 msgstr ""
 
-#: Mailman/ListAdmin.py:287
+#: Mailman/ListAdmin.py:295
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr ""
 
-#: Mailman/ListAdmin.py:326
+#: Mailman/ListAdmin.py:334
 msgid "Forward of moderated message"
 msgstr ""
 
-#: Mailman/ListAdmin.py:382
+#: Mailman/ListAdmin.py:390
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:405
+#: Mailman/ListAdmin.py:413
 msgid "Subscription request"
 msgstr ""
 
-#: Mailman/ListAdmin.py:434
+#: Mailman/ListAdmin.py:442
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:457
+#: Mailman/ListAdmin.py:465
 msgid "Unsubscription request"
 msgstr ""
 
-#: Mailman/ListAdmin.py:488
+#: Mailman/ListAdmin.py:496
 msgid "Original Message"
 msgstr ""
 
-#: Mailman/ListAdmin.py:491
+#: Mailman/ListAdmin.py:499
 msgid "Request to mailing list %(realname)s rejected"
 msgstr ""
 
@@ -5624,11 +5690,11 @@ msgstr ""
 msgid "%(file)s permissions must be 066x (got %(octmode)s)"
 msgstr ""
 
-#: Mailman/MTA/Postfix.py:318 Mailman/MTA/Postfix.py:345 bin/check_perms:112
-#: bin/check_perms:134 bin/check_perms:144 bin/check_perms:155
-#: bin/check_perms:180 bin/check_perms:197 bin/check_perms:216
-#: bin/check_perms:239 bin/check_perms:258 bin/check_perms:272
-#: bin/check_perms:292 bin/check_perms:329
+#: Mailman/MTA/Postfix.py:318 Mailman/MTA/Postfix.py:345 bin/check_perms:123
+#: bin/check_perms:145 bin/check_perms:155 bin/check_perms:166
+#: bin/check_perms:191 bin/check_perms:208 bin/check_perms:227
+#: bin/check_perms:250 bin/check_perms:269 bin/check_perms:283
+#: bin/check_perms:303 bin/check_perms:340
 msgid "(fixing)"
 msgstr ""
 
@@ -5640,35 +5706,35 @@ msgstr ""
 msgid "%(dbfile)s owned by %(owner)s (must be owned by %(user)s"
 msgstr ""
 
-#: Mailman/MailList.py:756
+#: Mailman/MailList.py:763
 msgid "You have been invited to join the %(listname)s mailing list"
 msgstr ""
 
-#: Mailman/MailList.py:860 Mailman/MailList.py:1249
+#: Mailman/MailList.py:867 Mailman/MailList.py:1256
 msgid " from %(remote)s"
 msgstr ""
 
-#: Mailman/MailList.py:894
+#: Mailman/MailList.py:901
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 
-#: Mailman/MailList.py:958 bin/add_members:242
+#: Mailman/MailList.py:965 bin/add_members:242
 msgid "%(realname)s subscription notification"
 msgstr ""
 
-#: Mailman/MailList.py:977
+#: Mailman/MailList.py:984
 msgid "unsubscriptions require moderator approval"
 msgstr ""
 
-#: Mailman/MailList.py:997
+#: Mailman/MailList.py:1004
 msgid "%(realname)s unsubscribe notification"
 msgstr ""
 
-#: Mailman/MailList.py:1158
+#: Mailman/MailList.py:1165
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1418
+#: Mailman/MailList.py:1430
 msgid "Last autoresponse notification for today"
 msgstr ""
 
@@ -5688,46 +5754,46 @@ msgstr ""
 msgid "Uncaught bounce notification"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:90
+#: Mailman/Queue/CommandRunner.py:92
 msgid "Ignoring non-text/plain MIME parts"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:146
+#: Mailman/Queue/CommandRunner.py:148
 msgid ""
 "The results of your email command are provided below.\n"
 "Attached is your original message.\n"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:151
+#: Mailman/Queue/CommandRunner.py:153
 msgid "- Results:"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:157
+#: Mailman/Queue/CommandRunner.py:159
 msgid ""
 "\n"
 "- Unprocessed:"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:161
+#: Mailman/Queue/CommandRunner.py:163
 msgid ""
 "No commands were found in this message.\n"
 "To obtain instructions, send a message containing just the word \"help\".\n"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:166
+#: Mailman/Queue/CommandRunner.py:168
 msgid ""
 "\n"
 "- Ignored:"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:168
+#: Mailman/Queue/CommandRunner.py:170
 msgid ""
 "\n"
 "- Done.\n"
 "\n"
 msgstr ""
 
-#: Mailman/Queue/CommandRunner.py:192
+#: Mailman/Queue/CommandRunner.py:194
 msgid "The results of your email commands"
 msgstr ""
 
@@ -5906,7 +5972,7 @@ msgid "No such list: %(listname)s"
 msgstr ""
 
 #: bin/add_members:230 bin/change_pw:158 bin/check_db:114 bin/discard:83
-#: bin/sync_members:244 bin/update:552 cron/bumpdigests:78
+#: bin/sync_members:244 bin/update:555 cron/bumpdigests:78
 msgid "Nothing to do."
 msgstr ""
 
@@ -6127,106 +6193,105 @@ msgid ""
 "With no arguments, just check and report all the files that have bogus\n"
 "permissions or group ownership.  With -f (and run as root), fix all the\n"
 "permission problems found.  With -v be verbose.\n"
-"\n"
 msgstr ""
 
-#: bin/check_perms:97
+#: bin/check_perms:108
 msgid "    checking gid and mode for %(path)s"
 msgstr ""
 
-#: bin/check_perms:109
+#: bin/check_perms:120
 msgid "%(path)s bad group (has: %(groupname)s, expected %(MAILMAN_GROUP)s)"
 msgstr ""
 
-#: bin/check_perms:132
+#: bin/check_perms:143
 msgid "directory permissions must be %(octperms)s: %(path)s"
 msgstr ""
 
-#: bin/check_perms:141
+#: bin/check_perms:152
 msgid "source perms must be %(octperms)s: %(path)s"
 msgstr ""
 
-#: bin/check_perms:152
+#: bin/check_perms:163
 msgid "article db files must be %(octperms)s: %(path)s"
 msgstr ""
 
-#: bin/check_perms:164
+#: bin/check_perms:175
 msgid "checking mode for %(prefix)s"
 msgstr ""
 
-#: bin/check_perms:174
+#: bin/check_perms:185
 msgid "WARNING: directory does not exist: %(d)s"
 msgstr ""
 
-#: bin/check_perms:178
+#: bin/check_perms:189
 msgid "directory must be at least 02775: %(d)s"
 msgstr ""
 
-#: bin/check_perms:190
+#: bin/check_perms:201
 msgid "checking perms on %(private)s"
 msgstr ""
 
-#: bin/check_perms:195
+#: bin/check_perms:206
 msgid "%(private)s must not be other-readable"
 msgstr ""
 
-#: bin/check_perms:214
+#: bin/check_perms:225
 msgid "mbox file must be at least 0660:"
 msgstr ""
 
-#: bin/check_perms:237
+#: bin/check_perms:248
 msgid "%(dbdir)s \"other\" perms must be 000"
 msgstr ""
 
-#: bin/check_perms:247
+#: bin/check_perms:258
 msgid "checking cgi-bin permissions"
 msgstr ""
 
-#: bin/check_perms:252
+#: bin/check_perms:263
 msgid "    checking set-gid for %(path)s"
 msgstr ""
 
-#: bin/check_perms:256
+#: bin/check_perms:267
 msgid "%(path)s must be set-gid"
 msgstr ""
 
-#: bin/check_perms:266
+#: bin/check_perms:277
 msgid "checking set-gid for %(wrapper)s"
 msgstr ""
 
-#: bin/check_perms:270
+#: bin/check_perms:281
 msgid "%(wrapper)s must be set-gid"
 msgstr ""
 
-#: bin/check_perms:280
+#: bin/check_perms:291
 msgid "checking permissions on %(pwfile)s"
 msgstr ""
 
-#: bin/check_perms:289
+#: bin/check_perms:300
 msgid "%(pwfile)s permissions must be exactly 0640 (got %(octmode)s)"
 msgstr ""
 
-#: bin/check_perms:313
+#: bin/check_perms:324
 msgid "checking permissions on list data"
 msgstr ""
 
-#: bin/check_perms:319
+#: bin/check_perms:330
 msgid "    checking permissions on: %(path)s"
 msgstr ""
 
-#: bin/check_perms:327
+#: bin/check_perms:338
 msgid "file permissions must be at least 660: %(path)s"
 msgstr ""
 
-#: bin/check_perms:372
+#: bin/check_perms:383
 msgid "No problems found"
 msgstr ""
 
-#: bin/check_perms:374
+#: bin/check_perms:385
 msgid "Problems found:"
 msgstr ""
 
-#: bin/check_perms:375
+#: bin/check_perms:386
 msgid "Re-run as %(MAILMAN_USER)s (or root) with -f flag to fix"
 msgstr ""
 
@@ -7282,39 +7347,6 @@ msgid ""
 "This script is provided for convenience purposes only.  It isn't supported.\n"
 msgstr ""
 
-#: bin/rb-archfix.~1~:21
-#, docstring
-msgid ""
-"Reduce disk space usage for Pipermail archives.\n"
-"\n"
-"Only use this script if you have correctly installed the patch file\n"
-"fixarchiver-2.1.3-0.1.patch that this file came with. Using this if you have\n"
-"not installed the rest of the patch (including restarting mailmanctl) will ruin\n"
-"your whole day.\n"
-"\n"
-"Usage: %(PROGRAM)s [options] file ...\n"
-"\n"
-"Where options are:\n"
-"    -h / --help\n"
-"        Print this help message and exit.\n"
-"\n"
-"Only use this to 'fix' archive -article database files that have been written\n"
-"with Mailman 2.1.3 or earlier and have html_body attributes in them . These\n"
-"attributes can cause huge amounts of memory bloat and impact performance for\n"
-"high activity lists, particularly those having large text postings made to\n"
-"them. Use like this from your $PREFIX directory:\n"
-"\n"
-"\n"
-"%% ls -1 archives/private/*/database/*-article | xargs %(PROGRAM)s\n"
-"\n"
-"(note the backquotes are required)\n"
-"\n"
-"You will need to run `bin/check_perms -f' after running this script.\n"
-"\n"
-"You will probably want to delete the -article.bak files created by this script\n"
-"when you are satisifed the upad\n"
-msgstr ""
-
 #: bin/remove_members:19
 #, docstring
 msgid ""
@@ -7681,7 +7713,7 @@ msgstr ""
 msgid "Fixing language templates: %(listname)s"
 msgstr ""
 
-#: bin/update:196 bin/update:686
+#: bin/update:196 bin/update:689
 msgid "WARNING: could not acquire lock for list: %(listname)s"
 msgstr ""
 
@@ -7792,61 +7824,61 @@ msgstr ""
 msgid "updating old qfiles"
 msgstr ""
 
-#: bin/update:509
+#: bin/update:512
 msgid "message is unparsable: %(filebase)s"
 msgstr ""
 
-#: bin/update:538
+#: bin/update:541
 msgid "Updating Mailman 2.0 pending_subscriptions.db database"
 msgstr ""
 
-#: bin/update:549
+#: bin/update:552
 msgid "Updating Mailman 2.1.4 pending.pck database"
 msgstr ""
 
-#: bin/update:573
+#: bin/update:576
 msgid "Ignoring bad pended data: %(key)s: %(val)s"
 msgstr ""
 
-#: bin/update:589
+#: bin/update:592
 msgid "WARNING: Ignoring duplicate pending ID: %(id)s."
 msgstr ""
 
-#: bin/update:642
+#: bin/update:645
 msgid "getting rid of old source files"
 msgstr ""
 
-#: bin/update:652
+#: bin/update:655
 msgid "no lists == nothing to do, exiting"
 msgstr ""
 
-#: bin/update:659
+#: bin/update:662
 msgid ""
 "fixing all the perms on your old html archives to work with b6\n"
 "If your archives are big, this could take a minute or two..."
 msgstr ""
 
-#: bin/update:664
+#: bin/update:667
 msgid "done"
 msgstr ""
 
-#: bin/update:666
+#: bin/update:669
 msgid "Updating mailing list: %(listname)s"
 msgstr ""
 
-#: bin/update:669
+#: bin/update:672
 msgid "Updating Usenet watermarks"
 msgstr ""
 
-#: bin/update:674
+#: bin/update:677
 msgid "- nothing to update here"
 msgstr ""
 
-#: bin/update:697
+#: bin/update:700
 msgid "- usenet watermarks updated and gate_watermarks removed"
 msgstr ""
 
-#: bin/update:711
+#: bin/update:714
 msgid ""
 "\n"
 "\n"
@@ -7867,22 +7899,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bin/update:768
+#: bin/update:771
 msgid "No updates are necessary."
 msgstr ""
 
-#: bin/update:771
+#: bin/update:774
 msgid ""
 "Downgrade detected, from version %(hexlversion)s to version %(hextversion)s\n"
 "This is probably not safe.\n"
 "Exiting."
 msgstr ""
 
-#: bin/update:776
+#: bin/update:779
 msgid "Upgrading from version %(hexlversion)s to %(hextversion)s"
 msgstr ""
 
-#: bin/update:785
+#: bin/update:788
 msgid ""
 "\n"
 "ERROR:\n"
@@ -8093,21 +8125,31 @@ msgid ""
 "        Print this message and exit.\n"
 msgstr ""
 
-#: cron/checkdbs:110
+#: cron/checkdbs:107
+msgid ""
+"Notice: %(discarded)d old request(s) automatically expired.\n"
+"\n"
+msgstr ""
+
+#: cron/checkdbs:120
 msgid "%(count)d %(realname)s moderator request(s) waiting"
 msgstr ""
 
-#: cron/checkdbs:130
+#: cron/checkdbs:123
+msgid "%(realname)s moderator request check result"
+msgstr ""
+
+#: cron/checkdbs:143
 msgid "Pending subscriptions:"
 msgstr ""
 
-#: cron/checkdbs:141
+#: cron/checkdbs:154
 msgid ""
 "\n"
 "Pending posts:"
 msgstr ""
 
-#: cron/checkdbs:148
+#: cron/checkdbs:161
 msgid ""
 "From: %(sender)s on %(date)s\n"
 "Subject: %(subject)s\n"
diff --git a/messages/marked.files b/messages/marked.files
index fa5164aa..92d7c30e 100644
--- a/messages/marked.files
+++ b/messages/marked.files
@@ -20,7 +20,7 @@ Mailman/OldStyleMemberships.py
 Mailman/Pending.py
 Mailman/Post.py
 Mailman/SafeDict.py
-Mailman/Defaults.py
+Mailman/SecurityManager.py
 Mailman/Site.py
 Mailman/TopicMgr.py
 Mailman/UserDesc.py
@@ -78,12 +78,14 @@ Mailman/Gui/Privacy.py
 Mailman/Gui/Topics.py
 Mailman/Gui/Usenet.py
 Mailman/Gui/__init__.py
+Mailman/Handlers/Scrubber.py
 Mailman/Handlers/Acknowledge.py
 Mailman/Handlers/AfterDelivery.py
 Mailman/Handlers/Approve.py
 Mailman/Handlers/AvoidDuplicates.py
 Mailman/Handlers/CalcRecips.py
 Mailman/Handlers/Cleanse.py
+Mailman/Handlers/CookHeaders.py
 Mailman/Handlers/Decorate.py
 Mailman/Handlers/Emergency.py
 Mailman/Handlers/FileRecips.py
@@ -93,7 +95,6 @@ Mailman/Handlers/Moderate.py
 Mailman/Handlers/OwnerRecips.py
 Mailman/Handlers/Replybot.py
 Mailman/Handlers/SMTPDirect.py
-Mailman/Handlers/Scrubber.py
 Mailman/Handlers/Sendmail.py
 Mailman/Handlers/SpamDetect.py
 Mailman/Handlers/Tagger.py
@@ -102,7 +103,6 @@ Mailman/Handlers/ToDigest.py
 Mailman/Handlers/ToOutgoing.py
 Mailman/Handlers/ToUsenet.py
 Mailman/Handlers/__init__.py
-Mailman/Handlers/CookHeaders.py
 Mailman/Logging/Logger.py
 Mailman/Logging/MultiLogger.py
 Mailman/Logging/StampedLogger.py
@@ -120,10 +120,10 @@ Mailman/Queue/IncomingRunner.py
 Mailman/Queue/MaildirRunner.py
 Mailman/Queue/NewsRunner.py
 Mailman/Queue/OutgoingRunner.py
+Mailman/Queue/RetryRunner.py
 Mailman/Queue/Runner.py
 Mailman/Queue/Switchboard.py
 Mailman/Queue/VirginRunner.py
 Mailman/Queue/__init__.py
 Mailman/Queue/sbcache.py
-Mailman/Queue/RetryRunner.py
-Mailman/SecurityManager.py
+Mailman/Defaults.py