Merge translation files from master branch.

2 files changed, 30 insertions, 30 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index 4dd7631416d..bb4d3a081b9 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-03-03 18:57+0100\n"
+"POT-Creation-Date: 2019-04-28 23:56+0200\n"
 "PO-Revision-Date: 2006-04-30 16:49+0800\n"
 "Last-Translator: Funda Wang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -299,7 +299,7 @@ msgstr "确定"
 #: ../dependencies/tqt3/src/dialogs/qerrormessage.cpp:174
 #: ../dependencies/tqt3/src/dialogs/qfiledialog.cpp:2561
 #: ../dependencies/tqt3/src/dialogs/qfiledialog.cpp:4667 common_texts.cpp:67
-#: tdecore/kdebug.cpp:339 tdecore/tdeapplication.cpp:1625
+#: tdecore/kdebug.cpp:341 tdecore/tdeapplication.cpp:1625
 #: tdecore/tdeapplication.cpp:2685 tdecore/tdeapplication.cpp:2720
 #: tdecore/tdeapplication.cpp:2991 tdecore/tdeapplication.cpp:3016
 #: tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po b/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po
index dd554aad1fb..3a86c7b7e14 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_imap4\n"
-"POT-Creation-Date: 2018-12-15 18:41+0100\n"
+"POT-Creation-Date: 2019-04-28 20:29+0200\n"
 "PO-Revision-Date: 2005-08-04 09:52+0800\n"
 "Last-Translator: Funda Wang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -25,88 +25,88 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: imap4.cc:613
+#: imap4.cc:622
 msgid "Message from %1 while processing '%2': %3"
 msgstr "处理“%2”时来自 %1 的邮件：%3"
 
-#: imap4.cc:615
+#: imap4.cc:624
 msgid "Message from %1: %2"
 msgstr "来自 %1 的邮件：%2"
 
-#: imap4.cc:936
+#: imap4.cc:948
 msgid ""
 "The following folder will be created on the server: %1 What do you want to "
 "store in this folder?"
 msgstr "下列文件夹将会在服务器上创建：%1您是否想要在此服务器上存储？"
 
-#: imap4.cc:938
+#: imap4.cc:950
 msgid "Create Folder"
 msgstr "创建文件夹"
 
-#: imap4.cc:939
+#: imap4.cc:951
 msgid "&Messages"
 msgstr "邮件(&M)"
 
-#: imap4.cc:939
+#: imap4.cc:951
 msgid "&Subfolders"
 msgstr "子文件夹(&S)"
 
-#: imap4.cc:1273
+#: imap4.cc:1285
 msgid "Unsubscribe of folder %1 failed. The server returned: %2"
 msgstr "退订文件夹 %1 失败。服务器返回了：%2"
 
-#: imap4.cc:1294
+#: imap4.cc:1306
 msgid "Subscribe of folder %1 failed. The server returned: %2"
 msgstr "订阅文件夹 %1 失败。服务器返回了：%2"
 
-#: imap4.cc:1363 imap4.cc:1375 imap4.cc:1406
+#: imap4.cc:1375 imap4.cc:1387 imap4.cc:1418
 msgid "Changing the flags of message %1 failed."
 msgstr "更改信件 %1 的标志失败。"
 
-#: imap4.cc:1452
+#: imap4.cc:1464
 msgid ""
 "Setting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 msgstr "在文件夹 %1 上设置用户 %2 的访问控制列表失败。服务器返回了：%3"
 
-#: imap4.cc:1471
+#: imap4.cc:1483
 msgid ""
 "Deleting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 msgstr "在文件夹 %1 上删除用户 %2 的访问控制列表失败。服务器返回了：%3"
 
-#: imap4.cc:1488 imap4.cc:1515
+#: imap4.cc:1500 imap4.cc:1527
 msgid ""
 "Retrieving the Access Control List on folder %1 failed. The server returned: "
 "%2"
 msgstr "获取文件夹 %1 的访问控制列表失败。服务器返回了：%2"
 
-#: imap4.cc:1549
+#: imap4.cc:1561
 msgid "Searching of folder %1 failed. The server returned: %2"
 msgstr "搜索文件夹 %1 失败。服务器返回了：%2"
 
-#: imap4.cc:1583
+#: imap4.cc:1595
 #, fuzzy
 msgid "Custom command %1:%2 failed. The server returned: %3"
 msgstr "订阅文件夹 %1 失败。服务器返回了：%2"
 
-#: imap4.cc:1666
+#: imap4.cc:1678
 msgid "Setting the annotation %1 on folder %2  failed. The server returned: %3"
 msgstr "在文件夹 %2 上设定批注 %1 失败。服务器返回了：%3"
 
-#: imap4.cc:1690
+#: imap4.cc:1702
 msgid ""
 "Retrieving the annotation %1 on folder %2 failed. The server returned: %3"
 msgstr "获取文件夹 %2 的批注 %1 失败。服务器返回了：%3"
 
-#: imap4.cc:1727
+#: imap4.cc:1739
 #, fuzzy
 msgid ""
 "Retrieving the quota root information on folder %1 failed. The server "
 "returned: %2"
 msgstr "获取文件夹 %2 的批注 %1 失败。服务器返回了：%3"
 
-#: imap4.cc:2052
+#: imap4.cc:2064
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -114,7 +114,7 @@ msgstr ""
 "服务器 %1 既不支持 IMAP4 也不支持 IMAP4rev1。\n"
 "它将自身标识为：%2"
 
-#: imap4.cc:2063
+#: imap4.cc:2075
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -122,23 +122,23 @@ msgstr ""
 "服务器不支持 TLS。\n"
 "请禁用此安全特性后再不加密连接。"
 
-#: imap4.cc:2088
+#: imap4.cc:2100
 msgid "Starting TLS failed."
 msgstr "启动 TLS 失败。"
 
-#: imap4.cc:2097
+#: imap4.cc:2109
 msgid "LOGIN is disabled by the server."
 msgstr "服务器禁止 LOGIN。"
 
-#: imap4.cc:2104
+#: imap4.cc:2116
 msgid "The authentication method %1 is not supported by the server."
 msgstr "服务器不支持身份验证方式 %1。"
 
-#: imap4.cc:2132
+#: imap4.cc:2144
 msgid "Username and password for your IMAP account:"
 msgstr "您 IMAP 账户的用户名和密码："
 
-#: imap4.cc:2146
+#: imap4.cc:2158
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
 "The server %1 replied:\n"
@@ -148,7 +148,7 @@ msgstr ""
 "服务器 %1 返回了：\n"
 "%2"
 
-#: imap4.cc:2153
+#: imap4.cc:2165
 msgid ""
 "Unable to authenticate via %1.\n"
 "The server %2 replied:\n"
@@ -158,11 +158,11 @@ msgstr ""
 "服务器 %2 返回了：\n"
 "%3"
 
-#: imap4.cc:2160
+#: imap4.cc:2172
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr "SASL 身份验证未编译进 tdeio_imap4。"
 
-#: imap4.cc:2704
+#: imap4.cc:2716
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "无法打开文件夹 %1。服务器返回了：%2"