Merge translation files from master branch.

1 files changed, 42 insertions, 32 deletions

diff --git a/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po
index c55836f2447..7d85ae65bad 100644
--- a/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2020-02-16 23:35+0100\n"
+"POT-Creation-Date: 2020-02-23 20:08+0100\n"
 "PO-Revision-Date: 2006-03-29 22:24+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -27,28 +27,23 @@ msgid ""
 "Your emails"
 msgstr "kmashrab@uni-bremen.de"
 
-#: componentchooser.cpp:165
+#: componentchooser.cpp:166
 msgid "Select preferred email client:"
 msgstr "Afzal koʻrgan xat-xabar klientini tanlang"
 
-#: componentchooser.cpp:271
-#, fuzzy
-msgid "Select preferred file manager application:"
-msgstr "Afzal koʻrgan terminal dasturini tanlang"
-
-#: componentchooser.cpp:342
+#: componentchooser.cpp:309
 msgid "Select preferred terminal application:"
 msgstr "Afzal koʻrgan terminal dasturini tanlang"
 
-#: componentchooser.cpp:437
+#: componentchooser.cpp:404
 msgid "Select preferred Web browser application:"
 msgstr "Afzal koʻrgan veb-brauzerni tanlang:"
 
-#: componentchooser.cpp:462
+#: componentchooser.cpp:429
 msgid "Unknown"
 msgstr "Nomaʼlum"
 
-#: componentchooser.cpp:477
+#: componentchooser.cpp:444
 msgid ""
 "<qt>You changed the default component of your choice. Do you want to save "
 "that change now?</qt>"
@@ -56,11 +51,11 @@ msgstr ""
 "<qt>Andoza komponentga oʻzgarish kiritildi. Oʻzgarishni saqlashni istaysizmi?"
 "</qt>"
 
-#: componentchooser.cpp:481
+#: componentchooser.cpp:448
 msgid "No description available"
 msgstr "Hech qanday taʼrif yoʻq"
 
-#: componentchooser.cpp:492 componentchooser.cpp:497
+#: componentchooser.cpp:459 componentchooser.cpp:464
 msgid ""
 "Choose from the list below which component should be used by default for the "
 "%1 service."
@@ -94,7 +89,7 @@ msgid "in the following browser:"
 msgstr "koʻrsatilgan brauzerda:"
 
 #: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
-#: filemanagerconfig_ui.ui:149 terminalemulatorconfig_ui.ui:149
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "Tanlash"
@@ -202,28 +197,23 @@ msgstr "&Boshqa xat-xabar klientidan foydalanish:"
 msgid "Select this option if you want to use any other mail program."
 msgstr "Boshqa xat-xabar dasturidan foydalanmoqchi boʻlsangiz, shuni tanlang."
 
-#: filemanagerconfig_ui.ui:72
-#, fuzzy, no-c-format
-msgid "Use a different &file manager program:"
-msgstr "&Boshqa terminal dasturidan foydalanish:"
-
-#: filemanagerconfig_ui.ui:97
-#, fuzzy, no-c-format
-msgid "&Use Konqueror as file manager application"
-msgstr "&Terminal sifatida Konsole dasturidan foydalanish"
-
-#: filemanagerconfig_ui.ui:130
+#: filemanagerconfig_ui.ui:36
 #, no-c-format
 msgid ""
-"Press this button to select your favorite file manager client. Please note "
-"that the file you select has to have the executable attribute set in order "
-"to be accepted.<br> "
+"The default file manager can be selected by changing the preferred "
+"application for mime type inode/directory in the File Associations control "
+"module"
 msgstr ""
 
-#: filemanagerconfig_ui.ui:152
-#, fuzzy, no-c-format
-msgid "Click here to browse for a file manager program."
-msgstr "Terminal dasturini tanlash uchun shu yerni bosing."
+#: filemanagerconfig_ui.ui:66
+#, no-c-format
+msgid "Open File Associations module"
+msgstr ""
+
+#: filemanagerconfig_ui.ui:69
+#, no-c-format
+msgid "Click here to open the File Association control module."
+msgstr ""
 
 #: terminalemulatorconfig_ui.ui:72
 #, no-c-format
@@ -250,6 +240,26 @@ msgid "Click here to browse for terminal program."
 msgstr "Terminal dasturini tanlash uchun shu yerni bosing."
 
 #, fuzzy
+#~| msgid "Select preferred terminal application:"
+#~ msgid "Select preferred file manager application:"
+#~ msgstr "Afzal koʻrgan terminal dasturini tanlang"
+
+#, fuzzy
+#~| msgid "Use a different &terminal program:"
+#~ msgid "Use a different &file manager program:"
+#~ msgstr "&Boshqa terminal dasturidan foydalanish:"
+
+#, fuzzy
+#~| msgid "&Use Konsole as terminal application"
+#~ msgid "&Use Konqueror as file manager application"
+#~ msgstr "&Terminal sifatida Konsole dasturidan foydalanish"
+
+#, fuzzy
+#~| msgid "Click here to browse for terminal program."
+#~ msgid "Click here to browse for a file manager program."
+#~ msgstr "Terminal dasturini tanlash uchun shu yerni bosing."
+
+#, fuzzy
 #~ msgid "&Use Kontact as preferred email client"
 #~ msgstr "&Xat-xabar klienti sifatida KMail dasturidan foydalanish"