merge lp:mailman/2.1 up to rev 1791

1 files changed, 168 insertions, 164 deletions

diff --git a/messages/zh_CN/LC_MESSAGES/mailman.po b/messages/zh_CN/LC_MESSAGES/mailman.po
index e8ee201a..af502d25 100755
--- a/messages/zh_CN/LC_MESSAGES/mailman.po
+++ b/messages/zh_CN/LC_MESSAGES/mailman.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2005-05-14 12:07+0800\n"
 "Last-Translator: Dai Xiaoguang <leona@cs.hit.edu.cn>\n"
 "Language-Team:  <mailman-cn@mail.cs.hit.edu.cn>\n"
@@ -201,7 +201,7 @@ msgstr "(由)您自己"
 msgid "by the list administrator"
 msgstr "(由)列表管理员"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "因为未知原因"
 
@@ -217,23 +217,23 @@ msgstr "禁止"
 msgid "Bounce action notification"
 msgstr "退信行为通告"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "禁止"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "您最后的退信日期为 %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(无主题)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[无退信的细节信息]"
 
@@ -247,7 +247,7 @@ msgstr "管理员"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -255,7 +255,7 @@ msgstr "没有类似的列表 <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -265,8 +265,8 @@ msgstr "错误"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -278,7 +278,7 @@ msgid "Authorization failed."
 msgstr "认证失败"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -295,7 +295,7 @@ msgstr ""
 "不然你的邮件列表基本是无法使用的。"
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "警告："
 
@@ -449,7 +449,7 @@ msgstr "处理待裁决请求"
 msgid "Go to the general list information page"
 msgstr "前往列表常规信息页"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "编辑公开的HTML页和文本文件"
 
@@ -542,7 +542,7 @@ msgstr "主题名"
 msgid "Regexp:"
 msgstr "正则表达式"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "描述"
 
@@ -701,7 +701,7 @@ msgid "nodupes"
 msgstr "无副本"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "摘要"
 
@@ -733,7 +733,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "除了我"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "没有邮件"
 
@@ -1043,151 +1043,151 @@ msgstr "确认主持者密码:"
 msgid "Submit Your Changes"
 msgstr "提交您的修改"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "主持者密码不匹配"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "您的口令不匹配。"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "管理员密码不匹配"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "已经是成员了"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;空行&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "错误/无效的邮件地址"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "不合法的地址(含有非法的字符)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "成功邀请:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "成功订阅:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "错误邀请:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "错误订阅:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "成功取消订阅:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "不能取消非成员的订阅:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "您必须先修正上述的无效地址."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "已经是成员了"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "您必须提供一个有效的电子邮件地址。"
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "已经是成员了"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "通告"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "通告"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "错误的节制标记变量"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "没有订阅"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "忽略对已删除用户的更改: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "成功删除:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "错误取消订阅:"
 
@@ -1738,8 +1738,8 @@ msgstr ""
 "\n"
 "    <p>或者点击 <em>取消并且删除</em> 来撤销您的取消订阅请求."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
@@ -2316,47 +2316,51 @@ msgstr "是否每月发送密码提示？"
 msgid "List name is required."
 msgstr "列表名称是必需的."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- 为 %(template_info)s 编辑html "
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "编辑HTML : 错误"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: 无效的模版"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML 页面编辑"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "选择您要编辑的页面:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "查看或编辑列表的配置信息."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "当您正要完成更改时..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "提交更改"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "不能有空的html页面."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML 没有改变."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2365,20 +2369,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML 没有改变."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML更新成功."
 
@@ -2436,7 +2440,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "编辑选项"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "选择本页所用的语言："
@@ -2445,92 +2449,92 @@ msgstr "选择本页所用的语言："
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI脚本错误"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "没有给出地址"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "非法的邮件地址: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "不存在 %(safeuser)s 这个成员."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "确认邮件已经发送"
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr "您的取消订阅的请求已经转发给列表管理员,等待批准."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "您的密码提示已经发送到您的电子信箱了"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "认证失败"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "您的密码提示已经发送到您的电子信箱了"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "为 %(safeuser)s 列出在 %(hostname)s 上的订阅"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "点击连接以访问您请求的邮件列表的选项页面"
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "地址不匹配!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "您已经使用了那个邮件地址"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 msgid ""
 "The new address you requested %(newaddr)s is already a member of the\n"
 "%(listname)s mailing list, however you have also requested a global change "
@@ -2542,31 +2546,31 @@ msgstr ""
 "但是您仍然请求对这个地址进行全局的修改.\n"
 "确认后, 其他包含 %(safeuser)s 这个地址的邮件列表将被修改."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "新的地址 %(newaddr)s 已经是成员了"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "地址不能为空"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "确认信息已经发送到了 %(newaddr)s ."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "提供了错误的邮件地址"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "提供了非法的邮件地址"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s 已经是列表的成员."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2576,11 +2580,11 @@ msgstr ""
 "您提供的邮件地址被禁止。如果您觉得这些限制是错误的，\n"
 "请联系列表管理员 %(owneraddr)s"
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "成员姓名修改成功"
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2589,15 +2593,15 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "密码不能为空"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "密码不匹配!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2607,12 +2611,12 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "密码修改成功"
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2621,16 +2625,16 @@ msgstr ""
 "为了确认您取消订阅的请求,您必须选中复选框中 <em>取消订阅</em> \n"
 "                这一项.  您还没有取消订阅!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s 列表： 成员选项登录页 "
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "退订结果"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2640,7 +2644,7 @@ msgstr ""
 "您的退订请求已被收到并转发给列表管理员以待其核准。\n"
 "            管理员作出决定后您将受到一封邮件通知。"
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2654,7 +2658,7 @@ msgstr ""
 "的\n"
 "            问题，请联系列表管理员： %(owneraddr)s。"
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2662,7 +2666,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2672,7 +2676,7 @@ msgstr ""
 "列表管理员已经禁止了此列表的摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2682,63 +2686,63 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "您已经成功设置您的选项。"
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "您可能会收到最后一封摘要。"
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>是的，我确实想要退订</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "修改我的口令"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "列出我的所有订阅"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "把我的口令邮寄给我"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "口令"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "退出登录"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "提交我的修改"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "修改我的地址和姓名"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>没有已定义的主题</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2748,19 +2752,19 @@ msgstr ""
 "您使用大小写相关的地址订阅了此列表\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s 列表： 成员选项登录页 "
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "邮件地址和"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s 列表： 用户 %(safeuser)s 的成员选项信息"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2788,19 +2792,19 @@ msgstr ""
 "    否则您做的所有修改都将不起作用。\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "邮件地址："
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "口令："
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "登录"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2812,37 +2816,37 @@ msgstr ""
 "    您需要点击确认函中的一个链接来完成整个退订过程(您也可以通过邮件来确认，\n"
 "    请参考确认函中的具体信息)。"
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "口令提示函"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr "通过点击<em>提示</em>按钮，您的口令将被邮寄给您。"
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "提示"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<丢失>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "请求的主题不存在: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "主题过滤器详情"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "名字："
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "模式(正则表达式)"
 
@@ -7819,7 +7823,7 @@ msgstr "访问订阅者列表"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "你的口令将每月一次以提示函的形式发送给你。"
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "当前归档"
 
@@ -8174,7 +8178,7 @@ msgstr "结束"
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "您以标题 \"%(subject)s\" 发布的信件"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[没有给出原因]"
 
@@ -8186,28 +8190,28 @@ msgstr "被暂存信件的转发"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "来自 %(addr)s 的对 %(realname)s 列表的订阅请求"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "继续等待批准"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "来自 %(addr)s 的对 %(realname)s 列表的退订请求"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "退订请求"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "原文"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "对于 %(realname)s 邮件列表的请求被拒绝"
 
@@ -8314,56 +8318,56 @@ msgstr "您需要对加入 %(listname)s 邮件列表进行确认"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "您需要对退出 %(listname)s 邮件列表进行确认"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr "来自 %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "对 %(realname)s 的订阅请求需要列表主持者批准"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s 订阅通知"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "退订需要列表主持人批准"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s 的订阅需要管理员批准"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "输入验证cookie"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "本日最后一条自动回复通知"
 
@@ -8453,15 +8457,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "由 Mailman<br> %(version)s 投递"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"