Merge translation files from master branch.

1 files changed, 49 insertions, 36 deletions

diff --git a/po/is/amarok.po b/po/is/amarok.po
index e305867f..16291ff7 100644
--- a/po/is/amarok.po
+++ b/po/is/amarok.po
@@ -4,7 +4,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-07-24 13:12+0000\n"
 "Last-Translator: Sveinn í Felli\n"
 "Language-Team:  <is@li.org>\n"
@@ -5370,9 +5370,9 @@ msgstr "Smelltu til að breyta síu"
 msgid "Disable"
 msgstr "Slökkva á"
 
-#: 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 "Ekki meðhöndla"
 
@@ -6432,11 +6432,8 @@ msgstr "Tæki"
 #, 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 ""
 "Engin ný ferðatæki fundust. Ef þetta stemmir ekki\n"
 "athugaðu að DBUS og HAL púkarnir séu\n"
@@ -6445,7 +6442,7 @@ msgstr ""
 "     \"dcop kded mediamanager fullList\"\n"
 "í skeljarglugga."
 
-#: mediumpluginmanager.cpp:238
+#: mediumpluginmanager.cpp:235
 msgid ""
 "Sorry, you cannot define two devices\n"
 "with the same name and mountpoint!"
@@ -6453,23 +6450,23 @@ msgstr ""
 "Þú getur ekki skilgreint tvö tæki með\n"
 "sama nafn og tengipunkt!"
 
-#: mediumpluginmanager.cpp:263
+#: mediumpluginmanager.cpp:260
 msgid "Add New Device"
 msgstr "Bæta við nýju tæki"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr "Veldu íforrit sem á að nota með þessu tæki:"
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 msgid "Enter a &name for this device (required):"
 msgstr "Sláðu inn &nafn á tækið (nauðsynlegt):"
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr "Dæmi: Ipodinn minn"
 
-#: 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 ( | ) "
@@ -6478,15 +6475,15 @@ msgstr ""
 "Sláðu inn nafn fyrir tækið. Nafnið verður að vera einstakt fyrir öll tæki, "
 "einnig þau sem fundust sjálfkrafa. Það má ekki innihalda píputáknið ( | )."
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr "Sláðu inn tengislóð tækis, ef á við:"
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr "Dæmi: /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 "
@@ -6495,7 +6492,7 @@ msgstr ""
 "Sláðu inn tengislóð tækis. Sum tæki (sem iRiver iFP) hafa ekki tengislóð og "
 "má hunsa. Öll önnur tæki (iPodar, UMS/VFAT tæki) ættu að hafa tengislóð 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"
@@ -6507,66 +6504,66 @@ msgstr ""
 "nafnið. Sjálfkrafa fundin tæki verða einnig að\n"
 "hafa einstök nöfn.\n"
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 msgid "(none)"
 msgstr "(ekkert)"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 msgid "Autodetected:"
 msgstr "Fundið sjálfkrafa:"
 
-#: mediumpluginmanager.cpp:403
+#: mediumpluginmanager.cpp:400
 msgid "ID:"
 msgstr "Auðkenni:"
 
 #: magnatunebrowser/magnatunepurchasedialogbase.ui:498
-#: mediumpluginmanager.cpp:405
+#: mediumpluginmanager.cpp:402
 #, no-c-format
 msgid "Name:"
 msgstr "Nafn:"
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr "Merki:"
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 msgid "User Label:"
 msgstr "Notandamerki:"
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 msgid "Device Node:"
 msgstr "Tækjahnúður:"
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 msgid "Mount Point:"
 msgstr "Tengipunktur:"
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 msgid "Mime Type:"
 msgstr "MIME tegund:"
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, c-format
 msgid "Device information for %1"
 msgstr "Tækja upplýsingar fyrir %1"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 msgid "Name: "
 msgstr "Nafn: "
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr "(<a href='whatsthis:%1'>Nánar</a>)"
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 msgid "Plugin:"
 msgstr "Íforrit:"
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 msgid "Configure device settings"
 msgstr "Stilla tæki"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr "Fjarlægja færslur þessa tækis frá stilliskrá"
 
@@ -9239,8 +9236,8 @@ msgid ""
 "found on <a href='http://trinity-look.org'>http://trinity-look.org</a>"
 msgstr ""
 "Smelltu hér til að setja inn nýja þemu fyrir samhengisflakkarann.<br>Þú "
-"getur fundið fleiri þemur á <a href='http://trinity-look.org'>http://trinity-look."
-"org</a>"
+"getur fundið fleiri þemur á <a href='http://trinity-look.org'>http://trinity-"
+"look.org</a>"
 
 #: Options2.ui:636
 #, no-c-format
@@ -12485,6 +12482,22 @@ msgstr "Skráarnafn"
 msgid "Select Best Possible Match"
 msgstr "Veldu bestu samsvörun"
 
+#, 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 ""
+#~ "Engin ný ferðatæki fundust. Ef þetta stemmir ekki\n"
+#~ "athugaðu að DBUS og HAL púkarnir séu\n"
+#~ "keyrandi og að TDE sé byggt með stuðning við þá. Þú getur\n"
+#~ "athugað þetta með því að keyra\n"
+#~ "     \"dcop kded mediamanager fullList\"\n"
+#~ "í skeljarglugga."
+
 #~ msgid ""
 #~ "IRC:\n"
 #~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"