Merge translation files from master branch.

1 files changed, 61 insertions, 37 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
index 75afdc7ce01..90c3dab1daf 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \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-08-09 13:01+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -137,35 +137,35 @@ msgstr "不需确认就关机"
 msgid "Reboot without Confirmation"
 msgstr "不需确认就重新启动"
 
-#: kdiconview.cpp:444
+#: kdiconview.cpp:443
 msgid "&Rename"
 msgstr "重命名(&R)"
 
-#: kdiconview.cpp:445
+#: kdiconview.cpp:444
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: kdiconview.cpp:446
+#: kdiconview.cpp:445
 msgid "&Move to Trash"
 msgstr "移至回收站(&M)"
 
-#: 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 ""
 
@@ -229,7 +229,7 @@ msgstr "垂直排列图标"
 msgid "Align to Grid"
 msgstr "对齐到网格"
 
-#: kdesktop.kcfg:185 krootwm.cpp:182
+#: kdesktop.kcfg:195 krootwm.cpp:182
 #, no-c-format
 msgid "Lock in Place"
 msgstr "就地锁定"
@@ -278,7 +278,7 @@ msgstr "会话"
 msgid "New"
 msgstr "新建"
 
-#: 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 "
@@ -292,11 +292,11 @@ msgstr ""
 "定为第二个会话，依次类推。您可以同时按下 Ctrl、Alt 和对应的 Fn 功能键在不同的"
 "会话之间切换。此外，TDE 面板和桌面菜单也可用于切换会话。</p>"
 
-#: krootwm.cpp:902
+#: krootwm.cpp:914
 msgid "Warning - New Session"
 msgstr "警告 - 新会话"
 
-#: krootwm.cpp:903 lock/lockdlg.cpp:702
+#: krootwm.cpp:915 lock/lockdlg.cpp:702
 msgid "&Start New Session"
 msgstr "开始新会话(&S)"
 
@@ -742,7 +742,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 "目录在前"
@@ -880,20 +880,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 "显示预览的文件类型"
 
-#: kdesktop.kcfg:161
+#: 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, "
@@ -902,34 +926,34 @@ msgstr ""
 "选择排序依据。可供选择的选项有：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 "
 "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 "当前应用程序的菜单栏(Mac OS 样式)"
 
-#: kdesktop.kcfg:222
+#: kdesktop.kcfg:232
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar "
@@ -940,44 +964,44 @@ msgstr ""
 "如果选中了此选项，应用程序的菜单栏将不会显示在其自己的窗口中。而屏幕上方会出"
 "现一个显示目前激活的应用程序的菜单。您可能会在 Mac OS 中看到过此特性。"
 
-#: kdesktop.kcfg:228
+#: kdesktop.kcfg:238
 #, no-c-format
 msgid "Desktop menu bar"
 msgstr "桌面菜单栏"
 
-#: 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 "启用屏幕保护程序"
 
-#: 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 "屏幕保护程序超时"
 
-#: 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"
@@ -987,39 +1011,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 "