diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index ca46c665e0d6fa6f3bb2fd12330df65bbe71d349..61bd5eba60fbd735d3101c27f5d72e1fb9f2e0c0 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 557e0fbfdc2420adcccbf51bde9172bcd238b182..342ffc5591a6a6afc78dad116df304d482991bb9 100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-21 13:37+0200\n"
 "PO-Revision-Date: 2004-04-20 16:38+0800\n"
-"Last-Translator: umm <umm@pchome.com.tw>\n"
+"Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -83,7 +83,7 @@ msgstr "工作區個數"
 
 #: mcs-plugin/xfwm4_plugin.c:82
 msgid "Menu"
-msgstr "選單："
+msgstr "選單"
 
 #: mcs-plugin/xfwm4_plugin.c:83
 msgid "Stick"
@@ -138,20 +138,22 @@ msgstr "右側"
 
 #: mcs-plugin/xfwm4_plugin.c:570
 msgid "Click and drag buttons to change the layout"
-msgstr ""
+msgstr "要修改按鈕的布局，拖曳下面按鈕即可"
 
+# FIXME 譯文有待改進
 #: mcs-plugin/xfwm4_plugin.c:575
 msgid "Active"
-msgstr ""
+msgstr "現用"
 
 #: mcs-plugin/xfwm4_plugin.c:586
 msgid "Title"
-msgstr "標題："
+msgstr "標題"
 
 #: mcs-plugin/xfwm4_plugin.c:587
 msgid "The window title, it cannot be removed"
-msgstr ""
+msgstr "視窗標題，不可移走"
 
+# FIXME 譯文有待改進
 #: mcs-plugin/xfwm4_plugin.c:595
 msgid "Hidden"
 msgstr "隱藏"
@@ -186,33 +188,28 @@ msgid "Button layout"
 msgstr "按鈕布局"
 
 #: mcs-plugin/xfwm4_plugin.c:1466
-#, fuzzy
 msgid "Style"
-msgstr "標題："
+msgstr "風格"
 
 #: mcs-plugin/xfwm4_plugin.c:1492
-#, fuzzy
 msgid "Windows shortcuts"
-msgstr "新視窗獲取焦點"
+msgstr "有關視窗的快速鍵"
 
 #: mcs-plugin/xfwm4_plugin.c:1513 mcs-plugin/xfwm4_plugin.c:1541
 msgid "Command"
-msgstr ""
+msgstr "指令"
 
 #: mcs-plugin/xfwm4_plugin.c:1518 mcs-plugin/xfwm4_plugin.c:1546
-#, fuzzy
 msgid "Shortcut"
 msgstr "快速鍵"
 
 #: mcs-plugin/xfwm4_plugin.c:1521
-#, fuzzy
 msgid "Command shortcuts"
-msgstr "快速鍵"
+msgstr "執行指令的快速鍵"
 
 #: mcs-plugin/xfwm4_plugin.c:1549
-#, fuzzy
 msgid "Keyboard"
-msgstr "快速鍵"
+msgstr "鍵盤"
 
 #: mcs-plugin/xfwm4_plugin.c:1560
 msgid "Focus model"
@@ -231,22 +228,16 @@ msgid "New window focus"
 msgstr "新視窗獲取焦點"
 
 #: mcs-plugin/xfwm4_plugin.c:1586
-#, fuzzy
 msgid "Automatically give focus to newly created windows"
-msgstr ""
-"自動為新建立\n"
-"視窗獲取焦點"
+msgstr "自動為新建立的視窗獲取焦點"
 
 #: mcs-plugin/xfwm4_plugin.c:1591
 msgid "Raise on focus"
 msgstr "獲取焦點時置頂"
 
 #: mcs-plugin/xfwm4_plugin.c:1599
-#, fuzzy
 msgid "Automatically raise windows when they receive focus"
-msgstr ""
-"當視窗獲取焦點時\n"
-"自動將該視窗置頂"
+msgstr "當視窗獲取焦點時自動將該視窗置頂"
 
 #: mcs-plugin/xfwm4_plugin.c:1609
 msgid "Delay before raising focused window :"
@@ -265,16 +256,12 @@ msgid "Raise on click"
 msgstr "點選置頂"
 
 #: mcs-plugin/xfwm4_plugin.c:1641
-#, fuzzy
 msgid "Raise window when clicking inside application window"
-msgstr ""
-"點選視窗內部時\n"
-"將視窗置頂"
+msgstr "點選視窗內部時將視窗置頂"
 
 #: mcs-plugin/xfwm4_plugin.c:1646
-#, fuzzy
 msgid "Focus"
-msgstr "焦點模式"
+msgstr "焦點"
 
 #: mcs-plugin/xfwm4_plugin.c:1656
 msgid "Windows snapping"
@@ -341,207 +328,175 @@ msgid "Advanced"
 msgstr "進階"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:65 mcs-plugin/xfwm4_shortcuteditor.c:440
-#, fuzzy
 msgid "Close window"
-msgstr "隱藏視窗"
+msgstr "關閉視窗"
 
+# FIXME 譯文有待改進
 #: mcs-plugin/xfwm4_shortcuteditor.c:75 mcs-plugin/xfwm4_shortcuteditor.c:448
-#, fuzzy
 msgid "Maximize window vertically"
-msgstr "最大化視窗"
+msgstr "垂直的最大化視窗"
 
+# FIXME 譯文有待改進
 #: mcs-plugin/xfwm4_shortcuteditor.c:80 mcs-plugin/xfwm4_shortcuteditor.c:452
-#, fuzzy
 msgid "Maximize window horizontally"
-msgstr "最大化視窗"
+msgstr "水平的最大化視窗"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:95 mcs-plugin/xfwm4_shortcuteditor.c:464
-#, fuzzy
 msgid "Stick window"
-msgstr "隱藏視窗"
+msgstr "貼連視窗"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:100 mcs-plugin/xfwm4_shortcuteditor.c:468
-#, fuzzy
 msgid "Cycle windows"
-msgstr "隱藏視窗"
+msgstr "循環視窗"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:105 mcs-plugin/xfwm4_shortcuteditor.c:472
-#, fuzzy
 msgid "Move window up"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗向上移"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:110 mcs-plugin/xfwm4_shortcuteditor.c:476
-#, fuzzy
 msgid "Move window down"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗向下移"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:115 mcs-plugin/xfwm4_shortcuteditor.c:480
-#, fuzzy
 msgid "Move window left"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗向左移"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:120 mcs-plugin/xfwm4_shortcuteditor.c:484
-#, fuzzy
 msgid "Move window right"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗向右移"
 
+# FIXME check
 #: mcs-plugin/xfwm4_shortcuteditor.c:125 mcs-plugin/xfwm4_shortcuteditor.c:488
-#, fuzzy
 msgid "Resize window up"
-msgstr "隱藏視窗"
+msgstr "向上修改視窗大小"
 
+# FIXME check
 #: mcs-plugin/xfwm4_shortcuteditor.c:130 mcs-plugin/xfwm4_shortcuteditor.c:492
-#, fuzzy
 msgid "Resize window down"
-msgstr "隱藏視窗"
+msgstr "向下修改視窗大小"
 
+# FIXME check
 #: mcs-plugin/xfwm4_shortcuteditor.c:135 mcs-plugin/xfwm4_shortcuteditor.c:496
-#, fuzzy
 msgid "Resize window left"
-msgstr "隱藏視窗"
+msgstr "向左修改視窗大小"
 
+# FIXME check
 #: mcs-plugin/xfwm4_shortcuteditor.c:140 mcs-plugin/xfwm4_shortcuteditor.c:500
-#, fuzzy
 msgid "Resize window right"
-msgstr "隱藏視窗"
+msgstr "向右修改視窗大小"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:145 mcs-plugin/xfwm4_shortcuteditor.c:504
-#, fuzzy
 msgid "Raise window"
-msgstr "隱藏視窗"
+msgstr "提升視窗"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:150 mcs-plugin/xfwm4_shortcuteditor.c:508
-#, fuzzy
 msgid "Lower window"
-msgstr "隱藏視窗"
+msgstr "降低視窗"
 
+# TODO check translation
 #: mcs-plugin/xfwm4_shortcuteditor.c:155 mcs-plugin/xfwm4_shortcuteditor.c:512
 msgid "Toggle fullscreen"
-msgstr ""
+msgstr "切換全螢幕模式"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:160 mcs-plugin/xfwm4_shortcuteditor.c:516
-#, fuzzy
 msgid "Next workspace"
-msgstr "迴繞工作區"
+msgstr "下一個工作區"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:165 mcs-plugin/xfwm4_shortcuteditor.c:520
-#, fuzzy
 msgid "Previous workspace"
-msgstr "迴繞工作區"
+msgstr "上一個工作區"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:170 mcs-plugin/xfwm4_shortcuteditor.c:524
-#, fuzzy
 msgid "Add workspace"
-msgstr "迴繞工作區"
+msgstr "新增工作區"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:175 mcs-plugin/xfwm4_shortcuteditor.c:528
-#, fuzzy
 msgid "Delete workspace"
-msgstr "迴繞工作區"
+msgstr "移除工作區"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:180 mcs-plugin/xfwm4_shortcuteditor.c:532
-#, fuzzy
 msgid "Workspace 1"
-msgstr "工作區 %i"
+msgstr "工作區 1"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:185 mcs-plugin/xfwm4_shortcuteditor.c:536
-#, fuzzy
 msgid "Workspace 2"
-msgstr "工作區 %i"
+msgstr "工作區 2"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:190 mcs-plugin/xfwm4_shortcuteditor.c:540
-#, fuzzy
 msgid "Workspace 3"
-msgstr "工作區 %i"
+msgstr "工作區 3"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:195 mcs-plugin/xfwm4_shortcuteditor.c:544
-#, fuzzy
 msgid "Workspace 4"
-msgstr "工作區 %i"
+msgstr "工作區 4"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:200 mcs-plugin/xfwm4_shortcuteditor.c:548
-#, fuzzy
 msgid "Workspace 5"
-msgstr "工作區 %i"
+msgstr "工作區 5"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:205 mcs-plugin/xfwm4_shortcuteditor.c:552
-#, fuzzy
 msgid "Workspace 6"
-msgstr "工作區 %i"
+msgstr "工作區 6"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:210 mcs-plugin/xfwm4_shortcuteditor.c:556
-#, fuzzy
 msgid "Workspace 7"
-msgstr "工作區 %i"
+msgstr "工作區 7"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:215 mcs-plugin/xfwm4_shortcuteditor.c:560
-#, fuzzy
 msgid "Workspace 8"
-msgstr "工作區 %i"
+msgstr "工作區 8"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:220 mcs-plugin/xfwm4_shortcuteditor.c:564
-#, fuzzy
 msgid "Workspace 9"
-msgstr "工作區 %i"
+msgstr "工作區 9"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:225 mcs-plugin/xfwm4_shortcuteditor.c:568
-#, fuzzy
 msgid "Move window to next workspace"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至下一個工作區"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:230 mcs-plugin/xfwm4_shortcuteditor.c:572
-#, fuzzy
 msgid "Move window to previous workspace"
-msgstr "迴繞工作區"
+msgstr "將視窗移至上一個工作區"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:235 mcs-plugin/xfwm4_shortcuteditor.c:576
-#, fuzzy
 msgid "Move window to workspace 1"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 1"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:240 mcs-plugin/xfwm4_shortcuteditor.c:580
-#, fuzzy
 msgid "Move window to workspace 2"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 2"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:245 mcs-plugin/xfwm4_shortcuteditor.c:584
-#, fuzzy
 msgid "Move window to workspace 3"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 3"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:250 mcs-plugin/xfwm4_shortcuteditor.c:588
-#, fuzzy
 msgid "Move window to workspace 4"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 4"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:255 mcs-plugin/xfwm4_shortcuteditor.c:592
-#, fuzzy
 msgid "Move window to workspace 5"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 5"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:260 mcs-plugin/xfwm4_shortcuteditor.c:596
-#, fuzzy
 msgid "Move window to workspace 6"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 6"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:265 mcs-plugin/xfwm4_shortcuteditor.c:600
-#, fuzzy
 msgid "Move window to workspace 7"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 7"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:270 mcs-plugin/xfwm4_shortcuteditor.c:604
-#, fuzzy
 msgid "Move window to workspace 8"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 8"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:275 mcs-plugin/xfwm4_shortcuteditor.c:608
-#, fuzzy
 msgid "Move window to workspace 9"
-msgstr "新視窗獲取焦點"
+msgstr "將視窗移至工作區 9"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:656
 msgid "Cannot open the theme directory !"
-msgstr ""
+msgstr "無法開啟主題目錄！"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:675
 #, c-format
@@ -549,6 +504,8 @@ msgid ""
 "Cannot open %s : \n"
 "%s"
 msgstr ""
+"無法開啟 %s：\n"
+"%s"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:690 mcs-plugin/xfwm4_shortcuteditor.c:701
 #, c-format
@@ -556,51 +513,56 @@ msgid ""
 "Cannot write in %s : \n"
 "%s"
 msgstr ""
+"無法寫入 %s：\n"
+"%s"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:764
 msgid "Select command"
-msgstr ""
+msgstr "選擇指令"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:866
 msgid ""
 "Shortcut already in use !\n"
 "Are you sure you want to use it ?"
 msgstr ""
+"這個快速鍵已在使用中！\n"
+"您真的要用這個快速鍵嗎？"
 
+# FIXME The source is wrong!! untranslatable string!!
 #: mcs-plugin/xfwm4_shortcuteditor.c:928
-#, fuzzy
 msgid "Compose shortcut for :"
-msgstr "快速鍵"
+msgstr "為下列動作設定快速鍵："
 
 #. Create dialog
 #: mcs-plugin/xfwm4_shortcuteditor.c:931
 #: mcs-plugin/xfwm4_shortcuteditor.c:1110
-#, fuzzy
 msgid "Compose shortcut"
-msgstr "快速鍵"
+msgstr "設定快速鍵"
 
+# TODO check translation
 #: mcs-plugin/xfwm4_shortcuteditor.c:963
 #: mcs-plugin/xfwm4_shortcuteditor.c:1141
 msgid "Cannot grab the keyboard"
-msgstr ""
+msgstr "無法抓住鍵盤"
 
 #. Create dialog
 #: mcs-plugin/xfwm4_shortcuteditor.c:1015
 msgid "Choose command"
-msgstr ""
+msgstr "請選擇指令"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:1017
-#, fuzzy
 msgid "Command :"
-msgstr "快速鍵"
+msgstr "指令："
 
+# FIXME 譯文有待改進
 #: mcs-plugin/xfwm4_shortcuteditor.c:1051
 msgid "The command doesn't exist or the file is not executable !"
-msgstr ""
+msgstr "指令不存在，或有關的檔案並非可執行的！"
 
+# FIXME source is wrong!!! untranslatable string!!!
 #: mcs-plugin/xfwm4_shortcuteditor.c:1107
 msgid "Compose shortcut for command :"
-msgstr ""
+msgstr "為下列指令設定快速鍵："
 
 #: src/events.c:1623
 #, c-format
@@ -622,11 +584,13 @@ msgstr "%s: 另一個視窗管理程式正在運行"
 msgid "%s: Missing data from default files"
 msgstr "%s: 預設文件中缺少資料"
 
+# TODO verify
 #: src/main.c:419
 #, c-format
 msgid "%s: Failed to enter daemon mode: %s"
 msgstr "%s: 無法進入保護模式： %s"
 
+# TODO verify
 #: src/main.c:427
 #, c-format
 msgid "%s: Failed to create new process: %s"
@@ -635,7 +599,7 @@ msgstr "%s: 無法建立新行程： %s"
 #: src/main.c:448
 #, c-format
 msgid "%s: Unknown error occured"
-msgstr "%s: 發生未知的錯誤"
+msgstr "%s: 發生不明錯誤"
 
 #: src/menu.c:39
 msgid "Ma_ximize"
@@ -651,7 +615,7 @@ msgstr "隱藏(_H)"
 
 #: src/menu.c:42
 msgid "Hide _all others"
-msgstr "隱藏其他全部視窗(_A)"
+msgstr "隱藏其他視窗(_A)"
 
 #: src/menu.c:43
 msgid "S_how"
@@ -711,15 +675,17 @@ msgstr "工作區 %i (%s)"
 msgid "Workspace %i"
 msgstr "工作區 %i"
 
+# TODO verify
 #: src/menu.c:425
 #, c-format
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: GtkMenu 無法取得鼠標\n"
 
+# NOTE「Unmanaged」意謂「未受管理」，應非「無法管理」
 #: src/netwm.c:252
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
-msgstr "%s: 無法管理的 net_wm_state (window 0x%lx)"
+msgstr "%s: 未受管理的 net_wm_state (window 0x%lx)"
 
 #: src/settings.c:342
 #, c-format
@@ -749,7 +715,7 @@ msgstr "%s: 無法分析未使用的顏色 %s\n"
 #: src/settings.c:845
 #, c-format
 msgid "%s: specified key theme \"%s\" missing, using default"
-msgstr "msgid \"%s: 指定的主題 \"%s\" 不存在，使用預設主題\""
+msgstr "%s: 指定的主題「%s」不存在，使用預設主題"
 
 #: src/settings.c:852
 #, c-format
@@ -762,7 +728,7 @@ msgstr "切換到..."
 
 #: src/tabwin.c:129
 msgid "Unknown application!"
-msgstr ""
+msgstr "不明的應用程式！"
 
 #, fuzzy
 #~ msgid ""