Merge translation files from master branch.

2 files changed, 170 insertions, 94 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/kcmkonq.po b/tde-i18n-en_GB/messages/tdebase/kcmkonq.po
index 1662eff6a08..b4f86ad5f06 100644
--- a/tde-i18n-en_GB/messages/tdebase/kcmkonq.po
+++ b/tde-i18n-en_GB/messages/tdebase/kcmkonq.po
@@ -7,7 +7,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: 2005-12-28 23:53+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -233,15 +233,15 @@ msgstr "Mouse wheel over desktop background switches desktop"
 msgid "Desktop %1"
 msgstr "Desktop %1"
 
-#: desktopbehavior_impl.cpp:76
+#: desktopbehavior_impl.cpp:77
 msgid "Sound Files"
 msgstr "Sound Files"
 
-#: desktopbehavior_impl.cpp:137
+#: desktopbehavior_impl.cpp:141
 msgid "&Left button:"
 msgstr "&Left button:"
 
-#: 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:"
@@ -249,11 +249,11 @@ msgstr ""
 "You can choose what happens when you click the left button of your pointing "
 "device on the desktop:"
 
-#: desktopbehavior_impl.cpp:141
+#: desktopbehavior_impl.cpp:145
 msgid "Right b&utton:"
 msgstr "Right b&utton:"
 
-#: 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:"
@@ -261,7 +261,7 @@ msgstr ""
 "You can choose what happens when you click the right button of your pointing "
 "device on the desktop:"
 
-#: desktopbehavior_impl.cpp:158 desktopbehavior_impl.cpp:204
+#: desktopbehavior_impl.cpp:162 desktopbehavior_impl.cpp:208
 #, fuzzy
 msgid ""
 " <ul><li><em>No action:</em> as you might guess, nothing happens!</li> "
@@ -290,7 +290,7 @@ msgstr ""
 "you like to keep the panel (also known as \"Kicker\") hidden from view.</"
 "li></ul>"
 
-#: desktopbehavior_impl.cpp:179
+#: desktopbehavior_impl.cpp:183
 #, fuzzy
 msgid ""
 "You can choose what happens when you click the middle button of your "
@@ -321,35 +321,35 @@ msgstr ""
 "for quickly accessing applications if you like to keep the panel (also known "
 "as \"Kicker\") hidden from view.</li></ul>"
 
-#: desktopbehavior_impl.cpp:290
+#: desktopbehavior_impl.cpp:299
 msgid "No Action"
 msgstr "No Action"
 
-#: desktopbehavior_impl.cpp:291
+#: desktopbehavior_impl.cpp:300
 msgid "Window List Menu"
 msgstr "Window List Menu"
 
-#: desktopbehavior_impl.cpp:292
+#: desktopbehavior_impl.cpp:301
 msgid "Desktop Menu"
 msgstr "Desktop Menu"
 
-#: desktopbehavior_impl.cpp:293
+#: desktopbehavior_impl.cpp:302
 msgid "Application Menu"
 msgstr "Application Menu"
 
-#: desktopbehavior_impl.cpp:294
+#: desktopbehavior_impl.cpp:303
 msgid "Bookmarks Menu"
 msgstr "Bookmarks Menu"
 
-#: desktopbehavior_impl.cpp:295
+#: desktopbehavior_impl.cpp:304
 msgid "Custom Menu 1"
 msgstr "Custom Menu 1"
 
-#: desktopbehavior_impl.cpp:296
+#: desktopbehavior_impl.cpp:305
 msgid "Custom Menu 2"
 msgstr "Custom Menu 2"
 
-#: desktopbehavior_impl.cpp:480
+#: desktopbehavior_impl.cpp:520
 msgid ""
 "<h1>Behavior</h1>\n"
 "This module allows you to choose various options\n"
@@ -697,12 +697,17 @@ msgstr "Confirmation Required"
 msgid "General"
 msgstr "General"
 
-#: desktopbehavior.ui:53
+#: desktopbehavior.ui:45
+#, fuzzy, no-c-format
+msgid "Desktop Icons"
+msgstr "Desktop Menu"
+
+#: desktopbehavior.ui:61
 #, no-c-format
 msgid "&Show icons on desktop"
 msgstr "&Show icons on desktop"
 
-#: 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 "
@@ -713,12 +718,12 @@ msgstr ""
 "icons the desktop will be somewhat faster but you will no longer be able to "
 "drag files to the desktop."
 
-#: desktopbehavior.ui:92
+#: desktopbehavior.ui:100
 #, no-c-format
 msgid "Allow pro&grams in desktop window"
 msgstr "Allow pro&grams in desktop window"
 
-#: 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 "
@@ -731,34 +736,92 @@ msgstr ""
 "like netscape that check the root window for running instances, disable this "
 "option."
 
-#: desktopbehavior.ui:105
+#: desktopbehavior.ui:113
 #, no-c-format
 msgid "Show &tooltips"
 msgstr "Show &tooltips"
 
-#: desktopbehavior.ui:113
+#: desktopbehavior.ui:139
+#, no-c-format
+msgid "Lock in Place"
+msgstr ""
+
+#: desktopbehavior.ui:142
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to prevent your icons from being dragged "
+"around."
+msgstr ""
+"Tick this option if you want to see your icons automatically aligned to the "
+"grid when you move them."
+
+#: 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 ""
+"Tick this option if you want to see your icons automatically aligned to the "
+"grid when you move them."
+
+#: 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
+#, fuzzy, no-c-format
+msgid " px"
+msgstr " pixels"
+
+#: 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 "Menu Bar at Top of Screen"
 
-#: desktopbehavior.ui:124
+#: desktopbehavior.ui:288
 #, no-c-format
 msgid "&None"
 msgstr "&None"
 
-#: 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 ""
 "If this option is selected, there is no menu bar at the top of the screen."
 
-#: desktopbehavior.ui:135
+#: desktopbehavior.ui:299
 #, no-c-format
 msgid "&Desktop menu bar"
 msgstr "&Desktop menu bar"
 
-#: 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 "
@@ -767,12 +830,12 @@ msgstr ""
 "If this option is selected, there is one menu bar at the top of the screen "
 "which shows the desktop menus."
 
-#: desktopbehavior.ui:146
+#: desktopbehavior.ui:310
 #, no-c-format
 msgid "&Current application's menu bar (Mac OS-style)"
 msgstr "&Current application's menu bar (Mac OS-style)"
 
-#: desktopbehavior.ui:149
+#: desktopbehavior.ui:313
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar "
@@ -785,56 +848,42 @@ msgstr ""
 "top of the screen which shows the menus of the currently active application. "
 "You might recognise this behaviour from Mac OS."
 
-#: desktopbehavior.ui:159
+#: desktopbehavior.ui:323
 #, no-c-format
 msgid "Mouse Button Actions"
 msgstr "Mouse Button Actions"
 
-#: desktopbehavior.ui:170
+#: desktopbehavior.ui:334
 #, no-c-format
 msgid "Middle button:"
 msgstr "Middle button:"
 
-#: desktopbehavior.ui:178
+#: desktopbehavior.ui:342
 #, no-c-format
 msgid "Left button:"
 msgstr "Left button:"
 
-#: desktopbehavior.ui:186
+#: desktopbehavior.ui:350
 #, no-c-format
 msgid "Right button:"
 msgstr "Right button:"
 
-#: desktopbehavior.ui:223 desktopbehavior.ui:247 desktopbehavior.ui:258
+#: desktopbehavior.ui:387 desktopbehavior.ui:411 desktopbehavior.ui:422
 #, no-c-format
 msgid "Edit..."
 msgstr "Edit..."
 
-#: desktopbehavior.ui:304
+#: desktopbehavior.ui:468
 #, no-c-format
 msgid "File Icons"
 msgstr "File Icons"
 
-#: desktopbehavior.ui:315
-#, no-c-format
-msgid "Automatically &line up icons"
-msgstr "Automatically &line up icons"
-
-#: 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 ""
-"Tick this option if you want to see your icons automatically aligned to the "
-"grid when you move them."
-
-#: desktopbehavior.ui:326
+#: desktopbehavior.ui:479
 #, no-c-format
 msgid "Show &hidden files"
 msgstr "Show &hidden files"
 
-#: desktopbehavior.ui:329
+#: desktopbehavior.ui:482
 #, no-c-format
 msgid ""
 "<p>If you check this option, any files in your desktop directory that begin "
@@ -855,41 +904,44 @@ msgstr ""
 "should not change or delete these files unless you know what you are doing.</"
 "p>"
 
-#: desktopbehavior.ui:336
+#: desktopbehavior.ui:489
 #, no-c-format
 msgid "Show Icon Previews For"
 msgstr "Show Icon Previews For"
 
-#: desktopbehavior.ui:352
+#: desktopbehavior.ui:505
 #, no-c-format
 msgid "Select for which types of files you want to enable preview images."
 msgstr "Select for which types of files you want to enable preview images."
 
-#: desktopbehavior.ui:362
+#: desktopbehavior.ui:515
 #, no-c-format
 msgid "Device Icons"
 msgstr "Device Icons"
 
-#: desktopbehavior.ui:373
+#: desktopbehavior.ui:526
 #, fuzzy, no-c-format
 msgid "&Show device icons"
 msgstr "&Show device icons:"
 
-#: desktopbehavior.ui:381
+#: desktopbehavior.ui:534
 #, fuzzy, no-c-format
 msgid "&Show free space overlay on device icons"
 msgstr "&Show device icons:"
 
-#: desktopbehavior.ui:387
+#: desktopbehavior.ui:540
 #, no-c-format
 msgid "Device Types to Display"
 msgstr "Device Types to Display"
 
-#: 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 "Deselect the device types which you do not want to see on the desktop."
 
+#~ msgid "Automatically &line up icons"
+#~ msgstr "Automatically &line up icons"
+
 #~ msgid " lines"
 #~ msgstr " lines"
 
diff --git a/tde-i18n-en_GB/messages/tdebase/kdesktop.po b/tde-i18n-en_GB/messages/tdebase/kdesktop.po
index d3f4952f30c..c37ef2cf6e0 100644
--- a/tde-i18n-en_GB/messages/tdebase/kdesktop.po
+++ b/tde-i18n-en_GB/messages/tdebase/kdesktop.po
@@ -7,7 +7,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: 2005-12-26 02:03+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -140,35 +140,35 @@ msgstr "Halt without Confirmation"
 msgid "Reboot without Confirmation"
 msgstr "Reboot without Confirmation"
 
-#: kdiconview.cpp:444
+#: kdiconview.cpp:443
 msgid "&Rename"
 msgstr "&Rename"
 
-#: kdiconview.cpp:445
+#: kdiconview.cpp:444
 msgid "&Properties"
 msgstr "&Properties"
 
-#: kdiconview.cpp:446
+#: kdiconview.cpp:445
 msgid "&Move to Trash"
 msgstr "&Move to Wastebin"
 
-#: 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 ""
 
@@ -232,7 +232,7 @@ msgstr "Line Up Vertically"
 msgid "Align to Grid"
 msgstr "Align to Grid"
 
-#: kdesktop.kcfg:185 krootwm.cpp:182
+#: kdesktop.kcfg:195 krootwm.cpp:182
 #, no-c-format
 msgid "Lock in Place"
 msgstr "Lock in Place"
@@ -281,7 +281,7 @@ msgstr "Sessions"
 msgid "New"
 msgstr "New"
 
-#: 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 "
@@ -297,11 +297,11 @@ msgstr ""
 "Ctrl, Alt and the appropriate F-key at the same time. Additionally, the TDE "
 "Panel and Desktop menus have actions for switching between sessions.</p>"
 
-#: krootwm.cpp:902
+#: krootwm.cpp:914
 msgid "Warning - New Session"
 msgstr "Warning - New Session"
 
-#: krootwm.cpp:903 lock/lockdlg.cpp:702
+#: krootwm.cpp:915 lock/lockdlg.cpp:702
 msgid "&Start New Session"
 msgstr "&Start New Session"
 
@@ -768,7 +768,7 @@ msgstr ""
 "Tick this option if you want to see your icons automatically aligned to the "
 "grid when you move them."
 
-#: kdesktop.kcfg:65 kdesktop.kcfg:180
+#: kdesktop.kcfg:65 kdesktop.kcfg:190
 #, no-c-format
 msgid "Sort directories first"
 msgstr "Sort directories first"
@@ -918,20 +918,44 @@ msgstr ""
 
 #: kdesktop.kcfg:160
 #, no-c-format
+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 "Show Icon Previews For"
 
-#: kdesktop.kcfg:161
+#: kdesktop.kcfg:171
 #, no-c-format
 msgid "Select for which types of files you want to enable preview images."
 msgstr "Select for which types of files you want to enable preview images."
 
-#: kdesktop.kcfg:175
+#: kdesktop.kcfg:185
 #, no-c-format
 msgid "Sort criterion"
 msgstr "Sort criterion"
 
-#: kdesktop.kcfg:176
+#: kdesktop.kcfg:186
 #, no-c-format
 msgid ""
 "Sets the sort criterion. Possible choices are NameCaseSensitive = 0, "
@@ -940,7 +964,7 @@ msgstr ""
 "Sets the sort criterion. Possible choices are NameCaseSensitive = 0, "
 "NameCaseInsensitive = 1, Size = 2, Type = 3 Date = 4."
 
-#: kdesktop.kcfg:181
+#: kdesktop.kcfg:191
 #, no-c-format
 msgid ""
 "Enable this to place directories in front of the sorted list, otherwise they "
@@ -949,27 +973,27 @@ msgstr ""
 "Enable this to place directories in front of the sorted list, otherwise they "
 "are amongst the files."
 
-#: kdesktop.kcfg:186
+#: kdesktop.kcfg:196
 #, no-c-format
 msgid "Check this option if you want to keep your icons from moving."
 msgstr "Tick this option if you want to keep your icons from moving."
 
-#: kdesktop.kcfg:207
+#: kdesktop.kcfg:217
 #, no-c-format
 msgid "Device Types to exclude"
 msgstr "Device Types to exclude"
 
-#: kdesktop.kcfg:208
+#: kdesktop.kcfg:218
 #, no-c-format
 msgid "The device types which you do not want to see on the desktop."
 msgstr "The device types which you do not want to see on the desktop."
 
-#: kdesktop.kcfg:221
+#: kdesktop.kcfg:231
 #, no-c-format
 msgid "Current application's menu bar (Mac OS-style)"
 msgstr "Current application's menu bar (Mac OS-style)"
 
-#: kdesktop.kcfg:222
+#: kdesktop.kcfg:232
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar "
@@ -982,12 +1006,12 @@ msgstr ""
 "top of the screen which shows the menus of the currently active application. "
 "You might recognise this behaviour from Mac OS."
 
-#: kdesktop.kcfg:228
+#: kdesktop.kcfg:238
 #, no-c-format
 msgid "Desktop menu bar"
 msgstr "Desktop menu bar"
 
-#: 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 "
@@ -996,32 +1020,32 @@ msgstr ""
 "If this option is selected, there is one menu bar at the top of the screen "
 "which shows the desktop menus."
 
-#: kdesktop.kcfg:235
+#: kdesktop.kcfg:245
 #, no-c-format
 msgid "Enable screen saver"
 msgstr "Enable screen saver"
 
-#: kdesktop.kcfg:236
+#: kdesktop.kcfg:246
 #, no-c-format
 msgid "Enables the screen saver."
 msgstr "Enables the screen saver."
 
-#: kdesktop.kcfg:240
+#: kdesktop.kcfg:250
 #, no-c-format
 msgid "Screen saver timeout"
 msgstr "Screen saver timeout"
 
-#: kdesktop.kcfg:241
+#: kdesktop.kcfg:251
 #, no-c-format
 msgid "Sets the seconds after which the screen saver is started."
 msgstr "Sets the seconds after which the screen saver is started."
 
-#: 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"
@@ -1031,39 +1055,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 "