Merge translation files from master branch.

2 files changed, 58 insertions, 59 deletions

diff --git a/tde-i18n-ko/messages/tdebase/kasbarextension.po b/tde-i18n-ko/messages/tdebase/kasbarextension.po
index 5be7e3623cf..b9a6bde9c40 100644
--- a/tde-i18n-ko/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-ko/messages/tdebase/kasbarextension.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-18 01:58+0200\n"
 "PO-Revision-Date: 2007-12-04 19:32+0900\n"
 "Last-Translator: Park Shinjo <peremen@gmail.com>\n"
 "Language-Team: Korean <tde-i18n@kldp.org>\n"
@@ -378,25 +378,24 @@ msgid "Enable &progress indicator"
 msgstr "진행 표시기 사용(&P)"
 
 #: kasprefsdlg.cpp:421
-msgid ""
-"Enables the display of a progress bar in the label of windows show are "
-"progress indicators."
-msgstr ""
+#, fuzzy
+msgid "Enables the display of a progress indicator in the label of windows."
+msgstr "시작하고 있는 중이지만 창을 만들지 않은 작업을 표시합니다."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "주의 표시기 사용(&A)"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr "주의를 받아야 할 창에 아이콘을 표시합니다."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "비활성 항목의 프레임 사용"
 
-#: kasprefsdlg.cpp:434
+#: kasprefsdlg.cpp:433
 msgid ""
 "Enables frames around inactive items, if you want the bar to disappear into "
 "the background you should probably uncheck this option."
@@ -404,7 +403,7 @@ msgstr ""
 "비활성 항목을 둘러싸는 프레임을 사용합니다. 만약 막대가 배경을 따라 표시되도"
 "록 하려면 이 옵션을 선택하지 않아야 합니다."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
diff --git a/tde-i18n-ko/messages/tdebase/ktip.po b/tde-i18n-ko/messages/tdebase/ktip.po
index d24617afd62..4209045d4de 100644
--- a/tde-i18n-ko/messages/tdebase/ktip.po
+++ b/tde-i18n-ko/messages/tdebase/ktip.po
@@ -1846,55 +1846,6 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
-#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
-#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
-#~ "Acrobat Reader,\n"
-#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
-#~ msgstr ""
-#~ "<p> TDE의 인쇄 능력을 비-TDE 응용프로그램에서도 사용하고 싶습니까? </p>\n"
-#~ "<p> 그렇다면 <strong>'kprinter'</strong> 를 \"인쇄 명령\"으로 사용하십시"
-#~ "오.\n"
-#~ "Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-#~ " StarOffice, OpenOffice.org, 등 모든 GNOME 응용프로그램에서 작동합니다.</"
-#~ "p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
-
-#~ msgid ""
-#~ "<p>\n"
-#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
-#~ " choice.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
-#~ "you back to\n"
-#~ " the first tip.</i>\n"
-#~ "</p>\n"
-#~ msgstr ""
-#~ "<p>\n"
-#~ "TDE가 시작할 때에 <b>NumLock</b> 을 켜거나 끄게 할 수 있습니다.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "제어판에서 주변장치를 열어 키보드로 들어가면 선택할 수\n"
-#~ " 있습니다.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>(팁 데이타베이스에 있는 마지막 팁 입니다. \"다음\" 단추를 눌러 \n"
-#~ "첫번째 귀띔으로 돌아가십시오.)</i>\n"
-#~ "</p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1997,3 +1948,52 @@ msgstr ""
 #~ "주/달 기간으로 찾아보는게 좋습니다.\n"
 #~ "</p>\n"
 #~ "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
+#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
+#~ "Acrobat Reader,\n"
+#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
+#~ msgstr ""
+#~ "<p> TDE의 인쇄 능력을 비-TDE 응용프로그램에서도 사용하고 싶습니까? </p>\n"
+#~ "<p> 그렇다면 <strong>'kprinter'</strong> 를 \"인쇄 명령\"으로 사용하십시"
+#~ "오.\n"
+#~ "Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
+#~ " StarOffice, OpenOffice.org, 등 모든 GNOME 응용프로그램에서 작동합니다.</"
+#~ "p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
+#~ " choice.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
+#~ "you back to\n"
+#~ " the first tip.</i>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "TDE가 시작할 때에 <b>NumLock</b> 을 켜거나 끄게 할 수 있습니다.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "제어판에서 주변장치를 열어 키보드로 들어가면 선택할 수\n"
+#~ " 있습니다.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>(팁 데이타베이스에 있는 마지막 팁 입니다. \"다음\" 단추를 눌러 \n"
+#~ "첫번째 귀띔으로 돌아가십시오.)</i>\n"
+#~ "</p>\n"