Merge translation files from master branch.

2 files changed, 43 insertions, 43 deletions

diff --git a/tde-i18n-nb/messages/tdebase/kcmscreensaver.po b/tde-i18n-nb/messages/tdebase/kcmscreensaver.po
index 524d764fd6d..a33d8418f30 100644
--- a/tde-i18n-nb/messages/tdebase/kcmscreensaver.po
+++ b/tde-i18n-nb/messages/tdebase/kcmscreensaver.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmscreensaver\n"
-"POT-Creation-Date: 2018-12-10 03:08+0100\n"
+"POT-Creation-Date: 2019-03-31 20:01+0200\n"
 "PO-Revision-Date: 2006-06-26 12:11+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.pping.uio.no>\n"
@@ -85,7 +85,7 @@ msgstr ""
 "Handlinga som skal utføres når musepekeren ligger nede i høyre hjørnet på "
 "skjermen i 15 sekund."
 
-#: scrnsave.cpp:104
+#: scrnsave.cpp:99
 msgid ""
 "<h1>Screen Saver</h1> This module allows you to enable and configure a "
 "screen saver. Note that you can enable a screen saver even if you have power "
@@ -107,61 +107,61 @@ msgstr ""
 "det, kan du likevel låse skjermen ved å velge «Lås skjerm» fra "
 "skrivebordsmenyen."
 
-#: scrnsave.cpp:147
+#: scrnsave.cpp:142
 msgid "Screen Saver"
 msgstr "Pauseskjerm"
 
-#: scrnsave.cpp:162
+#: scrnsave.cpp:157
 msgid "Select the screen saver to use."
 msgstr "Velg hvilken pauseskjerm du vil bruke."
 
-#: scrnsave.cpp:165
+#: scrnsave.cpp:160
 msgid "&Setup..."
 msgstr "&Tilpass …"
 
-#: scrnsave.cpp:169
+#: scrnsave.cpp:164
 msgid "Configure the screen saver's options, if any."
 msgstr "Tilpass eventuelle innstillinger til pauseskjermen."
 
-#: scrnsave.cpp:171
+#: scrnsave.cpp:166
 msgid "&Test"
 msgstr "&Test"
 
-#: scrnsave.cpp:175
+#: scrnsave.cpp:170
 msgid "Show a full screen preview of the screen saver."
 msgstr "Viser hvordan den valgte pauseskjermen vil se ut i fullskjerm."
 
-#: scrnsave.cpp:177
+#: scrnsave.cpp:172
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: scrnsave.cpp:182
+#: scrnsave.cpp:177
 msgid "Start a&utomatically"
 msgstr "A&utomatisk start"
 
-#: scrnsave.cpp:184
+#: scrnsave.cpp:179
 msgid "Automatically start the screen saver after a period of inactivity."
 msgstr "Start pauseskjermen automatisk etter en tid uten aktivitet."
 
-#: scrnsave.cpp:191 scrnsave.cpp:219
+#: scrnsave.cpp:186 scrnsave.cpp:214
 msgid "After:"
 msgstr "Etter:"
 
-#: scrnsave.cpp:197
+#: scrnsave.cpp:192
 msgid " min"
 msgstr " minutter"
 
-#: scrnsave.cpp:205
+#: scrnsave.cpp:200
 msgid "The period of inactivity after which the screen saver should start."
 msgstr ""
 "Velg hvor lang tid det skal gå før pauseskjermen starter når maskinen står i "
 "ro."
 
-#: scrnsave.cpp:209
+#: scrnsave.cpp:204
 msgid "&Require password to stop"
 msgstr "K&rev passord for å stoppe pauseskjermen"
 
-#: scrnsave.cpp:214
+#: scrnsave.cpp:209
 msgid ""
 "Prevent potential unauthorized use by requiring a password to stop the "
 "screen saver."
@@ -169,7 +169,7 @@ msgstr ""
 "Hindre mulig uautorisert bruk ved å kreve passord før pauseskjermen blir "
 "stoppet."
 
-#: scrnsave.cpp:221
+#: scrnsave.cpp:216
 msgid ""
 "The amount of time, after the screen saver has started, to ask for the "
 "unlock password."
@@ -177,75 +177,75 @@ msgstr ""
 "Velg hvor lang tid det skal gå fra pauseskjermen starter til du må bruke "
 "passord for å stoppe den."
 
-#: scrnsave.cpp:226
+#: scrnsave.cpp:221
 msgid " sec"
 msgstr " sekunder"
 
-#: scrnsave.cpp:242
+#: scrnsave.cpp:237
 msgid "Choose the period after which the display will be locked. "
 msgstr "Velg forsinkelse før skjermen låses."
 
-#: scrnsave.cpp:246
+#: scrnsave.cpp:241
 msgid "&Delay saver start after lock"
 msgstr ""
 
-#: scrnsave.cpp:251
+#: scrnsave.cpp:246
 msgid ""
 "When manually locking the screen, wait to start the screen saver until the "
 "configured start delay has elapsed."
 msgstr ""
 
-#: scrnsave.cpp:253
+#: scrnsave.cpp:248
 msgid "&Use Secure Attention Key"
 msgstr ""
 
-#: scrnsave.cpp:258
+#: scrnsave.cpp:253
 msgid "Require Secure Attention Key prior to displaying the unlock dialog."
 msgstr ""
 
-#: scrnsave.cpp:260
+#: scrnsave.cpp:255
 msgid "Use &legacy lock windows"
 msgstr ""
 
-#: scrnsave.cpp:265
+#: scrnsave.cpp:260
 msgid "Use old-style unmanaged X11 lock windows."
 msgstr ""
 
-#: scrnsave.cpp:267
+#: scrnsave.cpp:262
 msgid "Hide active &windows from saver"
 msgstr ""
 
-#: scrnsave.cpp:272
+#: scrnsave.cpp:267
 msgid ""
 "Hide all active windows from the screen saver and use the desktop background "
 "as the screen saver input."
 msgstr ""
 
-#: scrnsave.cpp:274
+#: scrnsave.cpp:269
 msgid "Hide &cancel button"
 msgstr ""
 
-#: scrnsave.cpp:279
+#: scrnsave.cpp:274
 msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
 msgstr ""
 
-#: scrnsave.cpp:288
+#: scrnsave.cpp:283
 msgid "A preview of the selected screen saver."
 msgstr "Her kan du se en forhåndsvisning av pauseskjermen."
 
-#: scrnsave.cpp:293
+#: scrnsave.cpp:288
 msgid "Advanced &Options"
 msgstr "&Avanserte innstillinger"
 
-#: scrnsave.cpp:320
+#: scrnsave.cpp:315
 msgid "kcmscreensaver"
 msgstr "kcmscreensaver"
 
-#: scrnsave.cpp:320
+#: scrnsave.cpp:315
 msgid "TDE Screen Saver Control Module"
 msgstr "TDE-kontrollmodul for pauseskjerm"
 
-#: scrnsave.cpp:322
+#: scrnsave.cpp:317
 msgid ""
 "(c) 1997-2002 Martin R. Jones\n"
 "(c) 2003-2004 Chris Howells"
@@ -253,7 +253,7 @@ msgstr ""
 "© 1997-2002 Martin R. Jones\n"
 "© 2003-2004 Chris Howells"
 
-#: scrnsave.cpp:519
+#: scrnsave.cpp:514
 msgid "Loading..."
 msgstr ""
 "Laster …Make aware of power &managementGjør skjer&mspareren oppmerksom på "
diff --git a/tde-i18n-nb/messages/tdebase/kdesktop.po b/tde-i18n-nb/messages/tdebase/kdesktop.po
index b1bdcea01d5..8fb4b791055 100644
--- a/tde-i18n-nb/messages/tdebase/kdesktop.po
+++ b/tde-i18n-nb/messages/tdebase/kdesktop.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdesktop\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-04-01 09:21+0200\n"
 "PO-Revision-Date: 2006-06-26 12:11+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.pping.uio.no>\n"
@@ -527,31 +527,31 @@ msgstr ""
 msgid "No appropriate greeter plugin configured."
 msgstr "Velkomstprogram er ikke satt opp."
 
-#: lock/main.cc:215
+#: lock/main.cc:207
 msgid "Force session locking"
 msgstr "Lås alltid økta"
 
-#: lock/main.cc:216
+#: lock/main.cc:208
 msgid "Only start screensaver"
 msgstr "Start bare pauseskjermen"
 
-#: lock/main.cc:217
+#: lock/main.cc:209
 msgid "Launch the secure dialog"
 msgstr ""
 
-#: lock/main.cc:218
+#: lock/main.cc:210
 msgid "Only use the blank screensaver"
 msgstr "Start bare pauseskjermen med blank skjerm"
 
-#: lock/main.cc:219
+#: lock/main.cc:211
 msgid "TDE internal command for background process loading"
 msgstr ""
 
-#: lock/main.cc:237
+#: lock/main.cc:229
 msgid "KDesktop Locker"
 msgstr "KDesktop-lås"
 
-#: lock/main.cc:237
+#: lock/main.cc:229
 msgid "Session Locker for KDesktop"
 msgstr "Øktlås for KDesktop"