Merge translation files from master branch.

2 files changed, 166 insertions, 92 deletions

diff --git a/tde-i18n-uz/messages/tdebase/kcmkonq.po b/tde-i18n-uz/messages/tdebase/kcmkonq.po
index bd0097fa2f5..20ff48a3f0f 100644
--- a/tde-i18n-uz/messages/tdebase/kcmkonq.po
+++ b/tde-i18n-uz/messages/tdebase/kcmkonq.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkonq\n"
-"POT-Creation-Date: 2020-09-27 19:35+0200\n"
+"POT-Creation-Date: 2021-03-30 20:18+0000\n"
 "PO-Revision-Date: 2006-10-01 21:18+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -216,31 +216,31 @@ msgstr ""
 msgid "Desktop %1"
 msgstr "Ish stoli %1"
 
-#: desktopbehavior_impl.cpp:76
+#: desktopbehavior_impl.cpp:77
 msgid "Sound Files"
 msgstr "Tovush fayllari"
 
-#: desktopbehavior_impl.cpp:137
+#: desktopbehavior_impl.cpp:141
 msgid "&Left button:"
 msgstr "Ch&ap tugma:"
 
-#: desktopbehavior_impl.cpp:138
+#: desktopbehavior_impl.cpp:142
 msgid ""
 "You can choose what happens when you click the left button of your pointing "
 "device on the desktop:"
 msgstr ""
 
-#: desktopbehavior_impl.cpp:141
+#: desktopbehavior_impl.cpp:145
 msgid "Right b&utton:"
 msgstr "Oʻn&g tugma:"
 
-#: desktopbehavior_impl.cpp:142
+#: desktopbehavior_impl.cpp:146
 msgid ""
 "You can choose what happens when you click the right button of your pointing "
 "device on the desktop:"
 msgstr ""
 
-#: desktopbehavior_impl.cpp:158 desktopbehavior_impl.cpp:204
+#: desktopbehavior_impl.cpp:162 desktopbehavior_impl.cpp:208
 msgid ""
 " <ul><li><em>No action:</em> as you might guess, nothing happens!</li> "
 "<li><em>Window list menu:</em> a menu showing all windows on all virtual "
@@ -256,7 +256,7 @@ msgid ""
 "li></ul>"
 msgstr ""
 
-#: desktopbehavior_impl.cpp:179
+#: desktopbehavior_impl.cpp:183
 msgid ""
 "You can choose what happens when you click the middle button of your "
 "pointing device on the desktop: <ul><li><em>No action:</em> as you might "
@@ -273,35 +273,35 @@ msgid ""
 "(also known as \"Kicker\") hidden from view.</li></ul>"
 msgstr ""
 
-#: desktopbehavior_impl.cpp:290
+#: desktopbehavior_impl.cpp:299
 msgid "No Action"
 msgstr "Amal yoʻq"
 
-#: desktopbehavior_impl.cpp:291
+#: desktopbehavior_impl.cpp:300
 msgid "Window List Menu"
 msgstr "Oynalar roʻyxati menyusi"
 
-#: desktopbehavior_impl.cpp:292
+#: desktopbehavior_impl.cpp:301
 msgid "Desktop Menu"
 msgstr "Ish stoli menyusi"
 
-#: desktopbehavior_impl.cpp:293
+#: desktopbehavior_impl.cpp:302
 msgid "Application Menu"
 msgstr "Dastur menyusi"
 
-#: desktopbehavior_impl.cpp:294
+#: desktopbehavior_impl.cpp:303
 msgid "Bookmarks Menu"
 msgstr "Xatchoʻplar menyusi"
 
-#: desktopbehavior_impl.cpp:295
+#: desktopbehavior_impl.cpp:304
 msgid "Custom Menu 1"
 msgstr ""
 
-#: desktopbehavior_impl.cpp:296
+#: desktopbehavior_impl.cpp:305
 msgid "Custom Menu 2"
 msgstr ""
 
-#: desktopbehavior_impl.cpp:480
+#: desktopbehavior_impl.cpp:520
 msgid ""
 "<h1>Behavior</h1>\n"
 "This module allows you to choose various options\n"
@@ -582,12 +582,17 @@ msgstr "Tasdiqlash talab qilinadi"
 msgid "General"
 msgstr "Umumiy"
 
-#: desktopbehavior.ui:53
+#: desktopbehavior.ui:45
+#, fuzzy, no-c-format
+msgid "Desktop Icons"
+msgstr "Ish stoli menyusi"
+
+#: desktopbehavior.ui:61
 #, no-c-format
 msgid "&Show icons on desktop"
 msgstr "&Ish stolida nishonchalarni koʻrsatish"
 
-#: desktopbehavior.ui:56
+#: desktopbehavior.ui:64
 #, no-c-format
 msgid ""
 "Uncheck this option if you do not want to have icons on the desktop. Without "
@@ -595,12 +600,12 @@ msgid ""
 "drag files to the desktop."
 msgstr ""
 
-#: desktopbehavior.ui:92
+#: desktopbehavior.ui:100
 #, no-c-format
 msgid "Allow pro&grams in desktop window"
 msgstr ""
 
-#: desktopbehavior.ui:95
+#: desktopbehavior.ui:103
 #, no-c-format
 msgid ""
 "Check this option if you want to run X11 programs that draw into the desktop "
@@ -609,45 +614,99 @@ msgid ""
 "option."
 msgstr ""
 
-#: desktopbehavior.ui:105
+#: desktopbehavior.ui:113
 #, no-c-format
 msgid "Show &tooltips"
 msgstr "Eslatmalarni &koʻrsatish"
 
-#: desktopbehavior.ui:113
+#: desktopbehavior.ui:139
+#, no-c-format
+msgid "Lock in Place"
+msgstr ""
+
+#: desktopbehavior.ui:142
+#, no-c-format
+msgid ""
+"Check this option if you want to prevent your icons from being dragged "
+"around."
+msgstr ""
+
+#: desktopbehavior.ui:153
+#, no-c-format
+msgid "Align to grid"
+msgstr ""
+
+#: desktopbehavior.ui:156
+#, no-c-format
+msgid ""
+"Check this option if you want to see your icons automatically aligned to the "
+"grid when you move them."
+msgstr ""
+
+#: desktopbehavior.ui:196
+#, no-c-format
+msgid "Icon Spacing:"
+msgstr ""
+
+#: desktopbehavior.ui:199 desktopbehavior.ui:216
+#, no-c-format
+msgid ""
+"Changing this value controls how close or far to each other the icons are "
+"placed on the desktop. This option has effect only if the \"Align to Grid\" "
+"option is enabled."
+msgstr ""
+
+#: desktopbehavior.ui:210
+#, no-c-format
+msgid " px"
+msgstr ""
+
+#: desktopbehavior.ui:243
+#, no-c-format
+msgid "Ctrl+Mouse Scroll changes spacing"
+msgstr ""
+
+#: desktopbehavior.ui:246
+#, no-c-format
+msgid ""
+"Check this if you want to change desktop icon spacing by pressing Ctrl and "
+"scrolling on the desktop background."
+msgstr ""
+
+#: desktopbehavior.ui:277
 #, no-c-format
 msgid "Menu Bar at Top of Screen"
 msgstr "Ish stolida menyular panelini koʻrsatish"
 
-#: desktopbehavior.ui:124
+#: desktopbehavior.ui:288
 #, no-c-format
 msgid "&None"
 msgstr "&Yoʻq"
 
-#: desktopbehavior.ui:127
+#: desktopbehavior.ui:291
 #, no-c-format
 msgid ""
 "If this option is selected, there is no menu bar at the top of the screen."
 msgstr ""
 
-#: desktopbehavior.ui:135
+#: desktopbehavior.ui:299
 #, no-c-format
 msgid "&Desktop menu bar"
 msgstr "Ish stoli &menyusi"
 
-#: desktopbehavior.ui:138
+#: desktopbehavior.ui:302
 #, no-c-format
 msgid ""
 "If this option is selected, there is one menu bar at the top of the screen "
 "which shows the desktop menus."
 msgstr ""
 
-#: desktopbehavior.ui:146
+#: desktopbehavior.ui:310
 #, no-c-format
 msgid "&Current application's menu bar (Mac OS-style)"
 msgstr "&Joriy dasturning menyusi (Mac OTga oʻxshash)"
 
-#: desktopbehavior.ui:149
+#: desktopbehavior.ui:313
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar "
@@ -656,54 +715,42 @@ msgid ""
 "You might recognize this behavior from Mac OS."
 msgstr ""
 
-#: desktopbehavior.ui:159
+#: desktopbehavior.ui:323
 #, no-c-format
 msgid "Mouse Button Actions"
 msgstr "Sichqonchaning tugmalari uchun amallar"
 
-#: desktopbehavior.ui:170
+#: desktopbehavior.ui:334
 #, no-c-format
 msgid "Middle button:"
 msgstr "Oʻrta tugma:"
 
-#: desktopbehavior.ui:178
+#: desktopbehavior.ui:342
 #, no-c-format
 msgid "Left button:"
 msgstr "Chap tugma:"
 
-#: desktopbehavior.ui:186
+#: desktopbehavior.ui:350
 #, no-c-format
 msgid "Right button:"
 msgstr "Oʻng tugma:"
 
-#: desktopbehavior.ui:223 desktopbehavior.ui:247 desktopbehavior.ui:258
+#: desktopbehavior.ui:387 desktopbehavior.ui:411 desktopbehavior.ui:422
 #, no-c-format
 msgid "Edit..."
 msgstr "Tahrirlash"
 
-#: desktopbehavior.ui:304
+#: desktopbehavior.ui:468
 #, no-c-format
 msgid "File Icons"
 msgstr "Fayl nishonchalari"
 
-#: desktopbehavior.ui:315
-#, no-c-format
-msgid "Automatically &line up icons"
-msgstr "Nishonchalarni avto-&tekislash"
-
-#: desktopbehavior.ui:318
-#, no-c-format
-msgid ""
-"Check this option if you want to see your icons automatically aligned to the "
-"grid when you move them."
-msgstr ""
-
-#: desktopbehavior.ui:326
+#: desktopbehavior.ui:479
 #, no-c-format
 msgid "Show &hidden files"
 msgstr "Yashi&rilgan fayllarni koʻrsatish"
 
-#: desktopbehavior.ui:329
+#: desktopbehavior.ui:482
 #, no-c-format
 msgid ""
 "<p>If you check this option, any files in your desktop directory that begin "
@@ -716,37 +763,40 @@ msgid ""
 "p>"
 msgstr ""
 
-#: desktopbehavior.ui:336
+#: desktopbehavior.ui:489
 #, no-c-format
 msgid "Show Icon Previews For"
 msgstr ""
 
-#: desktopbehavior.ui:352
+#: desktopbehavior.ui:505
 #, no-c-format
 msgid "Select for which types of files you want to enable preview images."
 msgstr ""
 
-#: desktopbehavior.ui:362
+#: desktopbehavior.ui:515
 #, no-c-format
 msgid "Device Icons"
 msgstr "Uskuna nishonchalari"
 
-#: desktopbehavior.ui:373
+#: desktopbehavior.ui:526
 #, fuzzy, no-c-format
 msgid "&Show device icons"
 msgstr "&Uskuna nishonchalarini koʻrsatish:"
 
-#: desktopbehavior.ui:381
+#: desktopbehavior.ui:534
 #, fuzzy, no-c-format
 msgid "&Show free space overlay on device icons"
 msgstr "&Uskuna nishonchalarini koʻrsatish:"
 
-#: desktopbehavior.ui:387
+#: desktopbehavior.ui:540
 #, no-c-format
 msgid "Device Types to Display"
 msgstr "Uskuna turlarini koʻrsatish"
 
-#: desktopbehavior.ui:406
+#: desktopbehavior.ui:559
 #, no-c-format
 msgid "Deselect the device types which you do not want to see on the desktop."
 msgstr ""
+
+#~ msgid "Automatically &line up icons"
+#~ msgstr "Nishonchalarni avto-&tekislash"
diff --git a/tde-i18n-uz/messages/tdebase/kdesktop.po b/tde-i18n-uz/messages/tdebase/kdesktop.po
index 78635fe6c76..501bd0faec3 100644
--- a/tde-i18n-uz/messages/tdebase/kdesktop.po
+++ b/tde-i18n-uz/messages/tdebase/kdesktop.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdesktop\n"
-"POT-Creation-Date: 2020-12-09 20:10+0100\n"
+"POT-Creation-Date: 2021-03-30 20:18+0000\n"
 "PO-Revision-Date: 2006-12-17 12:17+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -134,35 +134,35 @@ msgstr "Tasdiqlamay oʻchirish"
 msgid "Reboot without Confirmation"
 msgstr "Tasdiqlamay oʻchirib-yoqish"
 
-#: kdiconview.cpp:444
+#: kdiconview.cpp:443
 msgid "&Rename"
 msgstr "&Nomini oʻzgartirish"
 
-#: kdiconview.cpp:445
+#: kdiconview.cpp:444
 msgid "&Properties"
 msgstr "Xossa&lari"
 
-#: kdiconview.cpp:446
+#: kdiconview.cpp:445
 msgid "&Move to Trash"
 msgstr "&Chiqindilar qutisiga olib tashlash"
 
-#: kdiconview.cpp:808
+#: kdiconview.cpp:855
 msgid "You have chosen to remove a system icon"
 msgstr ""
 
-#: kdiconview.cpp:808
+#: kdiconview.cpp:855
 msgid "You can restore this icon in the future through the"
 msgstr ""
 
-#: kdiconview.cpp:808
+#: kdiconview.cpp:855
 msgid "tab in the"
 msgstr ""
 
-#: kdiconview.cpp:808
+#: kdiconview.cpp:855
 msgid "Behavior"
 msgstr ""
 
-#: kdiconview.cpp:808
+#: kdiconview.cpp:855
 msgid "pane of the Desktop Settings control module."
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr "Vertikal boʻyicha tekislash"
 msgid "Align to Grid"
 msgstr "Tekislash"
 
-#: kdesktop.kcfg:185 krootwm.cpp:182
+#: kdesktop.kcfg:195 krootwm.cpp:182
 #, no-c-format
 msgid "Lock in Place"
 msgstr "Joyiga qulflash"
@@ -275,7 +275,7 @@ msgstr "Seanslar"
 msgid "New"
 msgstr "Yangi"
 
-#: krootwm.cpp:891
+#: krootwm.cpp:903
 msgid ""
 "<p>You have chosen to open another desktop session.<br>The current session "
 "will be hidden and a new login screen will be displayed.<br>An F-key is "
@@ -291,11 +291,11 @@ msgstr ""
 "Ctrl, Alt va kerakli funksional tugmani bosish kerak. Bundan tashqari "
 "seanslarni tanlash uchun asosiy menyudan foydalanish mumkin.</p>"
 
-#: krootwm.cpp:902
+#: krootwm.cpp:914
 msgid "Warning - New Session"
 msgstr "Diqqat - Yangi seans"
 
-#: krootwm.cpp:903 lock/lockdlg.cpp:702
+#: krootwm.cpp:915 lock/lockdlg.cpp:702
 msgid "&Start New Session"
 msgstr "Yangi seansni &boshlash"
 
@@ -736,7 +736,7 @@ msgid ""
 "grid when you move them."
 msgstr ""
 
-#: kdesktop.kcfg:65 kdesktop.kcfg:180
+#: kdesktop.kcfg:65 kdesktop.kcfg:190
 #, no-c-format
 msgid "Sort directories first"
 msgstr "Oldin jildlar"
@@ -867,54 +867,78 @@ msgstr ""
 
 #: kdesktop.kcfg:160
 #, no-c-format
-msgid "Show Icon Previews For"
+msgid "Icon spacing"
 msgstr ""
 
 #: kdesktop.kcfg:161
 #, no-c-format
+msgid ""
+"<p>This is the minimal distance (in pixels) between the icons on your "
+"desktop.</p>"
+msgstr ""
+
+#: kdesktop.kcfg:165
+#, no-c-format
+msgid "Change spacing by Ctrl+Mouse Scroll"
+msgstr ""
+
+#: kdesktop.kcfg:166
+#, no-c-format
+msgid ""
+"<p>If this is enabled, you can change desktop icon spacing by pressing Ctrl "
+"and scrolling on the desktop background.</p>"
+msgstr ""
+
+#: kdesktop.kcfg:170
+#, no-c-format
+msgid "Show Icon Previews For"
+msgstr ""
+
+#: kdesktop.kcfg:171
+#, no-c-format
 msgid "Select for which types of files you want to enable preview images."
 msgstr ""
 
-#: kdesktop.kcfg:175
+#: kdesktop.kcfg:185
 #, no-c-format
 msgid "Sort criterion"
 msgstr ""
 
-#: kdesktop.kcfg:176
+#: kdesktop.kcfg:186
 #, no-c-format
 msgid ""
 "Sets the sort criterion. Possible choices are NameCaseSensitive = 0, "
 "NameCaseInsensitive = 1, Size = 2, Type = 3, Date = 4."
 msgstr ""
 
-#: kdesktop.kcfg:181
+#: kdesktop.kcfg:191
 #, no-c-format
 msgid ""
 "Enable this to place directories in front of the sorted list, otherwise they "
 "are amongst the files."
 msgstr ""
 
-#: kdesktop.kcfg:186
+#: kdesktop.kcfg:196
 #, no-c-format
 msgid "Check this option if you want to keep your icons from moving."
 msgstr ""
 
-#: kdesktop.kcfg:207
+#: kdesktop.kcfg:217
 #, no-c-format
 msgid "Device Types to exclude"
 msgstr ""
 
-#: kdesktop.kcfg:208
+#: kdesktop.kcfg:218
 #, no-c-format
 msgid "The device types which you do not want to see on the desktop."
 msgstr ""
 
-#: kdesktop.kcfg:221
+#: kdesktop.kcfg:231
 #, no-c-format
 msgid "Current application's menu bar (Mac OS-style)"
 msgstr "Joriy dasturning menyusi (Mac OSga oʻxshash)"
 
-#: kdesktop.kcfg:222
+#: kdesktop.kcfg:232
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar "
@@ -923,44 +947,44 @@ msgid ""
 "You might recognize this behavior from Mac OS."
 msgstr ""
 
-#: kdesktop.kcfg:228
+#: kdesktop.kcfg:238
 #, no-c-format
 msgid "Desktop menu bar"
 msgstr "Ish stoli menyusi"
 
-#: kdesktop.kcfg:229
+#: kdesktop.kcfg:239
 #, no-c-format
 msgid ""
 "If this option is selected, there is one menu bar at the top of the screen "
 "which shows the desktop menus."
 msgstr ""
 
-#: kdesktop.kcfg:235
+#: kdesktop.kcfg:245
 #, no-c-format
 msgid "Enable screen saver"
 msgstr "Ekran saqlovchisini yoqish"
 
-#: kdesktop.kcfg:236
+#: kdesktop.kcfg:246
 #, no-c-format
 msgid "Enables the screen saver."
 msgstr ""
 
-#: kdesktop.kcfg:240
+#: kdesktop.kcfg:250
 #, no-c-format
 msgid "Screen saver timeout"
 msgstr "Ekran saqlovchisi uchun taymaut"
 
-#: kdesktop.kcfg:241
+#: kdesktop.kcfg:251
 #, no-c-format
 msgid "Sets the seconds after which the screen saver is started."
 msgstr ""
 
-#: kdesktop.kcfg:245
+#: kdesktop.kcfg:255
 #, no-c-format
 msgid "Suspend screen saver when DPMS kicks in"
 msgstr ""
 
-#: kdesktop.kcfg:246
+#: kdesktop.kcfg:256
 #, no-c-format
 msgid ""
 "Usually the screen saver is suspended when display power saving kicks in,\n"
@@ -970,39 +994,39 @@ msgid ""
 "suspend them."
 msgstr ""
 
-#: kdesktop.kcfg:303
+#: kdesktop.kcfg:313
 #, no-c-format
 msgid ""
 "When enabled this restores the old style unmanaged window behavior of "
 "desktop locking."
 msgstr ""
 
-#: kdesktop.kcfg:308
+#: kdesktop.kcfg:318
 #, no-c-format
 msgid ""
 "When enabled the date and time when the desktop was locked is displayed as "
 "an additional intrusion detection measure."
 msgstr ""
 
-#: kdesktop.kcfg:313
+#: kdesktop.kcfg:323
 #, no-c-format
 msgid ""
 "When disabled the screensaver starts immediately when locking the desktop."
 msgstr ""
 
-#: kdesktop.kcfg:318
+#: kdesktop.kcfg:328
 #, no-c-format
 msgid ""
 "When enabled all active windows are hidden from the screensaver, showing "
 "only the desktop background as a result."
 msgstr ""
 
-#: kdesktop.kcfg:323
+#: kdesktop.kcfg:333
 #, no-c-format
 msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
 msgstr ""
 
-#: kdesktop.kcfg:328
+#: kdesktop.kcfg:338
 #, no-c-format
 msgid ""
 "When enabled, the Trinity Secure Attention Key (TSAK) system will be used to "