Merge translation files from master branch.

2 files changed, 166 insertions, 92 deletions

diff --git a/tde-i18n-zh_TW/messages/tdebase/kcmkonq.po b/tde-i18n-zh_TW/messages/tdebase/kcmkonq.po
index 955a1d1319a..bd49940bb3e 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kcmkonq.po
+++ b/tde-i18n-zh_TW/messages/tdebase/kcmkonq.po
@@ -9,7 +9,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-09-04 09:09+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -225,31 +225,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> "
@@ -273,7 +273,7 @@ msgstr ""
 "項。</li> <li><em>應用程式選單：</em>會彈出「K」選單。如果您喜歡隱藏面板（也"
 "稱為「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 "
@@ -299,35 +299,35 @@ msgstr ""
 "程式選單：</em>會彈出「K」選單。如果您喜歡隱藏面板（也稱為「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"
@@ -651,12 +651,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 "
@@ -666,12 +671,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 "
@@ -682,45 +687,99 @@ msgstr ""
 "若您想執行能在桌面上畫圖的 X11 程式，諸如 xsnow、xpenguin 或是 xmountain 請點"
 "選該選項。若對應用程式有任何問題，如 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 "
@@ -731,54 +790,42 @@ msgstr ""
 "如果選取這個選項，程式的選單不會在自己的視窗上，而是在螢幕最上方的選單列上顯"
 "示目前作用的應用程式選單。 您可能了解這個行為就像是 Mac OS 的視窗一樣。"
 
-#: 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 "
@@ -796,37 +843,40 @@ msgstr ""
 "示目錄的圖示、檔案的排列順序等。您不應該改變或刪除這些檔案，除非您知道您在做"
 "什麼。</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_TW/messages/tdebase/kdesktop.po b/tde-i18n-zh_TW/messages/tdebase/kdesktop.po
index 82d893dfc67..c3961fa60ae 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_TW/messages/tdebase/kdesktop.po
@@ -12,7 +12,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: 2007-11-09 14:32+0800\n"
 "Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
 "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
@@ -144,35 +144,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 ""
 
@@ -236,7 +236,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 "立刻鎖定"
@@ -285,7 +285,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 "
@@ -299,11 +299,11 @@ msgstr ""
 "個...如此類推。您還可以按下 Ctrl+Alt+F-key 在各個階段之間切換。另外，TDE "
 "Panel 和桌面選單會在切換期間作適當的改變。"
 
-#: 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)"
 
@@ -750,7 +750,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 "目錄在前"
@@ -887,20 +887,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, "
@@ -909,34 +933,34 @@ msgstr ""
 "設定排列準則。可用的選項為 區分大小寫 = 0, 不分大小寫 = 1, 大小 = 2, 類型 = "
 "3, 日期 = 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 "
@@ -947,44 +971,44 @@ msgstr ""
 "這個選項開啟後，應用程式的選單列不會再在它們的視窗裏。在螢幕頂端會顯示目前使"
 "用的應用程式的選單列。您可從 Mac OS 中找到這種風格。"
 
-#: kdesktop.kcfg:228
+#: kdesktop.kcfg:238
 #, no-c-format
 msgid "Desktop menu bar"
 msgstr "Desktop 選單列"
 
-#: 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 "當 DPMS 啟動時暫停螢幕保護程式"
 
-#: kdesktop.kcfg:246
+#: kdesktop.kcfg:256
 #, no-c-format
 msgid ""
 "Usually the screen saver is suspended when display power saving kicks in,\n"
@@ -996,39 +1020,39 @@ 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 "