Merge translation files from master branch.

2 files changed, 52 insertions, 48 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po b/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
index bcc508c46e8..26f2c56bffa 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
@@ -5,7 +5,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: 2005-05-14 04:12+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -372,32 +372,31 @@ 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."
 msgstr ""
 "启用非活动项目的框架。如果您想要任务栏消失在背景中，您就不应该选中此选项。"
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -519,5 +518,10 @@ msgstr ""
 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 "允许在含有进度指示器的窗口标题中显示进度栏。"
+
 #~ msgid " Pixels"
 #~ msgstr " 像素"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ktip.po b/tde-i18n-zh_CN/messages/tdebase/ktip.po
index 0e8bc16f71d..ac79b25bfd8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ktip.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ktip.po
@@ -1589,45 +1589,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, 任何 GNOME 应用程序和其它许多程序中都可用...</"
-#~ "p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>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>您可以让 TDE 启动时打开或关闭 <b>NumLock</b>。</p><p>打开控制中心，选择"
-#~ "外设->键盘，然后选择您喜欢的选项。</p><p><hr><br><br><i>这是提示数据库中的"
-#~ "最后一条提示。单击“下一条”将会将您带回到第一条提示。</i></p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1710,3 +1671,42 @@ msgstr ""
 #~ "表。如果您只找到旧的发布时间表，那么很可能再经过几个星期或几个月的开发，下"
 #~ "一个版本就会发布了。</p><br><center><img src=\"crystalsvg/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, 任何 GNOME 应用程序和其它许多程序中都可用...</"
+#~ "p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>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>您可以让 TDE 启动时打开或关闭 <b>NumLock</b>。</p><p>打开控制中心，选择"
+#~ "外设->键盘，然后选择您喜欢的选项。</p><p><hr><br><br><i>这是提示数据库中的"
+#~ "最后一条提示。单击“下一条”将会将您带回到第一条提示。</i></p>\n"