Merge translation files from master branch.

1 files changed, 45 insertions, 16 deletions

diff --git a/tde-i18n-et/messages/tdepim/akregator.po b/tde-i18n-et/messages/tdepim/akregator.po
index 89a0cc15fcd..1270573e2d6 100644
--- a/tde-i18n-et/messages/tdepim/akregator.po
+++ b/tde-i18n-et/messages/tdepim/akregator.po
@@ -3,7 +3,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-31 17:44+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -37,47 +37,47 @@ msgstr "TDE RSS-kanalite uudistekoguja"
 msgid "(C) 2004, 2005 Akregator developers"
 msgstr "(C) 2004, 2005: Akregatori arendajad"
 
-#: aboutdata.cpp:36
+#: aboutdata.cpp:35
 msgid "Maintainer"
 msgstr "Hooldaja"
 
-#: 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 "Arendaja"
 
-#: aboutdata.cpp:41 aboutdata.cpp:42 aboutdata.cpp:43
+#: aboutdata.cpp:40 aboutdata.cpp:41 aboutdata.cpp:42
 msgid "Contributor"
 msgstr "Kaasautor"
 
-#: aboutdata.cpp:44
+#: aboutdata.cpp:43
 msgid "Handbook"
 msgstr "Käsiraamat"
 
-#: aboutdata.cpp:45
+#: aboutdata.cpp:44
 msgid "Author of librss"
 msgstr "Teegi librss autor"
 
-#: aboutdata.cpp:46
+#: aboutdata.cpp:45
 msgid "Bug tracker management, Usability improvements"
 msgstr "Vigade haldamine, kasutamise hõlbustamine"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:46
 msgid "Tons of bug fixes"
 msgstr "Tohutult veaparandusi"
 
-#: aboutdata.cpp:48
+#: aboutdata.cpp:47
 msgid "'Delayed mark as read' feature"
 msgstr "Viivitusega loetuksmärkimise võimalus"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:48
 msgid "Icons"
 msgstr "Ikoonid"
 
-#: aboutdata.cpp:50
+#: aboutdata.cpp:49
 msgid "Insomnia"
 msgstr "Insomnia"
 
-#: aboutdata.cpp:51
+#: aboutdata.cpp:50
 msgid "Gentoo Ebuild"
 msgstr "Gentoo Ebuild"
 
@@ -745,11 +745,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;'>Tere tulemast kasutama Akregator %1!</"
 "h2><p>Akregator on TDE töökeskkonna RSS-kanalite lugemisvahend. Sellised "
@@ -1775,6 +1775,35 @@ msgid "Icon:"
 msgstr "Ikoon:"
 
 #, 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;'>Tere tulemast kasutama Akregator %1!</"
+#~ "h2><p>Akregator on TDE töökeskkonna RSS-kanalite lugemisvahend. Sellised "
+#~ "rakendused pakuvad mugava võimaluse vaadata mitmesugust veebis leiduvat "
+#~ "infot, sealhulgas uudiseid, veebipäevikuid ja muud sellist. Sa ei pea "
+#~ "enam ise kõigile saitidele minema uudiseid hankima - Akregator teeb seda "
+#~ "sinu eest.</p><p>Rohkem infot Akregatori kasutamise kohta leiab <a href="
+#~ "\"%3\">Akregatori veebileheküljelt</a>. Kui sa ei soovi käesolevat "
+#~ "lehekülge rohkem näha, <a href=\"config:/disable_introduction\">klõpsa "
+#~ "siia</a>.</p><p>Me loodame, et Akregator meeldib sulle.</p>\n"
+#~ "<p>Tänulikult sinu</p>\n"
+#~ "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Akregatori meeskond</p>\n"
+
+#, fuzzy
 #~ msgid "&Delete"
 #~ msgstr "K&ustuta silt"