From c94b721d4fe4003d60f8af1d82f4e3f5145816d8 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Thu, 25 Jul 2019 04:09:59 +0200
Subject: Merge translation files from master branch.

---
 tde-i18n-zh_CN/messages/tdelibs/tdeio.po | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tde-i18n-zh_CN/messages/tdelibs/tdeio.po')

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>。"
-- 
cgit v1.2.1