Merge translation files from master branch.

1 files changed, 39 insertions, 43 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/tdmgreet.po b/tde-i18n-en_GB/messages/tdebase/tdmgreet.po
index d957e86ebaa..db1d738fa72 100644
--- a/tde-i18n-en_GB/messages/tdebase/tdmgreet.po
+++ b/tde-i18n-en_GB/messages/tdebase/tdmgreet.po
@@ -6,7 +6,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: 2005-12-26 02:03+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -60,7 +60,7 @@ msgstr "&Accept"
 msgid "&Refresh"
 msgstr "&Refresh"
 
-#: kchooser.cpp:95 kgreeter.cpp:1045
+#: kchooser.cpp:95 kgreeter.cpp:925
 msgid "&Menu"
 msgstr "&Menu"
 
@@ -115,19 +115,19 @@ msgid ""
 "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: kgreeter.cpp:625
+#: kgreeter.cpp:598
 msgid "Custom"
 msgstr "Custom"
 
-#: kgreeter.cpp:626
+#: kgreeter.cpp:599
 msgid "Failsafe"
 msgstr "Failsafe"
 
-#: kgreeter.cpp:702
+#: kgreeter.cpp:674
 msgid " (previous)"
 msgstr " (previous)"
 
-#: 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."
@@ -135,15 +135,11 @@ msgstr ""
 "Your saved session type '%1' is not valid any more.\n"
 "Please select a new one, otherwise 'default' will be used."
 
-#: kgreeter.cpp:931 kgreeter.cpp:1334
-msgid "PIN:"
-msgstr ""
-
-#: kgreeter.cpp:977
+#: kgreeter.cpp:857
 msgid "Warning: this is an unsecured session"
 msgstr "Warning: this is an unsecured session"
 
-#: kgreeter.cpp:979
+#: kgreeter.cpp:859
 msgid ""
 "This display requires no X authorization.\n"
 "This means that anybody can connect to it,\n"
@@ -153,31 +149,31 @@ msgstr ""
 "This means that anybody can connect to it,\n"
 "open windows on it or intercept your input."
 
-#: kgreeter.cpp:1042
+#: kgreeter.cpp:922
 msgid "L&ogin"
 msgstr "L&ogin"
 
-#: kgreeter.cpp:1075 kgreeter.cpp:1222
+#: kgreeter.cpp:955 kgreeter.cpp:1098
 msgid "Session &Type"
 msgstr "Session &Type"
 
-#: kgreeter.cpp:1080 kgreeter.cpp:1234
+#: kgreeter.cpp:960 kgreeter.cpp:1110
 msgid "&Authentication Method"
 msgstr "&Authentication Method"
 
-#: kgreeter.cpp:1085 kgreeter.cpp:1239
+#: kgreeter.cpp:965 kgreeter.cpp:1115
 msgid "&Remote Login"
 msgstr "&Remote Login"
 
-#: kgreeter.cpp:1169
+#: kgreeter.cpp:1046
 msgid "Login Failed."
 msgstr "Login Failed."
 
-#: kgverify.cpp:187
+#: kgverify.cpp:177
 msgid "No greeter widget plugin loaded. Check the configuration."
 msgstr "No greeter widget plugin loaded. Check the configuration."
 
-#: kgverify.cpp:493
+#: kgverify.cpp:442
 msgid ""
 "Authenticating %1...\n"
 "\n"
@@ -185,23 +181,23 @@ msgstr ""
 "Authenticating %1...\n"
 "\n"
 
-#: kgverify.cpp:497
+#: kgverify.cpp:446
 msgid "You are required to change your password immediately (password aged)."
 msgstr "You are required to change your password immediately (password aged)."
 
-#: kgverify.cpp:498
+#: kgverify.cpp:447
 msgid "You are required to change your password immediately (root enforced)."
 msgstr "You are required to change your password immediately (root enforced)."
 
-#: kgverify.cpp:499
+#: kgverify.cpp:448
 msgid "You are not allowed to login at the moment."
 msgstr "You are not allowed to login at the moment."
 
-#: kgverify.cpp:500
+#: kgverify.cpp:449
 msgid "Home folder not available."
 msgstr "Home folder not available."
 
-#: kgverify.cpp:501
+#: kgverify.cpp:450
 msgid ""
 "Logins are not allowed at the moment.\n"
 "Try again later."
@@ -209,19 +205,19 @@ msgstr ""
 "Logins are not allowed at the moment.\n"
 "Try again later."
 
-#: kgverify.cpp:502
+#: kgverify.cpp:451
 msgid "Your login shell is not listed in /etc/shells."
 msgstr "Your login shell is not listed in /etc/shells."
 
-#: kgverify.cpp:503
+#: kgverify.cpp:452
 msgid "Root logins are not allowed."
 msgstr "Root logins are not allowed."
 
-#: kgverify.cpp:504
+#: kgverify.cpp:453
 msgid "Your account has expired; please contact your system administrator."
 msgstr "Your account has expired; please contact your system administrator."
 
-#: kgverify.cpp:514
+#: kgverify.cpp:463
 msgid ""
 "A critical error occurred.\n"
 "Please look at TDM's logfile(s) for more information\n"
@@ -231,7 +227,7 @@ msgstr ""
 "Please look at TDM's logfile(s) for more information\n"
 "or contact your system administrator."
 
-#: kgverify.cpp:540
+#: kgverify.cpp:489
 #, c-format
 msgid ""
 "_n: Your account expires tomorrow.\n"
@@ -240,11 +236,11 @@ msgstr ""
 "Your account expires tomorrow.\n"
 "Your account expires in %n days."
 
-#: kgverify.cpp:541
+#: kgverify.cpp:490
 msgid "Your account expires today."
 msgstr "Your account expires today."
 
-#: kgverify.cpp:549
+#: kgverify.cpp:497
 #, c-format
 msgid ""
 "_n: Your password expires tomorrow.\n"
@@ -253,19 +249,19 @@ msgstr ""
 "Your password expires tomorrow.\n"
 "Your password expires in %n days."
 
-#: kgverify.cpp:550
+#: kgverify.cpp:498
 msgid "Your password expires today."
 msgstr "Your password expires today."
 
-#: kgverify.cpp:617 kgverify.cpp:1155
+#: kgverify.cpp:565 kgverify.cpp:1012
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: kgverify.cpp:816
+#: kgverify.cpp:702
 msgid "Authenticated user (%1) does not match requested user (%2).\n"
 msgstr "Authenticated user (%1) does not match requested user (%2).\n"
 
-#: kgverify.cpp:1138
+#: kgverify.cpp:995
 #, c-format
 msgid ""
 "_n: Automatic login in 1 second...\n"
@@ -274,23 +270,23 @@ msgstr ""
 "Automatic login in 1 second...\n"
 "Automatic login in %n seconds..."
 
-#: kgverify.cpp:1147
+#: kgverify.cpp:1004
 msgid "Warning: Caps Lock on"
 msgstr "Warning: Caps Lock on"
 
-#: kgverify.cpp:1152
+#: kgverify.cpp:1009
 msgid "Change failed"
 msgstr "Change failed"
 
-#: kgverify.cpp:1154
+#: kgverify.cpp:1011
 msgid "Login failed"
 msgstr "Login failed"
 
-#: kgverify.cpp:1188
+#: kgverify.cpp:1045
 msgid "Theme not usable with authentication method '%1'."
 msgstr "Theme not usable with authentication method '%1'."
 
-#: kgverify.cpp:1244
+#: kgverify.cpp:1100
 msgid "Changing authentication token"
 msgstr "Changing authentication token"
 
@@ -306,15 +302,15 @@ msgstr "Name of the configuration file"
 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 ""