Merge translation files from master branch.

1 files changed, 34 insertions, 26 deletions

diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po b/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
index 78ada420095..b2e245ffc3a 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix 3.4\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-07-17 09:54+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -41,7 +41,7 @@ msgstr "选择主声道"
 msgid "Current Mixer"
 msgstr "当前混音器"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "当前混音器"
 
@@ -49,43 +49,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 下次启动才会生效。"
 
-#: kmix.cpp:601
+#: kmix.cpp:581
 msgid "Mixer Hardware Information"
 msgstr "混音器硬件信息"
 
@@ -109,21 +105,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 "详细致谢名单，请参见 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 "无效的混音器。"
 
@@ -143,27 +139,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 "显示混音器窗口"
 
@@ -644,7 +640,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 "设备设置"
 
@@ -697,6 +702,9 @@ msgstr "背景(&N)："
 msgid "Silen&t:"
 msgstr "减小音量(&T)："
 
+#~ msgid "Select Channel"
+#~ msgstr "选择声道"
+
 #, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "滑块方向："