Merge translation files from master branch.

1 files changed, 49 insertions, 36 deletions

diff --git a/po/sv/amarok.po b/po/sv/amarok.po
index 801865c1..070c6c34 100644
--- a/po/sv/amarok.po
+++ b/po/sv/amarok.po
@@ -7,7 +7,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-26 07:55+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -5404,9 +5404,9 @@ msgstr "Klicka för att redigera filtret"
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: 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 "Hantera inte"
 
@@ -6466,11 +6466,8 @@ msgstr "Enheter"
 #, 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 ""
 "Några nya mediaenheter hittades inte. Om du anser att det\n"
 "är felaktigt, försäkra dig om att DBUS- och HAL-demonerna\n"
@@ -6479,7 +6476,7 @@ msgstr ""
 "     \"dcop kded mediamanager fullList\"\n"
 "i ett terminalfönster."
 
-#: mediumpluginmanager.cpp:238
+#: mediumpluginmanager.cpp:235
 msgid ""
 "Sorry, you cannot define two devices\n"
 "with the same name and mountpoint!"
@@ -6487,23 +6484,23 @@ msgstr ""
 "Tyvärr kan du inte definiera två enheter\n"
 "med samma namn och monteringsplats."
 
-#: mediumpluginmanager.cpp:263
+#: mediumpluginmanager.cpp:260
 msgid "Add New Device"
 msgstr "Lägg till ny enhet"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr "Välj insticksprogram att använda med enheten:"
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 msgid "Enter a &name for this device (required):"
 msgstr "Skriv in ett &namn på enheten (nödvändigt):"
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr "Exempel: Min_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 ( | ) "
@@ -6513,15 +6510,15 @@ msgstr ""
 "inklusive de som detekteras automatiskt. Det får inte innehålla tecknet "
 "vertikalt streck ( | )."
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr "Skriv in enhetens &monteringsplats, om tillämpligt:"
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr "Exempel: /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 "
@@ -6531,7 +6528,7 @@ msgstr ""
 "kan inte ha någon monteringsplats och detta kan ignoreras. För alla andra "
 "enheter (iPod, UMS/VFAT-enheter) måste monteringsplatsen skrivas in här."
 
-#: mediumpluginmanager.cpp:321
+#: mediumpluginmanager.cpp:318
 msgid ""
 "Sorry, every device must have a name and\n"
 "you cannot define two devices with the\n"
@@ -6543,66 +6540,66 @@ msgstr ""
 "samma namn. Namnen måste också vara\n"
 "unika för enheter som detekteras automatiskt.\n"
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 msgid "(none)"
 msgstr "(ingen)"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 msgid "Autodetected:"
 msgstr "Automatiskt detekterade:"
 
-#: mediumpluginmanager.cpp:403
+#: mediumpluginmanager.cpp:400
 msgid "ID:"
 msgstr "Identifikation:"
 
 #: magnatunebrowser/magnatunepurchasedialogbase.ui:498
-#: mediumpluginmanager.cpp:405
+#: mediumpluginmanager.cpp:402
 #, no-c-format
 msgid "Name:"
 msgstr "Namn:"
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr "Beteckning:"
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 msgid "User Label:"
 msgstr "Användarbeteckning:"
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 msgid "Device Node:"
 msgstr "Enhetsnod:"
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 msgid "Mount Point:"
 msgstr "Monteringsplats:"
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 msgid "Mime Type:"
 msgstr "MIME-typ:"
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, c-format
 msgid "Device information for %1"
 msgstr "Enhetsinformation för %1"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 msgid "Name: "
 msgstr "Namn: "
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr "(<a href='whatsthis:%1'>Detaljinformation</a>)"
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 msgid "Plugin:"
 msgstr "Insticksprogram:"
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 msgid "Configure device settings"
 msgstr "Anpassa enhetsinställningar"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr "Ta bort poster som hör ihop med enheten från inställningsfilen"
 
@@ -9283,8 +9280,8 @@ msgid ""
 "found on <a href='http://trinity-look.org'>http://trinity-look.org</a>"
 msgstr ""
 "Klicka för att installera en ny stil för sammanhangsbläddraren.<br>Tips: "
-"Fler stilar kan hittas på <a href='http://trinity-look.org'>http://trinity-look.org</"
-"a>"
+"Fler stilar kan hittas på <a href='http://trinity-look.org'>http://trinity-"
+"look.org</a>"
 
 #: Options2.ui:636
 #, no-c-format
@@ -12609,6 +12606,22 @@ msgstr "Filnamn"
 msgid "Select Best Possible Match"
 msgstr "Välj bästa möjliga matchning"
 
+#, 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 ""
+#~ "Några nya mediaenheter hittades inte. Om du anser att det\n"
+#~ "är felaktigt, försäkra dig om att DBUS- och HAL-demonerna\n"
+#~ "kör, och att TDE byggdes med stöd för dem. Du kan prova\n"
+#~ "det genom att köra\n"
+#~ "     \"dcop kded mediamanager fullList\"\n"
+#~ "i ett terminalfönster."
+
 #~ msgid ""
 #~ "IRC:\n"
 #~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"