merge lp:mailman/2.1 up to rev 1827

1 files changed, 93 insertions, 75 deletions

diff --git a/messages/zh_CN/LC_MESSAGES/mailman.po b/messages/zh_CN/LC_MESSAGES/mailman.po
index b9fce273..8a722310 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: Sat Oct  5 14:26:33 2019\n"
+"POT-Creation-Date: Fri Nov  8 13:34:03 2019\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"
@@ -882,14 +882,15 @@ msgstr "向新的订阅者发送欢迎信件么?"
 #: Mailman/Gui/General.py:385 Mailman/Gui/General.py:390
 #: Mailman/Gui/General.py:396 Mailman/Gui/General.py:416
 #: Mailman/Gui/General.py:448 Mailman/Gui/General.py:471
-#: Mailman/Gui/General.py:488 Mailman/Gui/NonDigest.py:45
-#: Mailman/Gui/NonDigest.py:53 Mailman/Gui/NonDigest.py:140
-#: Mailman/Gui/NonDigest.py:162 Mailman/Gui/Privacy.py:111
-#: Mailman/Gui/Privacy.py:129 Mailman/Gui/Privacy.py:162
-#: Mailman/Gui/Privacy.py:215 Mailman/Gui/Privacy.py:317
-#: Mailman/Gui/Privacy.py:334 Mailman/Gui/Privacy.py:489
-#: Mailman/Gui/Privacy.py:508 Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56
-#: Mailman/Gui/Usenet.py:93 Mailman/Gui/Usenet.py:105
+#: Mailman/Gui/General.py:488 Mailman/Gui/General.py:511
+#: Mailman/Gui/NonDigest.py:45 Mailman/Gui/NonDigest.py:53
+#: Mailman/Gui/NonDigest.py:140 Mailman/Gui/NonDigest.py:162
+#: Mailman/Gui/Privacy.py:111 Mailman/Gui/Privacy.py:129
+#: Mailman/Gui/Privacy.py:162 Mailman/Gui/Privacy.py:215
+#: Mailman/Gui/Privacy.py:317 Mailman/Gui/Privacy.py:334
+#: Mailman/Gui/Privacy.py:489 Mailman/Gui/Privacy.py:508
+#: Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93
+#: Mailman/Gui/Usenet.py:105
 msgid "No"
 msgstr "不"
 
@@ -911,14 +912,14 @@ msgstr "不"
 #: Mailman/Gui/General.py:390 Mailman/Gui/General.py:396
 #: Mailman/Gui/General.py:416 Mailman/Gui/General.py:448
 #: Mailman/Gui/General.py:471 Mailman/Gui/General.py:488
-#: Mailman/Gui/NonDigest.py:45 Mailman/Gui/NonDigest.py:53
-#: Mailman/Gui/NonDigest.py:140 Mailman/Gui/NonDigest.py:162
-#: Mailman/Gui/Privacy.py:111 Mailman/Gui/Privacy.py:129
-#: Mailman/Gui/Privacy.py:162 Mailman/Gui/Privacy.py:215
-#: Mailman/Gui/Privacy.py:317 Mailman/Gui/Privacy.py:334
-#: Mailman/Gui/Privacy.py:489 Mailman/Gui/Privacy.py:508
-#: Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93
-#: Mailman/Gui/Usenet.py:105
+#: Mailman/Gui/General.py:511 Mailman/Gui/NonDigest.py:45
+#: Mailman/Gui/NonDigest.py:53 Mailman/Gui/NonDigest.py:140
+#: Mailman/Gui/NonDigest.py:162 Mailman/Gui/Privacy.py:111
+#: Mailman/Gui/Privacy.py:129 Mailman/Gui/Privacy.py:162
+#: Mailman/Gui/Privacy.py:215 Mailman/Gui/Privacy.py:317
+#: Mailman/Gui/Privacy.py:334 Mailman/Gui/Privacy.py:489
+#: Mailman/Gui/Privacy.py:508 Mailman/Gui/Usenet.py:52 Mailman/Gui/Usenet.py:56
+#: Mailman/Gui/Usenet.py:93 Mailman/Gui/Usenet.py:105
 msgid "Yes"
 msgstr "是"
 
@@ -3839,166 +3840,166 @@ msgstr "没订阅摘要(普通的)的成员:"
 msgid "Digest members:"
 msgstr "订阅了摘要的成员:"
 
-#: Mailman/Defaults.py:1783
+#: Mailman/Defaults.py:1790
 msgid "Arabic"
 msgstr ""
 
-#: Mailman/Defaults.py:1784
+#: Mailman/Defaults.py:1791
 #, fuzzy
 msgid "Asturian"
 msgstr "爱沙尼亚语"
 
-#: Mailman/Defaults.py:1785
+#: Mailman/Defaults.py:1792
 msgid "Catalan"
 msgstr "(西班牙)加泰罗尼亚语"
 
-#: Mailman/Defaults.py:1786
+#: Mailman/Defaults.py:1793
 msgid "Czech"
 msgstr "捷克语"
 
-#: Mailman/Defaults.py:1787
+#: Mailman/Defaults.py:1794
 msgid "Danish"
 msgstr "丹麦语"
 
-#: Mailman/Defaults.py:1788
+#: Mailman/Defaults.py:1795
 msgid "German"
 msgstr "德语"
 
-#: Mailman/Defaults.py:1789
+#: Mailman/Defaults.py:1796
 msgid "English (USA)"
 msgstr "英语(美式)"
 
-#: Mailman/Defaults.py:1790
+#: Mailman/Defaults.py:1797
 msgid "Esperanto"
 msgstr ""
 
-#: Mailman/Defaults.py:1791
+#: Mailman/Defaults.py:1798
 msgid "Spanish (Spain)"
 msgstr "西班牙语(西班牙)"
 
-#: Mailman/Defaults.py:1792
+#: Mailman/Defaults.py:1799
 msgid "Estonian"
 msgstr "爱沙尼亚语"
 
-#: Mailman/Defaults.py:1793
+#: Mailman/Defaults.py:1800
 msgid "Euskara"
 msgstr "喀拉海语"
 
-#: Mailman/Defaults.py:1794
+#: Mailman/Defaults.py:1801
 msgid "Persian"
 msgstr ""
 
-#: Mailman/Defaults.py:1795
+#: Mailman/Defaults.py:1802
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: Mailman/Defaults.py:1796
+#: Mailman/Defaults.py:1803
 msgid "French"
 msgstr "法语"
 
-#: Mailman/Defaults.py:1797
+#: Mailman/Defaults.py:1804
 #, fuzzy
 msgid "Galician"
 msgstr "意大利语"
 
-#: Mailman/Defaults.py:1798
+#: Mailman/Defaults.py:1805
 msgid "Greek"
 msgstr ""
 
-#: Mailman/Defaults.py:1799
+#: Mailman/Defaults.py:1806
 msgid "Hebrew"
 msgstr ""
 
-#: Mailman/Defaults.py:1800
+#: Mailman/Defaults.py:1807
 msgid "Croatian"
 msgstr "克罗地亚语"
 
-#: Mailman/Defaults.py:1801
+#: Mailman/Defaults.py:1808
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: Mailman/Defaults.py:1802
+#: Mailman/Defaults.py:1809
 msgid "Interlingua"
 msgstr ""
 
-#: Mailman/Defaults.py:1803
+#: Mailman/Defaults.py:1810
 msgid "Italian"
 msgstr "意大利语"
 
-#: Mailman/Defaults.py:1804
+#: Mailman/Defaults.py:1811
 msgid "Japanese"
 msgstr "日语"
 
-#: Mailman/Defaults.py:1805
+#: Mailman/Defaults.py:1812
 msgid "Korean"
 msgstr "韩国语"
 
-#: Mailman/Defaults.py:1806
+#: Mailman/Defaults.py:1813
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: Mailman/Defaults.py:1807
+#: Mailman/Defaults.py:1814
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: Mailman/Defaults.py:1808
+#: Mailman/Defaults.py:1815
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: Mailman/Defaults.py:1809
+#: Mailman/Defaults.py:1816
 msgid "Polish"
 msgstr "波兰语"
 
-#: Mailman/Defaults.py:1810
+#: Mailman/Defaults.py:1817
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: Mailman/Defaults.py:1811
+#: Mailman/Defaults.py:1818
 msgid "Portuguese (Brazil)"
 msgstr "葡萄牙语(巴西)"
 
-#: Mailman/Defaults.py:1812
+#: Mailman/Defaults.py:1819
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: Mailman/Defaults.py:1813
+#: Mailman/Defaults.py:1820
 msgid "Russian"
 msgstr "俄语"
 
-#: Mailman/Defaults.py:1814
+#: Mailman/Defaults.py:1821
 #, fuzzy
 msgid "Slovak"
 msgstr "斯洛文尼亚语"
 
-#: Mailman/Defaults.py:1815
+#: Mailman/Defaults.py:1822
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: Mailman/Defaults.py:1816
+#: Mailman/Defaults.py:1823
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: Mailman/Defaults.py:1817
+#: Mailman/Defaults.py:1824
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: Mailman/Defaults.py:1818
+#: Mailman/Defaults.py:1825
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: Mailman/Defaults.py:1819
+#: Mailman/Defaults.py:1826
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: Mailman/Defaults.py:1820
+#: Mailman/Defaults.py:1827
 msgid "Vietnamese"
 msgstr ""
 
-#: Mailman/Defaults.py:1821
+#: Mailman/Defaults.py:1828
 msgid "Chinese (China)"
 msgstr "中文（中国）"
 
-#: Mailman/Defaults.py:1822
+#: Mailman/Defaults.py:1829
 msgid "Chinese (Taiwan)"
 msgstr "中文（台湾）"
 
@@ -5797,20 +5798,37 @@ msgid ""
 "                 here."
 msgstr ""
 
-#: Mailman/Gui/General.py:511
+#: Mailman/Gui/General.py:512
+msgid "Should duplicate avoidance drop addresses from Cc: headers"
+msgstr ""
+
+#: Mailman/Gui/General.py:513
+msgid ""
+"The process which avoids sending a list copy of a message to\n"
+"               a member who is also directly addressed in To: or Cc: can "
+"drop\n"
+"               the address from Cc: to avoid growing a long Cc: list in "
+"long\n"
+"               threads.  This can be undesirable as it can break DKIM\n"
+"               signatures and possibly cause confusion.  To avoid changes "
+"to\n"
+"               Cc: headers, set this to No."
+msgstr ""
+
+#: Mailman/Gui/General.py:524
 msgid ""
 "Discard held messages older than this number of days.\n"
 "            Use 0 for no automatic discarding."
 msgstr "丢弃此日数前被延缓的邮件。0 表示不自动丢弃"
 
-#: Mailman/Gui/General.py:521
+#: Mailman/Gui/General.py:534
 msgid ""
 "<b>real_name</b> attribute not\n"
 "            changed!  It must differ from the list's name by case\n"
 "            only."
 msgstr "<b>real_name</b>属性没有被修改!它必须与邮件列表有大小写上的不同"
 
-#: Mailman/Gui/General.py:549
+#: Mailman/Gui/General.py:562
 msgid ""
 "The <b>info</b> attribute you saved\n"
 "contains suspicious HTML that could potentially expose your users to cross-"
@@ -5824,21 +5842,21 @@ msgid ""
 "                        "
 msgstr ""
 
-#: Mailman/Gui/General.py:560
+#: Mailman/Gui/General.py:573
 #, fuzzy
 msgid ""
 "<b>admin_member_chunksize</b> attribute not\n"
 "            changed!  It must be an integer > 0."
 msgstr "<b>real_name</b>属性没有被修改!它必须与邮件列表有大小写上的不同"
 
-#: Mailman/Gui/General.py:566
+#: Mailman/Gui/General.py:579
 #, 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
+#: Mailman/Gui/General.py:591
 msgid ""
 "You cannot add a Reply-To: to an explicit\n"
 "            address if that address is blank.  Resetting these values."
@@ -8374,56 +8392,56 @@ msgstr "您需要对加入 %(listname)s 邮件列表进行确认"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "您需要对退出 %(listname)s 邮件列表进行确认"
 
-#: Mailman/MailList.py:974 Mailman/MailList.py:1465
+#: Mailman/MailList.py:975 Mailman/MailList.py:1466
 msgid " from %(remote)s"
 msgstr "来自 %(remote)s"
 
-#: Mailman/MailList.py:1018
+#: Mailman/MailList.py:1019
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "对 %(realname)s 的订阅请求需要列表主持者批准"
 
-#: Mailman/MailList.py:1100 bin/add_members:299
+#: Mailman/MailList.py:1101 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s 订阅通知"
 
-#: Mailman/MailList.py:1120
+#: Mailman/MailList.py:1121
 msgid "unsubscriptions require moderator approval"
 msgstr "退订需要列表主持人批准"
 
-#: Mailman/MailList.py:1141
+#: Mailman/MailList.py:1142
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1303
+#: Mailman/MailList.py:1304
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1337
+#: Mailman/MailList.py:1338
 #, fuzzy
 msgid "via email confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1346
+#: Mailman/MailList.py:1347
 #, fuzzy
 msgid "via web confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1371
+#: Mailman/MailList.py:1372
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s 的订阅需要管理员批准"
 
-#: Mailman/MailList.py:1381
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "email confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1383
+#: Mailman/MailList.py:1384
 #, fuzzy
 msgid "web confirmation"
 msgstr "输入验证cookie"
 
-#: Mailman/MailList.py:1639
+#: Mailman/MailList.py:1640
 msgid "Last autoresponse notification for today"
 msgstr "本日最后一条自动回复通知"