Merge translation files from master branch.

1 files changed, 43 insertions, 16 deletions

diff --git a/tde-i18n-zh_TW/messages/tdepim/akregator.po b/tde-i18n-zh_TW/messages/tdepim/akregator.po
index ec0b8de5583..3efd5c02413 100644
--- a/tde-i18n-zh_TW/messages/tdepim/akregator.po
+++ b/tde-i18n-zh_TW/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: 2006-12-18 13:09+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -39,47 +39,47 @@ msgstr "TDE Feed 集散地"
 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"
 
@@ -727,11 +727,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 feed 集散地。這裡提供一個方便的環境瀏覽不同內容的文章，包括新聞、部落"
@@ -1748,6 +1748,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 是 "
+#~ "TDE 的 RSS feed 集散地。這裡提供一個方便的環境瀏覽不同內容的文章，包括新"
+#~ "聞、部落格、還有其他站台。您不需要自己檢查所有站台的最新內容，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)"