Merge translation files from master branch.

1 files changed, 54 insertions, 62 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index 537bbb2e9b0..2b5f4627d3b 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-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
 "PO-Revision-Date: 2005-08-09 13:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/tdehardwarebackend.cpp:1340
+#: mediamanager/tdehardwarebackend.cpp:1351
 #, 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:805
+#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:796
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "未知"
 
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "软盘"
@@ -130,7 +130,7 @@ msgstr "软盘"
 msgid "Zip Drive"
 msgstr "Zip 磁盘"
 
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:883
 msgid "Camera"
 msgstr "相机"
 
@@ -175,23 +175,23 @@ msgstr ""
 "此外，还检测到了仍然在使用设备的程序，程序清单列在下面。您需要关闭这些程序，"
 "或者更改其工作目录，然后再尝试卸载设备。"
 
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1579
 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:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/tdehardwarebackend.cpp:1397
+#: mediamanager/tdehardwarebackend.cpp:1415
+#: mediamanager/tdehardwarebackend.cpp:1455
 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:1470
+#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1461
 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:1232
+#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1223
 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:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:471
+#: mediamanager/tdehardwarebackend.cpp:508
+#: mediamanager/tdehardwarebackend.cpp:741
 #, fuzzy
 msgid "%1 Removable Device"
 msgstr "可移动设备"
 
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:516
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:525
 msgid "Blank CD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:534
 msgid "Blank CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:543
 msgid "Blank Magneto-Optical CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank Mount Ranier CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:561
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:570
 msgid "Blank DVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:579
 msgid "Blank DVD-RAM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:588
 msgid "Blank DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:597
 msgid "Blank DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:606
 msgid "Blank Dual Layer DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:615
 msgid "Blank Dual Layer DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:624
 msgid "Blank DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:633
 msgid "Blank DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:651
 msgid "Blank Dual Layer DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:660
 msgid "Blank BD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:669
 msgid "Blank BD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:678
 msgid "Blank BD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:687
 msgid "Blank HDDVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:696
 msgid "Blank HDDVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:705
 msgid "Blank HDDVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:712
 msgid "Audio CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:733
 msgid "%1 Fixed Disk (%2)"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:840
 #, fuzzy
 msgid "%1 Zip Disk"
 msgstr "Zip 磁盘"
 
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
+#: mediamanager/tdehardwarebackend.cpp:1203
+#: mediamanager/tdehardwarebackend.cpp:1383
 #, fuzzy
 msgid "Internal error"
 msgstr "内部错误"
 
-#: mediamanager/tdehardwarebackend.cpp:1239
+#: mediamanager/tdehardwarebackend.cpp:1230
 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:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1232
+#: mediamanager/tdehardwarebackend.cpp:1307
+#: mediamanager/tdehardwarebackend.cpp:1399
+#: mediamanager/tdehardwarebackend.cpp:1417
 msgid "<p>Technical details:<br>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1314
+#: mediamanager/tdehardwarebackend.cpp:1305
 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:1420
+#: mediamanager/tdehardwarebackend.cpp:1411
 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:1547
+#: mediamanager/tdehardwarebackend.cpp:1538
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -562,18 +562,6 @@ msgid ""
 "Autostart or an Autoopen file."
 msgstr ""
 
-#: libmediacommon/mediamanagersettings.kcfg:28
-#, fuzzy, no-c-format
-msgid "Enable notification popups"
-msgstr "通知(&N)"
-
-#: libmediacommon/mediamanagersettings.kcfg:29
-#, no-c-format
-msgid ""
-"Deselect this if you do not want action request popups to be generated when "
-"devices are plugged in."
-msgstr ""
-
 #: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
 #, no-c-format
 msgid "Decrypting Storage Device"
@@ -839,6 +827,10 @@ msgstr "混合"
 msgid "Filesystem: iso9660"
 msgstr "文件系统：iso9660"
 
+#, fuzzy
+#~ msgid "Enable notification popups"
+#~ msgstr "通知(&N)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."