Merge translation files from master branch.

1 files changed, 34 insertions, 26 deletions

diff --git a/tde-i18n-ko/messages/tdemultimedia/kmix.po b/tde-i18n-ko/messages/tdemultimedia/kmix.po
index 65fd5a5abcb..c21db3ceb24 100644
--- a/tde-i18n-ko/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-ko/messages/tdemultimedia/kmix.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kmix\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\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-12-04 19:39+0900\n"
 "Last-Translator: Park Shinjo <[email protected]>\n"
 "Language-Team: Korean <[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 "전역 단축키 설정(&O)..."
 
-#: 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 "믹서 하드웨어 정보"
 
@@ -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 "자세한 정보는 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 "잘못된 믹서가 입력되었습니다."
 
@@ -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 "믹서 창 보이기"
 
@@ -641,7 +637,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 "장치 설정"
 
@@ -694,6 +699,9 @@ msgstr "배경(&N):"
 msgid "Silen&t:"
 msgstr "조용히(&T):"
 
+#~ msgid "Select Channel"
+#~ msgstr "채널 선택"
+
 #, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "슬라이더 방향: "