diff --git a/po/ChangeLog b/po/ChangeLog
index ed37af522e54dc918e626e54a0c80641879dc338..749bb1ffb1ca4f70f9fed9f24ce1a99f8eef3149 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,6 +1,11 @@
+2006-05-23  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
+
+	* zh_TW.po: Correct the strings containing Button Label in
+	  traditional Chinese translations.
+
 2006-05-23 Piarres Beobide <pi@beobide.net>
 
-        * eu.po: Basque translation update.
+	* eu.po: Basque translation update.
 
 2006-05-21  Stavros Giannouris <stavrosg2002@freemail.gr>
 
@@ -21,6 +26,7 @@
 	* xfwm4.pot, *.po: Put back configurable shortcut for window
 	  cycling.
 
+>>>>>>> .r21800
 2006-05-18  Daichi Kawahata <daichi@xfce.org>
 
 	* ja.po: Updated Japanese translations.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 63824def53a96576a718f2ebda06ff78c6172347..52ace620dd9be4daa247dfd20f5e2d6287cdb9a1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: xfwm4 4.3.90.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-20 15:20+0200\n"
-"PO-Revision-Date: 2006-05-13 12:43+0800\n"
+"PO-Revision-Date: 2006-05-24 01:12+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr "底部："
 #. the button label in the xfce-mcs-manager dialog
 #: ../mcs-plugin/workspaces_plugin.c:110
 msgid "Button Label|Workspaces and Margins"
-msgstr "按鈕標籤|工作區和邊緣"
+msgstr "工作區和邊緣"
 
 #: ../mcs-plugin/workspaces_plugin.c:144
 msgid "Workspaces and Margins"
@@ -194,7 +194,7 @@ msgstr "設定快速鍵"
 #. the button label in the xfce-mcs-manager dialog
 #: ../mcs-plugin/wmtweaks_plugin.c:610
 msgid "Button Label|Window Manager Tweaks"
-msgstr "按鈕標籤|視窗管理程式調校"
+msgstr "視窗管理程式調校"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:725 ../mcs-plugin/xfwm4_plugin.c:2356
 #, c-format
@@ -469,7 +469,7 @@ msgstr "進階"
 #. the button label in the xfce-mcs-manager dialog
 #: ../mcs-plugin/xfwm4_plugin.c:1988
 msgid "Button Label|Window Manager"
-msgstr "按鈕|視窗管理程式"
+msgstr "視窗管理程式"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:53
 msgid "Do you really want to remove this keybinding theme ?"