Merge translation files from master branch.

3 files changed, 18 insertions, 18 deletions

diff --git a/tde-i18n-nb/messages/tdebase/ksmserver.po b/tde-i18n-nb/messages/tdebase/ksmserver.po
index 5707444c5f7..bc7c9d9975e 100644
--- a/tde-i18n-nb/messages/tdebase/ksmserver.po
+++ b/tde-i18n-nb/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-05-06 20:19+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -59,11 +59,11 @@ msgstr ""
 msgid "Also allow remote connections"
 msgstr "Godta også fjernforbindelser"
 
-#: main.cpp:183
+#: main.cpp:179
 msgid "The TDE Session Manager"
 msgstr "TDE øktbehandler"
 
-#: main.cpp:187
+#: main.cpp:183
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
diff --git a/tde-i18n-nb/messages/tdebase/ksysguard.po b/tde-i18n-nb/messages/tdebase/ksysguard.po
index 089e80caf5f..9f2fa7d227a 100644
--- a/tde-i18n-nb/messages/tdebase/ksysguard.po
+++ b/tde-i18n-nb/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-03-17 11:03+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -1539,7 +1539,11 @@ msgstr "Innstillinger for tidtager"
 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"
@@ -1637,10 +1641,6 @@ msgstr "Vis bare prossesslista for lokal vert"
 msgid "Optional worksheet files to load"
 msgstr "Valgfrie arbeidsark som skal lastes"
 
-#: ksysguard.cc:556
-msgid "TDE System Guard"
-msgstr "TDE systemvakt"
-
 #: ksysguard.cc:558
 msgid "(c) 1996-2002 The KSysGuard Developers"
 msgstr "© 1996–2002 The KSysGuard-utviklere"
@@ -1734,7 +1734,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-nb/messages/tdelibs/tdelibs.po b/tde-i18n-nb/messages/tdelibs/tdelibs.po
index 27ef5718003..b47fc7720f0 100644
--- a/tde-i18n-nb/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-nb/messages/tdelibs/tdelibs.po
@@ -9,7 +9,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-19 20:08+0200\n"
 "Last-Translator: Knut Yrvin <knuty@skolelinux.no>\n"
 "Language-Team:  <i18n-no@lister.ping.uio.no>\n"
@@ -6565,7 +6565,7 @@ msgstr "fatal tolkingsfeil: %1 i 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 "
@@ -6575,7 +6575,7 @@ msgstr ""
 "Systemet kan ha nådd det størst mulige antall åpne filer, eller har nådd det "
 "største antall åpne filer du har lov til å bruke."
 
-#: 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 "
@@ -6585,11 +6585,11 @@ msgstr ""
 "Systemet kan ha nådd det størst mulige antall prosesser, eller har nådd det "
 "største antall prosesser du har lov til å bruke."
 
-#: tdeinit/tdeinit.cpp:589
+#: tdeinit/tdeinit.cpp:590
 msgid "Could not find '%1' executable."
 msgstr "Kunne ikke finne den kjørbare fila «%1»."
 
-#: tdeinit/tdeinit.cpp:605
+#: tdeinit/tdeinit.cpp:606
 msgid ""
 "Could not open library '%1'.\n"
 "%2"
@@ -6600,12 +6600,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 "Ukjent feil"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdeinit/tdeinit.cpp:649
 msgid ""
 "Could not find 'kdemain' in '%1'.\n"
 "%2"