Merge translation files from master branch.

2 files changed, 166 insertions, 92 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po b/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
index 36264b9256d..012082c671d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-09-27 19:35+0200\n"
+"POT-Creation-Date: 2021-03-30 20:18+0000\n"
 "PO-Revision-Date: 2004-05-06 17:41+0800\n"
 "Last-Translator: Funda Wang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -220,31 +220,31 @@ msgstr "在桌面背景上使用鼠标滚轮切换桌面"
 msgid "Desktop %1"
 msgstr "桌面 %1"
 
-#: desktopbehavior_impl.cpp:76
+#: desktopbehavior_impl.cpp:77
 msgid "Sound Files"
 msgstr "声音文件"
 
-#: desktopbehavior_impl.cpp:137
+#: desktopbehavior_impl.cpp:141
 msgid "&Left button:"
 msgstr "左键(&L)："
 
-#: 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 "右键(&U)："
 
-#: 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
 #, fuzzy
 msgid ""
 " <ul><li><em>No action:</em> as you might guess, nothing happens!</li> "
@@ -266,7 +266,7 @@ msgstr ""
 "上下文菜单。该菜单包括了屏幕显示、屏幕锁定、退出TDE的选项。</li><li><em>应用"
 "程序菜单：</em>“Kicker”菜单。快速访问应用程序。</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 "
@@ -290,35 +290,35 @@ msgstr ""
 "屏幕显示、屏幕锁定、退出TDE的选项。</li><li><em>应用程序菜单：</em>“Kicker”菜"
 "单。快速访问应用程序。</li></ul>"
 
-#: desktopbehavior_impl.cpp:290
+#: desktopbehavior_impl.cpp:299
 msgid "No Action"
 msgstr "无动作"
 
-#: desktopbehavior_impl.cpp:291
+#: desktopbehavior_impl.cpp:300
 msgid "Window List Menu"
 msgstr "窗口列表菜单"
 
-#: desktopbehavior_impl.cpp:292
+#: desktopbehavior_impl.cpp:301
 msgid "Desktop Menu"
 msgstr "桌面菜单"
 
-#: desktopbehavior_impl.cpp:293
+#: desktopbehavior_impl.cpp:302
 msgid "Application Menu"
 msgstr "应用程序菜单"
 
-#: desktopbehavior_impl.cpp:294
+#: desktopbehavior_impl.cpp:303
 msgid "Bookmarks Menu"
 msgstr "书签菜单"
 
-#: desktopbehavior_impl.cpp:295
+#: desktopbehavior_impl.cpp:304
 msgid "Custom Menu 1"
 msgstr "自定义菜单 1"
 
-#: desktopbehavior_impl.cpp:296
+#: desktopbehavior_impl.cpp:305
 msgid "Custom Menu 2"
 msgstr "自定义菜单 2"
 
-#: desktopbehavior_impl.cpp:480
+#: desktopbehavior_impl.cpp:520
 msgid ""
 "<h1>Behavior</h1>\n"
 "This module allows you to choose various options\n"
@@ -637,12 +637,17 @@ msgstr "请求确认"
 msgid "General"
 msgstr "常规"
 
-#: desktopbehavior.ui:53
+#: desktopbehavior.ui:45
+#, fuzzy, no-c-format
+msgid "Desktop Icons"
+msgstr "桌面菜单"
+
+#: desktopbehavior.ui:61
 #, no-c-format
 msgid "&Show icons on desktop"
 msgstr "在桌面上显示图标(&S)"
 
-#: 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 "
@@ -652,12 +657,12 @@ msgstr ""
 "假如您不想要桌面上的图标，不要选取此项。没有图标的桌面会快一些，但是您不能再"
 "拖放文件到桌面上了。"
 
-#: desktopbehavior.ui:92
+#: desktopbehavior.ui:100
 #, no-c-format
 msgid "Allow pro&grams in desktop window"
 msgstr "允许桌面窗口中的程序(&G)"
 
-#: 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 "
@@ -669,45 +674,99 @@ msgstr ""
 "果您运行像 netscape 这样会检查根窗口中的运行实例的应用程序遇到问题，请禁止该"
 "选项。"
 
-#: desktopbehavior.ui:105
+#: desktopbehavior.ui:113
 #, no-c-format
 msgid "Show &tooltips"
 msgstr "显示工具提示(&T)"
 
-#: 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 "如果您想要在移动图标时自动对齐网格，请选中此选项。"
+
+#: 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 "屏幕顶部的菜单栏"
 
-#: desktopbehavior.ui:124
+#: desktopbehavior.ui:288
 #, no-c-format
 msgid "&None"
 msgstr "无(&N)"
 
-#: 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 "桌面菜单栏(&D)"
 
-#: 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 "当前应用程序的菜单栏(Mac OS 风格)(&C)"
 
-#: desktopbehavior.ui:149
+#: desktopbehavior.ui:313
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar "
@@ -718,54 +777,42 @@ msgstr ""
 "如果选中了此选项，应用程序将不再拥有它们自己窗口所属的菜单栏。而屏幕顶部的菜"
 "单栏将会显示当前应用程序的菜单。您可能在 MacOS 中看到过这一行为。"
 
-#: desktopbehavior.ui:159
+#: desktopbehavior.ui:323
 #, no-c-format
 msgid "Mouse Button Actions"
 msgstr "鼠标按钮操作"
 
-#: desktopbehavior.ui:170
+#: desktopbehavior.ui:334
 #, no-c-format
 msgid "Middle button:"
 msgstr "中键："
 
-#: desktopbehavior.ui:178
+#: desktopbehavior.ui:342
 #, no-c-format
 msgid "Left button:"
 msgstr "左键："
 
-#: desktopbehavior.ui:186
+#: desktopbehavior.ui:350
 #, no-c-format
 msgid "Right button:"
 msgstr "右键："
 
-#: desktopbehavior.ui:223 desktopbehavior.ui:247 desktopbehavior.ui:258
+#: desktopbehavior.ui:387 desktopbehavior.ui:411 desktopbehavior.ui:422
 #, no-c-format
 msgid "Edit..."
 msgstr "编辑..."
 
-#: desktopbehavior.ui:304
+#: desktopbehavior.ui:468
 #, no-c-format
 msgid "File Icons"
 msgstr "文件图标"
 
-#: desktopbehavior.ui:315
-#, no-c-format
-msgid "Automatically &line up icons"
-msgstr "自动对齐图标(&L)"
-
-#: 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 "显示隐藏文件(&H)"
 
-#: desktopbehavior.ui:329
+#: desktopbehavior.ui:482
 #, no-c-format
 msgid ""
 "<p>If you check this option, any files in your desktop directory that begin "
@@ -782,37 +829,40 @@ msgstr ""
 "<p>例如，“.directory”文件包含了 Konqueror 信息，这些信息包括目录中应显示的图"
 "标，文件的排序规则等。在不清楚的情况下，不要删除这些文件。</p>"
 
-#: 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 "设备图标"
 
-#: desktopbehavior.ui:373
+#: desktopbehavior.ui:526
 #, fuzzy, no-c-format
 msgid "&Show device icons"
 msgstr "显示设备图标(&S)："
 
-#: desktopbehavior.ui:381
+#: desktopbehavior.ui:534
 #, fuzzy, no-c-format
 msgid "&Show free space overlay on device icons"
 msgstr "显示设备图标(&S)："
 
-#: desktopbehavior.ui:387
+#: desktopbehavior.ui:540
 #, no-c-format
 msgid "Device Types to Display"
 msgstr "要显示的设备类型"
 
-#: 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 "自动对齐图标(&L)"
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 <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\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 "