From 7966efcdb770b800c46ea7f73f9c282b86d09da8 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Sun, 18 Oct 2020 22:58:23 +0200
Subject: Merge translation files from master branch.

---
 tde-i18n-zh_CN/messages/tdebase/libkonq.po     |  7 +++-
 tde-i18n-zh_CN/messages/tdebase/tdeio_media.po | 54 ++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

(limited to 'tde-i18n-zh_CN/messages/tdebase')

diff --git a/tde-i18n-zh_CN/messages/tdebase/libkonq.po b/tde-i18n-zh_CN/messages/tdebase/libkonq.po
index 5624f247598..9552ed23a0b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkonq.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkonq.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2020-05-11 13:04+0200\n"
 "PO-Revision-Date: 2005-01-20 01:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -307,3 +307,8 @@ msgstr "撤消(&O)：放入回收站"
 #: konq_undo.cc:265
 msgid "Und&o: Create Folder"
 msgstr "撤消(&O)：创建文件夹"
+
+#, fuzzy
+#~| msgid "Open the medium in a new window"
+#~ msgid "Open item in a new window"
+#~ msgstr "在新窗口中打开介质"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index 965cbde6dd4..430de60376a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -833,6 +833,14 @@ msgstr "混合"
 msgid "Filesystem: iso9660"
 msgstr "文件系统：iso9660"
 
+#, fuzzy
+#~ msgid "%1 is already mounted to %2."
+#~ msgstr "设备已装入。"
+
+#, fuzzy
+#~ msgid "%1 is already unmounted."
+#~ msgstr "设备已装入。"
+
 #, fuzzy
 #~| msgid "Unknown"
 #~ msgid "Unknown error"
@@ -842,6 +850,52 @@ msgstr "文件系统：iso9660"
 #~ msgid "%1 is already unlocked."
 #~ msgstr "设备已装入。"
 
+#, fuzzy
+#~ msgid "%1 is already locked."
+#~ msgstr "设备已装入。"
+
+#, fuzzy
+#~| msgid "The TDE mediamanager is not running."
+#~ msgid "The TDE mediamanager is not running.\n"
+#~ msgstr "TDE 介质管理器未运行。"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgid "Unknown lock error."
+#~ msgstr "未知"
+
+#, fuzzy
+#~ msgid "%1 is not a mountable or encrypted media."
+#~ msgstr "%1 不是可挂载的介质。"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgid "Unknown unlock error."
+#~ msgstr "未知"
+
+#, fuzzy
+#~| msgid "Unmount given URL"
+#~ msgid "Mount given URL"
+#~ msgstr "卸载给出的 URL"
+
+#, fuzzy
+#~| msgid "Unmount given URL"
+#~ msgid "Unlock given URL"
+#~ msgstr "卸载给出的 URL"
+
+#, fuzzy
+#~ msgid "Lock given URL"
+#~ msgstr "卸载给出的 URL"
+
+#, fuzzy
+#~ msgid "Eject given URL"
+#~ msgstr "卸载给出的 URL"
+
+#, fuzzy
+#~| msgid "media:/ URL to mount/unmount/eject/remove"
+#~ msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
+#~ msgstr "要挂载/卸载/弹出/删除的 media:/ URL"
+
 #, fuzzy
 #~ msgid "Enable notification popups"
 #~ msgstr "通知(&N)"
-- 
cgit v1.2.1