Merge translation files from master branch.

1 files changed, 0 insertions, 37 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
index 798ea915a14..65718dace96 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
@@ -200,7 +200,6 @@ msgstr ""
 
 #: kcmtaskbarui.ui:117
 #, fuzzy, no-c-format
-#| msgid "Taskbar"
 msgid "&Tasks"
 msgstr "任务栏"
 
@@ -216,11 +215,6 @@ msgstr "显示全部桌面中的窗口(&S)"
 
 #: kcmtaskbarui.ui:153
 #, fuzzy, no-c-format
-#| 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 "
@@ -237,11 +231,6 @@ msgstr "按桌面排序窗口(&T)"
 
 #: kcmtaskbarui.ui:184
 #, fuzzy, no-c-format
-#| 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."
@@ -257,11 +246,6 @@ msgstr "显示全部屏幕中的窗口(&R)"
 
 #: kcmtaskbarui.ui:198
 #, fuzzy, no-c-format
-#| 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, "
@@ -278,12 +262,6 @@ msgstr "只显示最小化的窗口(&N)"
 
 #: kcmtaskbarui.ui:209
 #, fuzzy, no-c-format
-#| 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 "
@@ -334,17 +312,6 @@ msgstr "相似任务分组(&G)："
 
 #: kcmtaskbarui.ui:377
 #, fuzzy, no-c-format
-#| 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 "
@@ -364,7 +331,6 @@ msgstr ""
 
 #: kcmtaskbarui.ui:423
 #, fuzzy, no-c-format
-#| msgid "A&ppearance:"
 msgid "&Appearance"
 msgstr "外观(&P)："
 
@@ -469,7 +435,6 @@ msgstr ""
 
 #: kcmtaskbarui.ui:829
 #, fuzzy, no-c-format
-#| msgid "Taskbar"
 msgid "Taskbar style:"
 msgstr "任务栏"
 
@@ -490,13 +455,11 @@ msgstr ""
 
 #: kcmtaskbarui.ui:943
 #, fuzzy, no-c-format
-#| msgid "Actions"
 msgid "A&ctions"
 msgstr "动作"
 
 #: kcmtaskbarui.ui:962
 #, fuzzy, no-c-format
-#| msgid "Actions"
 msgid "Mouse Actions"
 msgstr "动作"