Merge translation files from master branch.

1 files changed, 34 insertions, 26 deletions

diff --git a/tde-i18n-tg/messages/tdemultimedia/kmix.po b/tde-i18n-tg/messages/tdemultimedia/kmix.po
index 7791d1eac57..f7643d0917a 100644
--- a/tde-i18n-tg/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-tg/messages/tdemultimedia/kmix.po
@@ -9,7 +9,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: 2005-10-04 16:54+0500\n"
 "Last-Translator: Victor Ibragimov <[email protected]>\n"
 "Language-Team: Tajik\n"
@@ -39,7 +39,7 @@ msgstr "Ҷудосозии Каналҳо"
 msgid "Current Mixer"
 msgstr "Омехтаи ҷорӣ"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "Омехтакунаки ҷорӣ"
 
@@ -47,43 +47,39 @@ msgstr "Омехтакунаки ҷорӣ"
 msgid "Select the channel representing the master volume:"
 msgstr "Интиҳоб кардани маҷрои намоишкардаи мохири овоз:"
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 msgid "Configure &Global Shortcuts..."
 msgstr "&Батанзимдарории Миёнбури Глобалӣ..."
 
-#: kmix.cpp:119
+#: kmix.cpp:118
 msgid "Hardware &Information"
 msgstr "&Ахбороти Сахтафзор"
 
-#: 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 "Ахбороти сахтафзории омехтакунак"
 
@@ -107,7 +103,7 @@ 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"
@@ -115,15 +111,15 @@ msgstr ""
 "Барои маълумоти муфассал марҳамат карда ба барномаи ахборот Оиди KMix "
 "муроҷиат кунед"
 
-#: 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 "Омехтакунаки нодуруст ворид шудааст."
 
@@ -144,27 +140,27 @@ msgstr "Барқароркунии баландиҳои овоз бо нобаё
 msgid "KMixCtrl"
 msgstr "KMixCtrl"
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr "Хомӯш кардани &овоз"
 
-#: 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 "Нишондиҳии Тирезаи Омехтакунак"
 
@@ -653,7 +649,16 @@ msgstr "Гардонандаҳои овози истифода шаванда:"
 msgid "&Channels"
 msgstr "&Маҷроҳо"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+#, fuzzy
+msgid "&Select Mixer"
+msgstr "Интихоби Омехтакунак"
+
+#: viewbase.cpp:139
+msgid "General"
+msgstr ""
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr "Гузоришҳои Дастгоҳ"
 
@@ -705,3 +710,6 @@ msgstr "Паснам&о:"
 #, no-c-format
 msgid "Silen&t:"
 msgstr "Оро&м:"
+
+#~ msgid "Select Channel"
+#~ msgstr "Интихоби Маҷро"