Merge translation files from master branch.

2 files changed, 43 insertions, 43 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po b/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
index bf15c4f3ad7..13c64ad0d45 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
@@ -6,7 +6,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: 2005-05-14 04:54+0800\n"
 "Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -65,7 +65,7 @@ msgid ""
 "corner of the screen for 15 seconds."
 msgstr "当鼠标指针指向屏幕右下角 15 秒之后要采取的行动。"
 
-#: 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 "
@@ -83,139 +83,139 @@ msgstr ""
 "您希望屏幕保护程序锁定屏幕，请确认您启用了屏幕保护程序的“需要密码”功能。如果"
 "您没有启用，仍然可以用桌面的“锁定会话”动作来锁定屏幕。"
 
-#: scrnsave.cpp:147
+#: scrnsave.cpp:142
 msgid "Screen Saver"
 msgstr "屏幕保护程序"
 
-#: scrnsave.cpp:162
+#: scrnsave.cpp:157
 msgid "Select the screen saver to use."
 msgstr "选择要使用的屏幕保护程序。"
 
-#: scrnsave.cpp:165
+#: scrnsave.cpp:160
 msgid "&Setup..."
 msgstr "设置(&S)..."
 
-#: scrnsave.cpp:169
+#: scrnsave.cpp:164
 msgid "Configure the screen saver's options, if any."
 msgstr "如果有的话，配置屏幕保护程序的选项。"
 
-#: scrnsave.cpp:171
+#: scrnsave.cpp:166
 msgid "&Test"
 msgstr "测试(&T)"
 
-#: scrnsave.cpp:175
+#: scrnsave.cpp:170
 msgid "Show a full screen preview of the screen saver."
 msgstr "显示屏幕保护程序的全屏预览。"
 
-#: scrnsave.cpp:177
+#: scrnsave.cpp:172
 msgid "Settings"
 msgstr "设置"
 
-#: scrnsave.cpp:182
+#: scrnsave.cpp:177
 msgid "Start a&utomatically"
 msgstr "自动启动(&U)"
 
-#: scrnsave.cpp:184
+#: scrnsave.cpp:179
 msgid "Automatically start the screen saver after a period of inactivity."
 msgstr "在指定时间不活动之后，自动启动屏幕保护程序。"
 
-#: scrnsave.cpp:191 scrnsave.cpp:219
+#: scrnsave.cpp:186 scrnsave.cpp:214
 msgid "After:"
 msgstr "等待："
 
-#: scrnsave.cpp:197
+#: scrnsave.cpp:192
 msgid " min"
 msgstr " 分钟"
 
-#: scrnsave.cpp:205
+#: scrnsave.cpp:200
 msgid "The period of inactivity after which the screen saver should start."
 msgstr "启动屏幕保护程序之前要等待的不活动时长。"
 
-#: scrnsave.cpp:209
+#: scrnsave.cpp:204
 msgid "&Require password to stop"
 msgstr "需要密码来停止(&R)"
 
-#: scrnsave.cpp:214
+#: scrnsave.cpp:209
 msgid ""
 "Prevent potential unauthorized use by requiring a password to stop the "
 "screen saver."
 msgstr "要停止屏幕保护程序，需要提供密码，这可以避免未授权的使用。"
 
-#: scrnsave.cpp:221
+#: scrnsave.cpp:216
 msgid ""
 "The amount of time, after the screen saver has started, to ask for the "
 "unlock password."
 msgstr "屏幕保护程序启动后，请求解锁密码的时长。"
 
-#: scrnsave.cpp:226
+#: scrnsave.cpp:221
 msgid " sec"
 msgstr " 秒"
 
-#: scrnsave.cpp:242
+#: scrnsave.cpp:237
 msgid "Choose the period after which the display will be locked. "
 msgstr "选择显示被锁定前等待的时间。"
 
-#: 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 "选中屏幕保护程序的预览。"
 
-#: scrnsave.cpp:293
+#: scrnsave.cpp:288
 msgid "Advanced &Options"
 msgstr "高级选项(&O)"
 
-#: scrnsave.cpp:320
+#: scrnsave.cpp:315
 msgid "kcmscreensaver"
 msgstr "kcmscreensaver"
 
-#: scrnsave.cpp:320
+#: scrnsave.cpp:315
 msgid "TDE Screen Saver Control Module"
 msgstr "TDE 屏幕保护控制模块"
 
-#: scrnsave.cpp:322
+#: scrnsave.cpp:317
 msgid ""
 "(c) 1997-2002 Martin R. Jones\n"
 "(c) 2003-2004 Chris Howells"
@@ -223,7 +223,7 @@ msgstr ""
 "(c) 1997-2002 Martin R. Jones\n"
 "(c) 2003-2004 Chris Howells"
 
-#: scrnsave.cpp:519
+#: scrnsave.cpp:514
 msgid "Loading..."
 msgstr "正在装入..."
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
index cacb41cf768..e70d6594c8c 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-23 23:16+0100\n"
+"POT-Creation-Date: 2019-04-01 09:21+0200\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"
@@ -512,31 +512,31 @@ msgstr "<i>kcheckpass</i> 无法操作。可能该程序未被 SetUID root。"
 msgid "No appropriate greeter plugin configured."
 msgstr "没有配置恰当的欢迎插件。"
 
-#: lock/main.cc:215
+#: lock/main.cc:207
 msgid "Force session locking"
 msgstr "强制锁定会话"
 
-#: lock/main.cc:216
+#: lock/main.cc:208
 msgid "Only start screensaver"
 msgstr "仅启动屏幕保护程序"
 
-#: 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 "仅使用空的屏幕保护程序"
 
-#: 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 锁定程序"
 
-#: lock/main.cc:237
+#: lock/main.cc:229
 msgid "Session Locker for KDesktop"
 msgstr "KDesktop 会话锁定程序"