1 files changed, 71 insertions, 30 deletions
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po b/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po
index bdd9e1a768f..a347033c7db 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po
@@ -5,72 +5,113 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_sieve\n"
-"POT-Creation-Date: 2008-03-07 02:10+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-12-28 15:50+0800\n"
 "Last-Translator: Zong Yaotang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: sieve.cpp:332
+#: sieve.cpp:343
 msgid "Connecting to %1..."
 msgstr "正在连接 %1..."
 
-#: sieve.cpp:335
+#: sieve.cpp:346
 msgid "The connection to the server was lost."
 msgstr "到服务器的连接已丢失。"
 
-#: sieve.cpp:347
+#: sieve.cpp:358
 msgid "Server identification failed."
 msgstr "服务器识别失败。"
 
-#: sieve.cpp:374
+#: sieve.cpp:364
+msgid "Can not use TLS. Please enable TLS in the TDE cryptography setting."
+msgstr ""
+
+#: sieve.cpp:371
+msgid ""
+"TLS encryption was requested, but your Sieve server does not advertise TLS in "
+"its capabilities.\n"
+"You can choose to try to initiate TLS negotiations nonetheless, or cancel the "
+"operation."
+msgstr ""
+
+#: sieve.cpp:373
+msgid "Server Does Not Advertise TLS"
+msgstr ""
+
+#: sieve.cpp:373
+msgid "&Start TLS nonetheless"
+msgstr ""
+
+#: sieve.cpp:375
+msgid "TLS encryption requested, but not supported by server."
+msgstr ""
+
+#: sieve.cpp:399
+msgid ""
+"Your Sieve server claims to support TLS, but negotiation was unsuccessful."
+msgstr ""
+
+#: sieve.cpp:401
+#, fuzzy
+msgid "Connection Failed"
+msgstr "认证失败。"
+
+#: sieve.cpp:408
+msgid ""
+"The server does not seem to support TLS. Disable TLS if you want to connect "
+"without encryption."
+msgstr ""
+
+#: sieve.cpp:418
 msgid "Authenticating user..."
 msgstr "正在认证用户..."
 
-#: sieve.cpp:377
+#: sieve.cpp:421
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: sieve.cpp:441 sieve.cpp:653 sieve.cpp:743 sieve.cpp:777
+#: sieve.cpp:485 sieve.cpp:697 sieve.cpp:787 sieve.cpp:821
 msgid "Done."
 msgstr "完成。"
 
-#: sieve.cpp:453
+#: sieve.cpp:497
 msgid "Activating script..."
 msgstr "正在激活脚本..."
 
-#: sieve.cpp:469
+#: sieve.cpp:513
 msgid "There was an error activating the script."
 msgstr "激活脚本时发生错误。"
 
-#: sieve.cpp:487
+#: sieve.cpp:531
 msgid "There was an error deactivating the script."
 msgstr "取消激活脚本时发生错误。"
 
-#: sieve.cpp:515
+#: sieve.cpp:559
 msgid "Sending data..."
 msgstr "正在发送数据..."
 
-#: sieve.cpp:532
+#: sieve.cpp:576
 msgid "TDEIO data supply error."
 msgstr "TDEIO 数据提供错误。"
 
-#: sieve.cpp:559
+#: sieve.cpp:603
 msgid "Quota exceeded"
 msgstr "超过配额"
 
-#: sieve.cpp:592 sieve.cpp:1156
+#: sieve.cpp:636 sieve.cpp:1200
 msgid "Network error."
 msgstr "网络错误。"
 
-#: sieve.cpp:603
+#: sieve.cpp:647
 msgid "Verifying upload completion..."
 msgstr "正在核对上传完成..."
 
-#: sieve.cpp:629 sieve.cpp:637
+#: sieve.cpp:673 sieve.cpp:681
 #, c-format
 msgid ""
 "The script did not upload successfully.\n"
@@ -83,7 +124,7 @@ msgstr ""
 "服务器响应：\n"
 "%1"
 
-#: sieve.cpp:642 sieve.cpp:646
+#: sieve.cpp:686 sieve.cpp:690
 msgid ""
 "The script did not upload successfully.\n"
 "The script may contain errors."
@@ -91,49 +132,49 @@ msgstr ""
 "脚本上传不成功。\n"
 "脚本可能含有错误。"
 
-#: sieve.cpp:681
+#: sieve.cpp:725
 msgid "Retrieving data..."
 msgstr "正在获取数据..."
 
-#: sieve.cpp:730
+#: sieve.cpp:774
 msgid "Finishing up..."
 msgstr "正在结束..."
 
-#: sieve.cpp:738
+#: sieve.cpp:782
 msgid "A protocol error occurred while trying to negotiate script downloading."
 msgstr "当试图协商脚本下载时发生协议错误。"
 
-#: sieve.cpp:750
+#: sieve.cpp:794
 msgid "Folders are not supported."
 msgstr "不支持文件夹。"
 
-#: sieve.cpp:758
+#: sieve.cpp:802
 msgid "Deleting file..."
 msgstr "正在删除文件..."
 
-#: sieve.cpp:773
+#: sieve.cpp:817
 msgid "The server would not delete the file."
 msgstr "服务器将不删除文件。"
 
-#: sieve.cpp:792
+#: sieve.cpp:836
 msgid "Cannot chmod to anything but 0700 (active) or 0600 (inactive script)."
 msgstr "不能改变权限到 0700 (激活的)或 0600 (不激活的脚本)到外的任何值。"
 
-#: sieve.cpp:941
+#: sieve.cpp:985
 msgid "No authentication details supplied."
 msgstr "未提供认证细节。"
 
-#: sieve.cpp:999
+#: sieve.cpp:1043
 msgid "Sieve Authentication Details"
 msgstr "Sieve 认证细节"
 
-#: sieve.cpp:1000
+#: sieve.cpp:1044
 msgid ""
 "Please enter your authentication details for your sieve account (usually the "
 "same as your email password):"
 msgstr "请键入您的 Sieve 帐户的认证细节(通常与您的电子邮件密码相同)："
 
-#: sieve.cpp:1067 sieve.cpp:1079
+#: sieve.cpp:1111 sieve.cpp:1123
 #, c-format
 msgid ""
 "A protocol error occurred during authentication.\n"
@@ -142,7 +183,7 @@ msgstr ""
 "在认证时发生协议错误。\n"
 "请为 %1 选择其它认证方法。"
 
-#: sieve.cpp:1127
+#: sieve.cpp:1171
 #, c-format
 msgid ""
 "Authentication failed.\n"
@@ -155,7 +196,7 @@ msgstr ""
 "服务器回应：\n"
 "%1"
 
-#: sieve.cpp:1205
+#: sieve.cpp:1249
 msgid "A protocol error occurred."
 msgstr "发生了协议错误。"