From 2661e521082d53201d474863ab932cf597a2327a Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Thu, 11 Jul 2019 04:34:28 +0200
Subject: Merge translation files from master branch.

---
 tde-i18n-zh_CN/messages/tdebase/tdeio_media.po |  9 +++++++++
 tde-i18n-zh_CN/messages/tdelibs/tdeio.po       |  5 +++++
 tde-i18n-zh_CN/messages/tdelibs/tdelibs.po     | 11 ++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'tde-i18n-zh_CN')

diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index 2b5f4627d3b..fe5b2c5d1c8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -827,6 +827,15 @@ msgstr "混合"
 msgid "Filesystem: iso9660"
 msgstr "文件系统：iso9660"
 
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgid "Unknown error"
+#~ msgstr "未知"
+
+#, fuzzy
+#~ msgid "%1 is already unlocked."
+#~ msgstr "设备已装入。"
+
 #, fuzzy
 #~ msgid "Enable notification popups"
 #~ msgstr "通知(&N)"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
index e2cfe929d77..4cc11393630 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
@@ -6097,6 +6097,11 @@ msgstr ""
 "一种图像 <u>image/x-bmp</u>。要哪个应用程序应该打开哪种类型的文件，您系统通知"
 "系统每个应用程序可处理哪些扩展名和 MIME 类型。</p>"
 
+#, fuzzy
+#~| msgid "Unknown Error"
+#~ msgid "Unknown unmount error."
+#~ msgstr "未知的错误"
+
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "书签"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index 75230a86b83..a5bb1003410 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-07-08 00:03+0200\n"
+"POT-Creation-Date: 2019-07-11 03:35+0200\n"
 "PO-Revision-Date: 2006-04-30 16:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -13278,6 +13278,15 @@ msgstr "日积月累"
 #~ msgid "Active"
 #~ msgstr "动作"
 
+#, fuzzy
+#~| msgid ""
+#~| "Cannot create the file\n"
+#~| "\""
+#~ msgid "Cannot create temporary password file"
+#~ msgstr ""
+#~ "无法创建文件\n"
+#~ "\""
+
 #~ msgid ""
 #~ "The <b>K Desktop Environment</b> is written and maintained by the TDE "
 #~ "Team, a world-wide network of software engineers committed to <a href="
-- 
cgit v1.2.1