Merge translation files from master branch.

2 files changed, 14 insertions, 9 deletions

diff --git a/tde-i18n-nn/messages/tdepim/kmail.po b/tde-i18n-nn/messages/tdepim/kmail.po
index d3fcde5444d..c2fbc61e8b8 100644
--- a/tde-i18n-nn/messages/tdepim/kmail.po
+++ b/tde-i18n-nn/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2019-04-21 19:42+0200\n"
+"POT-Creation-Date: 2019-04-21 21:15+0200\n"
 "PO-Revision-Date: 2006-07-23 19:03+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -14666,6 +14666,11 @@ msgstr ""
 "<p align=\"right\"><em>bidrag frå Davig F. Newman</em></p>\n"
 
 #, fuzzy
+#~| msgid "Message Structure Viewer"
+#~ msgid "Show Message Structure"
+#~ msgstr "Visar for meldingsstruktur"
+
+#, fuzzy
 #~ msgid "Clear"
 #~ msgstr "Tøm historia"
 
diff --git a/tde-i18n-nn/messages/tdeutils/klaptopdaemon.po b/tde-i18n-nn/messages/tdeutils/klaptopdaemon.po
index b330dee39bc..c9d5b5a5377 100644
--- a/tde-i18n-nn/messages/tdeutils/klaptopdaemon.po
+++ b/tde-i18n-nn/messages/tdeutils/klaptopdaemon.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klaptopdaemon\n"
-"POT-Creation-Date: 2019-01-13 18:52+0100\n"
+"POT-Creation-Date: 2019-05-05 19:00+0200\n"
 "PO-Revision-Date: 2006-06-22 22:15+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -462,7 +462,7 @@ msgstr ""
 "\n"
 "Systemet støttar ikkje kvilemodus/ventemodus."
 
-#: portable.cpp:1049 portable.cpp:2189 portable.cpp:2595 portable.cpp:2890
+#: portable.cpp:1049 portable.cpp:2189 portable.cpp:2602 portable.cpp:2928
 msgid "No PCMCIA controller detected"
 msgstr "Fann inga PCMCIA-kontrolleining"
 
@@ -523,19 +523,19 @@ msgstr ""
 "ikkje, kan du ta kontakt med systemadministratoren og spørja om du kan få "
 "lese- og skrivetilgang til /dev/apm."
 
-#: portable.cpp:2157 portable.cpp:2562
+#: portable.cpp:2157 portable.cpp:2569
 msgid "Your kernel lacks support for Advanced Power Management."
 msgstr "Kjernen støttar ikkje avansert straumstyring (APM)."
 
-#: portable.cpp:2161 portable.cpp:2566
+#: portable.cpp:2161 portable.cpp:2573
 msgid "There was a generic error while opening /dev/apm."
 msgstr "Det oppstod ein feil ved opning av /dev/apm."
 
-#: portable.cpp:2166 portable.cpp:2571
+#: portable.cpp:2166 portable.cpp:2578
 msgid "APM has most likely been disabled."
 msgstr "APM er truleg slått av."
 
-#: portable.cpp:2556
+#: portable.cpp:2563
 msgid ""
 "There is no /dev/apm file on this system. Please review the NetBSD "
 "documentation on how to create a device node for the APM device driver (man "
@@ -544,7 +544,7 @@ msgstr ""
 "Fila /dev/apm finst ikkje på dette systemet. Sjå i dokumentasjonen for "
 "NetBSD om korleis ein einingsnode kan lagast for APM-drivaren (man 4 apm)."
 
-#: portable.cpp:2559
+#: portable.cpp:2566
 msgid ""
 "Your system has the proper device node for APM support, however you cannot "
 "access it. If you have APM compiled into the kernel this should not happen."
@@ -552,7 +552,7 @@ msgstr ""
 "Systemet har den rette einingsnoden for APM-støtte, men du har ikkje tilgang "
 "til han. Dersom APM er kompilert inn i kjernen, skal ikkje dette skje."
 
-#: portable.cpp:2866
+#: portable.cpp:2904
 msgid ""
 "Your computer or operating system is not supported by the current version of "
 "the\n"