Merge translation files from master branch.

3 files changed, 18 insertions, 18 deletions

diff --git a/tde-i18n-uz@cyrillic/messages/tdebase/ksmserver.po b/tde-i18n-uz@cyrillic/messages/tdebase/ksmserver.po
index 01346768ab4..961e24198db 100644
--- a/tde-i18n-uz@cyrillic/messages/tdebase/ksmserver.po
+++ b/tde-i18n-uz@cyrillic/messages/tdebase/ksmserver.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2005-10-11 20:19+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -51,11 +51,11 @@ msgstr ""
 msgid "Also allow remote connections"
 msgstr "Масофадан уланишга ҳам рухсат бериш"
 
-#: main.cpp:183
+#: main.cpp:179
 msgid "The TDE Session Manager"
 msgstr "TDE сеанс бошқарувчиси"
 
-#: main.cpp:187
+#: main.cpp:183
 msgid "Maintainer"
 msgstr "Таъминловчи"
 
diff --git a/tde-i18n-uz@cyrillic/messages/tdebase/ksysguard.po b/tde-i18n-uz@cyrillic/messages/tdebase/ksysguard.po
index f05d2450eab..3ad0a408913 100644
--- a/tde-i18n-uz@cyrillic/messages/tdebase/ksysguard.po
+++ b/tde-i18n-uz@cyrillic/messages/tdebase/ksysguard.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksysguard\n"
-"POT-Creation-Date: 2019-11-28 03:15+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2008-04-11 20:45+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -1525,7 +1525,11 @@ msgstr "Таймернинг мосламалари"
 msgid "Use update interval of worksheet"
 msgstr "Иш варағининг янгилаш даврини ишлатиш"
 
-#: ksysguard.cc:64 ksysguard.cc:74
+#: ksysguard.cc:64
+msgid "TDE system guard"
+msgstr "TDE тизим назоратчиси"
+
+#: ksysguard.cc:74 ksysguard.cc:556
 #, fuzzy
 msgid "KSysGuard"
 msgstr "TDE тизим назоратчиси"
@@ -1626,10 +1630,6 @@ msgstr "Фақат локал компьютернинг вазифалар рў
 msgid "Optional worksheet files to load"
 msgstr "Юклаш учун иш варағини танлаш"
 
-#: ksysguard.cc:556
-msgid "TDE System Guard"
-msgstr "TDE тизим назоратчиси"
-
 #: ksysguard.cc:558
 msgid "(c) 1996-2002 The KSysGuard Developers"
 msgstr "(c) 1996-2002 KSysGuard тузувчилари"
@@ -1717,7 +1717,7 @@ msgstr "Процессор"
 msgid "Mem"
 msgstr "Хотира"
 
-#~ msgid "TDE system guard"
+#~ msgid "TDE System Guard"
 #~ msgstr "TDE тизим назоратчиси"
 
 #~ msgid "&Tree"
diff --git a/tde-i18n-uz@cyrillic/messages/tdelibs/tdelibs.po b/tde-i18n-uz@cyrillic/messages/tdelibs/tdelibs.po
index c2e8ba02072..cc61008040f 100644
--- a/tde-i18n-uz@cyrillic/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-uz@cyrillic/messages/tdelibs/tdelibs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-08-01 05:09+0200\n"
+"POT-Creation-Date: 2019-12-05 01:24+0100\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"
@@ -6535,25 +6535,25 @@ msgstr "жиддий ажратиш хатоси: %1 %2 сатр, %3 устун�
 msgid "XML parsing error"
 msgstr "XML ажратиш хатоси"
 
-#: tdeinit/tdeinit.cpp:475
+#: tdeinit/tdeinit.cpp:476
 msgid ""
 "Unable to start new process.\n"
 "The system may have reached the maximum number of open files possible or the "
 "maximum number of open files that you are allowed to use has been reached."
 msgstr ""
 
-#: tdeinit/tdeinit.cpp:497
+#: tdeinit/tdeinit.cpp:498
 msgid ""
 "Unable to create new process.\n"
 "The system may have reached the maximum number of processes possible or the "
 "maximum number of processes that you are allowed to use has been reached."
 msgstr ""
 
-#: tdeinit/tdeinit.cpp:589
+#: tdeinit/tdeinit.cpp:590
 msgid "Could not find '%1' executable."
 msgstr "\"%1\" дастури топилмади."
 
-#: tdeinit/tdeinit.cpp:605
+#: tdeinit/tdeinit.cpp:606
 msgid ""
 "Could not open library '%1'.\n"
 "%2"
@@ -6564,12 +6564,12 @@ msgstr ""
 #: ../dependencies/tqt3/src/network/qftp.cpp:1252
 #: ../dependencies/tqt3/src/network/qftp.cpp:1980
 #: ../dependencies/tqt3/src/network/qhttp.cpp:1226
-#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:606
-#: tdeinit/tdeinit.cpp:649
+#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:607
+#: tdeinit/tdeinit.cpp:650
 msgid "Unknown error"
 msgstr "Номаълум хато"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdeinit/tdeinit.cpp:649
 msgid ""
 "Could not find 'kdemain' in '%1'.\n"
 "%2"