Merge translation files from master branch.

2 files changed, 43 insertions, 43 deletions

diff --git a/tde-i18n-zh_TW/messages/tdebase/kcmscreensaver.po b/tde-i18n-zh_TW/messages/tdebase/kcmscreensaver.po
index eaebfb47baa..5d0d2751bfc 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kcmscreensaver.po
+++ b/tde-i18n-zh_TW/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: 2006-06-19 09:16+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -66,7 +66,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 "
@@ -84,139 +84,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"
@@ -224,7 +224,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_TW/messages/tdebase/kdesktop.po b/tde-i18n-zh_TW/messages/tdebase/kdesktop.po
index 62f6dc4d915..421f899d51f 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_TW/messages/tdebase/kdesktop.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdesktop\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-04-01 09:21+0200\n"
 "PO-Revision-Date: 2007-11-09 14:32+0800\n"
 "Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
 "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
@@ -519,31 +519,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 的工作階段鎖定程式"