merge lp:mailman up to rev 1765

1 files changed, 36 insertions, 32 deletions

diff --git a/messages/zh_CN/LC_MESSAGES/mailman.po b/messages/zh_CN/LC_MESSAGES/mailman.po
index db17b12c..042cb958 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 May 26 09:19:45 2018\n"
+"POT-Creation-Date: Sun Jun  3 17:52:55 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"
@@ -3825,132 +3825,136 @@ msgid "English (USA)"
 msgstr "英语(美式)"
 
 #: Mailman/Defaults.py:1749
+msgid "Esperanto"
+msgstr ""
+
+#: Mailman/Defaults.py:1750
 msgid "Spanish (Spain)"
 msgstr "西班牙语(西班牙)"
 
-#: Mailman/Defaults.py:1750
+#: Mailman/Defaults.py:1751
 msgid "Estonian"
 msgstr "爱沙尼亚语"
 
-#: Mailman/Defaults.py:1751
+#: Mailman/Defaults.py:1752
 msgid "Euskara"
 msgstr "喀拉海语"
 
-#: Mailman/Defaults.py:1752
+#: Mailman/Defaults.py:1753
 msgid "Persian"
 msgstr ""
 
-#: Mailman/Defaults.py:1753
+#: Mailman/Defaults.py:1754
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: Mailman/Defaults.py:1754
+#: Mailman/Defaults.py:1755
 msgid "French"
 msgstr "法语"
 
-#: Mailman/Defaults.py:1755
+#: Mailman/Defaults.py:1756
 #, fuzzy
 msgid "Galician"
 msgstr "意大利语"
 
-#: Mailman/Defaults.py:1756
+#: Mailman/Defaults.py:1757
 msgid "Greek"
 msgstr ""
 
-#: Mailman/Defaults.py:1757
+#: Mailman/Defaults.py:1758
 msgid "Hebrew"
 msgstr ""
 
-#: Mailman/Defaults.py:1758
+#: Mailman/Defaults.py:1759
 msgid "Croatian"
 msgstr "克罗地亚语"
 
-#: Mailman/Defaults.py:1759
+#: Mailman/Defaults.py:1760
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: Mailman/Defaults.py:1760
+#: Mailman/Defaults.py:1761
 msgid "Interlingua"
 msgstr ""
 
-#: Mailman/Defaults.py:1761
+#: Mailman/Defaults.py:1762
 msgid "Italian"
 msgstr "意大利语"
 
-#: Mailman/Defaults.py:1762
+#: Mailman/Defaults.py:1763
 msgid "Japanese"
 msgstr "日语"
 
-#: Mailman/Defaults.py:1763
+#: Mailman/Defaults.py:1764
 msgid "Korean"
 msgstr "韩国语"
 
-#: Mailman/Defaults.py:1764
+#: Mailman/Defaults.py:1765
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: Mailman/Defaults.py:1765
+#: Mailman/Defaults.py:1766
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: Mailman/Defaults.py:1766
+#: Mailman/Defaults.py:1767
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: Mailman/Defaults.py:1767
+#: Mailman/Defaults.py:1768
 msgid "Polish"
 msgstr "波兰语"
 
-#: Mailman/Defaults.py:1768
+#: Mailman/Defaults.py:1769
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: Mailman/Defaults.py:1769
+#: Mailman/Defaults.py:1770
 msgid "Portuguese (Brazil)"
 msgstr "葡萄牙语(巴西)"
 
-#: Mailman/Defaults.py:1770
+#: Mailman/Defaults.py:1771
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: Mailman/Defaults.py:1771
+#: Mailman/Defaults.py:1772
 msgid "Russian"
 msgstr "俄语"
 
-#: Mailman/Defaults.py:1772
+#: Mailman/Defaults.py:1773
 #, fuzzy
 msgid "Slovak"
 msgstr "斯洛文尼亚语"
 
-#: Mailman/Defaults.py:1773
+#: Mailman/Defaults.py:1774
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: Mailman/Defaults.py:1774
+#: Mailman/Defaults.py:1775
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: Mailman/Defaults.py:1775
+#: Mailman/Defaults.py:1776
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: Mailman/Defaults.py:1776
+#: Mailman/Defaults.py:1777
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: Mailman/Defaults.py:1777
+#: Mailman/Defaults.py:1778
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: Mailman/Defaults.py:1778
+#: Mailman/Defaults.py:1779
 msgid "Vietnamese"
 msgstr ""
 
-#: Mailman/Defaults.py:1779
+#: Mailman/Defaults.py:1780
 msgid "Chinese (China)"
 msgstr "中文（中国）"
 
-#: Mailman/Defaults.py:1780
+#: Mailman/Defaults.py:1781
 msgid "Chinese (Taiwan)"
 msgstr "中文（台湾）"