merge lp:mailman 2.1 up to rev 1756

1 files changed, 203 insertions, 173 deletions

diff --git a/messages/zh_CN/LC_MESSAGES/mailman.po b/messages/zh_CN/LC_MESSAGES/mailman.po
index d9162852..371002c3 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: Tue Jan 30 08:13:26 2018\n"
+"POT-Creation-Date: Fri May 25 15:13:52 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"
@@ -11,157 +11,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.4\n"
 
-#: Mailman/Archiver/HyperArch.py:123
+#: Mailman/Archiver/HyperArch.py:124
 msgid "size not available"
 msgstr "不被允许的大小"
 
-#: Mailman/Archiver/HyperArch.py:129
+#: Mailman/Archiver/HyperArch.py:130
 msgid " %(size)i bytes "
 msgstr "%(size)i 字节"
 
-#: Mailman/Archiver/HyperArch.py:275 Mailman/Archiver/pipermail.py:181
+#: Mailman/Archiver/HyperArch.py:276 Mailman/Archiver/pipermail.py:181
 #: Mailman/Archiver/pipermail.py:182
 msgid "No subject"
 msgstr "无主题"
 
-#: Mailman/Archiver/HyperArch.py:291 Mailman/Archiver/HyperArch.py:294
-#: Mailman/Archiver/HyperArch.py:425 Mailman/Archiver/HyperArch.py:483
-#: Mailman/Archiver/HyperArch.py:592 Mailman/Archiver/HyperArch.py:1066
-#: Mailman/Archiver/HyperArch.py:1195
+#: Mailman/Archiver/HyperArch.py:292 Mailman/Archiver/HyperArch.py:295
+#: Mailman/Archiver/HyperArch.py:426 Mailman/Archiver/HyperArch.py:484
+#: Mailman/Archiver/HyperArch.py:593 Mailman/Archiver/HyperArch.py:1067
+#: Mailman/Archiver/HyperArch.py:1196
 msgid " at "
 msgstr "在"
 
-#: Mailman/Archiver/HyperArch.py:512
+#: Mailman/Archiver/HyperArch.py:513
 #, fuzzy
 msgid "Previous message (by thread):"
 msgstr "上一条消息"
 
-#: Mailman/Archiver/HyperArch.py:534
+#: Mailman/Archiver/HyperArch.py:535
 #, fuzzy
 msgid "Next message (by thread):"
 msgstr "下一条消息"
 
-#: Mailman/Archiver/HyperArch.py:707 Mailman/Archiver/HyperArch.py:743
+#: Mailman/Archiver/HyperArch.py:708 Mailman/Archiver/HyperArch.py:744
 msgid "thread"
 msgstr "线索"
 
-#: Mailman/Archiver/HyperArch.py:708 Mailman/Archiver/HyperArch.py:744
+#: Mailman/Archiver/HyperArch.py:709 Mailman/Archiver/HyperArch.py:745
 msgid "subject"
 msgstr "主题"
 
-#: Mailman/Archiver/HyperArch.py:709 Mailman/Archiver/HyperArch.py:745
+#: Mailman/Archiver/HyperArch.py:710 Mailman/Archiver/HyperArch.py:746
 msgid "author"
 msgstr "作者"
 
-#: Mailman/Archiver/HyperArch.py:710 Mailman/Archiver/HyperArch.py:746
+#: Mailman/Archiver/HyperArch.py:711 Mailman/Archiver/HyperArch.py:747
 msgid "date"
 msgstr "日期"
 
-#: Mailman/Archiver/HyperArch.py:782
+#: Mailman/Archiver/HyperArch.py:783
 msgid "<P>Currently, there are no archives. </P>"
 msgstr "<P>目前没有归档文件 </P>"
 
-#: Mailman/Archiver/HyperArch.py:820
+#: Mailman/Archiver/HyperArch.py:821
 msgid "Gzip'd Text%(sz)s"
 msgstr "Gzip压缩文本大小为 %(sz)s"
 
-#: Mailman/Archiver/HyperArch.py:825
+#: Mailman/Archiver/HyperArch.py:826
 msgid "Text%(sz)s"
 msgstr "文本大小为 %(sz)s"
 
-#: Mailman/Archiver/HyperArch.py:915
+#: Mailman/Archiver/HyperArch.py:916
 msgid "figuring article archives\n"
 msgstr "处理文章存档\n"
 
-#: Mailman/Archiver/HyperArch.py:925
+#: Mailman/Archiver/HyperArch.py:926
 msgid "April"
 msgstr "四月"
 
-#: Mailman/Archiver/HyperArch.py:925
+#: Mailman/Archiver/HyperArch.py:926
 msgid "February"
 msgstr "二月"
 
-#: Mailman/Archiver/HyperArch.py:925
+#: Mailman/Archiver/HyperArch.py:926
 msgid "January"
 msgstr "一月"
 
-#: Mailman/Archiver/HyperArch.py:925
+#: Mailman/Archiver/HyperArch.py:926
 msgid "March"
 msgstr "三月"
 
-#: Mailman/Archiver/HyperArch.py:926
+#: Mailman/Archiver/HyperArch.py:927
 msgid "August"
 msgstr "八月"
 
-#: Mailman/Archiver/HyperArch.py:926
+#: Mailman/Archiver/HyperArch.py:927
 msgid "July"
 msgstr "七月"
 
-#: Mailman/Archiver/HyperArch.py:926
+#: Mailman/Archiver/HyperArch.py:927
 msgid "June"
 msgstr "六月"
 
-#: Mailman/Archiver/HyperArch.py:926 Mailman/i18n.py:137
+#: Mailman/Archiver/HyperArch.py:927 Mailman/i18n.py:137
 msgid "May"
 msgstr "五月"
 
-#: Mailman/Archiver/HyperArch.py:927
+#: Mailman/Archiver/HyperArch.py:928
 msgid "December"
 msgstr "十二月"
 
-#: Mailman/Archiver/HyperArch.py:927
+#: Mailman/Archiver/HyperArch.py:928
 msgid "November"
 msgstr "十一月"
 
-#: Mailman/Archiver/HyperArch.py:927
+#: Mailman/Archiver/HyperArch.py:928
 msgid "October"
 msgstr "十月"
 
-#: Mailman/Archiver/HyperArch.py:927
+#: Mailman/Archiver/HyperArch.py:928
 msgid "September"
 msgstr "九月"
 
-#: Mailman/Archiver/HyperArch.py:935
+#: Mailman/Archiver/HyperArch.py:936
 msgid "First"
 msgstr "第一"
 
-#: Mailman/Archiver/HyperArch.py:935
+#: Mailman/Archiver/HyperArch.py:936
 msgid "Fourth"
 msgstr "第四"
 
-#: Mailman/Archiver/HyperArch.py:935
+#: Mailman/Archiver/HyperArch.py:936
 msgid "Second"
 msgstr "第二"
 
-#: Mailman/Archiver/HyperArch.py:935
+#: Mailman/Archiver/HyperArch.py:936
 msgid "Third"
 msgstr "第三"
 
-#: Mailman/Archiver/HyperArch.py:937
+#: Mailman/Archiver/HyperArch.py:938
 msgid "%(ord)s quarter %(year)i"
 msgstr "%(year)i 的第 %(ord)s 季度"
 
-#: Mailman/Archiver/HyperArch.py:944
+#: Mailman/Archiver/HyperArch.py:945
 msgid "%(month)s %(year)i"
 msgstr "%(month)s 月 %(year)i 年"
 
-#: Mailman/Archiver/HyperArch.py:949
+#: Mailman/Archiver/HyperArch.py:950
 msgid "The Week Of Monday %(day)i %(month)s %(year)i"
 msgstr ""
 
-#: Mailman/Archiver/HyperArch.py:953
+#: Mailman/Archiver/HyperArch.py:954
 msgid "%(day)i %(month)s %(year)i"
 msgstr "%(day)i 日 %(month)s 月 %(year)i 年"
 
-#: Mailman/Archiver/HyperArch.py:1053
+#: Mailman/Archiver/HyperArch.py:1054
 msgid "Computing threaded index\n"
 msgstr "计算索引\n"
 
-#: Mailman/Archiver/HyperArch.py:1318
+#: Mailman/Archiver/HyperArch.py:1319
 msgid "Updating HTML for article %(seq)s"
 msgstr "为文章 %(seq)s 更新HTML"
 
-#: Mailman/Archiver/HyperArch.py:1325
+#: Mailman/Archiver/HyperArch.py:1326
 msgid "article file %(filename)s is missing!"
 msgstr "文章文件 %(filename)s 丢失"
 
@@ -223,7 +223,7 @@ msgstr "您最后的退信日期为 %(date)s"
 
 #: Mailman/Bouncer.py:329 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
-#: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:251
+#: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:223
 msgid "(no subject)"
 msgstr "(无主题)"
@@ -241,7 +241,7 @@ msgid "Administrator"
 msgstr "管理员"
 
 #: Mailman/Cgi/admin.py:80 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
-#: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:56
+#: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
 #: Mailman/Cgi/options.py:98 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
@@ -250,7 +250,7 @@ msgstr "没有类似的列表 <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:95 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:117
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:117
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:146 Mailman/Cgi/roster.py:147
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -260,7 +260,7 @@ msgstr "错误"
 
 #: Mailman/Cgi/admin.py:96 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:69 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:81
 #: Mailman/Cgi/options.py:118 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
@@ -273,7 +273,7 @@ msgid "Authorization failed."
 msgstr "认证失败"
 
 #: Mailman/Cgi/admin.py:212 Mailman/Cgi/admindb.py:236
-#: Mailman/Cgi/edithtml.py:170 Mailman/Cgi/options.py:338
+#: Mailman/Cgi/edithtml.py:170 Mailman/Cgi/options.py:324
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -290,7 +290,7 @@ msgstr ""
 "不然你的邮件列表基本是无法使用的。"
 
 #: Mailman/Cgi/admin.py:222 Mailman/Cgi/admin.py:230 Mailman/Cgi/admin.py:237
-#: Mailman/Cgi/admin.py:1648 Mailman/Gui/GUIBase.py:208
+#: Mailman/Cgi/admin.py:1648 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "警告："
 
@@ -317,11 +317,11 @@ msgstr ""
 msgid "%(hostname)s mailing lists - Admin Links"
 msgstr "%(hostname)s 的邮件列表 - 管理链接"
 
-#: Mailman/Cgi/admin.py:294 Mailman/Cgi/listinfo.py:122
+#: Mailman/Cgi/admin.py:294 Mailman/Cgi/listinfo.py:121
 msgid "Welcome!"
 msgstr "欢迎！"
 
-#: Mailman/Cgi/admin.py:297 Mailman/Cgi/listinfo.py:125
+#: Mailman/Cgi/admin.py:297 Mailman/Cgi/listinfo.py:124
 msgid "Mailman"
 msgstr "Mailman"
 
@@ -373,16 +373,16 @@ msgstr "邮件列表简介页"
 msgid "<p>(Send questions and comments to "
 msgstr "<p>(发送问题和评论到"
 
-#: Mailman/Cgi/admin.py:335 Mailman/Cgi/listinfo.py:157 cron/mailpasswds:216
+#: Mailman/Cgi/admin.py:335 Mailman/Cgi/listinfo.py:156 cron/mailpasswds:216
 msgid "List"
 msgstr "列表"
 
 #: Mailman/Cgi/admin.py:336 Mailman/Cgi/admin.py:604
-#: Mailman/Cgi/listinfo.py:158
+#: Mailman/Cgi/listinfo.py:157
 msgid "Description"
 msgstr "描述"
 
-#: Mailman/Cgi/admin.py:342 Mailman/Cgi/listinfo.py:164 bin/list_lists:130
+#: Mailman/Cgi/admin.py:342 Mailman/Cgi/listinfo.py:163 bin/list_lists:130
 msgid "[no description available]"
 msgstr "[没有描述]"
 
@@ -537,7 +537,7 @@ msgstr "主题名"
 msgid "Regexp:"
 msgstr "正则表达式"
 
-#: Mailman/Cgi/admin.py:755 Mailman/Cgi/options.py:1139
+#: Mailman/Cgi/admin.py:755 Mailman/Cgi/options.py:1141
 msgid "Description:"
 msgstr "描述"
 
@@ -696,7 +696,7 @@ msgid "nodupes"
 msgstr "无副本"
 
 #: Mailman/Cgi/admin.py:1033 Mailman/Cgi/admin.py:1099
-#: Mailman/Cgi/options.py:382
+#: Mailman/Cgi/options.py:384
 msgid "digest"
 msgstr "摘要"
 
@@ -728,7 +728,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "除了我"
 
-#: Mailman/Cgi/admin.py:1075 Mailman/Cgi/options.py:380
+#: Mailman/Cgi/admin.py:1075 Mailman/Cgi/options.py:382
 msgid "nomail"
 msgstr "没有邮件"
 
@@ -845,7 +845,7 @@ msgstr "替这些用户订阅或者邀请他们"
 msgid "Invite"
 msgstr "邀请"
 
-#: Mailman/Cgi/admin.py:1220 Mailman/Cgi/listinfo.py:200
+#: Mailman/Cgi/admin.py:1220 Mailman/Cgi/listinfo.py:199
 msgid "Subscribe"
 msgstr "订阅"
 
@@ -1068,7 +1068,7 @@ msgstr "错误/无效的邮件地址"
 msgid "Hostile address (illegal characters)"
 msgstr "不合法的地址(含有非法的字符)"
 
-#: Mailman/Cgi/admin.py:1495 bin/add_members:150 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1495 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
@@ -1721,8 +1721,8 @@ msgstr ""
 "\n"
 "    <p>或者点击 <em>取消并且删除</em> 来撤销您的取消订阅请求."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:849
-#: Mailman/Cgi/options.py:996 Mailman/Cgi/options.py:1006
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:851
+#: Mailman/Cgi/options.py:998 Mailman/Cgi/options.py:1008
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
@@ -2365,17 +2365,17 @@ msgstr "HTML 没有改变."
 msgid "HTML successfully updated."
 msgstr "HTML更新成功."
 
-#: Mailman/Cgi/listinfo.py:90
+#: Mailman/Cgi/listinfo.py:89
 msgid "%(hostname)s Mailing Lists"
 msgstr " %(hostname)s 邮件列表"
 
-#: Mailman/Cgi/listinfo.py:128
+#: Mailman/Cgi/listinfo.py:127
 msgid ""
 "<p>There currently are no publicly-advertised\n"
 "            %(mailmanlink)s mailing lists on %(hostname)s."
 msgstr "<p>目前在 %(hostname)s 上没有公开的 %(mailmanlink)s 邮件列表."
 
-#: Mailman/Cgi/listinfo.py:132
+#: Mailman/Cgi/listinfo.py:131
 msgid ""
 "<p>Below is a listing of all the public mailing lists on\n"
 "            %(hostname)s.  Click on a list name to get more information "
@@ -2388,11 +2388,11 @@ msgstr ""
 "           点击列表名称以获得关于该列表更多的信息,或者订阅,取消订阅,更改您订"
 "阅的偏好设置."
 
-#: Mailman/Cgi/listinfo.py:138
+#: Mailman/Cgi/listinfo.py:137
 msgid "right"
 msgstr "正确"
 
-#: Mailman/Cgi/listinfo.py:141
+#: Mailman/Cgi/listinfo.py:140
 msgid ""
 " To visit the general information page for an unadvertised list,\n"
 "        open a URL similar to this one, but with a '/' and the %(adj)s\n"
@@ -2403,11 +2403,11 @@ msgstr ""
 "        打开类似的 URL , 但是在列表名后附加上 '/' 和 %(adj)s .\n"
 "        <p>如果你是列表管理员,您可以访问 "
 
-#: Mailman/Cgi/listinfo.py:146
+#: Mailman/Cgi/listinfo.py:145
 msgid "the list admin overview page"
 msgstr "列表管理概览页面"
 
-#: Mailman/Cgi/listinfo.py:147
+#: Mailman/Cgi/listinfo.py:146
 msgid ""
 " to find the management interface for your list.\n"
 "         <p>If you are having trouble using the lists, please contact "
@@ -2415,11 +2415,11 @@ msgstr ""
 " 以找到您的列表管理接口.\n"
 "         <p>如果您在使用列表时碰到的麻烦,请与我们联系 "
 
-#: Mailman/Cgi/listinfo.py:236
+#: Mailman/Cgi/listinfo.py:235
 msgid "Edit Options"
 msgstr "编辑选项"
 
-#: Mailman/Cgi/listinfo.py:243 Mailman/Cgi/options.py:961
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:963
 #: Mailman/Cgi/roster.py:130
 msgid "View this page in"
 msgstr "选择本页所用的语言："
@@ -2441,75 +2441,75 @@ msgstr "没有给出地址"
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "非法的邮件地址: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:179 Mailman/Cgi/options.py:247
-#: Mailman/Cgi/options.py:271 Mailman/Cgi/private.py:163
+#: Mailman/Cgi/options.py:179 Mailman/Cgi/options.py:233
+#: Mailman/Cgi/options.py:257 Mailman/Cgi/private.py:163
 msgid "No such member: %(safeuser)s."
 msgstr "不存在 %(safeuser)s 这个成员."
 
-#: Mailman/Cgi/options.py:218
+#: Mailman/Cgi/options.py:204
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "确认邮件已经发送"
 
-#: Mailman/Cgi/options.py:219
+#: Mailman/Cgi/options.py:205
 #, 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:261
+#: Mailman/Cgi/options.py:247
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "您的密码提示已经发送到您的电子信箱了"
 
-#: Mailman/Cgi/options.py:304
+#: Mailman/Cgi/options.py:290
 msgid "Authentication failed."
 msgstr "认证失败"
 
-#: Mailman/Cgi/options.py:353
+#: Mailman/Cgi/options.py:355
 msgid "A reminder of your password has been emailed to you."
 msgstr "您的密码提示已经发送到您的电子信箱了"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:362
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:361 Mailman/Cgi/options.py:410
-#: Mailman/Cgi/options.py:538 Mailman/Cgi/options.py:761
+#: Mailman/Cgi/options.py:363 Mailman/Cgi/options.py:412
+#: Mailman/Cgi/options.py:540 Mailman/Cgi/options.py:763
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:366
+#: Mailman/Cgi/options.py:368
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "为 %(safeuser)s 列出在 %(hostname)s 上的订阅"
 
-#: Mailman/Cgi/options.py:369
+#: Mailman/Cgi/options.py:371
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "点击连接以访问您请求的邮件列表的选项页面"
 
-#: Mailman/Cgi/options.py:407
+#: Mailman/Cgi/options.py:409
 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:430
+#: Mailman/Cgi/options.py:432
 msgid "Addresses did not match!"
 msgstr "地址不匹配!"
 
-#: Mailman/Cgi/options.py:435
+#: Mailman/Cgi/options.py:437
 msgid "You are already using that email address"
 msgstr "您已经使用了那个邮件地址"
 
-#: Mailman/Cgi/options.py:447
+#: Mailman/Cgi/options.py:449
 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 "
@@ -2521,31 +2521,31 @@ msgstr ""
 "但是您仍然请求对这个地址进行全局的修改.\n"
 "确认后, 其他包含 %(safeuser)s 这个地址的邮件列表将被修改."
 
-#: Mailman/Cgi/options.py:456
+#: Mailman/Cgi/options.py:458
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "新的地址 %(newaddr)s 已经是成员了"
 
-#: Mailman/Cgi/options.py:462
+#: Mailman/Cgi/options.py:464
 msgid "Addresses may not be blank"
 msgstr "地址不能为空"
 
-#: Mailman/Cgi/options.py:476
+#: Mailman/Cgi/options.py:478
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "确认信息已经发送到了 %(newaddr)s ."
 
-#: Mailman/Cgi/options.py:485
+#: Mailman/Cgi/options.py:487
 msgid "Bad email address provided"
 msgstr "提供了错误的邮件地址"
 
-#: Mailman/Cgi/options.py:487
+#: Mailman/Cgi/options.py:489
 msgid "Illegal email address provided"
 msgstr "提供了非法的邮件地址"
 
-#: Mailman/Cgi/options.py:489
+#: Mailman/Cgi/options.py:491
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s 已经是列表的成员."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:494
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2555,11 +2555,11 @@ msgstr ""
 "您提供的邮件地址被禁止。如果您觉得这些限制是错误的，\n"
 "请联系列表管理员 %(owneraddr)s"
 
-#: Mailman/Cgi/options.py:503
+#: Mailman/Cgi/options.py:505
 msgid "Member name successfully changed. "
 msgstr "成员姓名修改成功"
 
-#: Mailman/Cgi/options.py:513
+#: Mailman/Cgi/options.py:515
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2568,15 +2568,15 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:522
+#: Mailman/Cgi/options.py:524
 msgid "Passwords may not be blank"
 msgstr "密码不能为空"
 
-#: Mailman/Cgi/options.py:527
+#: Mailman/Cgi/options.py:529
 msgid "Passwords did not match!"
 msgstr "密码不匹配!"
 
-#: Mailman/Cgi/options.py:535
+#: Mailman/Cgi/options.py:537
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2586,12 +2586,12 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:552 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:554 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "密码修改成功"
 
-#: Mailman/Cgi/options.py:561
+#: Mailman/Cgi/options.py:563
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2600,11 +2600,11 @@ msgstr ""
 "为了确认您取消订阅的请求,您必须选中复选框中 <em>取消订阅</em> \n"
 "                这一项.  您还没有取消订阅!"
 
-#: Mailman/Cgi/options.py:600
+#: Mailman/Cgi/options.py:602
 msgid "Unsubscription results"
 msgstr "退订结果"
 
-#: Mailman/Cgi/options.py:604
+#: Mailman/Cgi/options.py:606
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2614,7 +2614,7 @@ msgstr ""
 "您的退订请求已被收到并转发给列表管理员以待其核准。\n"
 "            管理员作出决定后您将受到一封邮件通知。"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:611
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2628,7 +2628,7 @@ msgstr ""
 "的\n"
 "            问题，请联系列表管理员： %(owneraddr)s。"
 
-#: Mailman/Cgi/options.py:758
+#: Mailman/Cgi/options.py:760
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2636,7 +2636,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:768
+#: Mailman/Cgi/options.py:770
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2646,7 +2646,7 @@ msgstr ""
 "列表管理员已经禁止了此列表的摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:772
+#: Mailman/Cgi/options.py:774
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2656,63 +2656,63 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能，所以您的\n"
 "            投递选项没有被设置，但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:776
+#: Mailman/Cgi/options.py:778
 msgid "You have successfully set your options."
 msgstr "您已经成功设置您的选项。"
 
-#: Mailman/Cgi/options.py:779
+#: Mailman/Cgi/options.py:781
 msgid "You may get one last digest."
 msgstr "您可能会收到最后一封摘要。"
 
-#: Mailman/Cgi/options.py:851
+#: Mailman/Cgi/options.py:853
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>是的，我确实想要退订</em>"
 
-#: Mailman/Cgi/options.py:855
+#: Mailman/Cgi/options.py:857
 msgid "Change My Password"
 msgstr "修改我的口令"
 
-#: Mailman/Cgi/options.py:858
+#: Mailman/Cgi/options.py:860
 msgid "List my other subscriptions"
 msgstr "列出我的所有订阅"
 
-#: Mailman/Cgi/options.py:865
+#: Mailman/Cgi/options.py:867
 msgid "Email My Password To Me"
 msgstr "把我的口令邮寄给我"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:869
 msgid "password"
 msgstr "口令"
 
-#: Mailman/Cgi/options.py:869
+#: Mailman/Cgi/options.py:871
 msgid "Log out"
 msgstr "退出登录"
 
-#: Mailman/Cgi/options.py:871
+#: Mailman/Cgi/options.py:873
 msgid "Submit My Changes"
 msgstr "提交我的修改"
 
-#: Mailman/Cgi/options.py:883
+#: Mailman/Cgi/options.py:885
 msgid "days"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:885
+#: Mailman/Cgi/options.py:887
 msgid "day"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:886
+#: Mailman/Cgi/options.py:888
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:894
 msgid "Change My Address and Name"
 msgstr "修改我的地址和姓名"
 
-#: Mailman/Cgi/options.py:918
+#: Mailman/Cgi/options.py:920
 msgid "<em>No topics defined</em>"
 msgstr "<em>没有已定义的主题</em>"
 
-#: Mailman/Cgi/options.py:926
+#: Mailman/Cgi/options.py:928
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2722,19 +2722,19 @@ msgstr ""
 "您使用大小写相关的地址订阅了此列表\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:942
+#: Mailman/Cgi/options.py:944
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s 列表： 成员选项登录页 "
 
-#: Mailman/Cgi/options.py:943
+#: Mailman/Cgi/options.py:945
 msgid "email address and "
 msgstr "邮件地址和"
 
-#: Mailman/Cgi/options.py:946
+#: Mailman/Cgi/options.py:948
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s 列表： 用户 %(safeuser)s 的成员选项信息"
 
-#: Mailman/Cgi/options.py:972
+#: Mailman/Cgi/options.py:974
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2762,19 +2762,19 @@ msgstr ""
 "    否则您做的所有修改都将不起作用。\n"
 "    "
 
-#: Mailman/Cgi/options.py:986
+#: Mailman/Cgi/options.py:988
 msgid "Email address:"
 msgstr "邮件地址："
 
-#: Mailman/Cgi/options.py:990
+#: Mailman/Cgi/options.py:992
 msgid "Password:"
 msgstr "口令："
 
-#: Mailman/Cgi/options.py:992
+#: Mailman/Cgi/options.py:994
 msgid "Log in"
 msgstr "登录"
 
-#: Mailman/Cgi/options.py:1000
+#: Mailman/Cgi/options.py:1002
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2786,37 +2786,37 @@ msgstr ""
 "    您需要点击确认函中的一个链接来完成整个退订过程(您也可以通过邮件来确认，\n"
 "    请参考确认函中的具体信息)。"
 
-#: Mailman/Cgi/options.py:1008
+#: Mailman/Cgi/options.py:1010
 msgid "Password reminder"
 msgstr "口令提示函"
 
-#: Mailman/Cgi/options.py:1012
+#: Mailman/Cgi/options.py:1014
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr "通过点击<em>提示</em>按钮，您的口令将被邮寄给您。"
 
-#: Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/options.py:1017
 msgid "Remind"
 msgstr "提示"
 
-#: Mailman/Cgi/options.py:1115 Mailman/ListAdmin.py:225
+#: Mailman/Cgi/options.py:1117 Mailman/ListAdmin.py:225
 msgid "<missing>"
 msgstr "<丢失>"
 
-#: Mailman/Cgi/options.py:1126
+#: Mailman/Cgi/options.py:1128
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "请求的主题不存在: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1131
+#: Mailman/Cgi/options.py:1133
 msgid "Topic filter details"
 msgstr "主题过滤器详情"
 
-#: Mailman/Cgi/options.py:1134
+#: Mailman/Cgi/options.py:1136
 msgid "Name:"
 msgstr "名字："
 
-#: Mailman/Cgi/options.py:1136
+#: Mailman/Cgi/options.py:1138
 msgid "Pattern (as regexp):"
 msgstr "模式(正则表达式)"
 
@@ -4825,11 +4825,11 @@ msgstr "没有要发送的摘要。"
 msgid "Invalid value for variable: %(property)s"
 msgstr "该变量的值非法：%(property)s"
 
-#: Mailman/Gui/GUIBase.py:177
+#: Mailman/Gui/GUIBase.py:178
 msgid "Bad email address for option %(property)s: %(error)s"
 msgstr "错误的邮件地址选项%(property)s: %(error)s"
 
-#: Mailman/Gui/GUIBase.py:203
+#: Mailman/Gui/GUIBase.py:204
 msgid ""
 "The following illegal substitution variables were\n"
 "                found in the <code>%(property)s</code> string:\n"
@@ -4842,7 +4842,7 @@ msgstr ""
 "                <code>%(bad)s</code>\n"
 "                <p>不更正这些问题，你的列表可能无法正常运作"
 
-#: Mailman/Gui/GUIBase.py:217
+#: Mailman/Gui/GUIBase.py:218
 msgid ""
 "Your <code>%(property)s</code> string appeared to\n"
 "                    have some correctable problems in its new value.\n"
@@ -5779,7 +5779,14 @@ msgid ""
 "            changed!  It must be an integer > 0."
 msgstr "<b>real_name</b>属性没有被修改!它必须与邮件列表有大小写上的不同"
 
-#: Mailman/Gui/General.py:570
+#: Mailman/Gui/General.py:566
+#, fuzzy
+msgid ""
+"<b>host_name</b> attribute not changed!\n"
+"                It must be a valid domain name."
+msgstr "<b>real_name</b>属性没有被修改!它必须与邮件列表有大小写上的不同"
+
+#: Mailman/Gui/General.py:578
 msgid ""
 "You cannot add a Reply-To: to an explicit\n"
 "            address if that address is blank.  Resetting these values."
@@ -8097,39 +8104,39 @@ msgstr ""
 msgid "Message rejected by filter rule match"
 msgstr "由于匹配过滤规则而被拒绝的信件"
 
-#: Mailman/Handlers/ToDigest.py:174
+#: Mailman/Handlers/ToDigest.py:173
 msgid "%(realname)s Digest, Vol %(volume)d, Issue %(issue)d"
 msgstr "%(realname)s 摘要, 卷 %(volume)d, 发布 %(issue)d"
 
-#: Mailman/Handlers/ToDigest.py:220
+#: Mailman/Handlers/ToDigest.py:219
 msgid "digest header"
 msgstr "摘要头部"
 
-#: Mailman/Handlers/ToDigest.py:223
+#: Mailman/Handlers/ToDigest.py:222
 msgid "Digest Header"
 msgstr "摘要头部"
 
-#: Mailman/Handlers/ToDigest.py:236
+#: Mailman/Handlers/ToDigest.py:235
 msgid "Today's Topics:\n"
 msgstr "本日主题:\n"
 
-#: Mailman/Handlers/ToDigest.py:316
+#: Mailman/Handlers/ToDigest.py:315
 msgid "Today's Topics (%(msgcount)d messages)"
 msgstr "本日主题 (%(msgcount)d 封信件)"
 
-#: Mailman/Handlers/ToDigest.py:342
+#: Mailman/Handlers/ToDigest.py:341
 msgid "[Message discarded by content filter]"
 msgstr "[被内容过滤程序删除的信件]"
 
-#: Mailman/Handlers/ToDigest.py:370
+#: Mailman/Handlers/ToDigest.py:369
 msgid "digest footer"
 msgstr "摘要尾部"
 
-#: Mailman/Handlers/ToDigest.py:373 Mailman/Handlers/ToDigest.py:381
+#: Mailman/Handlers/ToDigest.py:372 Mailman/Handlers/ToDigest.py:380
 msgid "Digest Footer"
 msgstr "摘要尾部"
 
-#: Mailman/Handlers/ToDigest.py:388
+#: Mailman/Handlers/ToDigest.py:387
 msgid "End of "
 msgstr "结束"
 
@@ -8272,36 +8279,36 @@ msgstr "您需要对加入 %(listname)s 邮件列表进行确认"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "您需要对退出 %(listname)s 邮件列表进行确认"
 
-#: Mailman/MailList.py:929 Mailman/MailList.py:1405
+#: Mailman/MailList.py:937 Mailman/MailList.py:1413
 msgid " from %(remote)s"
 msgstr "来自 %(remote)s"
 
-#: Mailman/MailList.py:973
+#: Mailman/MailList.py:981
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "对 %(realname)s 的订阅请求需要列表主持者批准"
 
-#: Mailman/MailList.py:1048 bin/add_members:253
+#: Mailman/MailList.py:1056 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s 订阅通知"
 
-#: Mailman/MailList.py:1067
+#: Mailman/MailList.py:1075
 msgid "unsubscriptions require moderator approval"
 msgstr "退订需要列表主持人批准"
 
-#: Mailman/MailList.py:1088
+#: Mailman/MailList.py:1096
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1249
+#: Mailman/MailList.py:1257
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1322
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s 的订阅需要管理员批准"
 
-#: Mailman/MailList.py:1579
+#: Mailman/MailList.py:1587
 msgid "Last autoresponse notification for today"
 msgstr "本日最后一条自动回复通知"
 
@@ -8485,7 +8492,7 @@ msgid ""
 msgstr ""
 "%(wday)s %(mon)s %(day)2i %(hh)02i:%(mm)02i:%(ss)02i %(tzname)s %(year)04i"
 
-#: bin/add_members:26
+#: bin/add_members:22
 #, fuzzy
 msgid ""
 "Add members to a list from the command line.\n"
@@ -8499,29 +8506,43 @@ msgid ""
 "    -r file\n"
 "        A file containing addresses of the members to be added, one\n"
 "        address per line.  This list of people become non-digest\n"
-"        members.  If file is `-', read addresses from stdin.  Note that\n"
-"        -n/--non-digest-members-file are deprecated synonyms for this "
-"option.\n"
+"        members.  If file is `-', read addresses from stdin.\n"
 "\n"
 "    --digest-members-file=file\n"
 "    -d file\n"
 "        Similar to above, but these people become digest members.\n"
 "\n"
+"    --invite\n"
+"    -i\n"
+"        Specify this if you only want to invite the users to a list\n"
+"        instead of subscribing them.\n"
+"\n"
+"    --invite-msg-file=file\n"
+"    -m file\n"
+"        This will prepend the message in the file to the invite email that\n"
+"        gets generated when --invite is set.\n"
+"\n"
 "    --welcome-msg=<y|n>\n"
 "    -w <y|n>\n"
 "        Set whether or not to send the list members a welcome message,\n"
-"        overriding whatever the list's `send_welcome_msg' setting is.\n"
+"        overriding whatever the list's `send_welcome_msg' setting is.  This\n"
+"        is ignored and the list's setting at the time of acceptance is used\n"
+"        if --invite is set.\n"
 "\n"
 "    --admin-notify=<y|n>\n"
 "    -a <y|n>\n"
 "        Set whether or not to send the list administrators a notification "
 "on\n"
 "        the success/failure of these subscriptions, overriding whatever the\n"
-"        list's `admin_notify_mchanges' setting is.\n"
+"        list's `admin_notify_mchanges' setting is.  This is ignored and the\n"
+"        list's setting at the time of acceptance is used if --invite is "
+"set.\n"
 "\n"
 "    --nomail\n"
 "    -n\n"
-"        Set the newly added members mail delivery to disabled by admin.\n"
+"        Set the newly added members mail delivery to disabled by admin.  "
+"This\n"
+"        is ignored if --invite is set.\n"
 "\n"
 "    --help\n"
 "    -h\n"
@@ -8569,45 +8590,54 @@ msgstr ""
 "\n"
 "-r和-d选项您必须至少C指定一个.最多可以指定一个文件为`-'.\n"
 
-#: bin/add_members:147
+#: bin/add_members:162 bin/add_members:172
 msgid "Already a member: %(member)s"
 msgstr "已经是成员：%(member)s"
 
-#: bin/add_members:153
+#: bin/add_members:178
 msgid "Bad/Invalid email address: blank line"
 msgstr "错误/不合法的邮件地址: 空行"
 
-#: bin/add_members:155
+#: bin/add_members:180
 msgid "Bad/Invalid email address: %(member)s"
 msgstr "错误/不合法的邮件地址： %(member)s"
 
-#: bin/add_members:157
+#: bin/add_members:182
 msgid "Hostile address (illegal characters): %(member)s"
 msgstr "恶意地址(非法字符)： %(member)s"
 
-#: bin/add_members:159
+#: bin/add_members:185
+#, fuzzy
+msgid "Invited: %(member)s"
+msgstr "已订阅: %(member)s"
+
+#: bin/add_members:187
 msgid "Subscribed: %(member)s"
 msgstr "已订阅: %(member)s"
 
-#: bin/add_members:200
+#: bin/add_members:237
 msgid "Bad argument to -w/--welcome-msg: %(arg)s"
 msgstr "-w/--welcome-msg选项的错误参数: %(arg)s "
 
-#: bin/add_members:207
+#: bin/add_members:244
 msgid "Bad argument to -a/--admin-notify: %(arg)s"
 msgstr "-a/--admin-notify选项的错误参数: %(arg)s"
 
-#: bin/add_members:215
+#: bin/add_members:252
 msgid "Cannot read both digest and normal members from standard input."
 msgstr "无法从标准输入既读取摘要用户又读取正常用户 "
 
-#: bin/add_members:221 bin/config_list:110 bin/export.py:271 bin/find_member:97
+#: bin/add_members:256
+msgid "Setting invite-msg-file requires --invite."
+msgstr ""
+
+#: bin/add_members:261 bin/config_list:110 bin/export.py:271 bin/find_member:97
 #: bin/inject:91 bin/list_admins:90 bin/list_members:252 bin/sync_members:222
 #: cron/bumpdigests:86
 msgid "No such list: %(listname)s"
 msgstr "没有此列表： %(listname)s"
 
-#: bin/add_members:241 bin/change_pw:159 bin/check_db:114 bin/discard:83
+#: bin/add_members:285 bin/change_pw:159 bin/check_db:114 bin/discard:83
 #: bin/sync_members:244 bin/update:302 bin/update:323 bin/update:577
 #: cron/bumpdigests:78
 msgid "Nothing to do."