Merge translation files from master branch.

1 files changed, 31 insertions, 34 deletions

diff --git a/po/en_GB/amarok.po b/po/en_GB/amarok.po
index a7f40fa7..5362cf1a 100644
--- a/po/en_GB/amarok.po
+++ b/po/en_GB/amarok.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amarok\n"
-"POT-Creation-Date: 2019-07-16 01:12+0200\n"
+"POT-Creation-Date: 2019-07-29 06:47+0200\n"
 "PO-Revision-Date: 2007-01-11 17:18+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -5565,9 +5565,9 @@ msgstr "Click to edit filter"
 msgid "Disable"
 msgstr "Disable"
 
-#: 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 "Do not handle"
 
@@ -6630,60 +6630,57 @@ msgstr "Devices"
 #: 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
 #, fuzzy
 msgid "Add New Device"
 msgstr "Add new preset"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr ""
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 #, fuzzy
 msgid "Enter a &name for this device (required):"
 msgstr "&Enter a name for the playlist:"
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr ""
 
-#: 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 ( | ) "
 "character."
 msgstr ""
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr ""
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr ""
 
-#: 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"
@@ -6691,75 +6688,75 @@ msgid ""
 "across autodetected devices as well.\n"
 msgstr ""
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 #, fuzzy
 msgid "(none)"
 msgstr "Done"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 #, fuzzy
 msgid "Autodetected:"
 msgstr "Autodetect"
 
-#: mediumpluginmanager.cpp:403
+#: mediumpluginmanager.cpp:400
 msgid "ID:"
 msgstr ""
 
 #: magnatunebrowser/magnatunepurchasedialogbase.ui:498
-#: mediumpluginmanager.cpp:405
+#: mediumpluginmanager.cpp:402
 #, no-c-format
 msgid "Name:"
 msgstr "Name:"
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr ""
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 #, fuzzy
 msgid "User Label:"
 msgstr "Username:"
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 #, fuzzy
 msgid "Device Node:"
 msgstr "Device:"
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 #, fuzzy
 msgid "Mount Point:"
 msgstr "MountCommand"
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 #, fuzzy
 msgid "Mime Type:"
 msgstr "Device"
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, fuzzy, c-format
 msgid "Device information for %1"
 msgstr "Wikipedia Information"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 #, fuzzy
 msgid "Name: "
 msgstr "Name:"
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr ""
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 #, fuzzy
 msgid "Plugin:"
 msgstr "Plugins"
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 #, fuzzy
 msgid "Configure device settings"
 msgstr "Configure Media Device"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr ""