Merge translation files from master branch.

1 files changed, 39 insertions, 43 deletions

diff --git a/tde-i18n-zh_TW/messages/tdebase/tdmgreet.po b/tde-i18n-zh_TW/messages/tdebase/tdmgreet.po
index 0005e927589..166e5ff745c 100644
--- a/tde-i18n-zh_TW/messages/tdebase/tdmgreet.po
+++ b/tde-i18n-zh_TW/messages/tdebase/tdmgreet.po
@@ -11,7 +11,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-06-21 08:43+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -66,7 +66,7 @@ msgstr "接受 (&A)"
 msgid "&Refresh"
 msgstr "重新整理(&R)"
 
-#: kchooser.cpp:95 kgreeter.cpp:1045
+#: kchooser.cpp:95 kgreeter.cpp:925
 msgid "&Menu"
 msgstr "選單 (&M)"
 
@@ -121,19 +121,19 @@ msgid ""
 "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: kgreeter.cpp:625
+#: kgreeter.cpp:598
 msgid "Custom"
 msgstr "自訂"
 
-#: kgreeter.cpp:626
+#: kgreeter.cpp:599
 msgid "Failsafe"
 msgstr "安全模式"
 
-#: kgreeter.cpp:702
+#: kgreeter.cpp:674
 msgid " (previous)"
 msgstr "(以往的)"
 
-#: 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."
@@ -141,15 +141,11 @@ msgstr ""
 "您已儲存的工作階段類型 '%1' 不再有效。\n"
 "請選擇一個新的，否則會使用'預設'。"
 
-#: kgreeter.cpp:931 kgreeter.cpp:1334
-msgid "PIN:"
-msgstr ""
-
-#: kgreeter.cpp:977
+#: kgreeter.cpp:857
 msgid "Warning: this is an unsecured session"
 msgstr "警告：這是一個不安全工作階段"
 
-#: kgreeter.cpp:979
+#: kgreeter.cpp:859
 msgid ""
 "This display requires no X authorization.\n"
 "This means that anybody can connect to it,\n"
@@ -159,31 +155,31 @@ msgstr ""
 "這表示任何人都可以連接它，\n"
 "在它上面開啟蜆窗或截取您的輸入。"
 
-#: kgreeter.cpp:1042
+#: kgreeter.cpp:922
 msgid "L&ogin"
 msgstr "登入(&L)"
 
-#: kgreeter.cpp:1075 kgreeter.cpp:1222
+#: kgreeter.cpp:955 kgreeter.cpp:1098
 msgid "Session &Type"
 msgstr "工作階段類型 (&T):"
 
-#: kgreeter.cpp:1080 kgreeter.cpp:1234
+#: kgreeter.cpp:960 kgreeter.cpp:1110
 msgid "&Authentication Method"
 msgstr "驗證類型(&A)"
 
-#: kgreeter.cpp:1085 kgreeter.cpp:1239
+#: kgreeter.cpp:965 kgreeter.cpp:1115
 msgid "&Remote Login"
 msgstr "遠端登入 (&R)"
 
-#: kgreeter.cpp:1169
+#: kgreeter.cpp:1046
 msgid "Login Failed."
 msgstr "登入失敗."
 
-#: kgverify.cpp:187
+#: kgverify.cpp:177
 msgid "No greeter widget plugin loaded. Check the configuration."
 msgstr "沒有接待部件外掛程式被載入。請檢查設定。"
 
-#: kgverify.cpp:493
+#: kgverify.cpp:442
 msgid ""
 "Authenticating %1...\n"
 "\n"
@@ -191,23 +187,23 @@ msgstr ""
 "正在驗證 %1 ...\n"
 "\n"
 
-#: kgverify.cpp:497
+#: kgverify.cpp:446
 msgid "You are required to change your password immediately (password aged)."
 msgstr "您需要立刻更改您的密碼(密碼太舊)。"
 
-#: kgverify.cpp:498
+#: kgverify.cpp:447
 msgid "You are required to change your password immediately (root enforced)."
 msgstr "您需要立刻更改您的密碼(管理員 root 強迫)。"
 
-#: kgverify.cpp:499
+#: kgverify.cpp:448
 msgid "You are not allowed to login at the moment."
 msgstr "您目前未被允許登入."
 
-#: kgverify.cpp:500
+#: kgverify.cpp:449
 msgid "Home folder not available."
 msgstr "家目錄不可用."
 
-#: kgverify.cpp:501
+#: kgverify.cpp:450
 msgid ""
 "Logins are not allowed at the moment.\n"
 "Try again later."
@@ -215,19 +211,19 @@ msgstr ""
 "目前不允許登入.\n"
 "請稍後再試."
 
-#: kgverify.cpp:502
+#: kgverify.cpp:451
 msgid "Your login shell is not listed in /etc/shells."
 msgstr "您的登入 shell 並沒有列在 /etc/shells 中."
 
-#: kgverify.cpp:503
+#: kgverify.cpp:452
 msgid "Root logins are not allowed."
 msgstr "不允許 root 登入。"
 
-#: kgverify.cpp:504
+#: kgverify.cpp:453
 msgid "Your account has expired; please contact your system administrator."
 msgstr "您的帳號已經過期。請聯絡你的系統管理者。"
 
-#: kgverify.cpp:514
+#: kgverify.cpp:463
 msgid ""
 "A critical error occurred.\n"
 "Please look at TDM's logfile(s) for more information\n"
@@ -237,60 +233,60 @@ msgstr ""
 "請查看 TDM 的紀錄檔以取得更多資訊\n"
 "或是聯絡您的系統管理者。"
 
-#: kgverify.cpp:540
+#: kgverify.cpp:489
 #, c-format
 msgid ""
 "_n: Your account expires tomorrow.\n"
 "Your account expires in %n days."
 msgstr "您的帳號將在 %n 天後到期。"
 
-#: kgverify.cpp:541
+#: kgverify.cpp:490
 msgid "Your account expires today."
 msgstr "您的帳號將在今天到期。"
 
-#: kgverify.cpp:549
+#: kgverify.cpp:497
 #, c-format
 msgid ""
 "_n: Your password expires tomorrow.\n"
 "Your password expires in %n days."
 msgstr "您的密碼將在 %n 天後過期。"
 
-#: kgverify.cpp:550
+#: kgverify.cpp:498
 msgid "Your password expires today."
 msgstr "您的密碼將在今天過期。"
 
-#: kgverify.cpp:617 kgverify.cpp:1155
+#: kgverify.cpp:565 kgverify.cpp:1012
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: kgverify.cpp:816
+#: kgverify.cpp:702
 msgid "Authenticated user (%1) does not match requested user (%2).\n"
 msgstr "已驗證的使用者(%1)不符合要求的使用者(%2)。\n"
 
-#: kgverify.cpp:1138
+#: kgverify.cpp:995
 #, c-format
 msgid ""
 "_n: Automatic login in 1 second...\n"
 "Automatic login in %n seconds..."
 msgstr "於 %n 秒後自動登入..."
 
-#: kgverify.cpp:1147
+#: kgverify.cpp:1004
 msgid "Warning: Caps Lock on"
 msgstr "警告： Caps Lock 已開啟"
 
-#: kgverify.cpp:1152
+#: kgverify.cpp:1009
 msgid "Change failed"
 msgstr "更改失敗"
 
-#: kgverify.cpp:1154
+#: kgverify.cpp:1011
 msgid "Login failed"
 msgstr "登入失敗"
 
-#: kgverify.cpp:1188
+#: kgverify.cpp:1045
 msgid "Theme not usable with authentication method '%1'."
 msgstr "佈景主題不可用於驗證方式 '%1'。"
 
-#: kgverify.cpp:1244
+#: kgverify.cpp:1100
 msgid "Changing authentication token"
 msgstr "更改驗證記號中"
 
@@ -306,15 +302,15 @@ msgstr "配置檔案名稱"
 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 ""