Merge translation files from master branch.

1 files changed, 39 insertions, 43 deletions

diff --git a/tde-i18n-nb/messages/tdebase/tdmgreet.po b/tde-i18n-nb/messages/tdebase/tdmgreet.po
index 594e7b08cbc..788882eb2be 100644
--- a/tde-i18n-nb/messages/tdebase/tdmgreet.po
+++ b/tde-i18n-nb/messages/tdebase/tdmgreet.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdmgreet\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
 "PO-Revision-Date: 2006-12-26 10:50+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -67,7 +67,7 @@ msgstr "&Aksepter"
 msgid "&Refresh"
 msgstr "&Oppfrisk"
 
-#: kchooser.cpp:95 kgreeter.cpp:1045
+#: kchooser.cpp:95 kgreeter.cpp:925
 msgid "&Menu"
 msgstr "&Meny"
 
@@ -122,19 +122,19 @@ msgid ""
 "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: kgreeter.cpp:625
+#: kgreeter.cpp:598
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: kgreeter.cpp:626
+#: kgreeter.cpp:599
 msgid "Failsafe"
 msgstr "Feilsikker"
 
-#: kgreeter.cpp:702
+#: kgreeter.cpp:674
 msgid " (previous)"
 msgstr " (forrige)"
 
-#: kgreeter.cpp:775
+#: kgreeter.cpp:747
 msgid ""
 "Your saved session type '%1' is not valid any more.\n"
 "Please select a new one, otherwise 'default' will be used."
@@ -142,15 +142,11 @@ msgstr ""
 "Den lagrede økttypen «%1» er ikke gyldig lengre.\n"
 "Du kan velge en annen type eller bruke «standard»."
 
-#: kgreeter.cpp:931 kgreeter.cpp:1334
-msgid "PIN:"
-msgstr ""
-
-#: kgreeter.cpp:977
+#: kgreeter.cpp:857
 msgid "Warning: this is an unsecured session"
 msgstr "Advarsel: dette er en usikret økt"
 
-#: kgreeter.cpp:979
+#: kgreeter.cpp:859
 msgid ""
 "This display requires no X authorization.\n"
 "This means that anybody can connect to it,\n"
@@ -160,31 +156,31 @@ msgstr ""
 "Det betyr at alle kan koble til den,\n"
 "åpne vinduer eller fange opp dine inndata."
 
-#: kgreeter.cpp:1042
+#: kgreeter.cpp:922
 msgid "L&ogin"
 msgstr "&Logg inn"
 
-#: kgreeter.cpp:1075 kgreeter.cpp:1222
+#: kgreeter.cpp:955 kgreeter.cpp:1098
 msgid "Session &Type"
 msgstr "Økt&type"
 
-#: kgreeter.cpp:1080 kgreeter.cpp:1234
+#: kgreeter.cpp:960 kgreeter.cpp:1110
 msgid "&Authentication Method"
 msgstr "Autentiserings&metode"
 
-#: kgreeter.cpp:1085 kgreeter.cpp:1239
+#: kgreeter.cpp:965 kgreeter.cpp:1115
 msgid "&Remote Login"
 msgstr "&Fjerninnlogging"
 
-#: kgreeter.cpp:1169
+#: kgreeter.cpp:1046
 msgid "Login Failed."
 msgstr "Mislykket innlogging."
 
-#: kgverify.cpp:187
+#: kgverify.cpp:177
 msgid "No greeter widget plugin loaded. Check the configuration."
 msgstr "Har ikke lastet noen hilsningselement. Sjekk oppsettet."
 
-#: kgverify.cpp:493
+#: kgverify.cpp:442
 msgid ""
 "Authenticating %1...\n"
 "\n"
@@ -192,23 +188,23 @@ msgstr ""
 "Autentiserer %1 ...\n"
 "\n"
 
-#: kgverify.cpp:497
+#: kgverify.cpp:446
 msgid "You are required to change your password immediately (password aged)."
 msgstr "Du må endre passordet ditt nå (passordet er foreldet)."
 
-#: kgverify.cpp:498
+#: kgverify.cpp:447
 msgid "You are required to change your password immediately (root enforced)."
 msgstr "Du må endre passordet ditt nå (root krever det)."
 
-#: kgverify.cpp:499
+#: kgverify.cpp:448
 msgid "You are not allowed to login at the moment."
 msgstr "Du får ikke logge inn nå."
 
-#: kgverify.cpp:500
+#: kgverify.cpp:449
 msgid "Home folder not available."
 msgstr "Hjemmemappa er ikke tilgjengelig."
 
-#: kgverify.cpp:501
+#: kgverify.cpp:450
 msgid ""
 "Logins are not allowed at the moment.\n"
 "Try again later."
@@ -216,19 +212,19 @@ msgstr ""
 "Ingen kan logge inn nå.\n"
 "Prøv igjen senere."
 
-#: kgverify.cpp:502
+#: kgverify.cpp:451
 msgid "Your login shell is not listed in /etc/shells."
 msgstr "Innloggingsskallet ditt står ikke i /etc/shells."
 
-#: kgverify.cpp:503
+#: kgverify.cpp:452
 msgid "Root logins are not allowed."
 msgstr "Kan ikke logge inn som root."
 
-#: kgverify.cpp:504
+#: kgverify.cpp:453
 msgid "Your account has expired; please contact your system administrator."
 msgstr "Kontoen din er utgått på dato, kontakt din systemadministrator."
 
-#: kgverify.cpp:514
+#: kgverify.cpp:463
 msgid ""
 "A critical error occurred.\n"
 "Please look at TDM's logfile(s) for more information\n"
@@ -238,7 +234,7 @@ msgstr ""
 "Vennligst se mer informasjon i TDMs logg(er), eller \n"
 "kontakt din systemadministrator."
 
-#: kgverify.cpp:540
+#: kgverify.cpp:489
 #, c-format
 msgid ""
 "_n: Your account expires tomorrow.\n"
@@ -247,11 +243,11 @@ msgstr ""
 "Kontoen din går ut i morgen.\n"
 "Kontoen din går ut om %n dager."
 
-#: kgverify.cpp:541
+#: kgverify.cpp:490
 msgid "Your account expires today."
 msgstr "Kontoen din går ut i dag."
 
-#: kgverify.cpp:549
+#: kgverify.cpp:497
 #, c-format
 msgid ""
 "_n: Your password expires tomorrow.\n"
@@ -260,21 +256,21 @@ msgstr ""
 "Passordet ditt går ut i morgen.\n"
 "Passordet ditt går ut om %n dager."
 
-#: kgverify.cpp:550
+#: kgverify.cpp:498
 msgid "Your password expires today."
 msgstr "Passordet ditt foreldes i dag."
 
-#: kgverify.cpp:617 kgverify.cpp:1155
+#: kgverify.cpp:565 kgverify.cpp:1012
 msgid "Authentication failed"
 msgstr "Autentiseringen mislyktes"
 
-#: kgverify.cpp:816
+#: kgverify.cpp:702
 msgid "Authenticated user (%1) does not match requested user (%2).\n"
 msgstr ""
 "Den autentiserte brukeren (%1) stemmer ikke overens med den forespurte "
 "brukeren (%2).\n"
 
-#: kgverify.cpp:1138
+#: kgverify.cpp:995
 #, c-format
 msgid ""
 "_n: Automatic login in 1 second...\n"
@@ -283,23 +279,23 @@ msgstr ""
 "Automatisk innlogging om 1 sekund ...\n"
 " Automatisk innlogging om %n sekunder …"
 
-#: kgverify.cpp:1147
+#: kgverify.cpp:1004
 msgid "Warning: Caps Lock on"
 msgstr "Advarsel: Caps Lock er på"
 
-#: kgverify.cpp:1152
+#: kgverify.cpp:1009
 msgid "Change failed"
 msgstr "Kunne ikke endre"
 
-#: kgverify.cpp:1154
+#: kgverify.cpp:1011
 msgid "Login failed"
 msgstr "Feil ved innlogging"
 
-#: kgverify.cpp:1188
+#: kgverify.cpp:1045
 msgid "Theme not usable with authentication method '%1'."
 msgstr "Temaet kan ikke brukes med autentiseringsmetoden «%1»."
 
-#: kgverify.cpp:1244
+#: kgverify.cpp:1100
 msgid "Changing authentication token"
 msgstr "Endrer autentiseringstegn"
 
@@ -315,15 +311,15 @@ msgstr "Navn på oppsettsfila"
 msgid "KRootImage"
 msgstr "KRootImage"
 
-#: sakdlg.cc:129
+#: sakdlg.cc:124
 msgid "Press Ctrl+Alt+Del to begin."
 msgstr ""
 
-#: sakdlg.cc:129
+#: sakdlg.cc:124
 msgid "This process helps keep your password secure."
 msgstr ""
 
-#: sakdlg.cc:129
+#: sakdlg.cc:124
 msgid "It prevents unauthorized users from emulating the login screen."
 msgstr ""