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-uz@cyrillic/messages/tdebase/libkonq.po   |  7 +++-
 .../messages/tdebase/tdeio_media.po                | 49 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

(limited to 'tde-i18n-uz@cyrillic')

diff --git a/tde-i18n-uz@cyrillic/messages/tdebase/libkonq.po b/tde-i18n-uz@cyrillic/messages/tdebase/libkonq.po
index e3590444e38..43a80c17de5 100644
--- a/tde-i18n-uz@cyrillic/messages/tdebase/libkonq.po
+++ b/tde-i18n-uz@cyrillic/messages/tdebase/libkonq.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkonq\n"
-"POT-Creation-Date: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2020-05-11 13:04+0200\n"
 "PO-Revision-Date: 2006-04-07 18:03+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -313,3 +313,8 @@ msgstr "&Бекор қилиш: Чиқиндилар қутисига жўнат
 #: konq_undo.cc:265
 msgid "Und&o: Create Folder"
 msgstr "&Бекор қилиш: Жилдни яратиш"
+
+#, fuzzy
+#~| msgid "Open the medium in a new window"
+#~ msgid "Open item in a new window"
+#~ msgstr "Янги ойнада очиш"
diff --git a/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po b/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po
index 36e7ecead9f..1e48a1ae258 100644
--- a/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po
@@ -797,6 +797,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"
@@ -805,3 +813,44 @@ msgstr "Файл тизими: ISO9660"
 #, fuzzy
 #~ 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'ни узиш"
-- 
cgit v1.2.3