merge lp:mailman/2.1 rev 1823

1 files changed, 19 insertions, 20 deletions

diff --git a/messages/zh_TW/LC_MESSAGES/mailman.po b/messages/zh_TW/LC_MESSAGES/mailman.po
index add86699..3624bc33 100755
--- a/messages/zh_TW/LC_MESSAGES/mailman.po
+++ b/messages/zh_TW/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman-2.0\n"
-"POT-Creation-Date: Tue Sep 17 14:12:32 2019\n"
+"POT-Creation-Date: Sat Oct  5 14:26:33 2019\n"
 "PO-Revision-Date: Tue Jan 16 10:00:00 2001\n"
 "Last-Translator: Yuan-Chen Cheng <ycheng@slat.org>\n"
 "Language-Team: Chinese (traditional) <zh-L10n@linux.org.tw>\n"
@@ -300,7 +300,7 @@ msgstr ""
 "您必須自兩者中擇一使用，不然您的通信論壇基本上是無法使用的。"
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1764 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1774 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "警告："
 
@@ -1054,21 +1054,21 @@ msgstr ""
 msgid "Already a member"
 msgstr "已是訂戶"
 
-#: Mailman/Cgi/admin.py:1519 Mailman/Cgi/admin.py:1683
+#: Mailman/Cgi/admin.py:1519 Mailman/Cgi/admin.py:1693
 msgid "&lt;blank line&gt;"
 msgstr "&lt;空白行&gt;"
 
 #: Mailman/Cgi/admin.py:1520 Mailman/Cgi/admin.py:1523
-#: Mailman/Cgi/admin.py:1684 Mailman/Cgi/admin.py:1687
+#: Mailman/Cgi/admin.py:1694 Mailman/Cgi/admin.py:1697
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "不良或不正確的 email 地址"
 
-#: Mailman/Cgi/admin.py:1526 Mailman/Cgi/admin.py:1690
+#: Mailman/Cgi/admin.py:1526 Mailman/Cgi/admin.py:1700
 msgid "Hostile address (illegal characters)"
 msgstr "爛地址（含有不合法字元）"
 
-#: Mailman/Cgi/admin.py:1529 Mailman/Cgi/admin.py:1693 bin/add_members:175
+#: Mailman/Cgi/admin.py:1529 Mailman/Cgi/admin.py:1703 bin/add_members:175
 #: bin/clone_member:136 bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
@@ -1077,7 +1077,7 @@ msgstr ""
 msgid "Successfully invited:"
 msgstr "邀請成功："
 
-#: Mailman/Cgi/admin.py:1537 Mailman/Cgi/admin.py:1718
+#: Mailman/Cgi/admin.py:1537 Mailman/Cgi/admin.py:1728
 msgid "Successfully subscribed:"
 msgstr "訂閱成功："
 
@@ -1085,7 +1085,7 @@ msgstr "訂閱成功："
 msgid "Error inviting:"
 msgstr "邀請失敗："
 
-#: Mailman/Cgi/admin.py:1544 Mailman/Cgi/admin.py:1722
+#: Mailman/Cgi/admin.py:1544 Mailman/Cgi/admin.py:1732
 msgid "Error subscribing:"
 msgstr "訂閱失敗："
 
@@ -1093,7 +1093,7 @@ msgstr "訂閱失敗："
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1578
+#: Mailman/Cgi/admin.py:1578 Mailman/Cgi/admin.py:1737
 msgid "Successfully Unsubscribed:"
 msgstr "退訂成功："
 
@@ -1158,32 +1158,27 @@ msgstr "通知"
 msgid "Notification sent to %(schange_to)s."
 msgstr "通知"
 
-#: Mailman/Cgi/admin.py:1727
-#, fuzzy
-msgid "Successfully unsubscribed:"
-msgstr "退訂成功："
-
-#: Mailman/Cgi/admin.py:1735
+#: Mailman/Cgi/admin.py:1745
 msgid "Bad moderation flag value"
 msgstr "錯誤的裁決設定值"
 
-#: Mailman/Cgi/admin.py:1755
+#: Mailman/Cgi/admin.py:1765
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1760
+#: Mailman/Cgi/admin.py:1770
 msgid "Not subscribed"
 msgstr "不是訂戶"
 
-#: Mailman/Cgi/admin.py:1763
+#: Mailman/Cgi/admin.py:1773
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "忽略對已除名訂戶 %(user)s 的設定"
 
-#: Mailman/Cgi/admin.py:1803
+#: Mailman/Cgi/admin.py:1813
 msgid "Successfully Removed:"
 msgstr "成功除名："
 
-#: Mailman/Cgi/admin.py:1807
+#: Mailman/Cgi/admin.py:1817
 msgid "Error Unsubscribing:"
 msgstr "退訂時出錯："
 
@@ -11069,6 +11064,10 @@ msgstr ""
 " --listname=論壇名\n"
 " 只為指定的論壇派發文摘，若沒指定，會處理所有的論壇。\n"
 
+#, fuzzy
+#~ msgid "Successfully unsubscribed:"
+#~ msgstr "退訂成功："
+
 #~ msgid "The message headers matched a filter rule"
 #~ msgstr "訊息標頭符合過濾程式規則"