Merge translation files from master branch.

1 files changed, 43 insertions, 35 deletions

diff --git a/po/pa/amarok.po b/po/pa/amarok.po
index 2ef9f935..44e330e2 100644
--- a/po/pa/amarok.po
+++ b/po/pa/amarok.po
@@ -10,7 +10,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: 2007-12-09 08:16+0530\n"
 "Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <punjabi-l10n@users.sf.net>\n"
@@ -5298,9 +5298,9 @@ msgstr "ਫਿਲਟਰ ਸੋਧਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 msgid "Disable"
 msgstr "ਆਯੋਗ"
 
-#: 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 "ਕੰਟਰੋਲ ਨਾ ਕਰੋ"
 
@@ -6334,14 +6334,11 @@ msgstr "ਜੰਤਰ"
 #, 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 "ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਜੇਹਾ ਜੰਤਰ ਨਹੀਂ ਹੈ, ਜੋ ਕਿ ਅਮਰੋਕ ਨਾਲ ਵਰਤਿਆ ਜਾ ਸਕੇ।"
 
-#: mediumpluginmanager.cpp:238
+#: mediumpluginmanager.cpp:235
 msgid ""
 "Sorry, you cannot define two devices\n"
 "with the same name and mountpoint!"
@@ -6349,23 +6346,23 @@ msgstr ""
 "ਅਫ਼ਸੋਸ, ਤੁਸੀਂ ਦੋ ਜੰਤਰਾਂ ਲਈ ਇੱਕੋ ਨਾਂ ਅਤੇ ਮਾਊਂਟ\n"
 "ਥਾਂ ਨਹੀਂ ਦੇ ਸਕਦੇ ਹੋ!"
 
-#: mediumpluginmanager.cpp:263
+#: mediumpluginmanager.cpp:260
 msgid "Add New Device"
 msgstr "ਨਵਾਂ ਜੰਤਰ ਸ਼ਾਮਿਲ"
 
-#: mediumpluginmanager.cpp:270
+#: mediumpluginmanager.cpp:267
 msgid "Select the plugin to use with this device:"
 msgstr "ਇਹ ਜੰਤਰ ਨਾਲ ਵਰਤਣ ਲਈ ਪਲੱਗਇਨ ਦੀ ਚੋਣ ਕਰੋ:"
 
-#: mediumpluginmanager.cpp:280
+#: mediumpluginmanager.cpp:277
 msgid "Enter a &name for this device (required):"
 msgstr "ਇਹ ਜੰਤਰ ਲਈ ਇੱਕ ਨਾਂ ਦਿਓ (ਲੋੜੀਦਾ) (&n):"
 
-#: mediumpluginmanager.cpp:283
+#: mediumpluginmanager.cpp:280
 msgid "Example: My_Ipod"
 msgstr "ਉਦਾਹਰਨ: 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 ( | ) "
@@ -6374,22 +6371,22 @@ msgstr ""
 "ਜੰਤਰ ਲਈ ਇੱਕ ਨਾਂ ਦਿਓ:  ਨਾਂ ਸਵੈ-ਚਾਲਤ ਖੋਜੇ ਜੰਤਰ ਸਮੇਤ ਸਭ ਜੰਤਰਾਂ ਵਿੱਚੋਂ ਵਿਲੱਖਣ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।  ਇਸ "
 "ਵਿੱਚ ਪਾਈਪ (|) ਅੱਖਰ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: mediumpluginmanager.cpp:288
+#: mediumpluginmanager.cpp:285
 msgid "Enter the &mount point of the device, if applicable:"
 msgstr "ਜੇ ਲੋੜ ਹੋਵੇ ਤਾਂ ਜੰਤਰ ਦਾ ਮਾਊਂਟ ਥਾਂ ਦਿਓ(&m):"
 
-#: mediumpluginmanager.cpp:291
+#: mediumpluginmanager.cpp:288
 msgid "Example: /mnt/ipod"
 msgstr "ਉਦਾਹਰਨ: /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 "
 "(iPods, UMS/VFAT devices) should enter the mount point here."
 msgstr ""
 
-#: mediumpluginmanager.cpp:321
+#: mediumpluginmanager.cpp:318
 msgid ""
 "Sorry, every device must have a name and\n"
 "you cannot define two devices with the\n"
@@ -6401,66 +6398,66 @@ msgstr ""
 "ਦੇ ਸਕਦੇ ਹੋ। ਇਹ ਨਾਂ ਸਾਰੇ ਖੋਜੇ ਜੰਤਰਾਂ ਲਈ ਵੱਖਰਾ\n"
 "ਨਾਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।\n"
 
-#: mediumpluginmanager.cpp:398
+#: mediumpluginmanager.cpp:395
 msgid "(none)"
 msgstr "(ਕੋਈ ਨਹੀਂ)"
 
-#: mediumpluginmanager.cpp:401
+#: mediumpluginmanager.cpp:398
 msgid "Autodetected:"
 msgstr "ਸਵੈ-ਚਾਲਿਤ ਖੋਜੇ:"
 
-#: 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 "ਨਾਂ:"
 
-#: mediumpluginmanager.cpp:407
+#: mediumpluginmanager.cpp:404
 msgid "Label:"
 msgstr "ਲੇਬਲ:"
 
-#: mediumpluginmanager.cpp:409
+#: mediumpluginmanager.cpp:406
 msgid "User Label:"
 msgstr "ਉਪਭੋਗੀ ਲੇਬਲ:"
 
-#: mediumpluginmanager.cpp:411
+#: mediumpluginmanager.cpp:408
 msgid "Device Node:"
 msgstr "ਜੰਤਰ ਨੋਡ:"
 
-#: mediumpluginmanager.cpp:413
+#: mediumpluginmanager.cpp:410
 msgid "Mount Point:"
 msgstr "ਮਾਊਂਟ ਥਾਂ:"
 
-#: mediumpluginmanager.cpp:415
+#: mediumpluginmanager.cpp:412
 msgid "Mime Type:"
 msgstr "ਜੰਤਰ ਕਿਸਮ:"
 
-#: mediumpluginmanager.cpp:418
+#: mediumpluginmanager.cpp:415
 #, c-format
 msgid "Device information for %1"
 msgstr "%1 ਲਈ ਜੰਤਰ ਜਾਣਕਾਰੀ"
 
-#: mediumpluginmanager.cpp:421
+#: mediumpluginmanager.cpp:418
 msgid "Name: "
 msgstr "ਨਾਂ: "
 
-#: mediumpluginmanager.cpp:423
+#: mediumpluginmanager.cpp:420
 msgid "(<a href='whatsthis:%1'>Details</a>)"
 msgstr "(<a href='whatsthis:%1'>ਵੇਰਵਾ</a>)"
 
-#: mediumpluginmanager.cpp:426
+#: mediumpluginmanager.cpp:423
 msgid "Plugin:"
 msgstr "ਪਲੱਗਇਨ:"
 
-#: mediumpluginmanager.cpp:441
+#: mediumpluginmanager.cpp:438
 msgid "Configure device settings"
 msgstr "ਜੰਤਰ ਸਥਾਪਨ ਸੰਰਚਨਾ"
 
-#: mediumpluginmanager.cpp:445
+#: mediumpluginmanager.cpp:442
 msgid "Remove entries corresponding to this device from configuration file"
 msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਵਿੱਚੋਂ ਇਹ ਜੰਤਰ ਦੇ ਇੰਦਰਾਜ਼ ਹਟਾਓ"
 
@@ -9106,7 +9103,8 @@ msgid ""
 "found on <a href='http://trinity-look.org'>http://trinity-look.org</a>"
 msgstr ""
 "ਨਵਾਂ ਪਰਸੰਗ ਝਲਕਾਰਾ ਸਟਾਇਲ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਦਬਾਉ। <br>ਇਸ਼ਾਰਾ: ਹੋਰ ਸਟਾਇਲਾਂ ਨੂੰ <a "
-"href='http://trinity-look.org'>http://trinity-look.org</a> ਉੱਤੇ ਵੇਖਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"
+"href='http://trinity-look.org'>http://trinity-look.org</a> ਉੱਤੇ ਵੇਖਾਇਆ ਜਾ ਸਕਦਾ "
+"ਹੈ।"
 
 #: Options2.ui:636
 #, no-c-format
@@ -12251,6 +12249,16 @@ msgstr "ਫਾਇਲ ਨਾਂ"
 msgid "Select Best Possible Match"
 msgstr "ਸਰਵੋਤਮ ਸੰਭਵ ਮੇਲ ਚੁਣੋ"
 
+#, 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 "ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਜੇਹਾ ਜੰਤਰ ਨਹੀਂ ਹੈ, ਜੋ ਕਿ ਅਮਰੋਕ ਨਾਲ ਵਰਤਿਆ ਜਾ ਸਕੇ।"
+
 #~ msgid ""
 #~ "IRC:\n"
 #~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"