diff --git a/po/zh_TW.po b/po/zh_TW.po
index b6207f87..99a35ea4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: midori master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-11-22 23:12+0000\n"
-"PO-Revision-Date: 2010-11-23 13:40+0800\n"
+"PO-Revision-Date: 2010-11-25 00:41+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "輕量級網頁瀏覽器"
 #: ../midori/main.c:1775
 #: ../midori/midori-websettings.c:314
 msgid "Midori"
-msgstr "緑"
+msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:3
 msgid "Web Browser"
@@ -226,7 +226,7 @@ msgstr "檢查看看新版本於："
 
 #: ../midori/main.c:1839
 msgid "Website icons"
-msgstr ""
+msgstr "網站圖示"
 
 #: ../midori/main.c:1841
 msgid "Cookies"
@@ -499,7 +499,7 @@ msgstr "應用程式(_A)："
 #: ../midori/midori-browser.c:4024
 #: ../midori/midori-browser.c:4073
 msgid "Import from a file"
-msgstr ""
+msgstr "從檔案匯入"
 
 #: ../midori/midori-browser.c:4084
 msgid "Failed to import bookmarks"
@@ -507,7 +507,7 @@ msgstr "匯入書籤失敗"
 
 #: ../midori/midori-browser.c:4125
 msgid "Failed to export bookmarks"
-msgstr ""
+msgstr "無法匯出書籤"
 
 #. i18n: Dialog: Clear Private Data, in the Tools menu
 #: ../midori/midori-browser.c:4242
@@ -520,7 +520,7 @@ msgstr "清除隱私資料(_C)"
 
 #: ../midori/midori-browser.c:4260
 msgid "Clear the following data:"
-msgstr ""
+msgstr "清除下列資料："
 
 #. i18n: Browsing history, visited web pages
 #: ../midori/midori-browser.c:4271
@@ -535,7 +535,7 @@ msgstr "關閉的分頁(_C)"
 
 #: ../midori/midori-browser.c:4296
 msgid "Clear private data when _quitting Midori"
-msgstr ""
+msgstr "當退出 Midori 時清除隱私資料(_Q)"
 
 #: ../midori/midori-browser.c:4436
 msgid "A lightweight web browser."
@@ -586,7 +586,7 @@ msgstr "儲存到檔案"
 
 #: ../midori/midori-browser.c:4782
 msgid "Add to Speed _dial"
-msgstr ""
+msgstr "加入快速播號(_D)"
 
 #: ../midori/midori-browser.c:4783
 msgid "Add shortcut to speed dial"
@@ -594,11 +594,11 @@ msgstr "加入捷徑至快速播號"
 
 #: ../midori/midori-browser.c:4785
 msgid "Add Shortcut to the _desktop"
-msgstr ""
+msgstr "將捷徑加入至桌面(_D)"
 
 #: ../midori/midori-browser.c:4786
 msgid "Add shortcut to the desktop"
-msgstr ""
+msgstr "將捷徑加入至桌面"
 
 #: ../midori/midori-browser.c:4788
 msgid "Subscribe to News _feed"
@@ -638,7 +638,7 @@ msgstr "編輯(_E)"
 
 #: ../midori/midori-browser.c:4810
 msgid "Undo the last modification"
-msgstr ""
+msgstr "取消上次的修改"
 
 #: ../midori/midori-browser.c:4813
 #, fuzzy
@@ -835,7 +835,7 @@ msgstr "檢閱頁面(_I)"
 
 #: ../midori/midori-browser.c:4937
 msgid "Inspect page details and access developer tools..."
-msgstr ""
+msgstr "檢閱頁面詳細資料並存取開發者工具..."
 
 #: ../midori/midori-browser.c:4942
 msgid "_Previous Tab"
@@ -863,7 +863,7 @@ msgstr "專注於目前分頁"
 
 #: ../midori/midori-browser.c:4951
 msgid "Only show the Icon of the _Current Tab"
-msgstr ""
+msgstr "只顯示目前分頁的圖示(_C)"
 
 #: ../midori/midori-browser.c:4952
 msgid "Only show the icon of the current tab"
@@ -1113,15 +1113,15 @@ msgstr "執行資料庫敘述時失敗：%s\n"
 #. i18n: Right-click on Location, Open an URL from the clipboard
 #: ../midori/midori-locationaction.c:1367
 msgid "Paste and p_roceed"
-msgstr ""
+msgstr "貼上並處理(_R)"
 
 #: ../midori/midori-locationaction.c:1819
 msgid "Not verified"
-msgstr ""
+msgstr "尚未驗證"
 
 #: ../midori/midori-locationaction.c:1830
 msgid "Verified and encrypted connection"
-msgstr ""
+msgstr "通過驗證且經過加密的連線"
 
 #: ../midori/midori-panel.c:412
 #: ../midori/midori-panel.c:414
@@ -1149,7 +1149,7 @@ msgstr "側邊欄靠右對齊"
 
 #: ../midori/midori-panel.c:754
 msgid "Hide operating controls"
-msgstr ""
+msgstr "隱藏操作控制項"
 
 #: ../midori/midori-websettings.c:202
 msgid "Show Blank page"
@@ -1165,7 +1165,7 @@ msgstr "顯示最近開啟的分頁"
 
 #: ../midori/midori-websettings.c:206
 msgid "Show last tabs without loading"
-msgstr ""
+msgstr "顯示上次的分頁但不要載入"
 
 #: ../midori/midori-websettings.c:223
 msgid "Japanese (SHIFT_JIS)"
@@ -1462,7 +1462,7 @@ msgstr "詢問目的地資料夾"
 
 #: ../midori/midori-websettings.c:690
 msgid "Whether to ask for the destination folder when downloading a file"
-msgstr ""
+msgstr "下載檔案時是否要詢問儲存的目的地"
 
 #: ../midori/midori-websettings.c:709
 msgid "Notify when a transfer has been completed"
@@ -1606,19 +1606,19 @@ msgstr "啟用嵌入式 Netscape 外掛程式物件"
 
 #: ../midori/midori-websettings.c:885
 msgid "Enable HTML5 database support"
-msgstr ""
+msgstr "啟用 HTML 資料庫支援"
 
 #: ../midori/midori-websettings.c:886
 msgid "Whether to enable HTML5 database support"
-msgstr ""
+msgstr "是否要啟用 HTML5 資料庫支援"
 
 #: ../midori/midori-websettings.c:892
 msgid "Enable HTML5 local storage support"
-msgstr ""
+msgstr "啟用 HTML 本地端儲存支援"
 
 #: ../midori/midori-websettings.c:893
 msgid "Whether to enable HTML5 local storage support"
-msgstr ""
+msgstr "是否要啟用 HTML 本地端儲存支援"
 
 #: ../midori/midori-websettings.c:901
 msgid "Enable offline web application cache"
@@ -1727,7 +1727,7 @@ msgstr ""
 
 #: ../midori/midori-websettings.c:1098
 msgid "Clear private data"
-msgstr ""
+msgstr "清除隱私資料"
 
 #: ../midori/midori-websettings.c:1099
 msgid "The private data selected for deletion"
@@ -1739,12 +1739,12 @@ msgstr "清除資料"
 
 #: ../midori/midori-websettings.c:1115
 msgid "The data selected for deletion"
-msgstr ""
+msgstr "選取要刪除的資料"
 
 #: ../midori/midori-view.c:1264
 #, c-format
 msgid "%s wants to save an HTML5 database."
-msgstr ""
+msgstr "%s 想要儲存一門 HTML 資料庫。"
 
 #: ../midori/midori-view.c:1268
 #: ../midori/midori-view.c:1298
@@ -1759,7 +1759,7 @@ msgstr "允許(_A)"
 #: ../midori/midori-view.c:1294
 #, c-format
 msgid "%s wants to know your location."
-msgstr ""
+msgstr "%s 想要知道您的所在位置。"
 
 #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
 #. so reloading via Javascript works but not via API calls.
@@ -1934,11 +1934,11 @@ msgstr "確定要移除所有歷史項目？"
 
 #: ../midori/midori-view.c:3759
 msgid "Set number of columns and rows"
-msgstr "設定行與列的數目"
+msgstr "設定欄與列的數目"
 
 #: ../midori/midori-view.c:3760
 msgid "Enter number of columns and rows:"
-msgstr "輸入行與列的數目："
+msgstr "輸入欄與列的數目："
 
 #: ../midori/midori-view.c:3761
 msgid "Invalid input for the size of the speed dial"
@@ -2093,7 +2093,7 @@ msgstr "強制畫面像點密度為 96 DPI"
 
 #: ../midori/midori-preferences.c:441
 msgid "Allow scripts to open popups"
-msgstr ""
+msgstr "允許指令稿開啟彈出式視窗"
 
 #: ../midori/midori-preferences.c:442
 #, fuzzy
@@ -2160,7 +2160,7 @@ msgstr "網頁訊餅"
 
 #: ../midori/midori-preferences.c:532
 msgid "Delete cookies when quitting Midori"
-msgstr ""
+msgstr "當退出 Midori 時刪除訊餅"
 
 #: ../midori/midori-preferences.c:539
 msgid "Delete old cookies after 1 hour"
@@ -2810,19 +2810,19 @@ msgstr "表單歷史(_F)"
 
 #: ../extensions/history-list.vala:174
 msgid "Next Tab (History List)"
-msgstr ""
+msgstr "下一個分頁 (歷史清單)"
 
 #: ../extensions/history-list.vala:175
 msgid "Next tab from history"
-msgstr ""
+msgstr "下一個歷史中的分頁"
 
 #: ../extensions/history-list.vala:184
 msgid "Previous Tab (History List)"
-msgstr "上一個分頁 (歷史清單)(_P)"
+msgstr "上一個分頁 (歷史清單)"
 
 #: ../extensions/history-list.vala:185
 msgid "Previous tab from history"
-msgstr ""
+msgstr "上一個歷史中的分頁"
 
 #: ../extensions/history-list.vala:245
 msgid "History List"
@@ -2856,11 +2856,11 @@ msgstr ""
 
 #: ../extensions/shortcuts.c:170
 msgid "Customize Keyboard shortcuts"
-msgstr ""
+msgstr "自訂鍵盤捷徑"
 
 #: ../extensions/shortcuts.c:276
 msgid "Customize Sh_ortcuts..."
-msgstr ""
+msgstr "自訂捷徑(_O)..."
 
 #: ../extensions/shortcuts.c:313
 msgid "Shortcuts"
@@ -2868,7 +2868,7 @@ msgstr "捷徑"
 
 #: ../extensions/shortcuts.c:314
 msgid "View and edit keyboard shortcuts"
-msgstr ""
+msgstr "檢視並編輯鍵盤捷徑"
 
 #: ../extensions/status-clock.c:174
 msgid "Statusbar Clock"
@@ -2876,7 +2876,7 @@ msgstr "狀態列時鐘"
 
 #: ../extensions/status-clock.c:175
 msgid "Display date and time in the statusbar"
-msgstr ""
+msgstr "於狀態列顯示日期與時間"
 
 #: ../extensions/statusbar-features.c:85
 msgid "Images"