Merge translation files from master branch.

3 files changed, 18 insertions, 18 deletions

diff --git a/tde-i18n-nn/messages/tdebase/ksmserver.po b/tde-i18n-nn/messages/tdebase/ksmserver.po
index 1aa82d717b2..906664693f8 100644
--- a/tde-i18n-nn/messages/tdebase/ksmserver.po
+++ b/tde-i18n-nn/messages/tdebase/ksmserver.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2007-08-15 20:29+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -59,11 +59,11 @@ msgstr ""
 msgid "Also allow remote connections"
 msgstr "Tillat nettverkstilkoplingar"
 
-#: main.cpp:183
+#: main.cpp:179
 msgid "The TDE Session Manager"
 msgstr "Økthandsamar for TDE"
 
-#: main.cpp:187
+#: main.cpp:183
 msgid "Maintainer"
 msgstr "Vedlikehaldar"
 
diff --git a/tde-i18n-nn/messages/tdebase/ksysguard.po b/tde-i18n-nn/messages/tdebase/ksysguard.po
index deff857d1fa..dadf56634ac 100644
--- a/tde-i18n-nn/messages/tdebase/ksysguard.po
+++ b/tde-i18n-nn/messages/tdebase/ksysguard.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksysguard\n"
-"POT-Creation-Date: 2019-11-28 03:15+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2007-08-15 20:29+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -1535,7 +1535,11 @@ msgstr "Innstillingar for tidtakar"
 msgid "Use update interval of worksheet"
 msgstr "Bruk oppdateringsintervallet til arbeidsarket"
 
-#: ksysguard.cc:64 ksysguard.cc:74
+#: ksysguard.cc:64
+msgid "TDE system guard"
+msgstr "TDE Systemvakt"
+
+#: ksysguard.cc:74 ksysguard.cc:556
 #, fuzzy
 msgid "KSysGuard"
 msgstr "TDE Systemvakt"
@@ -1633,10 +1637,6 @@ msgstr "Vis berre prosesslista på den lokale verten"
 msgid "Optional worksheet files to load"
 msgstr "Valfrie arbeidsark som skal lastast"
 
-#: ksysguard.cc:556
-msgid "TDE System Guard"
-msgstr "TDE Systemvakt"
-
 #: ksysguard.cc:558
 msgid "(c) 1996-2002 The KSysGuard Developers"
 msgstr "© 1996–2002 KSysGuard-utviklarane"
@@ -1727,7 +1727,7 @@ msgstr "Prosessor"
 msgid "Mem"
 msgstr "Minne"
 
-#~ msgid "TDE system guard"
+#~ msgid "TDE System Guard"
 #~ msgstr "TDE Systemvakt"
 
 #~ msgid "&Tree"
diff --git a/tde-i18n-nn/messages/tdelibs/tdelibs.po b/tde-i18n-nn/messages/tdelibs/tdelibs.po
index 1c47594c466..2d6b24e7527 100644
--- a/tde-i18n-nn/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-nn/messages/tdelibs/tdelibs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-08-01 05:09+0200\n"
+"POT-Creation-Date: 2019-12-05 01:24+0100\n"
 "PO-Revision-Date: 2007-08-09 17:22+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -6570,7 +6570,7 @@ msgstr "fatal tolkingsfeil: %1 på linje %2, kolonne %3"
 msgid "XML parsing error"
 msgstr "XML-tolkingsfeil"
 
-#: tdeinit/tdeinit.cpp:475
+#: tdeinit/tdeinit.cpp:476
 msgid ""
 "Unable to start new process.\n"
 "The system may have reached the maximum number of open files possible or the "
@@ -6580,7 +6580,7 @@ msgstr ""
 "Systemet har anten nådd det høgste moglege talet på opne filer eller det "
 "høgste talet på opne filer du har lov til å bruka."
 
-#: tdeinit/tdeinit.cpp:497
+#: tdeinit/tdeinit.cpp:498
 msgid ""
 "Unable to create new process.\n"
 "The system may have reached the maximum number of processes possible or the "
@@ -6590,11 +6590,11 @@ msgstr ""
 "Systemet har anten nådd det høgste moglege talet på prosessar eller det "
 "høgste talet på prosessar du har lov til å bruka."
 
-#: tdeinit/tdeinit.cpp:589
+#: tdeinit/tdeinit.cpp:590
 msgid "Could not find '%1' executable."
 msgstr "Fann ikkje programfila «%1»."
 
-#: tdeinit/tdeinit.cpp:605
+#: tdeinit/tdeinit.cpp:606
 msgid ""
 "Could not open library '%1'.\n"
 "%2"
@@ -6605,12 +6605,12 @@ msgstr ""
 #: ../dependencies/tqt3/src/network/qftp.cpp:1252
 #: ../dependencies/tqt3/src/network/qftp.cpp:1980
 #: ../dependencies/tqt3/src/network/qhttp.cpp:1226
-#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:606
-#: tdeinit/tdeinit.cpp:649
+#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:607
+#: tdeinit/tdeinit.cpp:650
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdeinit/tdeinit.cpp:649
 msgid ""
 "Could not find 'kdemain' in '%1'.\n"
 "%2"