Merge translation files from master branch.

1 files changed, 47 insertions, 35 deletions

diff --git a/po/et/amarok.po b/po/et/amarok.po
index 82fc8b1b..fcc66896 100644
--- a/po/et/amarok.po
+++ b/po/et/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: 2008-04-27 13:06+0200\n"
 "Last-Translator: Marek Laane <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -5386,9 +5386,9 @@ msgstr "Klõpsa filtri muutmiseks"
 msgid "Disable"
 msgstr "Keela"
 
-#: 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 "Ei kasutata"
 
@@ -6447,18 +6447,15 @@ msgstr "Seadmed"
 #, 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 ""
 "Ühtegi meediaseadet ei leitud. Kui arvad, et see on viga,\n"
 "konrolli, kas DBUS- ja HAL-deemon töötab ning TDE neid toetab.\n"
 "Selle kontrollimiseks anna Konsoolis käsk\n"
 "     \"dcop kded mediamanager fullList\"."
 
-#: mediumpluginmanager.cpp:238
+#: mediumpluginmanager.cpp:235
 msgid ""
 "Sorry, you cannot define two devices\n"
 "with the same name and mountpoint!"
@@ -6466,23 +6463,23 @@ msgstr ""
 "Vabandust, kaks seadet ei saa olla\n"
 "ühe ja sama nime ning ühenduskohaga!"
 
-#: mediumpluginmanager.cpp:263
+#: mediumpluginmanager.cpp:260
 msgid "Add New Device"
 msgstr "Uue seadme lisamine"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr "Antud seadme puhul kasutatav plugin:"
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 msgid "Enter a &name for this device (required):"
 msgstr "Seadme &nimi (nõutav):"
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr "Näide: Minu_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 ( | ) "
@@ -6492,15 +6489,15 @@ msgstr ""
 "automaatselt tuvastatud seadmete seas). See ei tohi sisaldada püstkriipsu "
 "( | )."
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr "Seadme ühenda&miskoht (kui on vaja):"
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr "Näide: /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 "
@@ -6510,7 +6507,7 @@ msgstr ""
 "pruugi ühendamiskohta olla ja seda võib ignoreerida. Kõigi teiste seadmete "
 "korral (iPodid, UMS/VFAT seadmed) tuleb see siin määrata."
 
-#: mediumpluginmanager.cpp:321
+#: mediumpluginmanager.cpp:318
 msgid ""
 "Sorry, every device must have a name and\n"
 "you cannot define two devices with the\n"
@@ -6522,66 +6519,66 @@ msgstr ""
 "Nimed peavad olema unikaalsed ka\n"
 "automaatselt tuvastatud seadmete seas.\n"
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 msgid "(none)"
 msgstr "(puudub)"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 msgid "Autodetected:"
 msgstr "Automaatselt tuvastatud:"
 
-#: 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 "Nimi:"
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr "Nimetus:"
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 msgid "User Label:"
 msgstr "Kasutaja nimetus:"
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 msgid "Device Node:"
 msgstr "Seadme sõlm:"
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 msgid "Mount Point:"
 msgstr "Ühendamiskoht:"
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 msgid "Mime Type:"
 msgstr "MIME tüüp:"
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, c-format
 msgid "Device information for %1"
 msgstr "%1 seadmeinfo"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 msgid "Name: "
 msgstr "Nimi: "
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr "(<a href='whatsthis:%1'>Üksikasjad</a>)"
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 msgid "Plugin:"
 msgstr "Plugin:"
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 msgid "Configure device settings"
 msgstr "Seadme seadistamine"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr "Eemalda antud seadme kirjed seadistusfailis"
 
@@ -9262,7 +9259,8 @@ msgid ""
 "found on <a href='http://trinity-look.org'>http://trinity-look.org</a>"
 msgstr ""
 "Klõpsa kontekstisirvija uue stiili paigaldamiseks.<br>Vihje: rohkem stiile "
-"leiab aadressilt <a href='http://trinity-look.org'>http://trinity-look.org</a>"
+"leiab aadressilt <a href='http://trinity-look.org'>http://trinity-look.org</"
+"a>"
 
 #: Options2.ui:636
 #, no-c-format
@@ -12562,6 +12560,20 @@ msgstr "Faili nimi"
 msgid "Select Best Possible Match"
 msgstr "Parima sobivuse valimine"
 
+#, 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 ""
+#~ "Ühtegi meediaseadet ei leitud. Kui arvad, et see on viga,\n"
+#~ "konrolli, kas DBUS- ja HAL-deemon töötab ning TDE neid toetab.\n"
+#~ "Selle kontrollimiseks anna Konsoolis käsk\n"
+#~ "     \"dcop kded mediamanager fullList\"."
+
 #~ msgid ""
 #~ "IRC:\n"
 #~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"