diff --git a/locale/FAQ.lua b/locale/FAQ.lua
index 4e79561..82bc41b 100644
--- a/locale/FAQ.lua
+++ b/locale/FAQ.lua
@@ -1,5 +1,4 @@
---[[ $Id$ ]]
-local L = LibStub("AceLocale-3.0"):NewLocale("Bartender4_FAQ", "enUS", true)
+local L = LibStub("AceLocale-3.0"):NewLocale("Bartender4_FAQ", "enUS", true)
 if not L then return end
 
 L["FAQ_TEXT"] = [[
@@ -67,20 +66,20 @@ local L = LibStub("AceLocale-3.0"):NewLocale("Bartender4_FAQ", "zhCN")
 if L then
 	L["FAQ_TEXT"] = [[
 |cffffd200
-我刚刚安装了Bartender4，发现我的按键绑定似乎不太正确。
+我刚刚安装了Bartender4,发现我的按键绑定似乎不太正确.
 |r
-Bartender4仅仅将主动作条1与Bartender4的动作条1关联起来，游戏其他动作条的设置不会转移到Bartender4上，不过您之前设置的快捷键仍然是有效的，它们仅仅是被隐藏了起来而已。
+Bartender4仅仅将主动作条1与Bartender4的动作条1关联起来,游戏其他动作条的设置不会转移到Bartender4上,不过您之前设置的快捷键仍然是有效的,它们仅仅是被隐藏了起来而已.
 
 |cffffd200
 我如何才能为Bartender4的按钮设置快捷键?
 |r
-在聊天窗口输入命令 /kb ，会弹出一个窗口，此时移动鼠标到您需要设置快捷键的按钮上，按下您需要设置的快捷键，屏幕上会显示出您将要绑定的按键，确认无误后关闭弹出的窗口即可。
+在聊天窗口输入命令 /kb ,会弹出一个窗口,此时移动鼠标到您需要设置快捷键的按钮上,按下您需要设置的快捷键,屏幕上会显示出您将要绑定的按键,确认无误后关闭弹出的窗口即可.
 
 |cffffd200
 谁写的这个插件?
 |r
 Bartender4是欧洲服务器Antonidas的玩家 Nevcairiel 的作品, 该玩家同时也是Bartender3的作者!
-简体中文版本是由7区加里索斯服务器联盟玩家 提珞德夜行 提供的。
+简体中文版本是由7区加里索斯服务器联盟玩家 提珞德夜行 提供的.
 ]]
 end
 
@@ -145,4 +144,30 @@ Bartender4 преобразовывает только сочетания кла
 |r
 Bartender4 написал Nevcairiel с EU-Antonidas, автор Bartender3!
 ]]
-end
\ No newline at end of file
+end
+
+-- zhTW
+local L = LibStub("AceLocale-3.0"):NewLocale("Bartender4_FAQ", "zhTW")
+if L then
+	L["FAQ_TEXT"] = [[
+|cffffd200
+我剛剛安裝了Bartender4,發現我的按鍵綁定似乎不太正確.
+|r
+Bartender4只是把動作條1與Bartender4的動作條1關聯起來,遊戲其他動作條的設置不會轉移到Bartender4上,不過您之前設置的快捷鍵仍然是有效的,它們只是被隱藏了起來而已.
+
+|cffffd200
+我如何才能為Bartender4的按鈕設置快捷鍵?
+|r
+在聊天窗口輸入命令 /kb ,會彈出一個窗口,此時移動鼠標到您需要設置快捷鍵的按鈕上,按下您需要設置的快捷鍵,屏幕上會顯示出您將要綁定的按鍵,確認無誤後關閉彈出的窗口即可.
+
+|cffffd200
+誰人製作這超酷的插件?
+|r
+Bartender4是歐服Antonidas的玩家 Nevcairiel 的作品, 也是Bartender3的原作者!
+
+|cffffd200
+誰人那麼無聊做這些艱難的中文翻譯?
+|r
+|cffffff78天明|r 眾星之子
+]]
+end
diff --git a/locale/zhTW.lua b/locale/zhTW.lua
index afc2435..7978d80 100644
--- a/locale/zhTW.lua
+++ b/locale/zhTW.lua
@@ -1,22 +1,23 @@
--- Generated by Babelfish script, do not add strings manually, only translate existing strings.
+-- Generated by Babelfish script, do not add strings manually, only translate existing strings.
 -- Please make sure to save the file as UTF-8, BUT WITHOUT THE UTF-8 BOM HEADER; ¶
+--revise TChinese translation  12/DEC/08  天明@眾星之子
 local L = LibStub("AceLocale-3.0"):NewLocale("Bartender4", "zhTW")
 if not L then return end
 
 L["ALT"] = "ALT"
--- L["ActionBar Paging"] = true
+L["ActionBar Paging"] = "動作條轉換"
 L["Alignment"] = "對齊"
 L["Alpha"] = "透明度"
 L["Always Hide"] = "總是隱藏"
 L["Auto-Assist"] = "自動協助"
 L["Bag Bar"] = "背包列"
 L["Bar %s"] = "動作條 %s"
--- L["Bar Snapping"] = true
+L["Bar Snapping"] = "動作條依附"
 L["Bar Style & Layout"] = "動作條樣式和佈局"
 L["Bars"] = "動作條"
--- L["Bars unlocked. Move them now and click Lock when you are done."] = true
--- L["Bartender4"] = true
--- L["Button %s"] = true
+L["Bars unlocked. Move them now and click Lock when you are done."] = "動作條已解鎖. 移動它們之後再按一下鎖定"
+L["Bartender4"] = "Bartender4"
+L["Button %s"] = "按鈕 %s"
 L["Button Grid"] = "顯示空按鈕"
 L["Button Lock"] = "按鈕鎖定"
 L["Button Look"] = "按鈕外觀"
@@ -30,72 +31,72 @@ L["Configure actionbar paging when the %s key is down."] = "設定當按下 %s 
 L["Configure how the Out of Range Indicator should display on the buttons."] = "設定超出距離提示按鈕該如何顯示"
 L["Configure the Bag Bar"] = "設定背包列"
 L["Configure the Button Tooltip."] = "設定按紐說明提示"
--- L["Configure the Fade Out Alpha"] = true
--- L["Configure the Fade Out Delay"] = true
+L["Configure the Fade Out Alpha"] = "設定淡出透明度"
+L["Configure the Fade Out Delay"] = "設定淡出延遲"
 L["Configure the Micro Menu"] = "設定微型按鈕"
 L["Configure the Pet Bar"] = "設定寵物列"
--- L["Configure the Reputation Bar"] = true
--- L["Configure the VehicleBar"] = true
--- L["Configure the XP Bar"] = true
+L["Configure the Reputation Bar"] = "設定聲望列"
+L["Configure the VehicleBar"] = "設定載具列"
+L["Configure the XP Bar"] = "設定經驗列"
 L["Configure the alpha of the bar."] = "設定動作條透明度"
 L["Configure the padding of the buttons."] = "設定按鈕間距"
 L["Configure the scale of the bar."] = "設定動作條大小"
--- L["Copy Conditionals"] = true
--- L["Create a copy of the auto-generated conditionals in the custom configuration as a base template."] = true
--- L["Custom Conditionals"] = true
+L["Copy Conditionals"] = "條件複製"
+L["Create a copy of the auto-generated conditionals in the custom configuration as a base template."] = "複製一個自動生成條件的副本 定制配置為基礎的範本"
+L["Custom Conditionals"] ="自訂條件"
 L["Default Bar State"] = "預設動作條狀態"
 L["Disabled"] = "關閉"
 L["Disabled in Combat"] = "戰鬥中關閉"
--- L["Don't Page"] = true
+L["Don't Page"] = "不轉換"
 L["Enable Auto-Assist for this bar.\n Auto-Assist will automatically try to cast on your target's target if your target is no valid target for the selected spell."] = "開啟自動協助. \n 自動協助會自動地試著對你目標的目標施法,假如選定的技能目標是個無效的目標"
--- L["Enable Bar Switching based on the actionbar controls provided by the game. \nSee Blizzard Key Bindings for assignments - Usually Shift-Mouse Wheel and Shift+1 - Shift+6."] = true
+L["Enable Bar Switching based on the actionbar controls provided by the game. \nSee Blizzard Key Bindings for assignments - Usually Shift-Mouse Wheel and Shift+1 - Shift+6."] = "以遊戲所提供的動作條控制為依據, 啟用動作條轉換. \n 請參照暴雪按鍵綁定的設定 - 通常是滑鼠滾輪和Shift+1 - Shift+6."
 L["Enable State-based Button Swaping"] = "開啟狀態配置的按鈕切換"
 L["Enable the Bag Bar"] = "開啟背包列"
 L["Enable the FadeOut mode"] = "開啟淡出模式"
 L["Enable the Micro Menu"] = "開啟微型選單"
 L["Enable the PetBar"] = "開啟寵物列"
--- L["Enable the Reputation Bar"] = true
+L["Enable the Reputation Bar"] = "開啟聲望列"
 L["Enable the StanceBar"] = "開啟姿勢列"
--- L["Enable the Vehicle Bar"] = true
--- L["Enable the XP Bar"] = true
--- L["Enable the use of a custom condition, disabling all of the above."] = true
+L["Enable the Vehicle Bar"] = "開啟載具列"
+L["Enable the XP Bar"] = "開啟經驗列"
+L["Enable the use of a custom condition, disabling all of the above."] = "啟用自訂的條件, 停用上述所有"
 L["Enable/Disable the bar."] = "開啟/關閉動作條"
 L["Enabled"] = "開啟"
 L["FAQ"] = "問與答"
 L["Fade Out"] = "淡出"
 L["Fade Out Alpha"] = "淡出透明度"
 L["Fade Out Delay"] = "淡出延遲"
--- L["Focus-Cast Modifier"] = true
--- L["Focus-Cast by modifier"] = true
+L["Focus-Cast Modifier"] = "Focus-施法關聯鍵"
+L["Focus-Cast by modifier"] = "用關聯鍵來使用Focus-施法"
 L["Frequently Asked Questions"] = "常問問題"
 L["Full Button Mode"] = "完整按鈕模式"
 L["General Settings"] = "一般設定"
 L["Hide Hotkey"] = "隱藏熱鍵"
 L["Hide Macro Text"] = "隱藏巨集文字"
 L["Hide in Combat"] = "戰鬥中隱藏"
--- L["Hide in Stance/Form"] = true
--- L["Hide out of Combat"] = true
+L["Hide in Stance/Form"] = "姿態/型態隱藏"
+L["Hide out of Combat"] = "非戰鬥時隱藏"
 L["Hide the Hotkey on the buttons of this bar."] = "隱藏這個動作條的熱鍵文字"
 L["Hide the Macro Text on the buttons of this bar."] = "隱藏這個動作條的巨集名稱"
--- L["Hide this bar in a specific Stance or Form."] = true
--- L["Hide this bar when you are possessing a NPC."] = true
--- L["Hide this bar when you have a pet."] = true
--- L["Hide this bar when you have no pet."] = true
--- L["Hide when Possessing"] = true
--- L["Hide with pet"] = true
--- L["Hide without pet"] = true
+L["Hide this bar in a specific Stance or Form."] = "在使用某指定姿態或變形後隱藏"
+L["Hide this bar when you are possessing a NPC."] = "當控制NPC時隱藏"
+L["Hide this bar when you have a pet."] = "當你有寵物時隱藏"
+L["Hide this bar when you have no pet."] = "當你沒有寵物時隱藏"
+L["Hide when Possessing"] = "控制中隱藏"
+L["Hide with pet"] = "帶寵物隱藏"
+L["Hide without pet"] = "不帶寵物隱藏"
 L["Hotkey Mode"] = "熱鍵模式"
--- L["Key Bindings"] = true
+L["Key Bindings"] = "按鍵綁定"
 L["Keyring"] = "鑰匙圈"
 L["Lock"] = "鎖定"
 L["Lock all bars."] = "鎖定所有動作列"
 L["Lock the buttons."] = "鎖定按鈕"
 L["Micro Menu"] = "微型選單"
--- L["Minimap Icon"] = true
+L["Minimap Icon"] = "小地圖圖示"
 L["Modifier Based Switching"] = "修改基本切換"
 L["No Display"] = "不顯示"
--- L["None"] = true
--- L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = true
+L["None"] = "沒有"
+L["Note: Enabling Custom Conditionals will disable all of the above settings!"] = "注意: 啟用自定義條件將關閉所有上述設置"
 L["Number of buttons."] = "按鈕數量"
 L["Number of rows."] = "行數"
 L["One Bag"] = "單背包"
@@ -103,19 +104,19 @@ L["Only show one Bag Button in the BagBar."] = "在背包列中只顯示成單
 L["Out of Mana Indicator"] = "低法力提示"
 L["Out of Range Indicator"] = "超出距離提示"
 L["Padding"] = "間距"
--- L["Page %2d"] = true
+L["Page %2d"] = "Page %2d"
 L["Pet Bar"] = "寵物列"
 L["Possess Bar"] = "控制列"
--- L["Reputation Bar"] = true
+L["Reputation Bar"] = "聲望列"
 L["Right-click Self-Cast"] = "右鍵自我施法"
 L["Rows"] = "行"
 L["SHIFT"] = "SHIFT"
 L["Scale"] = "大小"
--- L["Select the Focus-Cast Modifier"] = true
--- L["Select the Self-Cast Modifier"] = true
--- L["Self-Cast Modifier"] = true
+L["Select the Focus-Cast Modifier"] = "選用Focus-施法的關聯鍵"
+L["Select the Self-Cast Modifier"] = "選用自我施法的關聯鍵"
+L["Self-Cast Modifier"] = "我施法的關聯鍵"
 L["Self-Cast by modifier"] = "自我施法"
--- L["Show a Icon to open the config at the Minimap"] = true
+L["Show a Icon to open the config at the Minimap"] = "在小地圖顯示圖示用以開啟本插件的設置"
 L["Show the keyring button."] = "顯示鑰匙圈按鈕"
 L["Specify the Color of the Out of Mana Indicator"] = "指定法力不足提示的顏色"
 L["Specify the Color of the Out of Range Indicator"] = "指定超出距離提示的顏色"
@@ -123,25 +124,25 @@ L["Stance Bar"] = "姿勢列"
 L["Stance Configuration"] = "姿勢設定"
 L["State Configuration"] = "狀態設定"
 L["Switch this bar to the Possess Bar when possessing a npc (eg. Mind Control)"] = "當控制一個NPC時切換此動作條為控制條(eg. 心靈控制)"
--- L["Switch to key-binding mode"] = true
-L["The Alignment menu is still on the TODO.\n\nAs a quick preview of whats planned:\n\n\t- Absolute and relative Bar Positioning\n\t- Bars \"snapping\" together and building clusters"] = "對齊選單還在趕工進行中"
--- L["The bar default is to be visible all the time, you can configure conditions here to control when the bar should be hidden."] = true
+L["Switch to key-binding mode"] = "轉換到按鍵綁定模式"
+L["The Alignment menu is still on the TODO.\n\nAs a quick preview of whats planned:\n\n\t- Absolute and relative Bar Positioning\n\t- Bars \"snapping\" together and building clusters"] = "對齊選單還在趕工進行中 \n\n預覽計劃: 絕對和相對動作條定位\n\t- 動作條 \"依附\" 在一起, 建設集群"
+L["The bar default is to be visible all the time, you can configure conditions here to control when the bar should be hidden."] = "所有的列都預設為可見, 你可使用自訂義條件來控制列的隱藏"
 L["The default behaviour of this bar when no state-based paging option affects it."] = "沒有狀態設定於動作條為此動作條預設行為"
--- L["This bar will be hidden once you enter combat."] = true
--- L["This bar will be hidden whenever you are not in combat."] = true
+L["This bar will be hidden once you enter combat."] = "這列會在進入戰鬥後隱藏"
+L["This bar will be hidden whenever you are not in combat."] = "這列會在非戰鬥時隱藏"
 L["Toggle Button Zoom\nFor more style options you need to install ButtonFacade"] = "切換按鈕放大/n 如需更多風格的按鈕你需要安裝 ButtonFacade"
 L["Toggle the button grid."] = "顯示空白按鈕"
--- L["Toggle the use of the modifier-based focus-cast functionality."] = true
+L["Toggle the use of the modifier-based focus-cast functionality."] = "啟用或關閉Focus-施法的關聯鍵"
 L["Toggle the use of the modifier-based self-cast functionality."] = "切換使用自我施法功能"
 L["Toggle the use of the right-click self-cast functionality."] = "切換使用右鍵自我施法功能"
--- L["Use Custom Condition"] = true
--- L["Vehicle Bar"] = true
--- L["VehicleBar"] = true
--- L["Visibility"] = true
--- L["XP Bar"] = true
--- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
--- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
--- L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = true
+L["Use Custom Condition"] = "使用自訂義條件"
+L["Vehicle Bar"] = "載具列 "
+L["VehicleBar"] = "載具列"
+L["Visibility"] = "能見度"
+L["XP Bar"] = "經驗條"
+L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = "你可以把列設定為永久隱藏, 如你只想用綁定的按鍵來運作"
+L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = "你可以在自訂義條件裡使用任何巨集的條件句, 使用 \"show\" 和 \"hide\" 作為基準.\n\n例如: [combat]hide;show"
+L["You can use any macro conditionals in the custom string, using the number of the bar as target value.\nExample: [form:1]9;0"] = "你可以在自訂義條件裡使用任何巨集的條件句, 使用動作條的編號作為目標值.\nExample: [form:1]9;0"
 L["Zoom"] = "放大"
--- L["|cffffff00Click|r to toggle bar lock"] = true
--- L["|cffffff00Right-click|r to open the options menu"] = true
+L["|cffffff00Click|r to toggle bar lock"] = "|cffffff00點擊|r 來開關動作條鎖"
+L["|cffffff00Right-click|r to open the options menu"] = "|cffffff00右擊|r 開啟設置選項"