Merge translation files from master branch.

2 files changed, 25 insertions, 25 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
index 13d8822b568..fd46d54402d 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
@@ -6102,17 +6102,6 @@ msgstr ""
 #~ msgid "Unknown unmount error."
 #~ msgstr "未知的错误"
 
-#~ msgid ""
-#~ "You may perform a search on the Internet for a TDE program (called a "
-#~ "tdeioslave or ioslave) which supports this protocol. Places to search "
-#~ "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
-#~ "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
-#~ msgstr ""
-#~ "您可以在 Internet 上搜索支持此协议的 TDE 程序(称为 tdeioslave 或 "
-#~ "ioslave)。推荐的搜索地点是 <a href=\"http://kde-apps.org/\">http://kde-"
-#~ "apps.org/</a> 和 <a href=\"http://freshmeat.net/\">http://freshmeat.net/</"
-#~ "a>。"
-
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "书签"
@@ -6159,3 +6148,14 @@ msgstr ""
 
 #~ msgid "Shared"
 #~ msgstr "已共享"
+
+#~ msgid ""
+#~ "You may perform a search on the Internet for a TDE program (called a "
+#~ "tdeioslave or ioslave) which supports this protocol. Places to search "
+#~ "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
+#~ "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
+#~ msgstr ""
+#~ "您可以在 Internet 上搜索支持此协议的 TDE 程序(称为 tdeioslave 或 "
+#~ "ioslave)。推荐的搜索地点是 <a href=\"http://kde-apps.org/\">http://kde-"
+#~ "apps.org/</a> 和 <a href=\"http://freshmeat.net/\">http://freshmeat.net/</"
+#~ "a>。"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
index 1eb16e16a82..0cc4320044b 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-21 21:14+0200\n"
+"POT-Creation-Date: 2019-07-21 20:16+0200\n"
 "PO-Revision-Date: 2005-05-17 00:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -5706,19 +5706,6 @@ msgid "&PageMarks"
 msgstr "页标记(&P)"
 
 #, fuzzy
-#~ msgid ""
-#~ " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want  to "
-#~ "print the page currently visible in your TDE application.</p> <p><b>Note:"
-#~ "</b> this field is disabled if you print from non-TDE applications like "
-#~ "Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
-#~ "which document page you are currently viewing.</p></qt>"
-#~ msgstr ""
-#~ "<qt><b>当前页：</b><p>如果您想要打印在您的 TDE 应用程序中目前可见的一页，"
-#~ "请选择<em>“当前页”</em>。</p><p><b>注意：</b>如果您从像 Mozilla 或 "
-#~ "OpenOffice.org 这样的非 TDE 应用程序中打印，此域将被禁用，因为 TDEPrint 无"
-#~ "法确定您正在查看的是哪一页。</p></qt>"
-
-#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "方向(&O)"
 
@@ -5782,3 +5769,16 @@ msgstr "页标记(&P)"
 
 #~ msgid "Documentation"
 #~ msgstr "文档"
+
+#, fuzzy
+#~ msgid ""
+#~ " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want  to "
+#~ "print the page currently visible in your TDE application.</p> <p><b>Note:"
+#~ "</b> this field is disabled if you print from non-TDE applications like "
+#~ "Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
+#~ "which document page you are currently viewing.</p></qt>"
+#~ msgstr ""
+#~ "<qt><b>当前页：</b><p>如果您想要打印在您的 TDE 应用程序中目前可见的一页，"
+#~ "请选择<em>“当前页”</em>。</p><p><b>注意：</b>如果您从像 Mozilla 或 "
+#~ "OpenOffice.org 这样的非 TDE 应用程序中打印，此域将被禁用，因为 TDEPrint 无"
+#~ "法确定您正在查看的是哪一页。</p></qt>"