Merge translation files from master branch.

1 files changed, 43 insertions, 16 deletions

diff --git a/tde-i18n-zh_CN/messages/tdepim/akregator.po b/tde-i18n-zh_CN/messages/tdepim/akregator.po
index dfea6b2d02e..68bd6399c1d 100644
--- a/tde-i18n-zh_CN/messages/tdepim/akregator.po
+++ b/tde-i18n-zh_CN/messages/tdepim/akregator.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: akregator\n"
-"POT-Creation-Date: 2019-01-13 18:48+0100\n"
+"POT-Creation-Date: 2019-07-18 01:58+0200\n"
 "PO-Revision-Date: 2005-12-03 22:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -37,47 +37,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 "Insomnia"
 
-#: aboutdata.cpp:51
+#: aboutdata.cpp:50
 msgid "Gentoo Ebuild"
 msgstr "Gentoo Ebuild"
 
@@ -720,11 +720,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 是 K 桌面"
 "环境下的 RSS 种子收集器。种子收集器提供了一种浏览不同内容的全新途径，这些内容"
@@ -1741,6 +1741,33 @@ 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 是 K "
+#~ "桌面环境下的 RSS 种子收集器。种子收集器提供了一种浏览不同内容的全新途径，"
+#~ "这些内容可以是新闻、博客日志以及在线网站的其它内容。由于 Akregator 会自动"
+#~ "帮您收集网站内容，您再也不必手动检查您所喜爱的网站是否有更新内容。</p><p>"
+#~ "要获得关于使用 Akregator 的更多信息，请检查 <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)"