Merge translation files from master branch.

2 files changed, 60 insertions, 56 deletions

diff --git a/tde-i18n-zh_TW/messages/tdebase/kasbarextension.po b/tde-i18n-zh_TW/messages/tdebase/kasbarextension.po
index cabcfc4607e..4381a413fc5 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-zh_TW/messages/tdebase/kasbarextension.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-18 01:58+0200\n"
 "PO-Revision-Date: 2006-06-19 09:14+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -377,25 +377,24 @@ msgid "Enable &progress indicator"
 msgstr "啟用進度指示器(&P)"
 
 #: kasprefsdlg.cpp:421
-msgid ""
-"Enables the display of a progress bar in the label of windows show are "
-"progress indicators."
+#, fuzzy
+msgid "Enables the display of a progress indicator in the label of windows."
 msgstr "啟用在視窗標籤中顯示進度的指示器。"
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "啟用注意指示器(&A)"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr "啟用顯示圖示來指出有視窗須注意。"
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "啟用非作用中項目的框架"
 
-#: kasprefsdlg.cpp:434
+#: kasprefsdlg.cpp:433
 msgid ""
 "Enables frames around inactive items, if you want the bar to disappear into "
 "the background you should probably uncheck this option."
@@ -403,7 +402,7 @@ msgstr ""
 "啟用非作用中項目周圍的框架，如果您希望工具列能消失到背景中您可能應該核消這個"
 "選項。"
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -524,3 +523,8 @@ msgstr ""
 #: kastaskitem.cpp:504
 msgid "NET WM Specification Info"
 msgstr "NET WM 規格資訊"
+
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr "啟用在視窗標籤中顯示進度的指示器。"
diff --git a/tde-i18n-zh_TW/messages/tdebase/ktip.po b/tde-i18n-zh_TW/messages/tdebase/ktip.po
index 7ccdfe062e7..37ca37845cc 100644
--- a/tde-i18n-zh_TW/messages/tdebase/ktip.po
+++ b/tde-i18n-zh_TW/messages/tdebase/ktip.po
@@ -1823,53 +1823,6 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
-#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
-#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
-#~ "Acrobat Reader,\n"
-#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
-#~ msgstr ""
-#~ "<p> 想要在非 TDE 程式中使用 TDE 的列印能力？</p>\n"
-#~ "<p> 那麼就使用<strong>「kprinter」</strong>做為「列印命令」吧。\n"
-#~ "它可以相容 Netscape、Mozilla、Galeon、gv、Acrobat Reader、\n"
-#~ "StarOffice、OpenOffice.org，任何 GNOME 程式以及更多...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
-
-#~ msgid ""
-#~ "<p>\n"
-#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
-#~ " choice.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
-#~ "you back to\n"
-#~ " the first tip.</i>\n"
-#~ "</p>\n"
-#~ msgstr ""
-#~ "<p>\n"
-#~ "您可以讓 TDE 在啟動時開啟或關閉 <b>NumLock</b> 。\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "開啟控制中心，選擇「週邊設備→鍵盤」並做出\n"
-#~ "您的選擇。\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>這是密訣資料庫中的最後一個密訣。按「下一步」會將您帶回\n"
-#~ "第一個密訣。</i>\n"
-#~ "</p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1964,3 +1917,50 @@ msgstr ""
 #~ "就可以找到推出時間表。如果你只找到舊版本的時間表，下個版本可能需時\n"
 #~ "數星期或數個月的發展。<p><br>\n"
 #~ "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
+#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
+#~ "Acrobat Reader,\n"
+#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
+#~ msgstr ""
+#~ "<p> 想要在非 TDE 程式中使用 TDE 的列印能力？</p>\n"
+#~ "<p> 那麼就使用<strong>「kprinter」</strong>做為「列印命令」吧。\n"
+#~ "它可以相容 Netscape、Mozilla、Galeon、gv、Acrobat Reader、\n"
+#~ "StarOffice、OpenOffice.org，任何 GNOME 程式以及更多...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
+#~ " choice.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
+#~ "you back to\n"
+#~ " the first tip.</i>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "您可以讓 TDE 在啟動時開啟或關閉 <b>NumLock</b> 。\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "開啟控制中心，選擇「週邊設備→鍵盤」並做出\n"
+#~ "您的選擇。\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>這是密訣資料庫中的最後一個密訣。按「下一步」會將您帶回\n"
+#~ "第一個密訣。</i>\n"
+#~ "</p>\n"