Merge translation files from master branch.

1 files changed, 34 insertions, 26 deletions

diff --git a/tde-i18n-pa/messages/tdemultimedia/kmix.po b/tde-i18n-pa/messages/tdemultimedia/kmix.po
index 76ce5bd672f..f90e2947195 100644
--- a/tde-i18n-pa/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-pa/messages/tdemultimedia/kmix.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix\n"
-"POT-Creation-Date: 2020-05-28 02:59+0200\n"
+"POT-Creation-Date: 2020-06-04 00:00+0200\n"
 "PO-Revision-Date: 2007-04-20 17:01+0530\n"
 "Last-Translator: A S Alam <[email protected]>\n"
 "Language-Team: Punjabi <[email protected]>\n"
@@ -37,7 +37,7 @@ msgstr "ਮਾਸਟਰ ਚੈਨਲ ਚੁਣੋ"
 msgid "Current Mixer"
 msgstr "ਮੌਜੂਦਾ ਮਿਕਸਰ"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "ਮੌਜੂਦਾ ਮਿਕਸਰ"
 
@@ -45,43 +45,39 @@ msgstr "ਮੌਜੂਦਾ ਮਿਕਸਰ"
 msgid "Select the channel representing the master volume:"
 msgstr "ਮਾਸਟਰ ਆਵਾਜ਼ ਨੂੰ ਵਿਖਾਉਣ ਵਾਲਾ ਚੈਨਲ ਚੁਨੋ:"
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 msgid "Configure &Global Shortcuts..."
 msgstr "ਵਿਆਪਕ ਸ਼ਾਰਟਕੱਟ ਸੰਰਚਨਾ(&G)..."
 
-#: kmix.cpp:119
+#: kmix.cpp:118
 msgid "Hardware &Information"
 msgstr "ਜੰਤਰ ਜਾਣਕਾਰੀ(&I)"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:418
+#: kmix.cpp:119 kmixdockwidget.cpp:441
 msgid "Hide Mixer Window"
 msgstr "ਮਿਕਸਰ ਝਰੋਖਾ ਓਹਲੇ"
 
-#: kmix.cpp:123
+#: kmix.cpp:122
 msgid "Increase Volume of Master Channel"
 msgstr "ਮਾਸਟਰ ਚੈਨਲ ਦੀ ਆਵਾਜ਼ ਵਧਾਓ"
 
-#: kmix.cpp:125
+#: kmix.cpp:124
 msgid "Decrease Volume of Master Channel"
 msgstr "ਮਾਸਟਰ ਚੈਨਲ ਦੀ ਆਵਾਜ਼ ਘਟਾਓ"
 
-#: kmix.cpp:127
+#: kmix.cpp:126
 msgid "Toggle Mute of Master Channel"
 msgstr "ਮਾਸਟਰ ਚੈਨਲ ਦੀ ਚੁੱਪ ਬਦਲੋ"
 
-#: kmix.cpp:162
+#: kmix.cpp:161
 msgid "Current mixer:"
 msgstr "ਮੌਜੂਦਾ ਮਿਕਸਰ:"
 
-#: kmix.cpp:216
-msgid "Select Channel"
-msgstr "ਚੈਨਲ ਚੁਣੋ"
-
-#: kmix.cpp:520
+#: kmix.cpp:500
 msgid "The change of orientation will be adopted on the next start of KMix."
 msgstr "ਸਥਿਤੀ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਕੇ-ਮਿਕਸ ਦੇ ਅਗਲੀ ਵਾਰ ਚਾਲੂ ਹੋਣ ਉੱਤੇ ਲਾਗੂ ਹੋਣਗੀਆਂ।"
 
-#: kmix.cpp:601
+#: kmix.cpp:581
 msgid "Mixer Hardware Information"
 msgstr "ਮਿਕਸਰ ਜੰਤਰ ਜਾਣਕਾਰੀ"
 
@@ -105,21 +101,21 @@ msgstr ""
 msgid "Select Mixer"
 msgstr "ਮਿਕਸਰ ਚੁਣੋ"
 
-#: kmixapplet.cpp:216
+#: kmixapplet.cpp:217
 msgid ""
 "For detailed credits, please refer to the About information of the KMix "
 "program"
 msgstr ""
 
-#: kmixapplet.cpp:323
+#: kmixapplet.cpp:325
 msgid "Mixers"
 msgstr "ਮਿਕਸਰ"
 
-#: kmixapplet.cpp:324
+#: kmixapplet.cpp:326
 msgid "Available mixers:"
 msgstr "ਉਪਲੱਬਧ ਮਿਕਸਰ:"
 
-#: kmixapplet.cpp:330
+#: kmixapplet.cpp:332
 msgid "Invalid mixer entered."
 msgstr "ਗਲਤ ਮਿਕਸਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
@@ -139,27 +135,27 @@ msgstr "ਮੂਲ ਆਵਾਜ਼ ਮੁੜ-ਪ੍ਰਾਪਤ"
 msgid "KMixCtrl"
 msgstr "KMixCtrl"
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr "ਚੁੱਪ(&u)"
 
-#: kmixdockwidget.cpp:92
+#: kmixdockwidget.cpp:97
 msgid "Select Master Channel..."
 msgstr "ਮਾਸਟਰ ਚੈਨਲ ਚੁਣੋ..."
 
-#: kmixdockwidget.cpp:201
+#: kmixdockwidget.cpp:225
 msgid "Mixer cannot be found"
 msgstr "ਮਿਕਸਰ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: kmixdockwidget.cpp:212
+#: kmixdockwidget.cpp:236
 msgid "Volume at %1%"
 msgstr "%1% ਉੱਤੇ ਆਵਾਜ਼"
 
-#: kmixdockwidget.cpp:214
+#: kmixdockwidget.cpp:238
 msgid " (Muted)"
 msgstr " (ਚੁੱਪ ਹੈ)"
 
-#: kmixdockwidget.cpp:422
+#: kmixdockwidget.cpp:445
 msgid "Show Mixer Window"
 msgstr "ਮਿਕਸਰ ਝਰੋਖਾ ਵਿਖਾਓ"
 
@@ -633,7 +629,16 @@ msgstr "ਵਰਤੇ ਸਾਊਡ ਡਰਾਇਵਰ:"
 msgid "&Channels"
 msgstr "ਚੈਨਲ(&C)"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+#, fuzzy
+msgid "&Select Mixer"
+msgstr "ਮਿਕਸਰ ਚੁਣੋ"
+
+#: viewbase.cpp:139
+msgid "General"
+msgstr ""
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr "ਜੰਤਰ ਸੈਟਿੰਗ"
 
@@ -685,3 +690,6 @@ msgstr "ਪਿੱਠਭੂਮੀ(&n):"
 #, no-c-format
 msgid "Silen&t:"
 msgstr "ਸ਼ਾਂਤ(&t):"
+
+#~ msgid "Select Channel"
+#~ msgstr "ਚੈਨਲ ਚੁਣੋ"