Merge translation files from master branch.

1 files changed, 31 insertions, 34 deletions

diff --git a/po/zh_CN/amarok.po b/po/zh_CN/amarok.po
index 57b5805e..9d92e914 100644
--- a/po/zh_CN/amarok.po
+++ b/po/zh_CN/amarok.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amaroK\n"
-"POT-Creation-Date: 2019-07-18 02:06+0200\n"
+"POT-Creation-Date: 2019-07-29 06:47+0200\n"
 "PO-Revision-Date: 2007-02-25 16:33+0800\n"
 "Last-Translator: Funda Wang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -5244,9 +5244,9 @@ msgstr "单击可编辑过滤器"
 msgid "Disable"
 msgstr "已禁用"
 
-#: mediabrowser.cpp:306 mediabrowser.cpp:307 mediumpluginmanager.cpp:210
-#: mediumpluginmanager.cpp:272 mediumpluginmanager.cpp:428
-#: mediumpluginmanager.cpp:440
+#: mediabrowser.cpp:306 mediabrowser.cpp:307 mediumpluginmanager.cpp:207
+#: mediumpluginmanager.cpp:269 mediumpluginmanager.cpp:425
+#: mediumpluginmanager.cpp:437
 msgid "Do not handle"
 msgstr "不处理"
 
@@ -6255,36 +6255,33 @@ msgstr "设备"
 #: mediumpluginmanager.cpp:170
 msgid ""
 "No new media devices were found. If you feel this is an\n"
-"error, ensure that the DBUS and HAL daemons are running\n"
-"and TDE was built with support for them. You can test this\n"
-"by running\n"
-"     \"dcop kded mediamanager fullList\"\n"
-"in a Konsole window."
+"error, ensure that the DBUS and either TDEHW or HAL daemon are running\n"
+"and TDE was built with support for them."
 msgstr ""
 
-#: mediumpluginmanager.cpp:238
+#: mediumpluginmanager.cpp:235
 msgid ""
 "Sorry, you cannot define two devices\n"
 "with the same name and mountpoint!"
 msgstr ""
 
-#: mediumpluginmanager.cpp:263
+#: mediumpluginmanager.cpp:260
 msgid "Add New Device"
 msgstr "添加新设备"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr "选择此设备要使用的插件："
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 msgid "Enter a &name for this device (required):"
 msgstr "输入此设备的名称(必需)(&N)："
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr "例：我的IPOD"
 
-#: mediumpluginmanager.cpp:284
+#: mediumpluginmanager.cpp:281
 msgid ""
 "Enter a name for the device.  The name must be unique across all devices, "
 "including autodetected devices.  It must not contain the pipe ( | ) "
@@ -6293,22 +6290,22 @@ msgstr ""
 "输入设备的名称。名称在所有设备中都必须是唯一的，包括自动检测到的设备。名称中"
 "不能包括管道字符(|)。"
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr "输入设备的挂载点，若适用的话(&M)："
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr "例：/mount/ipod"
 
-#: mediumpluginmanager.cpp:292
+#: mediumpluginmanager.cpp:289
 msgid ""
 "Enter the device's mount point.  Some devices (such as iRiver iFP devices) "
 "may not have a mount point and this can be ignored.  All other devices "
 "(iPods, UMS/VFAT devices) should enter the mount point here."
 msgstr ""
 
-#: mediumpluginmanager.cpp:321
+#: mediumpluginmanager.cpp:318
 msgid ""
 "Sorry, every device must have a name and\n"
 "you cannot define two devices with the\n"
@@ -6316,66 +6313,66 @@ msgid ""
 "across autodetected devices as well.\n"
 msgstr ""
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 msgid "(none)"
 msgstr "(无)"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 msgid "Autodetected:"
 msgstr "自动检测："
 
-#: mediumpluginmanager.cpp:403
+#: mediumpluginmanager.cpp:400
 msgid "ID:"
 msgstr "ID："
 
 #: magnatunebrowser/magnatunepurchasedialogbase.ui:498
-#: mediumpluginmanager.cpp:405
+#: mediumpluginmanager.cpp:402
 #, no-c-format
 msgid "Name:"
 msgstr "名称："
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr "标签："
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 msgid "User Label:"
 msgstr "用户标签："
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 msgid "Device Node:"
 msgstr "设备节点："
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 msgid "Mount Point:"
 msgstr "挂载点："
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 msgid "Mime Type:"
 msgstr "MIME 类型："
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, c-format
 msgid "Device information for %1"
 msgstr "%1 的设备信息"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 msgid "Name: "
 msgstr "名称："
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr "(<a href='whatsthis:%1'>细节</a>)"
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 msgid "Plugin:"
 msgstr "插件："
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 msgid "Configure device settings"
 msgstr "配置设备设置"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr "从配置文件中删除与此设备对应的项"