Merge translation files from master branch.

1 files changed, 50 insertions, 35 deletions

diff --git a/po/af/amarok.po b/po/af/amarok.po
index 428df9ce..35ffe294 100644
--- a/po/af/amarok.po
+++ b/po/af/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-16 16:13+0200\n"
 "Last-Translator: Frikkie Thirion <[email protected]>\n"
 "Language-Team: Afrikaans <[email protected]>\n"
@@ -5442,9 +5442,9 @@ msgstr "Kliek om die filter te redigeer"
 msgid "Disable"
 msgstr "Deaktiveer"
 
-#: 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 "Moet nie handteer nie"
 
@@ -6518,11 +6518,8 @@ msgstr "Toestelle"
 #, fuzzy
 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 ""
 "Geen nuwe media toestelle was gevind nie. As jy voel dat dit \n"
 "fout is, maak seker dat die DBUS en HAL bedieners loop \n"
@@ -6532,7 +6529,7 @@ msgstr ""
 "\"\n"
 "in 'n Konsole venster in te tik."
 
-#: mediumpluginmanager.cpp:238
+#: mediumpluginmanager.cpp:235
 msgid ""
 "Sorry, you cannot define two devices\n"
 "with the same name and mountpoint!"
@@ -6540,23 +6537,23 @@ msgstr ""
 "Jammer, jy kan nie twee toestelle\n"
 "met dieselfde naam en koppelpunt hê nie."
 
-#: mediumpluginmanager.cpp:263
+#: mediumpluginmanager.cpp:260
 msgid "Add New Device"
 msgstr "Voeg nuwe toestel by"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr "Kies 'n inprop module wat met hierdie toestel gebruik moet word:"
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 msgid "Enter a &name for this device (required):"
 msgstr "Voer 'n naam vir hierdie toestel in (word vereis):"
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr "Voorbeeld: My_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 ( | ) "
@@ -6566,16 +6563,16 @@ msgstr ""
 "insluitend outo bespeurde toestelle, wees. Die pyp (|) karakter mag nie "
 "gebruik word nie."
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr ""
 "Voer die koppel punt van die toestel hier in (as dit van toepassing is):"
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr "Voorbeeld: /mnt/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 "
@@ -6586,7 +6583,7 @@ msgstr ""
 "Alle ander toestelle, soos iPods, UMS/VFAT toestelle, se koppel punt moet "
 "hier ingevul word."
 
-#: mediumpluginmanager.cpp:321
+#: mediumpluginmanager.cpp:318
 msgid ""
 "Sorry, every device must have a name and\n"
 "you cannot define two devices with the\n"
@@ -6599,66 +6596,66 @@ msgstr ""
 "\n"
 "\n"
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 msgid "(none)"
 msgstr "(geen)"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 msgid "Autodetected:"
 msgstr "Outo bespeur:"
 
-#: 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 "Naam:"
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr "Etiket:"
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 msgid "User Label:"
 msgstr "Gebruiker Etiket:"
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 msgid "Device Node:"
 msgstr "Toestel Node:"
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 msgid "Mount Point:"
 msgstr "Koppel Punt:"
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 msgid "Mime Type:"
 msgstr "Mime tipe:"
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, c-format
 msgid "Device information for %1"
 msgstr "Toestel informasie vir %1"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 msgid "Name: "
 msgstr "Naam:"
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr "(<a href='whatsthis:%1'>Details</a>)"
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 msgid "Plugin:"
 msgstr "Inprop module:"
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 msgid "Configure device settings"
 msgstr "Stel toestel op"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr ""
 "Verwyder inskrywings vanuit die opstel lêer wat met hierdie toestel ooreen "
@@ -9366,7 +9363,8 @@ msgid ""
 "found on <a href='http://trinity-look.org'>http://trinity-look.org</a>"
 msgstr ""
 "Kliek om 'n nuwe konteks blaaier styl te installeer.<br>Wenk: Meer style kan "
-"by <a href='http://trinity-look.org'>http://trinity-look.org</a> afgelaai word."
+"by <a href='http://trinity-look.org'>http://trinity-look.org</a> afgelaai "
+"word."
 
 #: Options2.ui:636
 #, no-c-format
@@ -12763,6 +12761,23 @@ msgstr "Lêernaam"
 msgid "Select Best Possible Match"
 msgstr "Kies beste moontlike ooreenstemming"
 
+#, fuzzy
+#~ 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."
+#~ msgstr ""
+#~ "Geen nuwe media toestelle was gevind nie. As jy voel dat dit \n"
+#~ "fout is, maak seker dat die DBUS en HAL bedieners loop \n"
+#~ "en dat TDE met ondersteuning daarvoor gebou was. Jy kan \n"
+#~ "dit toets deur \n"
+#~ "\"dcop kded mediamanager fullList\n"
+#~ "\"\n"
+#~ "in 'n Konsole venster in te tik."
+
 #~ msgid ""
 #~ "IRC:\n"
 #~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"