Merge translation files from master branch.

1 files changed, 39 insertions, 43 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
index 7bd2ec884c1..cacb41cf768 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
 "PO-Revision-Date: 2005-08-09 13:01+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -102,12 +102,12 @@ msgstr "显示任务管理器"
 msgid "Show Window List"
 msgstr "显示窗口列表"
 
-#: kdesktopbindings.cpp:26 krootwm.cc:469 lock/lockdlg.cc:875
-#: lock/securedlg.cc:118
+#: kdesktopbindings.cpp:26 krootwm.cc:469 lock/lockdlg.cc:801
+#: lock/securedlg.cc:116
 msgid "Switch User"
 msgstr "切换用户"
 
-#: kdesktopbindings.cpp:31 krootwm.cc:194 lock/securedlg.cc:106
+#: kdesktopbindings.cpp:31 krootwm.cc:194 lock/securedlg.cc:104
 msgid "Lock Session"
 msgstr "锁住会话"
 
@@ -296,7 +296,7 @@ msgstr ""
 msgid "Warning - New Session"
 msgstr "警告 - 新会话"
 
-#: krootwm.cc:903 lock/lockdlg.cc:778
+#: krootwm.cc:903 lock/lockdlg.cc:702
 msgid "&Start New Session"
 msgstr "开始新会话(&S)"
 
@@ -379,66 +379,66 @@ msgstr ""
 msgid "Automatic Logout Notification"
 msgstr ""
 
-#: lock/autologout.cc:56
+#: lock/autologout.cc:54
 msgid "<nobr><qt><b>Automatic Log Out</b></qt><nobr>"
 msgstr "<nobr><qt><b>自动注销</b></qt><nobr>"
 
-#: lock/autologout.cc:57
+#: lock/autologout.cc:55
 msgid ""
 "<qt>To prevent being logged out, resume using this session by moving the "
 "mouse or pressing a key.</qt>"
 msgstr "<qt>为了避免被注销，请移动鼠标或者按任意键以便恢复此会话。</qt>"
 
-#: lock/autologout.cc:99
+#: lock/autologout.cc:97
 #, c-format
 msgid ""
 "_n: <nobr><qt>You will be automatically logged out in 1 second</qt></nobr>\n"
 "<nobr><qt>You will be automatically logged out in %n seconds</qt></nobr>"
 msgstr "<nobr><qt>您将在 %n 秒后被自动注销</qt></nobr>"
 
-#: lock/lockdlg.cc:121 lock/sakdlg.cc:76
+#: lock/lockdlg.cc:110 lock/sakdlg.cc:76
 #, fuzzy
 msgid "Desktop Session Locked"
 msgstr "KDesktop 锁定程序"
 
-#: lock/lockdlg.cc:142 lock/lockdlg.cc:143
+#: lock/lockdlg.cc:129 lock/lockdlg.cc:130
 msgid "This computer is in use and has been locked."
 msgstr ""
 
-#: lock/lockdlg.cc:143
+#: lock/lockdlg.cc:130
 msgid "Only '%1' may unlock this session."
 msgstr ""
 
-#: lock/lockdlg.cc:147
+#: lock/lockdlg.cc:134
 msgid "<nobr><b>The session is locked</b><br>"
 msgstr "<nobr><b>会话已经锁定</b><br>"
 
-#: lock/lockdlg.cc:148
+#: lock/lockdlg.cc:135
 msgid "<nobr><b>The session was locked by %1</b><br>"
 msgstr "<nobr><b>会话已经被 %1 锁定</b><br>"
 
-#: lock/lockdlg.cc:153
+#: lock/lockdlg.cc:140
 #, c-format
 msgid "This session has been locked since %1"
 msgstr ""
 
-#: lock/lockdlg.cc:164
+#: lock/lockdlg.cc:151
 msgid "Sw&itch User..."
 msgstr "切换用户(&I)..."
 
-#: lock/lockdlg.cc:165 lock/querydlg.cc:96
+#: lock/lockdlg.cc:152 lock/querydlg.cc:94
 msgid "Unl&ock"
 msgstr "取消锁定(&O)"
 
-#: lock/lockdlg.cc:331
+#: lock/lockdlg.cc:309
 msgid "<b>Unlocking failed</b>"
 msgstr "<b>取消锁定失败</b>"
 
-#: lock/lockdlg.cc:336
+#: lock/lockdlg.cc:316
 msgid "<b>Warning: Caps Lock on</b>"
 msgstr "<b>警告：大写状态</b>"
 
-#: lock/lockdlg.cc:636
+#: lock/lockdlg.cc:563
 msgid ""
 "Cannot unlock the session because the authentication system failed to work;\n"
 "you must kill kdesktop_lock (pid %1) manually."
@@ -446,16 +446,16 @@ msgstr ""
 "无法解锁会话，因为身份验证系统无法工作；\n"
 "您必须手动杀死 kdesktop_lock (pid %1)。"
 
-#: lock/lockdlg.cc:691 lock/lockprocess.cc:2421
+#: lock/lockdlg.cc:618 lock/lockprocess.cc:2418
 msgid "Authentication Subsystem Notice"
 msgstr ""
 
-#: lock/lockdlg.cc:750
+#: lock/lockdlg.cc:675
 #, fuzzy
 msgid "New Session"
 msgstr "开始新会话"
 
-#: lock/lockdlg.cc:765
+#: lock/lockdlg.cc:689
 msgid ""
 "You have chosen to open another desktop session instead of resuming the "
 "current one.<br>The current session will be hidden and a new login screen "
@@ -470,49 +470,45 @@ msgstr ""
 "一个会话，F%2 被指定为第二个会话，依次类推。您可以同时按下 Ctrl、Alt 和对应"
 "的 Fn 功能键在不同的会话之间切换。此外，TDE 面板和桌面菜单也可用于切换会话。"
 
-#: lock/lockdlg.cc:790
+#: lock/lockdlg.cc:714
 msgid "&Do not ask again"
 msgstr "不再询问(&D)"
 
-#: lock/lockdlg.cc:901
+#: lock/lockdlg.cc:826
 msgid "Session"
 msgstr "会话"
 
-#: lock/lockdlg.cc:902
+#: lock/lockdlg.cc:827
 msgid "Location"
 msgstr "位置"
 
-#: lock/lockdlg.cc:929
+#: lock/lockdlg.cc:853
 msgid ""
 "_: session\n"
 "&Activate"
 msgstr "激活(&A)"
 
-#: lock/lockdlg.cc:937
+#: lock/lockdlg.cc:862
 msgid "Start &New Session"
 msgstr "开始新会话(&N)"
 
-#: lock/lockdlg.cc:997
-msgid "PIN:"
-msgstr ""
-
-#: lock/lockprocess.cc:557 lock/lockprocess.cc:713
+#: lock/lockprocess.cc:541 lock/lockprocess.cc:697
 msgid "Securing desktop session"
 msgstr ""
 
-#: lock/lockprocess.cc:1457
+#: lock/lockprocess.cc:1460
 msgid "Will not lock the session, as unlocking would be impossible:\n"
 msgstr "将不会锁定会话，因为取消锁定不可能：\n"
 
-#: lock/lockprocess.cc:1461
+#: lock/lockprocess.cc:1464
 msgid "Cannot start <i>kcheckpass</i>."
 msgstr "无法启动 <i>kcheckpass</i>。"
 
-#: lock/lockprocess.cc:1462
+#: lock/lockprocess.cc:1465
 msgid "<i>kcheckpass</i> is unable to operate. Possibly it is not SetUID root."
 msgstr "<i>kcheckpass</i> 无法操作。可能该程序未被 SetUID root。"
 
-#: lock/lockprocess.cc:1504
+#: lock/lockprocess.cc:1508
 msgid "No appropriate greeter plugin configured."
 msgstr "没有配置恰当的欢迎插件。"
 
@@ -548,15 +544,15 @@ msgstr "KDesktop 会话锁定程序"
 msgid "Information Needed"
 msgstr ""
 
-#: lock/sakdlg.cc:104
+#: lock/sakdlg.cc:102
 msgid "Press Ctrl+Alt+Del to begin."
 msgstr ""
 
-#: lock/sakdlg.cc:104
+#: lock/sakdlg.cc:102
 msgid "This process helps keep your password secure."
 msgstr ""
 
-#: lock/sakdlg.cc:104
+#: lock/sakdlg.cc:102
 msgid "It prevents unauthorized users from emulating the login screen."
 msgstr ""
 
@@ -565,20 +561,20 @@ msgstr ""
 msgid "Secure Desktop Area"
 msgstr "刷新桌面"
 
-#: lock/securedlg.cc:97
+#: lock/securedlg.cc:95
 msgid "'%1' is currently logged on"
 msgstr ""
 
-#: lock/securedlg.cc:100
+#: lock/securedlg.cc:98
 msgid "You are currently logged on"
 msgstr ""
 
-#: lock/securedlg.cc:109
+#: lock/securedlg.cc:107
 #, fuzzy
 msgid "Task Manager"
 msgstr "显示任务管理器"
 
-#: lock/securedlg.cc:112
+#: lock/securedlg.cc:110
 msgid "Logoff Menu"
 msgstr ""