Merge translation files from master branch.

1 files changed, 33 insertions, 26 deletions

diff --git a/tde-i18n-uz/messages/tdemultimedia/kmix.po b/tde-i18n-uz/messages/tdemultimedia/kmix.po
index 59124bb1926..76420ecae7b 100644
--- a/tde-i18n-uz/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-uz/messages/tdemultimedia/kmix.po
@@ -4,7 +4,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: 2006-03-20 00:08+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Current Mixer"
 msgstr ""
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr ""
 
@@ -42,43 +42,39 @@ msgstr ""
 msgid "Select the channel representing the master volume:"
 msgstr ""
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 msgid "Configure &Global Shortcuts..."
 msgstr "Umumiy tugmalar &birikmasini moslash"
 
-#: 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 "Mikserning oynasini bekitish"
 
-#: 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 "Kanalni tanlash"
-
-#: 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 ""
 
@@ -100,21 +96,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 "Mikserlar"
 
-#: kmixapplet.cpp:324
+#: kmixapplet.cpp:326
 msgid "Available mixers:"
 msgstr ""
 
-#: kmixapplet.cpp:330
+#: kmixapplet.cpp:332
 msgid "Invalid mixer entered."
 msgstr ""
 
@@ -134,27 +130,27 @@ msgstr ""
 msgid "KMixCtrl"
 msgstr ""
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr "Tovushsi&z"
 
-#: 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 "Tovush %1%"
 
-#: kmixdockwidget.cpp:214
+#: kmixdockwidget.cpp:238
 msgid " (Muted)"
 msgstr " (Tovushsiz)"
 
-#: kmixdockwidget.cpp:422
+#: kmixdockwidget.cpp:445
 msgid "Show Mixer Window"
 msgstr "Mikserning oynasini koʻrsatish"
 
@@ -608,7 +604,15 @@ msgstr ""
 msgid "&Channels"
 msgstr "&Kanallar"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+msgid "&Select Mixer"
+msgstr ""
+
+#: viewbase.cpp:139
+msgid "General"
+msgstr ""
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr "Uskunaning moslamalari"
 
@@ -660,3 +664,6 @@ msgstr ""
 #, no-c-format
 msgid "Silen&t:"
 msgstr ""
+
+#~ msgid "Select Channel"
+#~ msgstr "Kanalni tanlash"