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-uz/messages/tdebase/tdeio_media.po |  9 +++++++++
 tde-i18n-uz/messages/tdelibs/tdeio.po       |  5 +++++
 tde-i18n-uz/messages/tdelibs/tdelibs.po     | 11 ++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'tde-i18n-uz/messages')

diff --git a/tde-i18n-uz/messages/tdebase/tdeio_media.po b/tde-i18n-uz/messages/tdebase/tdeio_media.po
index 55a8f72e336..2d851879de9 100644
--- a/tde-i18n-uz/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-uz/messages/tdebase/tdeio_media.po
@@ -790,3 +790,12 @@ msgstr "Aralash"
 #, no-c-format
 msgid "Filesystem: iso9660"
 msgstr "Fayl tizimi: ISO9660"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgid "Unknown error"
+#~ msgstr "Nomaʼlum"
+
+#, fuzzy
+#~ msgid "%1 is already unlocked."
+#~ msgstr "Uskuna allaqachon ulangan."
diff --git a/tde-i18n-uz/messages/tdelibs/tdeio.po b/tde-i18n-uz/messages/tdelibs/tdeio.po
index 485ac7c7e0d..426c924f7fd 100644
--- a/tde-i18n-uz/messages/tdelibs/tdeio.po
+++ b/tde-i18n-uz/messages/tdelibs/tdeio.po
@@ -5945,6 +5945,11 @@ msgid ""
 "extensions and mimetypes.</p>"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Unknown Error"
+#~ msgid "Unknown unmount error."
+#~ msgstr "Nomaʼlum xato"
+
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "Xatchoʻp"
diff --git a/tde-i18n-uz/messages/tdelibs/tdelibs.po b/tde-i18n-uz/messages/tdelibs/tdelibs.po
index 615673e873f..4f0fd7b9d79 100644
--- a/tde-i18n-uz/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-uz/messages/tdelibs/tdelibs.po
@@ -5,7 +5,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: 2008-04-14 22:21+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -13331,6 +13331,15 @@ msgstr "Kun maslahati"
 #~ msgid "Active"
 #~ msgstr "Amal"
 
+#, fuzzy
+#~| msgid ""
+#~| "Cannot create the file\n"
+#~| "\""
+#~ msgid "Cannot create temporary password file"
+#~ msgstr ""
+#~ "Faylni yaratib boʻlmadi\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