Merge translation files from master branch.

1 files changed, 45 insertions, 16 deletions

diff --git a/tde-i18n-sl/messages/tdepim/akregator.po b/tde-i18n-sl/messages/tdepim/akregator.po
index ea8f0d3bcc2..db0e6a3b888 100644
--- a/tde-i18n-sl/messages/tdepim/akregator.po
+++ b/tde-i18n-sl/messages/tdepim/akregator.po
@@ -6,7 +6,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: 2007-01-07 01:46+0100\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -42,47 +42,47 @@ msgstr "Zbiralnik virov RSS za TDE"
 msgid "(C) 2004, 2005 Akregator developers"
 msgstr "© 2004, 2005 razvijalci Akregatorja"
 
-#: aboutdata.cpp:36
+#: aboutdata.cpp:35
 msgid "Maintainer"
 msgstr "Vzdrževalec"
 
-#: 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 "Razvijalec"
 
-#: aboutdata.cpp:41 aboutdata.cpp:42 aboutdata.cpp:43
+#: aboutdata.cpp:40 aboutdata.cpp:41 aboutdata.cpp:42
 msgid "Contributor"
 msgstr "Prispevkar"
 
-#: aboutdata.cpp:44
+#: aboutdata.cpp:43
 msgid "Handbook"
 msgstr "Priročnik"
 
-#: aboutdata.cpp:45
+#: aboutdata.cpp:44
 msgid "Author of librss"
 msgstr "Avtorji librss"
 
-#: aboutdata.cpp:46
+#: aboutdata.cpp:45
 msgid "Bug tracker management, Usability improvements"
 msgstr "Upravljanje sledenja hroščem, izboljšave uporabnosti"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:46
 msgid "Tons of bug fixes"
 msgstr "Na tone popravkov"
 
-#: aboutdata.cpp:48
+#: aboutdata.cpp:47
 msgid "'Delayed mark as read' feature"
 msgstr "Zmožnost zakasnjenega označevanja kot prebrano"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:48
 msgid "Icons"
 msgstr "Ikone"
 
-#: aboutdata.cpp:50
+#: aboutdata.cpp:49
 msgid "Insomnia"
 msgstr "Insomnia"
 
-#: aboutdata.cpp:51
+#: aboutdata.cpp:50
 msgid "Gentoo Ebuild"
 msgstr "Ebuild za Gentoo"
 
@@ -752,11 +752,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;'>Dobrodošli v Akregator %1</h2><p>Akregator je "
 "zbiralnik virov RSS za namizje TDE. Zbiralniki virov omogočajo priročen "
@@ -1785,6 +1785,35 @@ msgid "Icon:"
 msgstr "Ikona:"
 
 #, 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;'>Dobrodošli v Akregator %1</h2><p>Akregator "
+#~ "je zbiralnik virov RSS za namizje TDE. Zbiralniki virov omogočajo "
+#~ "priročen način za brskanje po različnih vrstah vsebin, kot so novice, "
+#~ "spletni dnevniki in ostale vsebine s spletnih mest. Namesto da bi vse "
+#~ "priljubljene strani preverili ročno, vsebino za vas zbere Akregator.</"
+#~ "p><p>Za podrobnosti o uporabi programa obiščite <a href=\"%3\">spletno "
+#~ "stran Akregatorja</a>. Če tega sporočila v prihodnje ne želite videti, <a "
+#~ "href=\"config:/disable_introduction\">kliknite to povezavo</a>.</"
+#~ "p><p>Upamo, da boste z Akregatorjem uživali.</p>\n"
+#~ "<p>Hvala,</p>\n"
+#~ "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Ekipa Akregatorja</p>\n"
+
+#, fuzzy
 #~ msgid "&Delete"
 #~ msgstr "&Izbriši oznako"