Merge translation files from master branch.

1 files changed, 44 insertions, 16 deletions

diff --git a/tde-i18n-ko/messages/tdepim/akregator.po b/tde-i18n-ko/messages/tdepim/akregator.po
index 30d63ddb892..de6ed690969 100644
--- a/tde-i18n-ko/messages/tdepim/akregator.po
+++ b/tde-i18n-ko/messages/tdepim/akregator.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdepim\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2019-01-13 18:48+0100\n"
+"POT-Creation-Date: 2019-07-18 01:58+0200\n"
 "PO-Revision-Date: 2007-12-02 00:56+0900\n"
 "Last-Translator: Park Shinjo <peremen@gmail.com>\n"
 "Language-Team: Korean <cho.sungjae@gmail.com>\n"
@@ -41,47 +41,47 @@ msgstr "TDE 피드 수집기"
 msgid "(C) 2004, 2005 Akregator developers"
 msgstr "(C) 2004, 2005 Akregator 개발자"
 
-#: aboutdata.cpp:36
+#: aboutdata.cpp:35
 msgid "Maintainer"
 msgstr "관리자"
 
-#: aboutdata.cpp:37 aboutdata.cpp:38 aboutdata.cpp:39 aboutdata.cpp:40
+#: aboutdata.cpp:36 aboutdata.cpp:37 aboutdata.cpp:38 aboutdata.cpp:39
 msgid "Developer"
 msgstr "개발자"
 
-#: aboutdata.cpp:41 aboutdata.cpp:42 aboutdata.cpp:43
+#: aboutdata.cpp:40 aboutdata.cpp:41 aboutdata.cpp:42
 msgid "Contributor"
 msgstr "기여자"
 
-#: aboutdata.cpp:44
+#: aboutdata.cpp:43
 msgid "Handbook"
 msgstr "도움말"
 
-#: aboutdata.cpp:45
+#: aboutdata.cpp:44
 msgid "Author of librss"
 msgstr "librss 제작자"
 
-#: aboutdata.cpp:46
+#: aboutdata.cpp:45
 msgid "Bug tracker management, Usability improvements"
 msgstr "버그 트래커 관리, 사용성 향상"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:46
 msgid "Tons of bug fixes"
 msgstr "다량의 버그 수정"
 
-#: aboutdata.cpp:48
+#: aboutdata.cpp:47
 msgid "'Delayed mark as read' feature"
 msgstr "'일정 시간 후 읽은 상태로 표시' 기능"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:48
 msgid "Icons"
 msgstr "아이콘"
 
-#: aboutdata.cpp:50
+#: aboutdata.cpp:49
 msgid "Insomnia"
 msgstr "불면증"
 
-#: aboutdata.cpp:51
+#: aboutdata.cpp:50
 msgid "Gentoo Ebuild"
 msgstr "젠투 이빌드"
 
@@ -722,11 +722,11 @@ msgid ""
 "news, blogs, and other content from online sites. Instead of checking all "
 "your favorite web sites manually for updates, Akregator collects the content "
 "for you.</p><p>For more information about using Akregator, check the <a href="
-"\"%3\">Akregator website</a>. If you do not want to see this page anymore, "
-"<a href=\"config:/disable_introduction\">click here</a>.</p><p>We hope that "
-"you will enjoy Akregator.</p>\n"
+"\"%3\">Trinity website</a>. If you do not want to see this page anymore, <a "
+"href=\"config:/disable_introduction\">click here</a>.</p><p>We hope that you "
+"will enjoy Akregator.</p>\n"
 "<p>Thank you,</p>\n"
-"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n"
+"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Trinity Team</p>\n"
 msgstr ""
 "<h2 style='margin-top: 0px;'>Akregator %1에 오신 것을 환영합니다!</"
 "h2><p>Akregator는 TDE를 위한 RSS 피드 수집기입니다. 피드 수집기는 뉴스, 블로"
@@ -1748,6 +1748,34 @@ msgid "Icon:"
 msgstr "아이콘:"
 
 #, fuzzy
+#~ msgid ""
+#~ "_: %1: Akregator version; %2: help:// URL; %3: homepage URL; --- end of "
+#~ "comment ---\n"
+#~ "<h2 style='margin-top: 0px;'>Welcome to Akregator %1</h2><p>Akregator is "
+#~ "an RSS feed aggregator for the Trinity Desktop Environment. Feed "
+#~ "aggregators provide a convenient way to browse different kinds of "
+#~ "content, including news, blogs, and other content from online sites. "
+#~ "Instead of checking all your favorite web sites manually for updates, "
+#~ "Akregator collects the content for you.</p><p>For more information about "
+#~ "using Akregator, check the <a href=\"%3\">Akregator website</a>. If you "
+#~ "do not want to see this page anymore, <a href=\"config:/"
+#~ "disable_introduction\">click here</a>.</p><p>We hope that you will enjoy "
+#~ "Akregator.</p>\n"
+#~ "<p>Thank you,</p>\n"
+#~ "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n"
+#~ msgstr ""
+#~ "<h2 style='margin-top: 0px;'>Akregator %1에 오신 것을 환영합니다!</"
+#~ "h2><p>Akregator는 TDE를 위한 RSS 피드 수집기입니다. 피드 수집기는 뉴스, 블"
+#~ "로그 등을 한 자리에서 손쉽게 보고 관리할 수 있도록 도와 줍니다. 아마도 여"
+#~ "러분은 새 내용을 보기 위해 여러분이 좋아하는 웹 사이트를 매번 방문하였을 "
+#~ "것입니다. Akregator는 그 일을 대신 해 줍니다.</p><p>사용하는 정보를 더 알"
+#~ "아보고 싶다면 <a href=\"%3\">Akregator 웹사이트</a>를 참고하십시오. 이 페"
+#~ "이지를 다시 보지 않으시려면 <a href=\"config:/disable_introduction\">여기"
+#~ "</a>를 누르십시오.</p><p>Akregator를 잘 사용하시기를 바랍니다.</p>\n"
+#~ "<p>감사합니다,</p>\n"
+#~ "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Akregator 팀</p>\n"
+
+#, fuzzy
 #~ msgid "&Delete"
 #~ msgstr "태그 삭제(&D)"