Merge translation files from master branch.

2 files changed, 22 insertions, 29 deletions

diff --git a/tde-i18n-zh_TW/messages/tdeartwork/klock.po b/tde-i18n-zh_TW/messages/tdeartwork/klock.po
index 8c67eb10fc2..176f15f3f3a 100644
--- a/tde-i18n-zh_TW/messages/tdeartwork/klock.po
+++ b/tde-i18n-zh_TW/messages/tdeartwork/klock.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klock\n"
-"POT-Creation-Date: 2019-01-13 19:00+0100\n"
+"POT-Creation-Date: 2019-01-23 23:29+0100\n"
 "PO-Revision-Date: 2006-06-05 13:17+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -215,7 +215,7 @@ msgid "Cycling color"
 msgstr "循環顏色"
 
 #: kdesavers/banner.cpp:133 kdesavers/lines.cpp:139 kdesavers/lorenz.cpp:82
-#: kdesavers/polygon.cpp:87 kdesavers/science.cpp:932 xsavers/space.cpp:592
+#: kdesavers/polygon.cpp:87 kdesavers/science.cpp:932 xsavers/space.cpp:593
 #: xsavers/swarm.cpp:328
 msgid "Speed:"
 msgstr "速度："
@@ -302,11 +302,11 @@ msgstr ""
 "Tiaan Wessels 在1997所寫\n"
 "tiaan@netsys.co.za"
 
-#: kdesavers/firesaver.cpp:74
+#: kdesavers/firesaver.cpp:73
 msgid "Setup Screen Saver"
 msgstr "設定螢幕保護程式"
 
-#: kdesavers/firesaver.cpp:85
+#: kdesavers/firesaver.cpp:84
 msgid ""
 "<h3>KFireSaver 3D 1.0</h3>\n"
 "<p>TEST Koral - Enrico Ros::2004</p>"
@@ -314,35 +314,35 @@ msgstr ""
 "<h3>KFireSaver 3D 1.0</h3>\n"
 "<p>TEST Koral - Enrico Ros::2004</p>"
 
-#: kdesavers/firesaver.cpp:100
+#: kdesavers/firesaver.cpp:99
 msgid "Fireworks 3D (GL)"
 msgstr "3D 煙火秀(GL)"
 
-#: kdesavers/firesaver.cpp:523
+#: kdesavers/firesaver.cpp:522
 msgid "www.kde.org"
 msgstr "www.kde.org"
 
-#: kdesavers/firesaver.cpp:524
+#: kdesavers/firesaver.cpp:523
 msgid "My TDE, please!"
 msgstr "我的 TDE"
 
-#: kdesavers/firesaver.cpp:525
+#: kdesavers/firesaver.cpp:524
 msgid "KoNqUeR the World"
 msgstr "征服世界"
 
-#: kdesavers/firesaver.cpp:526
+#: kdesavers/firesaver.cpp:525
 msgid "KFIRESAVER 3D"
 msgstr "KFIRESAVER 3D"
 
-#: kdesavers/firesaver.cpp:527
+#: kdesavers/firesaver.cpp:526
 msgid "Gimme your eyes..."
 msgstr "看過來..."
 
-#: kdesavers/firesaver.cpp:528
+#: kdesavers/firesaver.cpp:527
 msgid "Thank you for using TDE"
 msgstr "感謝使用 TDE"
 
-#: kdesavers/firesaver.cpp:529
+#: kdesavers/firesaver.cpp:528
 msgid "Going insane tonight"
 msgstr "今晚一起來瘋狂"
 
@@ -782,19 +782,19 @@ msgstr "以示範模式開啟螢幕保護程式"
 msgid "TDELock"
 msgstr "TDELock"
 
-#: xsavers/space.cpp:425
+#: xsavers/space.cpp:426
 msgid "GL can not render with root visual\n"
 msgstr "GL不能用root visual表現\n"
 
-#: xsavers/space.cpp:578
+#: xsavers/space.cpp:579
 msgid "Setup Space Screen Saver"
 msgstr "設定空間螢幕保護程式"
 
-#: xsavers/space.cpp:602
+#: xsavers/space.cpp:603
 msgid "Warp interval:"
 msgstr "彎曲間隔："
 
-#: xsavers/space.cpp:675
+#: xsavers/space.cpp:676
 msgid ""
 "KSpace\n"
 "Copyright (c) 1998\n"
diff --git a/tde-i18n-zh_TW/messages/tdeartwork/twin_art_clients.po b/tde-i18n-zh_TW/messages/tdeartwork/twin_art_clients.po
index 5473d60ee60..aa41e6842b7 100644
--- a/tde-i18n-zh_TW/messages/tdeartwork/twin_art_clients.po
+++ b/tde-i18n-zh_TW/messages/tdeartwork/twin_art_clients.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin_art_clients\n"
-"POT-Creation-Date: 2019-01-13 19:00+0100\n"
+"POT-Creation-Date: 2019-01-23 23:29+0100\n"
 "PO-Revision-Date: 2006-06-05 13:29+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -168,23 +168,16 @@ msgstr "開啟 TDE 的 IceWM 主題資料夾"
 #, fuzzy
 msgid ""
 "Clicking on the link above will cause a window to appear showing the TDE "
-"IceWM theme folder. You can add or remove native IceWM themes by installing "
-"theme files into this folder or by creating folder symlinks to existing "
-"IceWM themes on your system. You can get extra-themes here: <b>https://"
-"github.com/bbidulock/icewm-extra-themes</b>"
+"IceWM theme folder. You can add or remove native IceWM themes by "
+"uncompressing <b>http://icewm.themes.org/</b> theme files into this folder, "
+"or by creating folder symlinks to existing IceWM themes on your system."
 msgstr ""
 "點選上方的連結讓視窗顯示 TDE IceWM 主題資料夾。您可以將 <b>http://icewm."
 "themes.org/</b> 的主題檔案解壓到此資料夾，或是建立連到目前 IceWM 主題的符號連"
 "結以新增或移除原始的 IceWM 主題。"
 
-#: icewm/config/config.cpp:107
-msgid ""
-"You're supposed to copy the entire theme folders into your TDE IceWM theme "
-"folder."
-msgstr ""
-
-#: icewm/config/config.cpp:170 icewm/config/config.cpp:212
-#: icewm/config/config.cpp:256 icewm/config/config.cpp:271
+#: icewm/config/config.cpp:167 icewm/config/config.cpp:209
+#: icewm/config/config.cpp:253 icewm/config/config.cpp:268
 msgid "Infadel #2 (default)"
 msgstr "Infadel #2 (預設)"