Merge translation files from master branch.

1 files changed, 47 insertions, 16 deletions

diff --git a/tde-i18n-nb/messages/tdepim/akregator.po b/tde-i18n-nb/messages/tdepim/akregator.po
index 4151b227fa6..e01b28ac395 100644
--- a/tde-i18n-nb/messages/tdepim/akregator.po
+++ b/tde-i18n-nb/messages/tdepim/akregator.po
@@ -8,7 +8,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-03-17 16:09+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -42,47 +42,47 @@ msgstr "Et TDE-program for innsamling av nyhetskilder"
 msgid "(C) 2004, 2005 Akregator developers"
 msgstr "© 2004, 2005 Akregator-utviklerne"
 
-#: aboutdata.cpp:36
+#: aboutdata.cpp:35
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: 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 "Utvikler"
 
-#: aboutdata.cpp:41 aboutdata.cpp:42 aboutdata.cpp:43
+#: aboutdata.cpp:40 aboutdata.cpp:41 aboutdata.cpp:42
 msgid "Contributor"
 msgstr "Bidragsyter"
 
-#: aboutdata.cpp:44
+#: aboutdata.cpp:43
 msgid "Handbook"
 msgstr "Håndbok"
 
-#: aboutdata.cpp:45
+#: aboutdata.cpp:44
 msgid "Author of librss"
 msgstr "librss-utvikler"
 
-#: aboutdata.cpp:46
+#: aboutdata.cpp:45
 msgid "Bug tracker management, Usability improvements"
 msgstr "Feilhåndteringssystem, bruksforbedringer"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:46
 msgid "Tons of bug fixes"
 msgstr "Tonnevis med feilfikser."
 
-#: aboutdata.cpp:48
+#: aboutdata.cpp:47
 msgid "'Delayed mark as read' feature"
 msgstr "Forsinket «merk som lest»-funksjon."
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:48
 msgid "Icons"
 msgstr "Ikoner"
 
-#: aboutdata.cpp:50
+#: aboutdata.cpp:49
 msgid "Insomnia"
 msgstr "Søvnløshet"
 
-#: aboutdata.cpp:51
+#: aboutdata.cpp:50
 msgid "Gentoo Ebuild"
 msgstr "Gentoo-Ebuild"
 
@@ -749,11 +749,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;'>Velkommen til Akregator %1</h2><p>Akregator er "
 "et program til å håndtere samlinger av RSS-kilder for skrivebordsmiljøet "
@@ -1788,6 +1788,37 @@ msgid "Icon:"
 msgstr "Ikon:"
 
 #, 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;'>Velkommen til Akregator %1</h2><p>Akregator "
+#~ "er et program til å håndtere samlinger av RSS-kilder for "
+#~ "skrivebordsmiljøet TDE. Programmer for kildesamlinger sørger for en enkel "
+#~ "måte å bla i forskellige typer informasjon, inklusive nyheter, "
+#~ "nettdagbøker og annen informasjon fra steder på Internett. I stedet for å "
+#~ "måtte sjekke alle favorittsidene manuelt, kan du bruke Akregator til å "
+#~ "samle inn informasjonen for deg.</p><p>For mer informasjon om hvordan "
+#~ "Akregator brukes, gå til <a href=\"%3\">Akregators hjemmeside</a>. Hvis "
+#~ "du ikke vil se denne siden mer, trykk <a href=\"config:/"
+#~ "disable_introduction\">her</a>.</p><p>Vi håper at du vil like Akregator.</"
+#~ "p>\n"
+#~ "<p>Mange takk,</p>\n"
+#~ "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Akregator-gjengen</p>\n"
+
+#, fuzzy
 #~ msgid "&Delete"
 #~ msgstr "&Slett merkelapp"