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

(limited to 'tde-i18n-sr')

diff --git a/tde-i18n-sr/messages/tdebase/tdeio_media.po b/tde-i18n-sr/messages/tdebase/tdeio_media.po
index 61029b72edf..b874d629dac 100644
--- a/tde-i18n-sr/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sr/messages/tdebase/tdeio_media.po
@@ -841,3 +841,12 @@ msgstr "Мешано"
 #, no-c-format
 msgid "Filesystem: iso9660"
 msgstr "Систем фајлова: iso9660"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgid "Unknown error"
+#~ msgstr "Непознато"
+
+#, fuzzy
+#~ msgid "%1 is already unlocked."
+#~ msgstr "Уређај је већ монтиран."
diff --git a/tde-i18n-sr/messages/tdelibs/tdeio.po b/tde-i18n-sr/messages/tdelibs/tdeio.po
index 8752596c161..ab8baaef379 100644
--- a/tde-i18n-sr/messages/tdelibs/tdeio.po
+++ b/tde-i18n-sr/messages/tdelibs/tdeio.po
@@ -6428,6 +6428,11 @@ msgstr ""
 "да буде обавештен о способностима сваког програма да рукује овим наставцима "
 "и mime типовима.</p>"
 
+#, fuzzy
+#~| msgid "Unknown Error"
+#~ msgid "Unknown unmount error."
+#~ msgstr "Непозната грешка"
+
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "Маркер"
diff --git a/tde-i18n-sr/messages/tdelibs/tdelibs.po b/tde-i18n-sr/messages/tdelibs/tdelibs.po
index 09a8c1547d0..fced5829061 100644
--- a/tde-i18n-sr/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-sr/messages/tdelibs/tdelibs.po
@@ -10,7 +10,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: 2007-10-01 22:09+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -13486,6 +13486,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