Merge translation files from master branch.

1 files changed, 47 insertions, 16 deletions

diff --git a/tde-i18n-es/messages/tdepim/akregator.po b/tde-i18n-es/messages/tdepim/akregator.po
index 78212e3f575..4a9f90ae5a7 100644
--- a/tde-i18n-es/messages/tdepim/akregator.po
+++ b/tde-i18n-es/messages/tdepim/akregator.po
@@ -7,7 +7,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-23 00:06+0100\n"
 "Last-Translator: Pablo de Vicente <pablo.devicente@gmail.com>\n"
 "Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -42,47 +42,47 @@ msgstr "Un agregador de orígenes de noticias para TDE"
 msgid "(C) 2004, 2005 Akregator developers"
 msgstr "(C) 2004, 2005 los desarrolladores de Akregator"
 
-#: aboutdata.cpp:36
+#: aboutdata.cpp:35
 msgid "Maintainer"
 msgstr "Mantenedor"
 
-#: 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 "Desarrollador"
 
-#: aboutdata.cpp:41 aboutdata.cpp:42 aboutdata.cpp:43
+#: aboutdata.cpp:40 aboutdata.cpp:41 aboutdata.cpp:42
 msgid "Contributor"
 msgstr "Colaborador"
 
-#: aboutdata.cpp:44
+#: aboutdata.cpp:43
 msgid "Handbook"
 msgstr "Manual"
 
-#: aboutdata.cpp:45
+#: aboutdata.cpp:44
 msgid "Author of librss"
 msgstr "Autor de librss"
 
-#: aboutdata.cpp:46
+#: aboutdata.cpp:45
 msgid "Bug tracker management, Usability improvements"
 msgstr "Gestión de seguimiento de fallos, mejoras en la usabilidad"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:46
 msgid "Tons of bug fixes"
 msgstr "Muchas correcciones de fallos"
 
-#: aboutdata.cpp:48
+#: aboutdata.cpp:47
 msgid "'Delayed mark as read' feature"
 msgstr "Característica «Marcar como leído tras un tiempo»"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:48
 msgid "Icons"
 msgstr "Iconos"
 
-#: aboutdata.cpp:50
+#: aboutdata.cpp:49
 msgid "Insomnia"
 msgstr "Insomnia"
 
-#: aboutdata.cpp:51
+#: aboutdata.cpp:50
 msgid "Gentoo Ebuild"
 msgstr "Ebuild para Gentoo"
 
@@ -753,11 +753,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;'>Bienvenido a Akregator %1</h2><p>Akregator es "
 "un agregador de orígenes RSS para el entorno de escritorio K. Los "
@@ -1797,6 +1797,37 @@ msgid "Icon:"
 msgstr "Icono:"
 
 #, 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;'>Bienvenido a Akregator %1</h2><p>Akregator "
+#~ "es un agregador de orígenes RSS para el entorno de escritorio K. Los "
+#~ "agregadores de orígenes proporcionan una forma sencilla de navegar entre "
+#~ "diversos tipos de contenido, entre los que se incluyen noticias, "
+#~ "bitácoras personales y otro tipo de contenido procedente de sitios web. "
+#~ "En lugar de comprobar manualmente si hay actualizaciones en sus sitios "
+#~ "web preferidos, Akregator recopila el contenido.</p><p>Si quiere más "
+#~ "información sobre cómo usar Akregator, puede dirigirse al <a href="
+#~ "\"%3\">sitio web de Akregator</a>. Si no quiere volver a ver esta página, "
+#~ "<a href=\"config:/disable_introduction\">haga clic aquí</a>.</"
+#~ "p><p>Esperamos que disfrute con Akregator.</p>\n"
+#~ "<p>Gracias,</p>\n"
+#~ "<p style='margin-bottom: 0px'>&nbsp; &nbsp; el equipo de Akregator.</p>\n"
+
+#, fuzzy
 #~ msgid "&Delete"
 #~ msgstr "E&liminar la etiqueta"