Merge translation files from master branch.

2 files changed, 61 insertions, 61 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index fe5b2c5d1c8..688e1eb84de 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-08-15 03:07+0200\n"
 "PO-Revision-Date: 2005-08-09 13:07+0800\n"
 "Last-Translator: Funda Wang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -77,8 +77,8 @@ msgstr ""
 #: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
 #: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
 #: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1340
-#: mediamanager/tdehardwarebackend.cpp:1351
+#: mediamanager/tdehardwarebackend.cpp:1341
+#: mediamanager/tdehardwarebackend.cpp:1352
 #, c-format
 msgid "No such medium: %1"
 msgstr "没有此类媒体： %1"
@@ -115,12 +115,12 @@ msgstr "远程共享"
 msgid "Hard Disk"
 msgstr "硬盘"
 
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:796
+#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:797
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "未知"
 
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:826
+#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:827
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "软盘"
@@ -130,7 +130,7 @@ msgstr "软盘"
 msgid "Zip Drive"
 msgstr "Zip 磁盘"
 
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:883
+#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:884
 msgid "Camera"
 msgstr "相机"
 
@@ -175,23 +175,23 @@ msgstr ""
 "此外，还检测到了仍然在使用设备的程序，程序清单列在下面。您需要关闭这些程序，"
 "或者更改其工作目录，然后再尝试卸载设备。"
 
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1579
+#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1580
 msgid ""
 "Programs that were still using the device have been forcibly terminated. "
 "They are listed below."
 msgstr ""
 
 #: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1397
-#: mediamanager/tdehardwarebackend.cpp:1415
-#: mediamanager/tdehardwarebackend.cpp:1455
+#: mediamanager/tdehardwarebackend.cpp:1398
+#: mediamanager/tdehardwarebackend.cpp:1416
+#: mediamanager/tdehardwarebackend.cpp:1456
 msgid ""
 "Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
 "mounted at <b>%4</b> could not be unmounted. "
 msgstr ""
 "设备 <b>%1</b> (%2) 名为<b>“%3”</b>，目前正挂载于 <b>%4</b>，现在无法卸载。"
 
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1461
+#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1462
 msgid "The following error was returned by umount command:"
 msgstr "umount 命令返回了下列错误："
 
@@ -200,7 +200,7 @@ msgstr "umount 命令返回了下列错误："
 msgid "Permission denied"
 msgstr "拒绝许可权限"
 
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1223
+#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1224
 msgid "Cannot mount encrypted drives!"
 msgstr ""
 
@@ -245,142 +245,142 @@ msgstr "功能仅对于 HAL 可用"
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "功能仅对于 HAL 可用"
 
-#: mediamanager/tdehardwarebackend.cpp:471
-#: mediamanager/tdehardwarebackend.cpp:508
-#: mediamanager/tdehardwarebackend.cpp:741
+#: mediamanager/tdehardwarebackend.cpp:472
+#: mediamanager/tdehardwarebackend.cpp:509
+#: mediamanager/tdehardwarebackend.cpp:742
 #, fuzzy
 msgid "%1 Removable Device"
 msgstr "可移动设备"
 
-#: mediamanager/tdehardwarebackend.cpp:516
+#: mediamanager/tdehardwarebackend.cpp:517
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:526
 msgid "Blank CD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:535
 msgid "Blank CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:544
 msgid "Blank Magneto-Optical CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:553
 msgid "Blank Mount Ranier CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:571
 msgid "Blank DVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:580
 msgid "Blank DVD-RAM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:589
 msgid "Blank DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:598
 msgid "Blank DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:607
 msgid "Blank Dual Layer DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:616
 msgid "Blank Dual Layer DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:625
 msgid "Blank DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:634
 msgid "Blank DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:643
 msgid "Blank Dual Layer DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank Dual Layer DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:661
 msgid "Blank BD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:670
 msgid "Blank BD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:679
 msgid "Blank BD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:688
 msgid "Blank HDDVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:697
 msgid "Blank HDDVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:706
 msgid "Blank HDDVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:712
+#: mediamanager/tdehardwarebackend.cpp:713
 msgid "Audio CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:733
+#: mediamanager/tdehardwarebackend.cpp:734
 msgid "%1 Fixed Disk (%2)"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:840
+#: mediamanager/tdehardwarebackend.cpp:841
 #, fuzzy
 msgid "%1 Zip Disk"
 msgstr "Zip 磁盘"
 
-#: mediamanager/tdehardwarebackend.cpp:1203
-#: mediamanager/tdehardwarebackend.cpp:1383
+#: mediamanager/tdehardwarebackend.cpp:1204
+#: mediamanager/tdehardwarebackend.cpp:1384
 #, fuzzy
 msgid "Internal error"
 msgstr "内部错误"
 
-#: mediamanager/tdehardwarebackend.cpp:1230
+#: mediamanager/tdehardwarebackend.cpp:1231
 msgid ""
 "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
 "device and/or user privilege level<br>Corrupt data on storage device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1232
-#: mediamanager/tdehardwarebackend.cpp:1307
-#: mediamanager/tdehardwarebackend.cpp:1399
-#: mediamanager/tdehardwarebackend.cpp:1417
+#: mediamanager/tdehardwarebackend.cpp:1233
+#: mediamanager/tdehardwarebackend.cpp:1308
+#: mediamanager/tdehardwarebackend.cpp:1400
+#: mediamanager/tdehardwarebackend.cpp:1418
 msgid "<p>Technical details:<br>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1305
+#: mediamanager/tdehardwarebackend.cpp:1306
 msgid ""
 "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
 "device and/or user privilege level<br>Corrupt data on storage "
 "device<br>Incorrect encryption password"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1411
+#: mediamanager/tdehardwarebackend.cpp:1412
 msgid ""
 "<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
 "%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +388,7 @@ msgid ""
 "lost</i>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1538
+#: mediamanager/tdehardwarebackend.cpp:1539
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/krfb.po b/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
index f4af5ab9f92..c744f2ae26f 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-23 23:20+0100\n"
+"POT-Creation-Date: 2019-08-15 03:08+0200\n"
 "PO-Revision-Date: 2005-01-09 21:58+0800\n"
 "Last-Translator: Funda Wang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -153,7 +153,7 @@ msgstr ""
 "找不到 KInetD。TDE 守护程序(kded)可能已经崩溃或者根本没有启动，或者是安装失"
 "败。"
 
-#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:885
+#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:938
 msgid "Desktop Sharing Error"
 msgstr "桌面共享错误"
 
@@ -167,43 +167,43 @@ msgstr "找不到用于桌面共享(krfb)的 KInetD 服务。安装不完整或�
 msgid "Personal Invitation"
 msgstr "个人邀请"
 
-#: krfb/rfbcontroller.cc:376
+#: krfb/rfbcontroller.cc:429
 msgid "%1@%2 (shared desktop)"
 msgstr "%1@%2 (共享的桌面)"
 
-#: krfb/rfbcontroller.cc:510
+#: krfb/rfbcontroller.cc:563
 #, c-format
 msgid "User accepts connection from %1"
 msgstr "用户接受来自 %1 的连接"
 
-#: krfb/rfbcontroller.cc:523
+#: krfb/rfbcontroller.cc:576
 #, c-format
 msgid "User refuses connection from %1"
 msgstr "用户拒绝来自 %1 的连接"
 
-#: krfb/rfbcontroller.cc:571
+#: krfb/rfbcontroller.cc:624
 #, c-format
 msgid "Closed connection: %1."
 msgstr "关闭的连接：%1。"
 
-#: krfb/rfbcontroller.cc:700 krfb/rfbcontroller.cc:705
+#: krfb/rfbcontroller.cc:753 krfb/rfbcontroller.cc:758
 msgid "Failed login attempt from %1: wrong password"
 msgstr "来自 %1 的登录失败：密码不对"
 
-#: krfb/rfbcontroller.cc:741
+#: krfb/rfbcontroller.cc:794
 msgid "Connection refused from %1, already connected."
 msgstr "来自 %1 的连接被拒绝，连接已经存在。"
 
-#: krfb/rfbcontroller.cc:751
+#: krfb/rfbcontroller.cc:804
 #, c-format
 msgid "Accepted uninvited connection from %1"
 msgstr "已接受来自 %1 的未邀请连接"
 
-#: krfb/rfbcontroller.cc:759
+#: krfb/rfbcontroller.cc:812
 msgid "Received connection from %1, on hold (waiting for confirmation)"
 msgstr "收到来自 %1 的连接，正在等待(等候确认)"
 
-#: krfb/rfbcontroller.cc:884
+#: krfb/rfbcontroller.cc:937
 msgid ""
 "Your X11 Server does not support the required XTest extension version 2.2. "
 "Sharing your desktop is not possible."