Merge translation files from master branch.

3 files changed, 40 insertions, 40 deletions

diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
index 10ad1351c83..c8711d54c68 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2008-01-29 17:02+0000\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
@@ -3440,7 +3440,7 @@ msgid "Please enter the same password twice."
 msgstr "请输入两次同样的密码。"
 
 #: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:160
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
 msgid "Password entries do not match."
 msgstr "两次密码不符。"
 
@@ -3597,7 +3597,7 @@ msgid "&Manage Privacy..."
 msgstr "管理隐私(&M)..."
 
 #: protocols/groupwise/gwaccount.cpp:251 protocols/jabber/jabberaccount.cpp:428
-#: protocols/jabber/ui/jabberregisteraccount.cpp:269
+#: protocols/jabber/ui/jabberregisteraccount.cpp:270
 #, fuzzy
 msgid ""
 "SSL support could not be initialized for account %1. This is most likely "
@@ -4972,7 +4972,7 @@ msgid "Jabber Error"
 msgstr "Jabber 错误"
 
 #: protocols/jabber/jabberaccount.cpp:430
-#: protocols/jabber/ui/jabberregisteraccount.cpp:271
+#: protocols/jabber/ui/jabberregisteraccount.cpp:272
 msgid "Jabber SSL Error"
 msgstr "Jabber SSL 错误"
 
@@ -5889,7 +5889,7 @@ msgstr "请输入服务器名称，或单击选择。"
 msgid "Please enter a valid Jabber ID."
 msgstr "请输入有效的 Jabber ID。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:192
+#: protocols/jabber/ui/jabberregisteraccount.cpp:193
 msgid ""
 "Unless you know what you are doing, your JID should be of the form "
 "\"username@server.com\".  In your case for example \"username@%1\"."
@@ -5897,33 +5897,33 @@ msgstr ""
 "除非您知道您在做什么，您的 JID 格式应该是“username@server.com”。您的情况就应"
 "该是“username@%1”。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:247
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
 msgid "Connecting to server..."
 msgstr "正在连接到服务器..."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:316
+#: protocols/jabber/ui/jabberregisteraccount.cpp:317
 msgid "Protocol error."
 msgstr "协议错误。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:329
+#: protocols/jabber/ui/jabberregisteraccount.cpp:330
 msgid "Connected successfully, registering new account..."
 msgstr "连接成功，正在注册新账户..."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:344
+#: protocols/jabber/ui/jabberregisteraccount.cpp:345
 msgid "Registration successful."
 msgstr "注册成功。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
 msgid "Registration failed."
 msgstr "注册失败。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:380
+#: protocols/jabber/ui/jabberregisteraccount.cpp:381
 msgid ""
 "Unable to create account on the server. The Jabber ID is probably already in "
 "use."
 msgstr "无法在服务器上创建账户。Jabber ID 可能已经被别人使用了。"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:381
+#: protocols/jabber/ui/jabberregisteraccount.cpp:382
 msgid "Jabber Account Registration"
 msgstr "Jabber 账户注册"
 
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/krdc.po b/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
index e009275b330..d3f393e8112 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krdc\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2005-08-02 17:28+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -282,13 +282,13 @@ msgstr "无法启动 rdesktop；请确定 rdesktop 已经正确安装。"
 msgid "rdesktop Failure"
 msgstr "rdesktop 失败"
 
-#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:470
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
 msgid "Connection attempt to host failed."
 msgstr "连接到主机失败。"
 
-#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:217 vnc/kvncview.cpp:471
-#: vnc/kvncview.cpp:476 vnc/kvncview.cpp:481 vnc/kvncview.cpp:486
-#: vnc/kvncview.cpp:491 vnc/kvncview.cpp:496
+#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:225 vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:473 vnc/kvncview.cpp:478 vnc/kvncview.cpp:483
+#: vnc/kvncview.cpp:488 vnc/kvncview.cpp:493
 msgid "Connection Failure"
 msgstr "连接失败"
 
@@ -307,55 +307,55 @@ msgstr "是"
 msgid "no"
 msgstr "否"
 
-#: vnc/kvncview.cpp:216
+#: vnc/kvncview.cpp:224
 msgid "It is not possible to connect to a local desktop sharing service."
 msgstr "不可能连接到本地桌面共享服务。"
 
-#: vnc/kvncview.cpp:231
+#: vnc/kvncview.cpp:239
 #, c-format
 msgid "VNC Host Preferences for %1"
 msgstr "%1 的 VNC 主机首选项"
 
-#: vnc/kvncview.cpp:419
+#: vnc/kvncview.cpp:416
 msgid "Access to the system requires a password."
 msgstr "访问系统需要密码。"
 
-#: vnc/kvncview.cpp:475
+#: vnc/kvncview.cpp:472
 msgid "Remote host is using an incompatible protocol."
 msgstr "远程主机使用的协议不兼容。"
 
-#: vnc/kvncview.cpp:480
+#: vnc/kvncview.cpp:477
 msgid "The connection to the host has been interrupted."
 msgstr "到主机的连接被中断。"
 
-#: vnc/kvncview.cpp:485
+#: vnc/kvncview.cpp:482
 msgid "Connection failed. The server does not accept new connections."
 msgstr "连接失败。服务器不接受新连接。"
 
-#: vnc/kvncview.cpp:490
+#: vnc/kvncview.cpp:487
 msgid "Connection failed. A server with the given name cannot be found."
 msgstr "连接失败。找不到给定名称的服务器。"
 
-#: vnc/kvncview.cpp:495
+#: vnc/kvncview.cpp:492
 #, fuzzy
 msgid ""
 "Connection failed. No server running at the given address and port. Verify "
 "the KDED TDE Internet Daemon is running at the remote server."
 msgstr "连接失败。给定地址和端口没有运行服务器。"
 
-#: vnc/kvncview.cpp:504
+#: vnc/kvncview.cpp:501
 msgid "Authentication failed. Connection aborted."
 msgstr "认证失败。连接中止。"
 
-#: vnc/kvncview.cpp:505
+#: vnc/kvncview.cpp:502
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: vnc/kvncview.cpp:509
+#: vnc/kvncview.cpp:506
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: vnc/kvncview.cpp:510
+#: vnc/kvncview.cpp:507
 msgid "Unknown Error"
 msgstr "未知错误"
 
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/krfb.po b/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
index 7660911691f..f4af5ab9f92 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2005-01-09 21:58+0800\n"
 "Last-Translator: Funda Wang <fundawnag@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -153,7 +153,7 @@ msgstr ""
 "找不到 KInetD。TDE 守护程序(kded)可能已经崩溃或者根本没有启动，或者是安装失"
 "败。"
 
-#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:894
+#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:885
 msgid "Desktop Sharing Error"
 msgstr "桌面共享错误"
 
@@ -167,43 +167,43 @@ msgstr "找不到用于桌面共享(krfb)的 KInetD 服务。安装不完整或�
 msgid "Personal Invitation"
 msgstr "个人邀请"
 
-#: krfb/rfbcontroller.cc:378
+#: krfb/rfbcontroller.cc:376
 msgid "%1@%2 (shared desktop)"
 msgstr "%1@%2 (共享的桌面)"
 
-#: krfb/rfbcontroller.cc:516
+#: krfb/rfbcontroller.cc:510
 #, c-format
 msgid "User accepts connection from %1"
 msgstr "用户接受来自 %1 的连接"
 
-#: krfb/rfbcontroller.cc:530
+#: krfb/rfbcontroller.cc:523
 #, c-format
 msgid "User refuses connection from %1"
 msgstr "用户拒绝来自 %1 的连接"
 
-#: krfb/rfbcontroller.cc:578
+#: krfb/rfbcontroller.cc:571
 #, c-format
 msgid "Closed connection: %1."
 msgstr "关闭的连接：%1。"
 
-#: krfb/rfbcontroller.cc:705 krfb/rfbcontroller.cc:710
+#: krfb/rfbcontroller.cc:700 krfb/rfbcontroller.cc:705
 msgid "Failed login attempt from %1: wrong password"
 msgstr "来自 %1 的登录失败：密码不对"
 
-#: krfb/rfbcontroller.cc:748
+#: krfb/rfbcontroller.cc:741
 msgid "Connection refused from %1, already connected."
 msgstr "来自 %1 的连接被拒绝，连接已经存在。"
 
-#: krfb/rfbcontroller.cc:758
+#: krfb/rfbcontroller.cc:751
 #, c-format
 msgid "Accepted uninvited connection from %1"
 msgstr "已接受来自 %1 的未邀请连接"
 
-#: krfb/rfbcontroller.cc:766
+#: krfb/rfbcontroller.cc:759
 msgid "Received connection from %1, on hold (waiting for confirmation)"
 msgstr "收到来自 %1 的连接，正在等待(等候确认)"
 
-#: krfb/rfbcontroller.cc:893
+#: krfb/rfbcontroller.cc:884
 msgid ""
 "Your X11 Server does not support the required XTest extension version 2.2. "
 "Sharing your desktop is not possible."