From 3ce27eb21c0ff2ea6d7577ce0be516e4e3c4c675 Mon Sep 17 00:00:00 2001
From: Automated System <gitea@mirror.git.trinitydesktop.org>
Date: Thu, 18 Feb 2021 21:37:19 +0000
Subject: Merge translation files from master branch.

---
 tde-i18n-zh_CN/messages/tdebase/kcmmedia.po    |  4 ++++
 tde-i18n-zh_CN/messages/tdebase/tdeio_media.po | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
index 56e37f67f39..9ab0c272eec 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
@@ -391,6 +391,10 @@ msgstr "命令:"
 #~ msgid "Enable notification dialog popups"
 #~ msgstr "通知(&N)"
 
+#, fuzzy
+#~ msgid "Enable device monitor notification popups"
+#~ msgstr "通知(&N)"
+
 #, fuzzy
 #~ msgid "Enable notification popups"
 #~ msgstr "通知(&N)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index 986ecde4a67..dfaf0c16661 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -908,7 +908,11 @@ msgstr "文件系统:iso9660"
 #~ msgstr "要挂载/卸载/弹出/删除的 media:/ URL"
 
 #, fuzzy
-#~ msgid "Enable notification popups"
+#~ msgid "Enable notification dialogs popups"
+#~ msgstr "通知(&N)"
+
+#, fuzzy
+#~ msgid "Enable device monitor notification popups"
 #~ msgstr "通知(&N)"
 
 #~ msgid ""
@@ -987,3 +991,7 @@ msgstr "文件系统:iso9660"
 
 #~ msgid "Autoopen - %1"
 #~ msgstr "自动打开 - %1"
+
+#, fuzzy
+#~ msgid "Enable notification popups"
+#~ msgstr "通知(&N)"
-- 
cgit v1.2.1