Merge translation files from master branch.

1 files changed, 34 insertions, 26 deletions

diff --git a/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po b/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po
index 48a53f45fa4..6126ee7bb58 100644
--- a/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po
@@ -7,7 +7,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-06-28 07:50+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -38,7 +38,7 @@ msgstr "選擇主聲道"
 msgid "Current Mixer"
 msgstr "目前混音器"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "目前混音器"
 
@@ -46,43 +46,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 "混音器硬體資訊"
 
@@ -106,21 +102,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 "輸入了不合規格的混音器。"
 
@@ -140,27 +136,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 "滑動器方向："