Merge translation files from master branch.

1 files changed, 49 insertions, 36 deletions

diff --git a/po/ca/amarok.po b/po/ca/amarok.po
index 8a46ef95..aba58582 100644
--- a/po/ca/amarok.po
+++ b/po/ca/amarok.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amarok\n"
 "Report-Msgid-Bugs-To: \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-05-12 12:43+0200\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -5433,9 +5433,9 @@ msgstr "Feu clic per editar el filtre"
 msgid "Disable"
 msgstr "Deshabilita"
 
-#: 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 "No l'administris"
 
@@ -6513,11 +6513,8 @@ msgstr "Dispositius"
 #, 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 ""
 "No s'han trobat nous dispositius de suports. Si creieu que és\n"
 "un error. assegureu-vos que els dimonis DBUS i HAL s'estan\n"
@@ -6526,7 +6523,7 @@ msgstr ""
 "     `dcop kded mediamanager fullList`\n"
 "en una finestra del Konsole."
 
-#: mediumpluginmanager.cpp:238
+#: mediumpluginmanager.cpp:235
 msgid ""
 "Sorry, you cannot define two devices\n"
 "with the same name and mountpoint!"
@@ -6534,23 +6531,23 @@ msgstr ""
 "Disculpeu, no podeu definir dos dispositius\n"
 "amb el mateix nom i punt de muntatge!"
 
-#: mediumpluginmanager.cpp:263
+#: mediumpluginmanager.cpp:260
 msgid "Add New Device"
 msgstr "Afegeix un nou dispositiu"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr "Seleccioneu el connector per emprar amb aquest dispositiu:"
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 msgid "Enter a &name for this device (required):"
 msgstr "Introduïu un &nom per aquest dispositiu (requerit):"
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr "Exemple: El_meu_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 ( | ) "
@@ -6560,15 +6557,15 @@ msgstr ""
 "a tots els dispositius, inclosos els dispositius autodetectats.\n"
 "No pot contenir el caràcter de tuberia «|»."
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr "Introduïu el punt de &muntatge del dispositiu, si és aplicable:"
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr "Exemple: /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 "
@@ -6581,7 +6578,7 @@ msgstr ""
 "Per a tots els altres dispositius (iPods, dispositius UMS/VFAT)\n"
 "hauríeu d'introduir aquí el punt de muntatge."
 
-#: mediumpluginmanager.cpp:321
+#: mediumpluginmanager.cpp:318
 msgid ""
 "Sorry, every device must have a name and\n"
 "you cannot define two devices with the\n"
@@ -6593,66 +6590,66 @@ msgstr ""
 "Aquests noms també han de ser únics entre tots els\n"
 "dispositius autodetectats.\n"
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 msgid "(none)"
 msgstr "(cap)"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 msgid "Autodetected:"
 msgstr "Autodetectat:"
 
-#: 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 "Nom:"
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 msgid "User Label:"
 msgstr "Etiqueta d'usuari:"
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 msgid "Device Node:"
 msgstr "Node del dispositiu:"
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 msgid "Mount Point:"
 msgstr "Punt de muntatge:"
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 msgid "Mime Type:"
 msgstr "Tipus Mime:"
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, c-format
 msgid "Device information for %1"
 msgstr "Informació pel dispositiu %1"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 msgid "Name: "
 msgstr "Nom: "
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr "(<a href='whatsthis:%1'>Detalls</a>)"
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 msgid "Plugin:"
 msgstr "Connector:"
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 msgid "Configure device settings"
 msgstr "Configura els arranjaments del dispositiu"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr ""
 "Elimina les entrades corresponents a aquest dispositiu del fitxer de "
@@ -9385,8 +9382,8 @@ msgid ""
 "found on <a href='http://trinity-look.org'>http://trinity-look.org</a>"
 msgstr ""
 "Feu clic per instal·lar un nou estil pel Navegador contextual.<br>Truc: "
-"podeu trobar més estils a <a·href='http://trinity-look.org'>http://trinity-look.org</"
-"a>"
+"podeu trobar més estils a <a·href='http://trinity-look.org'>http://trinity-"
+"look.org</a>"
 
 #: Options2.ui:636
 #, no-c-format
@@ -12798,6 +12795,22 @@ msgstr "Nom del fitxer"
 msgid "Select Best Possible Match"
 msgstr "Escolliu la millor coincidència"
 
+#, 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 ""
+#~ "No s'han trobat nous dispositius de suports. Si creieu que és\n"
+#~ "un error. assegureu-vos que els dimonis DBUS i HAL s'estan\n"
+#~ "executant i que el TDE s'ha compilat implementant-los.\n"
+#~ "Ho podeu comprovar executant\n"
+#~ "     `dcop kded mediamanager fullList`\n"
+#~ "en una finestra del Konsole."
+
 #~ msgid ""
 #~ "IRC:\n"
 #~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"