Update japanese catalog.

1 files changed, 207 insertions, 178 deletions

diff --git a/messages/ja/LC_MESSAGES/mailman.po b/messages/ja/LC_MESSAGES/mailman.po
index dd9a2a0a..ac662e6b 100644
--- a/messages/ja/LC_MESSAGES/mailman.po
+++ b/messages/ja/LC_MESSAGES/mailman.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1.6\n"
-"POT-Creation-Date: Wed Mar 23 09:55:34 2005\n"
+"POT-Creation-Date: Wed Jul 13 16:36:52 2005\n"
 "PO-Revision-Date: 2005-03-23 11:30+09:00\n"
 "Last-Translator: Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp>\n"
 "Language-Team: Japanese <mmjp-users@mm.tkikuchi.net>\n"
@@ -23,141 +23,141 @@ msgstr "サイズ情報なし"
 msgid " %(size)i bytes "
 msgstr " %(size)i バイト "
 
-#: Mailman/Archiver/HyperArch.py:281 Mailman/Archiver/HyperArch.py:454
-#: Mailman/Archiver/HyperArch.py:562 Mailman/Archiver/HyperArch.py:1031
-#: Mailman/Archiver/HyperArch.py:1160
+#: Mailman/Archiver/HyperArch.py:281 Mailman/Archiver/HyperArch.py:452
+#: Mailman/Archiver/HyperArch.py:560 Mailman/Archiver/HyperArch.py:1029
+#: Mailman/Archiver/HyperArch.py:1158
 msgid " at "
 msgstr " ＠ "
 
-#: Mailman/Archiver/HyperArch.py:483
+#: Mailman/Archiver/HyperArch.py:481
 msgid "Previous message:"
 msgstr "前の記事"
 
-#: Mailman/Archiver/HyperArch.py:505
+#: Mailman/Archiver/HyperArch.py:503
 msgid "Next message:"
 msgstr "次の記事"
 
-#: Mailman/Archiver/HyperArch.py:672 Mailman/Archiver/HyperArch.py:708
+#: Mailman/Archiver/HyperArch.py:670 Mailman/Archiver/HyperArch.py:706
 msgid "thread"
 msgstr "スレッド"
 
-#: Mailman/Archiver/HyperArch.py:673 Mailman/Archiver/HyperArch.py:709
+#: Mailman/Archiver/HyperArch.py:671 Mailman/Archiver/HyperArch.py:707
 msgid "subject"
 msgstr "件名"
 
-#: Mailman/Archiver/HyperArch.py:674 Mailman/Archiver/HyperArch.py:710
+#: Mailman/Archiver/HyperArch.py:672 Mailman/Archiver/HyperArch.py:708
 msgid "author"
 msgstr "発信者"
 
-#: Mailman/Archiver/HyperArch.py:675 Mailman/Archiver/HyperArch.py:711
+#: Mailman/Archiver/HyperArch.py:673 Mailman/Archiver/HyperArch.py:709
 msgid "date"
 msgstr "日付"
 
-#: Mailman/Archiver/HyperArch.py:747
+#: Mailman/Archiver/HyperArch.py:745
 msgid "<P>Currently, there are no archives. </P>"
 msgstr "<p>現在, 保存書庫はありません."
 
-#: Mailman/Archiver/HyperArch.py:785
+#: Mailman/Archiver/HyperArch.py:783
 msgid "Gzip'd Text%(sz)s"
 msgstr "Gzip圧縮テキスト %(sz)s"
 
-#: Mailman/Archiver/HyperArch.py:790
+#: Mailman/Archiver/HyperArch.py:788
 msgid "Text%(sz)s"
 msgstr "テキスト %(sz)s"
 
-#: Mailman/Archiver/HyperArch.py:880
+#: Mailman/Archiver/HyperArch.py:878
 msgid "figuring article archives\n"
 msgstr "保存書庫作成準備中\n"
 
-#: Mailman/Archiver/HyperArch.py:890
+#: Mailman/Archiver/HyperArch.py:888
 msgid "April"
 msgstr "4月"
 
-#: Mailman/Archiver/HyperArch.py:890
+#: Mailman/Archiver/HyperArch.py:888
 msgid "February"
 msgstr "2月"
 
-#: Mailman/Archiver/HyperArch.py:890
+#: Mailman/Archiver/HyperArch.py:888
 msgid "January"
 msgstr "1月"
 
-#: Mailman/Archiver/HyperArch.py:890
+#: Mailman/Archiver/HyperArch.py:888
 msgid "March"
 msgstr "3月"
 
-#: Mailman/Archiver/HyperArch.py:891
+#: Mailman/Archiver/HyperArch.py:889
 msgid "August"
 msgstr "8月"
 
-#: Mailman/Archiver/HyperArch.py:891
+#: Mailman/Archiver/HyperArch.py:889
 msgid "July"
 msgstr "7月"
 
-#: Mailman/Archiver/HyperArch.py:891
+#: Mailman/Archiver/HyperArch.py:889
 msgid "June"
 msgstr "6月"
 
-#: Mailman/Archiver/HyperArch.py:891 Mailman/i18n.py:102
+#: Mailman/Archiver/HyperArch.py:889 Mailman/i18n.py:102
 msgid "May"
 msgstr "5月"
 
-#: Mailman/Archiver/HyperArch.py:892
+#: Mailman/Archiver/HyperArch.py:890
 msgid "December"
 msgstr "12月"
 
-#: Mailman/Archiver/HyperArch.py:892
+#: Mailman/Archiver/HyperArch.py:890
 msgid "November"
 msgstr "11月"
 
-#: Mailman/Archiver/HyperArch.py:892
+#: Mailman/Archiver/HyperArch.py:890
 msgid "October"
 msgstr "10月"
 
-#: Mailman/Archiver/HyperArch.py:892
+#: Mailman/Archiver/HyperArch.py:890
 msgid "September"
 msgstr "9月"
 
-#: Mailman/Archiver/HyperArch.py:900
+#: Mailman/Archiver/HyperArch.py:898
 msgid "First"
 msgstr "第1"
 
-#: Mailman/Archiver/HyperArch.py:900
+#: Mailman/Archiver/HyperArch.py:898
 msgid "Fourth"
 msgstr "第4"
 
-#: Mailman/Archiver/HyperArch.py:900
+#: Mailman/Archiver/HyperArch.py:898
 msgid "Second"
 msgstr "第2"
 
-#: Mailman/Archiver/HyperArch.py:900
+#: Mailman/Archiver/HyperArch.py:898
 msgid "Third"
 msgstr "第3"
 
-#: Mailman/Archiver/HyperArch.py:902
+#: Mailman/Archiver/HyperArch.py:900
 msgid "%(ord)s quarter %(year)i"
 msgstr "%(year)i年%(ord)s四半期"
 
-#: Mailman/Archiver/HyperArch.py:909
+#: Mailman/Archiver/HyperArch.py:907
 msgid "%(month)s %(year)i"
 msgstr "%(year)i年%(month)s"
 
-#: Mailman/Archiver/HyperArch.py:914
+#: Mailman/Archiver/HyperArch.py:912
 msgid "The Week Of Monday %(day)i %(month)s %(year)i"
 msgstr "%(year)i年%(month)s%(day)i日(月曜日)の週"
 
-#: Mailman/Archiver/HyperArch.py:918
+#: Mailman/Archiver/HyperArch.py:916
 msgid "%(day)i %(month)s %(year)i"
 msgstr "%(year)i年%(month)s%(day)i日"
 
-#: Mailman/Archiver/HyperArch.py:1018
+#: Mailman/Archiver/HyperArch.py:1016
 msgid "Computing threaded index\n"
 msgstr "スレッド化索引を作成中\n"
 
-#: Mailman/Archiver/HyperArch.py:1283
+#: Mailman/Archiver/HyperArch.py:1281
 msgid "Updating HTML for article %(seq)s"
 msgstr "記事 %(seq)s 番のHTMLを更新中"
 
-#: Mailman/Archiver/HyperArch.py:1290
+#: Mailman/Archiver/HyperArch.py:1288
 msgid "article file %(filename)s is missing!"
 msgstr "記事ファイル %(filename)s がありません."
 
@@ -219,8 +219,8 @@ msgid " The last bounce received from you was dated %(date)s"
 msgstr "最後にエラーメールを受信した日付は %(date)s です"
 
 #: Mailman/Bouncer.py:279 Mailman/Deliverer.py:144
-#: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:284
-#: Mailman/Handlers/Hold.py:205 Mailman/Handlers/ToDigest.py:226
+#: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:280
+#: Mailman/Handlers/Hold.py:205 Mailman/Handlers/ToDigest.py:237
 #: Mailman/ListAdmin.py:223
 msgid "(no subject)"
 msgstr "(無題)"
@@ -820,34 +820,8 @@ msgstr "新入会員に歓迎メールを出しますか?"
 #: Mailman/Gui/Autoresponse.py:54 Mailman/Gui/Autoresponse.py:62
 #: 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: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: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: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/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:324
-#: Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93
-#: Mailman/Gui/Usenet.py:105
-msgid "No"
-msgstr "いいえ"
-
-#: Mailman/Cgi/admin.py:1144 Mailman/Cgi/admin.py:1153
-#: Mailman/Cgi/admin.py:1186 Mailman/Cgi/admin.py:1194
-#: Mailman/Cgi/confirm.py:289 Mailman/Cgi/create.py:339
-#: Mailman/Cgi/create.py:369 Mailman/Cgi/create.py:407
-#: Mailman/Cgi/rmlist.py:228 Mailman/Gui/Archive.py:33
-#: 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:112
+#: Mailman/Gui/Bounce.py:155 Mailman/Gui/ContentFilter.py:74
+#: Mailman/Gui/ContentFilter.py:116 Mailman/Gui/ContentFilter.py:120
 #: Mailman/Gui/Digest.py:46 Mailman/Gui/Digest.py:62 Mailman/Gui/Digest.py:84
 #: Mailman/Gui/Digest.py:89 Mailman/Gui/General.py:154
 #: Mailman/Gui/General.py:160 Mailman/Gui/General.py:238
@@ -862,6 +836,33 @@ msgstr "いいえ"
 #: Mailman/Gui/Privacy.py:197 Mailman/Gui/Privacy.py:305
 #: Mailman/Gui/Privacy.py:324 Mailman/Gui/Usenet.py:52
 #: Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93 Mailman/Gui/Usenet.py:105
+msgid "No"
+msgstr "いいえ"
+
+#: Mailman/Cgi/admin.py:1144 Mailman/Cgi/admin.py:1153
+#: Mailman/Cgi/admin.py:1186 Mailman/Cgi/admin.py:1194
+#: Mailman/Cgi/confirm.py:289 Mailman/Cgi/create.py:339
+#: Mailman/Cgi/create.py:369 Mailman/Cgi/create.py:407
+#: Mailman/Cgi/rmlist.py:228 Mailman/Gui/Archive.py:33
+#: 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:74 Mailman/Gui/ContentFilter.py:116
+#: Mailman/Gui/ContentFilter.py:120 Mailman/Gui/Digest.py:46
+#: Mailman/Gui/Digest.py:62 Mailman/Gui/Digest.py:84 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: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/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:324
+#: Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93
+#: Mailman/Gui/Usenet.py:105
 msgid "Yes"
 msgstr "はい"
 
@@ -1184,7 +1185,7 @@ msgid "Size:"
 msgstr "サイズ:"
 
 #: Mailman/Cgi/admindb.py:498 Mailman/Handlers/Scrubber.py:198
-#: Mailman/Handlers/Scrubber.py:295 Mailman/Handlers/Scrubber.py:296
+#: Mailman/Handlers/Scrubber.py:302 Mailman/Handlers/Scrubber.py:303
 msgid "not available"
 msgstr "無し"
 
@@ -2067,7 +2068,7 @@ msgstr "HTML ページを空白にすることはできません."
 msgid "HTML Unchanged."
 msgstr "HTML は変更されませんでした."
 
-#: Mailman/Cgi/edithtml.py:170
+#: Mailman/Cgi/edithtml.py:174
 msgid "HTML successfully updated."
 msgstr "HTML の変更が完了しました."
 
@@ -3406,124 +3407,124 @@ msgstr "普通配送会員:"
 msgid "Digest members:"
 msgstr "まとめ読み会員:"
 
-#: Mailman/Defaults.py:1310
+#: Mailman/Defaults.py:1315
 msgid "Catalan"
 msgstr "カタロニア語"
 
-#: Mailman/Defaults.py:1311
+#: Mailman/Defaults.py:1316
 msgid "Czech"
 msgstr "チェコ語"
 
-#: Mailman/Defaults.py:1312
+#: Mailman/Defaults.py:1317
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: Mailman/Defaults.py:1313
+#: Mailman/Defaults.py:1318
 msgid "German"
 msgstr "ドイツ語"
 
 # mm_cfg.py
-#: Mailman/Defaults.py:1314
+#: Mailman/Defaults.py:1319
 msgid "English (USA)"
 msgstr "英語 (米国)"
 
-#: Mailman/Defaults.py:1315
+#: Mailman/Defaults.py:1320
 msgid "Spanish (Spain)"
 msgstr "スペイン語 (スペイン)"
 
-#: Mailman/Defaults.py:1316
+#: Mailman/Defaults.py:1321
 msgid "Estonian"
 msgstr "エストニア語"
 
-#: Mailman/Defaults.py:1317
+#: Mailman/Defaults.py:1322
 msgid "Euskara"
 msgstr "バスク語"
 
-#: Mailman/Defaults.py:1318
+#: Mailman/Defaults.py:1323
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: Mailman/Defaults.py:1319
+#: Mailman/Defaults.py:1324
 msgid "French"
 msgstr "フランス語"
 
-#: Mailman/Defaults.py:1320
+#: Mailman/Defaults.py:1325
 msgid "Croatian"
 msgstr "クロアチア語"
 
-#: Mailman/Defaults.py:1321
+#: Mailman/Defaults.py:1326
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: Mailman/Defaults.py:1322
+#: Mailman/Defaults.py:1327
 msgid "Italian"
 msgstr "イタリア語"
 
-#: Mailman/Defaults.py:1323
+#: Mailman/Defaults.py:1328
 msgid "Japanese"
 msgstr "日本語"
 
-#: Mailman/Defaults.py:1324
+#: Mailman/Defaults.py:1329
 msgid "Korean"
 msgstr "韓国語"
 
-#: Mailman/Defaults.py:1325
+#: Mailman/Defaults.py:1330
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: Mailman/Defaults.py:1326
+#: Mailman/Defaults.py:1331
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: Mailman/Defaults.py:1327
+#: Mailman/Defaults.py:1332
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: Mailman/Defaults.py:1328
+#: Mailman/Defaults.py:1333
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: Mailman/Defaults.py:1329
+#: Mailman/Defaults.py:1334
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: Mailman/Defaults.py:1330
+#: Mailman/Defaults.py:1335
 msgid "Portuguese (Brazil)"
 msgstr "ポルトガル語(ブラジル)"
 
-#: Mailman/Defaults.py:1331
+#: Mailman/Defaults.py:1336
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: Mailman/Defaults.py:1332
+#: Mailman/Defaults.py:1337
 msgid "Russian"
 msgstr "ロシア語"
 
-#: Mailman/Defaults.py:1333
+#: Mailman/Defaults.py:1338
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: Mailman/Defaults.py:1334
+#: Mailman/Defaults.py:1339
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: Mailman/Defaults.py:1335
+#: Mailman/Defaults.py:1340
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: Mailman/Defaults.py:1336
+#: Mailman/Defaults.py:1341
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: Mailman/Defaults.py:1337
+#: Mailman/Defaults.py:1342
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: Mailman/Defaults.py:1338
+#: Mailman/Defaults.py:1343
 msgid "Chinese (China)"
 msgstr "中国語(中国)"
 
-#: Mailman/Defaults.py:1339
+#: Mailman/Defaults.py:1344
 msgid "Chinese (Taiwan)"
 msgstr "中国語(台湾)"
 
@@ -4055,11 +4056,14 @@ msgid ""
 "            attachments that are empty are removed.  If the outer message "
 "is\n"
 "            left empty after this filtering, then the whole message is\n"
-"            discarded.  Then, each <tt>multipart/alternative</tt> section "
-"will\n"
+"            discarded.\n"
+"\n"
+"            <p> Then, each <tt>multipart/alternative</tt> section will\n"
 "            be replaced by just the first alternative that is non-empty "
 "after\n"
-"            filtering.\n"
+"            filtering if\n"
+"            <a href=\"?VARHELP=contentfilter/collapse_alternatives\"\n"
+"            >collapse_alternatives</a> is enabled.\n"
 "\n"
 "            <p>Finally, any <tt>text/html</tt> parts that are left in the\n"
 "            message may be converted to <tt>text/plain</tt> if\n"
@@ -4083,7 +4087,10 @@ msgstr ""
 "<p>この初期削除で内容が空になった<tt>マルチパート</tt>の\n"
 "添付ファイルがあれば, 空の添付ファイルを削除します. 一番外側\n"
 "のメッセージが空になった場合は, そのメール全体を破棄します.\n"
-"そして, それぞれの<tt>multipart/alternative</tt>全体が, 先頭の\n"
+"\n"
+"<p>そして, もし, <a href=\"?VARHELP=contentfilter/collapse_alternatives\"\n"
+">collapse_alternatives</a>が設定されていれば, それぞれの\n"
+"<tt>multipart/alternative</tt>全体が, 先頭の\n"
 "空白でないalternativeの内容で置き換えられます.\n"
 "\n"
 "<p>最後に, <a href=\"?VARHELP=contentfilter/convert_html_to_plaintext\">\n"
@@ -4091,19 +4098,19 @@ msgstr ""
 "サイトの設定で平文への変換が定義されていれば, \n"
 "残りの<tt>text/html</tt>が<tt>text/plain</tt>に変換されます."
 
-#: Mailman/Gui/ContentFilter.py:71
+#: Mailman/Gui/ContentFilter.py:75
 msgid ""
 "Should Mailman filter the content of list traffic according\n"
 "             to the settings below?"
 msgstr "以下の設定でリストに配信されるメールから添付ファイルを削除しますか?"
 
-#: Mailman/Gui/ContentFilter.py:75
+#: Mailman/Gui/ContentFilter.py:79
 msgid ""
 "Remove message attachments that have a matching content\n"
 "             type."
 msgstr "以下のタイプに当てはまる添付ファイルを削除する."
 
-#: Mailman/Gui/ContentFilter.py:78
+#: Mailman/Gui/ContentFilter.py:82
 msgid ""
 "Use this option to remove each message attachment that\n"
 "             matches one of these content types.  Each line should contain "
@@ -4128,7 +4135,7 @@ msgstr ""
 "<a href=\"?VARHELP=contentfilter/pass_mime_types\">pass_mime_types</a>\n"
 "を参照してください."
 
-#: Mailman/Gui/ContentFilter.py:90
+#: Mailman/Gui/ContentFilter.py:94
 msgid ""
 "Remove message attachments that don't have a matching\n"
 "             content type.  Leave this field blank to skip this filter\n"
@@ -4137,7 +4144,7 @@ msgstr ""
 "指定されたファイルタイプ以外の添付ファイルを削除します.\n"
 "空白にしておくと, この検査を省略します."
 
-#: Mailman/Gui/ContentFilter.py:94
+#: Mailman/Gui/ContentFilter.py:98
 msgid ""
 "Use this option to remove each message attachment that does\n"
 "             not have a matching content type.  Requirements and formats "
@@ -4159,13 +4166,13 @@ msgstr ""
 "必ず<tt>multipart</tt>を指定してください.\n"
 "multipartがなければ添付ファイルのあるメールはすべて拒否されます."
 
-#: Mailman/Gui/ContentFilter.py:104
+#: Mailman/Gui/ContentFilter.py:108
 msgid ""
 "Remove message attachments that have a matching filename\n"
 "             extension."
 msgstr "以下の拡張子を持つ添付ファイルを削除する."
 
-#: Mailman/Gui/ContentFilter.py:108
+#: Mailman/Gui/ContentFilter.py:112
 msgid ""
 "Remove message attachments that don't have a matching\n"
 "             filename extension.  Leave this field blank to skip this "
@@ -4175,7 +4182,13 @@ msgstr ""
 "指定された拡張子以外の添付ファイルを削除します.\n"
 "空白にしておくと, この検査を省略します."
 
-#: Mailman/Gui/ContentFilter.py:113
+#: Mailman/Gui/ContentFilter.py:117
+msgid ""
+"Should Mailman collapse multipart/alternative to its\n"
+"             first part content?"
+msgstr "multipart/alternative 全体をその中の最初のパートで置き換えますか?"
+
+#: Mailman/Gui/ContentFilter.py:121
 msgid ""
 "Should Mailman convert <tt>text/html</tt> parts to plain\n"
 "             text?  This conversion happens after MIME attachments have "
@@ -4185,13 +4198,13 @@ msgstr ""
 "<tt>text/html</tt>の部分を平文に変換しますか?\n"
 "この変換は添付ファイルが取り除かれた後に実行されます."
 
-#: Mailman/Gui/ContentFilter.py:119
+#: Mailman/Gui/ContentFilter.py:127
 msgid ""
 "Action to take when a message matches the content filtering\n"
 "             rules."
 msgstr "メールが添付ファイル除去規則にマッチしたときの動作."
 
-#: Mailman/Gui/ContentFilter.py:122
+#: Mailman/Gui/ContentFilter.py:130
 msgid ""
 "One of these actions is take when the message matches one of\n"
 "             the content filtering rules, meaning, the top-level\n"
@@ -4240,7 +4253,7 @@ msgstr ""
 "閲覧して復活させるか, あるいは破棄します.\n"
 "保管オプションは, サイト管理者が有効にした場合にのみ選択できます."
 
-#: Mailman/Gui/ContentFilter.py:163
+#: Mailman/Gui/ContentFilter.py:171
 msgid "Bad MIME type ignored: %(spectype)s"
 msgstr "MIMEタイプに誤りがあります. 無視します: %(spectype)s"
 
@@ -7005,7 +7018,7 @@ msgstr "配送が許可されていないファイル拡張子です"
 msgid "After content filtering, the message was empty"
 msgstr "添付ファイルを除去した結果, メールが空になりました"
 
-#: Mailman/Handlers/MimeDel.py:229
+#: Mailman/Handlers/MimeDel.py:231
 msgid ""
 "The attached message matched the %(listname)s mailing list's content "
 "filtering\n"
@@ -7018,7 +7031,7 @@ msgstr ""
 "添付メッセージが破棄されました.\n"
 "破棄されなかった部分だけを配信します.\n"
 
-#: Mailman/Handlers/MimeDel.py:235
+#: Mailman/Handlers/MimeDel.py:237
 msgid "Content filtered message notification"
 msgstr "添付ファイル削除通知"
 
@@ -7099,7 +7112,7 @@ msgstr ""
 "サイズ: %(size)s バイト\n"
 "URL:    %(url)s\n"
 
-#: Mailman/Handlers/Scrubber.py:300
+#: Mailman/Handlers/Scrubber.py:307
 msgid ""
 "A non-text attachment was scrubbed...\n"
 "Name: %(filename)s\n"
@@ -7115,11 +7128,11 @@ msgstr ""
 "説明:       %(desc)s\n"
 "URL:        %(url)s\n"
 
-#: Mailman/Handlers/Scrubber.py:335
+#: Mailman/Handlers/Scrubber.py:342
 msgid "Skipped content of type %(partctype)s\n"
 msgstr "添付ファイルのタイプ %(partctype)s を無視します\n"
 
-#: Mailman/Handlers/Scrubber.py:370
+#: Mailman/Handlers/Scrubber.py:377
 msgid "-------------- next part --------------\n"
 msgstr "-------------- next part --------------\n"
 
@@ -7127,43 +7140,43 @@ msgstr "-------------- next part --------------\n"
 msgid "The message headers matched a filter rule"
 msgstr "メールへッダがフィルタ規則に合致しました"
 
-#: Mailman/Handlers/SpamDetect.py:135
+#: Mailman/Handlers/SpamDetect.py:136
 msgid "Message rejected by filter rule match"
 msgstr "フィルタ規則に合致したメールを拒否しました"
 
-#: Mailman/Handlers/ToDigest.py:149
+#: Mailman/Handlers/ToDigest.py:160
 msgid "%(realname)s Digest, Vol %(volume)d, Issue %(issue)d"
 msgstr "%(realname)s まとめ読み, %(volume)d 巻, %(issue)d 号"
 
-#: Mailman/Handlers/ToDigest.py:195
+#: Mailman/Handlers/ToDigest.py:206
 msgid "digest header"
 msgstr "まとめ読みヘッダ"
 
-#: Mailman/Handlers/ToDigest.py:198
+#: Mailman/Handlers/ToDigest.py:209
 msgid "Digest Header"
 msgstr "まとめ読みへッダ"
 
-#: Mailman/Handlers/ToDigest.py:211
+#: Mailman/Handlers/ToDigest.py:222
 msgid "Today's Topics:\n"
 msgstr "本日の話題:\n"
 
-#: Mailman/Handlers/ToDigest.py:291
+#: Mailman/Handlers/ToDigest.py:302
 msgid "Today's Topics (%(msgcount)d messages)"
 msgstr "本日の話題 (%(msgcount)d 通)"
 
-#: Mailman/Handlers/ToDigest.py:317
+#: Mailman/Handlers/ToDigest.py:328
 msgid "[Message discarded by content filter]"
 msgstr "[添付ファイル除去によりメールが破棄されました]"
 
-#: Mailman/Handlers/ToDigest.py:343
+#: Mailman/Handlers/ToDigest.py:354
 msgid "digest footer"
 msgstr "まとめ読みフッタ"
 
-#: Mailman/Handlers/ToDigest.py:346
+#: Mailman/Handlers/ToDigest.py:357
 msgid "Digest Footer"
 msgstr "まとめ読みフッタ"
 
-#: Mailman/Handlers/ToDigest.py:360
+#: Mailman/Handlers/ToDigest.py:371
 msgid "End of "
 msgstr "以上: "
 
@@ -7282,9 +7295,9 @@ msgstr ""
 
 #: 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
+#: bin/check_perms:191 bin/check_perms:208 bin/check_perms:234
+#: bin/check_perms:257 bin/check_perms:276 bin/check_perms:290
+#: bin/check_perms:310 bin/check_perms:347
 msgid "(fixing)"
 msgstr "(修正中)"
 
@@ -7304,31 +7317,31 @@ msgstr "%(listname)s メーリングリストに入会するには, あなたの確認が必要です"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "%(listname)s メーリングリストから退会するには, あなたの確認が必要です"
 
-#: Mailman/MailList.py:888 Mailman/MailList.py:1277
+#: Mailman/MailList.py:889 Mailman/MailList.py:1278
 msgid " from %(remote)s"
 msgstr " %(remote)s から"
 
-#: Mailman/MailList.py:922
+#: Mailman/MailList.py:923
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "%(realname)s への入会には管理者の承認が必要です"
 
-#: Mailman/MailList.py:986 bin/add_members:242
+#: Mailman/MailList.py:987 bin/add_members:242
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s 入会通知"
 
-#: Mailman/MailList.py:1005
+#: Mailman/MailList.py:1006
 msgid "unsubscriptions require moderator approval"
 msgstr "退会には管理者の承認が必要です"
 
-#: Mailman/MailList.py:1025
+#: Mailman/MailList.py:1026
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s 退会通知"
 
-#: Mailman/MailList.py:1186
+#: Mailman/MailList.py:1187
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s への入会には管理者の承認が必要です"
 
-#: Mailman/MailList.py:1449
+#: Mailman/MailList.py:1450
 msgid "Last autoresponse notification for today"
 msgstr "今日最後に送られた自動応答の通知"
 
@@ -7630,7 +7643,7 @@ msgid "No such list: %(listname)s"
 msgstr "%(listname)s というリストはありません"
 
 #: bin/add_members:230 bin/change_pw:158 bin/check_db:114 bin/discard:83
-#: bin/sync_members:244 bin/update:555 cron/bumpdigests:78
+#: bin/sync_members:244 bin/update:564 cron/bumpdigests:78
 msgid "Nothing to do."
 msgstr "なにもすることはありません."
 
@@ -8056,65 +8069,74 @@ msgstr "%(private)s のパーミッションをチェック"
 msgid "%(private)s must not be other-readable"
 msgstr "%(private)s は other が読み取り可能でなければいけません"
 
-#: bin/check_perms:225
+#: bin/check_perms:215
+msgid ""
+"Warning: Private archive directory is other-executable (o+x).\n"
+"         This could allow other users on your system to read private "
+"archives.\n"
+"         If you're on a shared multiuser system, you should consult the\n"
+"         installation manual on how to fix this."
+msgstr ""
+
+#: bin/check_perms:232
 msgid "mbox file must be at least 0660:"
 msgstr "mbox ファイルは最低 0660 でなければいけません"
 
-#: bin/check_perms:248
+#: bin/check_perms:255
 msgid "%(dbdir)s \"other\" perms must be 000"
 msgstr "%(dbdir)s は other に許可を与えてはいけません"
 
-#: bin/check_perms:258
+#: bin/check_perms:265
 msgid "checking cgi-bin permissions"
 msgstr "cgi-bin のパーミッションをチェック"
 
-#: bin/check_perms:263
+#: bin/check_perms:270
 msgid "    checking set-gid for %(path)s"
 msgstr "    %(path)s の set-gid をチェック"
 
-#: bin/check_perms:267
+#: bin/check_perms:274
 msgid "%(path)s must be set-gid"
 msgstr "%(path)s は set-gid されてないといけません"
 
-#: bin/check_perms:277
+#: bin/check_perms:284
 msgid "checking set-gid for %(wrapper)s"
 msgstr "%(wrapper)s の set-gid をチェック"
 
-#: bin/check_perms:281
+#: bin/check_perms:288
 msgid "%(wrapper)s must be set-gid"
 msgstr "%(wrapper)s は set-gid されてないといけません"
 
-#: bin/check_perms:291
+#: bin/check_perms:298
 msgid "checking permissions on %(pwfile)s"
 msgstr "%(pwfile)s のパーミッションをチェック"
 
-#: bin/check_perms:300
+#: bin/check_perms:307
 msgid "%(pwfile)s permissions must be exactly 0640 (got %(octmode)s)"
 msgstr ""
 "%(pwfile)s のパーミッションが %(octmode)s になっていますが, 0640 でないといけ"
 "ません"
 
-#: bin/check_perms:324
+#: bin/check_perms:331
 msgid "checking permissions on list data"
 msgstr "リストデータのパーミッションをチェック"
 
-#: bin/check_perms:330
+#: bin/check_perms:337
 msgid "    checking permissions on: %(path)s"
 msgstr "    %(path)s のパーミッションをチェック"
 
-#: bin/check_perms:338
+#: bin/check_perms:345
 msgid "file permissions must be at least 660: %(path)s"
 msgstr "%(path)s ファイルのパーミッションは最低 660 でないといけません"
 
-#: bin/check_perms:383
+#: bin/check_perms:390
 msgid "No problems found"
 msgstr "問題ありません"
 
-#: bin/check_perms:385
+#: bin/check_perms:392
 msgid "Problems found:"
 msgstr "問題があります:"
 
-#: bin/check_perms:386
+#: bin/check_perms:393
 msgid "Re-run as %(MAILMAN_USER)s (or root) with -f flag to fix"
 msgstr ""
 "修正するには -f オプションをつけて %(MAILMAN_USER)s か root の権限で実行して"
@@ -8621,15 +8643,15 @@ msgstr "引数の誤り: %(pargs)s"
 msgid "Please specify either -p or -m."
 msgstr "-p または -m を指定してください"
 
-#: bin/dumpdb:135
+#: bin/dumpdb:136
 msgid "[----- start pickle file -----]"
 msgstr "[----- pickle ファイル開始 -----]"
 
-#: bin/dumpdb:140
+#: bin/dumpdb:142
 msgid "[----- end pickle file -----]"
 msgstr "[----- pickle ファイル終了 -----]"
 
-#: bin/dumpdb:142
+#: bin/dumpdb:145
 msgid "<----- start object %(cnt)s ----->"
 msgstr "<----- %(cnt)s 番目のオブジェクト ----->"
 
@@ -10466,7 +10488,7 @@ msgstr ""
 msgid "Fixing language templates: %(listname)s"
 msgstr "言語テンプレートを修正: %(listname)s"
 
-#: bin/update:196 bin/update:689
+#: bin/update:196 bin/update:698
 msgid "WARNING: could not acquire lock for list: %(listname)s"
 msgstr "警告: リストのロックを獲得できません: %(listname)s"
 
@@ -10610,35 +10632,43 @@ msgstr "古いファイル %(pyc)s を削除できません -- %(rest)s"
 msgid "updating old qfiles"
 msgstr "古い qfile を更新"
 
-#: bin/update:512
+#: bin/update:448
+msgid "Warning!  Not a directory: %(dirpath)s"
+msgstr "警告! ディレクトリではありません: %(dirpath)s"
+
+#: bin/update:517
 msgid "message is unparsable: %(filebase)s"
 msgstr "メールを解析できません: %(filebase)s"
 
-#: bin/update:541
+#: bin/update:531
+msgid "Warning!  Deleting empty .pck file: %(pckfile)s"
+msgstr ""
+
+#: bin/update:550
 msgid "Updating Mailman 2.0 pending_subscriptions.db database"
 msgstr "Mailman 2.0 の pending_subscriptions.db データベースを更新"
 
-#: bin/update:552
+#: bin/update:561
 msgid "Updating Mailman 2.1.4 pending.pck database"
 msgstr "Mailman 2.1.4 の pending_subscriptions.db データベースを更新"
 
-#: bin/update:576
+#: bin/update:585
 msgid "Ignoring bad pended data: %(key)s: %(val)s"
 msgstr "保留データに誤り. 無視します: %(key)s: %(val)s"
 
-#: bin/update:592
+#: bin/update:601
 msgid "WARNING: Ignoring duplicate pending ID: %(id)s."
 msgstr "警告: 保留IDに重複あり. 無視します: %(id)s."
 
-#: bin/update:645
+#: bin/update:654
 msgid "getting rid of old source files"
 msgstr "古いソースファイルを削除中"
 
-#: bin/update:655
+#: bin/update:664
 msgid "no lists == nothing to do, exiting"
 msgstr "リストがありません == 何も実行せずに終了します"
 
-#: bin/update:662
+#: bin/update:671
 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..."
@@ -10646,27 +10676,27 @@ msgstr ""
 "古い HTML 保存書庫を b6 で動くようにパーミッションを変更中\n"
 "保存書庫が大きいと, これは 1,2 分かかります..."
 
-#: bin/update:667
+#: bin/update:676
 msgid "done"
 msgstr "終了"
 
-#: bin/update:669
+#: bin/update:678
 msgid "Updating mailing list: %(listname)s"
 msgstr "%(listname)s メーリングリストを更新中"
 
-#: bin/update:672
+#: bin/update:681
 msgid "Updating Usenet watermarks"
 msgstr "ネットニュースの水位票を更新"
 
-#: bin/update:677
+#: bin/update:686
 msgid "- nothing to update here"
 msgstr "- 更新は必要ありません"
 
-#: bin/update:700
+#: bin/update:709
 msgid "- usenet watermarks updated and gate_watermarks removed"
 msgstr "- ネットニュースの水位票更新を完了. gate_watermarkを削除"
 
-#: bin/update:714
+#: bin/update:723
 msgid ""
 "\n"
 "\n"
@@ -10707,11 +10737,11 @@ msgstr ""
 "注意 注意 注意 注意 注意\n"
 "\n"
 
-#: bin/update:771
+#: bin/update:780
 msgid "No updates are necessary."
 msgstr "更新の必要はありません."
 
-#: bin/update:774
+#: bin/update:783
 msgid ""
 "Downgrade detected, from version %(hexlversion)s to version %(hextversion)s\n"
 "This is probably not safe.\n"
@@ -10721,11 +10751,11 @@ msgstr ""
 "安全に実行できない可能性があります.\n"
 "終了します."
 
-#: bin/update:779
+#: bin/update:788
 msgid "Upgrading from version %(hexlversion)s to %(hextversion)s"
 msgstr "%(hexlversion)s から %(hextversion)s へアップグレード"
 
-#: bin/update:788
+#: bin/update:797
 msgid ""
 "\n"
 "ERROR:\n"
@@ -11369,4 +11399,3 @@ msgstr ""
 "    --listname=リスト名\n"
 "        リスト名をあげたリストについてだけ, まとめ読みを送信する.\n"
 "        これが無い場合, すべてのリストの処理をする.\n"
-