Merge translation files from master branch.

2 files changed, 150 insertions, 2 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
index fb46e91ec2e..8769817c704 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtaskbar\n"
-"POT-Creation-Date: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2021-07-07 22:18+0000\n"
 "PO-Revision-Date: 2005-01-20 01:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -404,6 +404,128 @@ msgstr "中键(&M)："
 msgid "Right b&utton:"
 msgstr "右键(&U)："
 
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "&Tasks"
+#~ msgstr "任务栏"
+
+#, fuzzy
+#~| msgid ""
+#~| "Turning this option off will cause the taskbar to display <b>only</b> "
+#~| "the windows on the current desktop. \n"
+#~| "\n"
+#~| "By default, this option is selected and all windows are shown."
+#~ msgid ""
+#~ "Turning this option off will cause the taskbar to display <b>only</b> the "
+#~ "windows on the current desktop. By default, this option is selected and "
+#~ "all windows are shown."
+#~ msgstr ""
+#~ "关闭此选项将使得任务上<b>只</b>显示当前桌面中的窗口。\n"
+#~ "\n"
+#~ "默认情况下，此选项为选中状态，即会显示全部窗口。"
+
+#, fuzzy
+#~| msgid ""
+#~| "Selecting this option causes the taskbar to show windows in order of the "
+#~| "desktop they appear on.\n"
+#~| "\n"
+#~| "By default this option is selected."
+#~ msgid ""
+#~ "Selecting this option causes the taskbar to show windows in order of the "
+#~ "desktop they appear on. By default this option is selected."
+#~ msgstr ""
+#~ "选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\n"
+#~ "\n"
+#~ "默认情况下，此选项是选中的。"
+
+#, fuzzy
+#~| msgid ""
+#~| "Turning this option off will cause the taskbar to display <b>only</b> "
+#~| "windows which are on the same Xinerama screen as the taskbar.\n"
+#~| "\n"
+#~| "By default, this option is selected and all windows are shown."
+#~ msgid ""
+#~ "Turning this option off will cause the taskbar to display <b>only</b> "
+#~ "windows which are on the same Xinerama screen as the taskbar. By default, "
+#~ "this option is selected and all windows are shown."
+#~ msgstr ""
+#~ "关闭此选项将使得任务上<b>只</b>显示与任务栏在同一 Xinerama 屏幕中的窗"
+#~ "口。\n"
+#~ "\n"
+#~ "默认情况下，此选项为选中状态，即会显示全部窗口。"
+
+#, fuzzy
+#~| msgid ""
+#~| "Select this option if you want the taskbar to display <b>only</b> "
+#~| "minimized windows. \n"
+#~| "\n"
+#~| "By default, this option is not selected and the taskbar will show all "
+#~| "windows."
+#~ msgid ""
+#~ "Select this option if you want the taskbar to display <b>only</b> "
+#~ "minimized windows. By default, this option is not selected and the "
+#~ "taskbar will show all windows."
+#~ msgstr ""
+#~ "如果您想要在任务栏上<b>只</b>显示最小化了的窗口，则应选中此选项。\n"
+#~ "\n"
+#~ "默认情况下，此选项未选中，任务栏将显示全部窗口。"
+
+#, fuzzy
+#~| msgid ""
+#~| "The taskbar can group similar windows into single buttons. When one of "
+#~| "these window group buttons are clicked on a menu appears showing all the "
+#~| "windows in that group. This can be especially useful with the <em>Show "
+#~| "all windows</em> option.\n"
+#~| "\n"
+#~| "You can set the taskbar to <strong>Never</strong> group windows, to "
+#~| "<strong>Always</strong> group windows or to group windows only "
+#~| "<strong>When the Taskbar is Full</strong>.\n"
+#~| "\n"
+#~| "By default the taskbar groups windows when it is full."
+#~ msgid ""
+#~ "The taskbar can group similar windows into single buttons. When one of "
+#~ "these window group buttons are clicked on a menu appears showing all the "
+#~ "windows in that group. This can be especially useful with the <em>Show "
+#~ "all windows</em> option. You can set the taskbar to <strong>Never</"
+#~ "strong> group windows, to <strong>Always</strong> group windows or to "
+#~ "group windows only <strong>When the Taskbar is Full</strong>. By default "
+#~ "the taskbar groups windows when it is full."
+#~ msgstr ""
+#~ "任务栏可以将类似窗口分组为一个按钮。单击这样的按钮后，会出现一个菜单，其中"
+#~ "显示了改组中的全部窗口。<em>显示全部窗口</em>选项可能会非常有用。\n"
+#~ "\n"
+#~ "您可以将任务栏设置为<strong>从不</strong>分组窗口，<strong>总是</strong>分"
+#~ "组窗口，或者是仅当<strong>任务栏满时</strong>。\n"
+#~ "\n"
+#~ "默认情况下，系统会在任务栏满时对窗口进行分组。"
+
+#, fuzzy
+#~| msgid "A&ppearance:"
+#~ msgid "&Appearance"
+#~ msgstr "外观(&P)："
+
+#, fuzzy
+#~ msgid "Selecting this option makes the taskbar use small icons."
+#~ msgstr ""
+#~ "选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\n"
+#~ "\n"
+#~ "默认情况下，此选项是选中的。"
+
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "Taskbar style:"
+#~ msgstr "任务栏"
+
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "A&ctions"
+#~ msgstr "动作"
+
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "Mouse Actions"
+#~ msgstr "动作"
+
 #~ msgid "Sho&w application icons"
 #~ msgstr "显示程序图标(&W)"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po b/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
index 2fda31f00cb..fbe90d0774b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtaskbar\n"
-"POT-Creation-Date: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2021-07-07 22:18+0000\n"
 "PO-Revision-Date: 2005-10-15 20:57+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -449,6 +449,32 @@ msgstr "任务栏按钮背景所使用的颜色"
 msgid "This color is used for displaying background of taskbar buttons."
 msgstr "此颜色将用于显示任务栏按钮背景。"
 
+#, fuzzy
+#~ msgid ""
+#~ "Turning this option on will cause the taskbar to draw a visible button "
+#~ "frame around the item currently under the mouse. By default, this option "
+#~ "is on."
+#~ msgstr ""
+#~ "开启此选项将是的任务栏中的每一项周围绘制可见边框。\\n\\n默认情况下，此选项"
+#~ "是关闭的。"
+
+#, fuzzy
+#~| msgid ""
+#~| "Enabling this option will draw a thumbnail of the window in its mouse-"
+#~| "over effect.<p>If a window is minimized or resides on a different "
+#~| "desktop while the taskbar is starting, an icon is shown until the window "
+#~| "is restored or the appropriate desktop is activated, respectively.</p>"
+#~ msgid ""
+#~ "Enabling this option will draw a thumbnail of the window in its mouse-"
+#~ "over effect.<p>If a window is minimized or resides on a different desktop "
+#~ "while the taskbar is starting, an icon is shown until the window is "
+#~ "restored or the appropriate desktop is activated, respectively. This "
+#~ "options needs a TWin compositor in order to work.</p>"
+#~ msgstr ""
+#~ "启用此选项将在鼠标指针指向任务时绘制窗口缩略图。<p>如果窗口已经最小化，或"
+#~ "者位于不同的桌面上，则会显示图标，除非该窗口被恢复，或者激活了相应的桌面。"
+#~ "</p>"
+
 #~ msgid "Show application icons"
 #~ msgstr "显示应用程序图标"