Merge translation files from master branch.

2 files changed, 61 insertions, 61 deletions

diff --git a/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po b/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po
index 54375cddecb..416d047d5a0 100644
--- a/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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: 2007-11-26 15:09+0800\n"
 "Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
 "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
@@ -81,8 +81,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"
@@ -119,11 +119,11 @@ msgstr "遠端分享"
 msgid "Hard Disk"
 msgstr "硬碟"
 
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:796
+#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:797
 msgid "Unknown Drive"
 msgstr "不明磁碟機"
 
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:826
+#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:827
 msgid "Floppy Drive"
 msgstr "軟碟機"
 
@@ -131,7 +131,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 "攝影機"
 
@@ -176,23 +176,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 "卸載時發生以下錯誤："
 
@@ -201,7 +201,7 @@ msgstr "卸載時發生以下錯誤："
 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 ""
 
@@ -246,142 +246,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 "光碟機"
 
-#: 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 "
@@ -389,7 +389,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_TW/messages/tdenetwork/krfb.po b/tde-i18n-zh_TW/messages/tdenetwork/krfb.po
index 5560e69ef42..4efe57a048f 100644
--- a/tde-i18n-zh_TW/messages/tdenetwork/krfb.po
+++ b/tde-i18n-zh_TW/messages/tdenetwork/krfb.po
@@ -4,7 +4,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: 2006-02-24 12:26+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -150,7 +150,7 @@ msgid ""
 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 "桌面分享錯誤"
 
@@ -164,43 +164,43 @@ msgstr "找不到桌面分享的 KInetD 服務(krfb)。安裝可能不完全或�
 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."