diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2ae2df9e80..f4f65a859c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-06-12 09:39+0200\n"
-"PO-Revision-Date: 2013-05-29 11:15+0200\n"
-"Last-Translator: Chung-Lun Chiang <benck@benck.tw>\n"
-"Language-Team: Traditional Chinese <http://l10n.cihar.com/projects/"
-"phpmyadmin/master/zh_TW/>\n"
+"PO-Revision-Date: 2013-06-18 23:06+0200\n"
+"Last-Translator: Tony Chen <tonychen@finenet.com.tw>\n"
+"Language-Team: Traditional Chinese "
+"<http://l10n.cihar.com/projects/phpmyadmin/master/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1426,7 +1426,7 @@ msgstr "使用匯入的設定檔讀取圖表時發生錯誤，改用預設的設
 #: prefs_manage.php:238 server_status_monitor.php:742
 #: setup/frames/menu.inc.php:21
 msgid "Import"
-msgstr "輸入"
+msgstr "匯入"
 
 #: js/messages.php:191
 msgid "Import monitor configuration"
@@ -5372,7 +5372,6 @@ msgid "Authentication type"
 msgstr "認證方式"
 
 #: libraries/config/messages.inc.php:376
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/"
 #| "a] support, suggested: [kbd]pma_bookmark[/kbd]"
@@ -5380,8 +5379,8 @@ msgid ""
 "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] "
 "support, suggested: [kbd]pma__bookmark[/kbd]"
 msgstr ""
-"不使用[a@http://wiki.phpmyadmin.net/pma/bookmark]書籤 [/a]功能請留空，預設："
-"[kbd]pma_bookmark[/kbd]"
+"在不支援[a@http://wiki.phpmyadmin.net/pma/bookmark]書籤[/a]功能時請留空，建議用：[kbd]pma__bo"
+"okmark[/kbd]"
 
 #: libraries/config/messages.inc.php:377
 msgid "Bookmark table"
@@ -5395,7 +5394,7 @@ msgstr "書籤表"
 msgid ""
 "Leave blank for no column comments/mime types, suggested: "
 "[kbd]pma__column_info[/kbd]"
-msgstr "留空則不使用列資訊和MIME類型。預設值：[kbd]pma_column_info[/kbd]"
+msgstr "不使用欄位註解/MIME類型時留空白。建議值：[kbd]pma__column_info[/kbd]"
 
 #: libraries/config/messages.inc.php:379
 msgid "Column information table"
@@ -5461,14 +5460,13 @@ msgid "Control port"
 msgstr "管理伺服器"
 
 #: libraries/config/messages.inc.php:391
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/"
 #| "kbd]"
 msgid ""
 "Leave blank for no Designer support, suggested: [kbd]pma__designer_coords[/"
 "kbd]"
-msgstr "不使用設計功能請留空，預設：[kbd]pma_designer_coords[/kbd]"
+msgstr "不使用設計功能請留空，建議值：[kbd]pma__designer_coords[/kbd]"
 
 #: libraries/config/messages.inc.php:392
 msgid "Designer table"
@@ -5503,14 +5501,13 @@ msgid "Hide databases"
 msgstr "隱藏資料庫"
 
 #: libraries/config/messages.inc.php:399
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query history support, suggested: "
 #| "[kbd]pma_history[/kbd]"
 msgid ""
 "Leave blank for no SQL query history support, suggested: [kbd]pma__history[/"
 "kbd]"
-msgstr "不使用 SQL 查詢歷史功能請留空，預設：[kbd]pma_history[/kbd]"
+msgstr "不使用 SQL 查詢歷史功能請留空，建議值：[kbd]pma__history[/kbd]"
 
 #: libraries/config/messages.inc.php:400
 msgid "SQL query history table"
@@ -5559,10 +5556,8 @@ msgid ""
 "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not "
 "[kbd]'my_db'[/kbd]."
 msgstr ""
-"您可以使用 MySQL 萬用字元 (% 和 _)，如果想要表示萬用字元的原始意義，請在前面"
-"加上反斜線。例：用 [kbd]'my\\_db'[/kbd] 而不是 [kbd]'my_db'[/kbd]。透過該選項"
-"您可以對資料庫列表排序，只要依序輸入它們的名稱並在最後加上 [kbd]*[/kbd] 顯示"
-"剩下的資料庫（依字母排序）。"
+"您可以使用 MySQL 萬用字元 (% 和 _)，如果想要表示萬用字元本身，請在前面加上反斜線。例：用 [kbd]'my\\_db'[/kbd] 而不是 "
+"[kbd]'my_db'[/kbd]。"
 
 #: libraries/config/messages.inc.php:409
 msgid "Show only listed databases"
@@ -5577,12 +5572,11 @@ msgid "Password for config auth"
 msgstr "config 認證方式的密碼"
 
 #: libraries/config/messages.inc.php:412
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]"
 msgid ""
 "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/kbd]"
-msgstr "不使用 PDF 大綱功能請留空，預設：[kbd]pma_pdf_pages[/kbd]"
+msgstr "不使用 PDF 大綱功能請留空，建議值：[kbd]pma__pdf_pages[/kbd]"
 
 #: libraries/config/messages.inc.php:413
 msgid "PDF schema: pages table"
@@ -5621,7 +5615,6 @@ msgid "Recently used table"
 msgstr "最近使用的資料表"
 
 #: libraries/config/messages.inc.php:420
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-"
 #| "links[/a] support, suggested: [kbd]pma_relation[/kbd]"
@@ -5629,8 +5622,8 @@ msgid ""
 "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-"
 "links[/a] support, suggested: [kbd]pma__relation[/kbd]"
 msgstr ""
-"不使用[a@http://wiki.phpmyadmin.net/pma/relation]關聯連結 [/a]功能請留空，預"
-"設：[kbd]pma_relation[/kbd]"
+"不使用[a@http://wiki.phpmyadmin.net/pma/relation]關聯連結 "
+"[/a]功能請留空，建議值：[kbd]pma__relation[/kbd]"
 
 #: libraries/config/messages.inc.php:421
 msgid "Relation table"
@@ -5676,28 +5669,26 @@ msgid "Use SSL"
 msgstr "使用 SSL"
 
 #: libraries/config/messages.inc.php:431
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/"
 #| "kbd]"
 msgid ""
 "Leave blank for no PDF schema support, suggested: [kbd]pma__table_coords[/"
 "kbd]"
-msgstr "不使用 PDF 大綱功能請留空，預設：[kbd]pma_table_coords[/kbd]"
+msgstr "不使用 PDF 大綱功能請留空，建議值：[kbd]pma__table_coords[/kbd]"
 
 #: libraries/config/messages.inc.php:432
 msgid "PDF schema: table coordinates"
 msgstr "PDF 大綱: 資料表同時"
 
 #: libraries/config/messages.inc.php:433
-#, fuzzy
 #| msgid ""
 #| "Table to describe the display columns, leave blank for no support; "
 #| "suggested: [kbd]pma_table_info[/kbd]"
 msgid ""
 "Table to describe the display columns, leave blank for no support; "
 "suggested: [kbd]pma__table_info[/kbd]"
-msgstr "描述顯示欄位的表，不使用請留空，預設：[kbd]pma_table_info[/kbd]"
+msgstr "描述顯示欄位的表，不使用請留空，建議值：[kbd]pma__table_info[/kbd]"
 
 #: libraries/config/messages.inc.php:434
 msgid "Display columns table"
@@ -5711,7 +5702,7 @@ msgstr "顯示字段表"
 msgid ""
 "Leave blank for no \"persistent\" tables' UI preferences across sessions, "
 "suggested: [kbd]pma__table_uiprefs[/kbd]"
-msgstr "不在資料庫中儲存使用者偏好請留空，預設：[kbd]pma_config[/kbd]"
+msgstr "不在資料表中儲存跨連線UI偏好時請留空，建議值：[kbd]pma__config[/kbd]"
 
 #: libraries/config/messages.inc.php:436
 msgid "UI preferences table"
@@ -5757,14 +5748,13 @@ msgid "Statements to track"
 msgstr "要追蹤的命令"
 
 #: libraries/config/messages.inc.php:445
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query tracking support, suggested: "
 #| "[kbd]pma_tracking[/kbd]"
 msgid ""
 "Leave blank for no SQL query tracking support, suggested: "
 "[kbd]pma__tracking[/kbd]"
-msgstr "不使用 SQL 查詢追蹤功能請留空，預設：[kbd]pma_tracking[/kbd]"
+msgstr "不使用 SQL 查詢追蹤功能請留空，建議值：[kbd]pma__tracking[/kbd]"
 
 #: libraries/config/messages.inc.php:446
 msgid "SQL query tracking table"
@@ -5781,14 +5771,13 @@ msgid "Automatically create versions"
 msgstr "自動建立版本"
 
 #: libraries/config/messages.inc.php:449
-#, fuzzy
 #| msgid ""
 #| "ve blank for no user preferences storage in database, suggested: "
 #| "[kbd]_config[/kbd]"
 msgid ""
 "Leave blank for no user preferences storage in database, suggested: "
 "[kbd]pma__userconfig[/kbd]"
-msgstr "不在資料庫中儲存使用者偏好請留空，預設：[kbd]pma_config[/kbd]"
+msgstr "不在資料庫中儲存使用者偏好請留空，建議值：[kbd]pma__config[/kbd]"
 
 #: libraries/config/messages.inc.php:450
 msgid "User preferences storage table"
@@ -5838,10 +5827,9 @@ msgid "Show or hide a column displaying the Creation timestamp for all tables"
 msgstr ""
 
 #: libraries/config/messages.inc.php:461
-#, fuzzy
 #| msgid "Show more actions"
 msgid "Show Creation timestamp"
-msgstr "顯示更多操作"
+msgstr "顯示建立時間戳記"
 
 #: libraries/config/messages.inc.php:462
 msgid ""
@@ -5858,10 +5846,9 @@ msgid ""
 msgstr ""
 
 #: libraries/config/messages.inc.php:465
-#, fuzzy
 #| msgid "Show master status"
 msgid "Show Last check timestamp"
-msgstr "查看主伺服器狀態"
+msgstr "顯示最後檢查時間戳記"
 
 #: libraries/config/messages.inc.php:466
 msgid ""
@@ -6103,10 +6090,9 @@ msgid ""
 msgstr ""
 
 #: libraries/config/messages.inc.php:523
-#, fuzzy
 #| msgid "Version check"
 msgid "Version check proxy url"
-msgstr "檢查更新"
+msgstr "檢查代理 url 版本"
 
 #: libraries/config/messages.inc.php:524
 msgid ""
@@ -6116,20 +6102,18 @@ msgid ""
 msgstr ""
 
 #: libraries/config/messages.inc.php:525
-#, fuzzy
 #| msgid "Version check"
 msgid "Version check proxy username"
-msgstr "檢查更新"
+msgstr "檢查代理使用者名稱版本"
 
 #: libraries/config/messages.inc.php:526
 msgid "The password for authenticating with the proxy"
 msgstr ""
 
 #: libraries/config/messages.inc.php:527
-#, fuzzy
 #| msgid "Version check"
 msgid "Version check proxy password"
-msgstr "檢查更新"
+msgstr "檢查代理密碼版本"
 
 #: libraries/config/messages.inc.php:529
 msgid ""
@@ -6253,10 +6237,9 @@ msgid "Empty phpMyAdmin control user password while using pmadb"
 msgstr "使用 PMA 資料時控制使用者的密碼不能爲空"
 
 #: libraries/config/validate.lib.php:435
-#, fuzzy
 #| msgid "Incorrect value"
 msgid "Incorrect value:"
-msgstr "輸入的值不正確"
+msgstr "輸入的值不正確："
 
 #: libraries/config/validate.lib.php:443
 #, php-format
@@ -6301,16 +6284,14 @@ msgstr "密碼："
 #: libraries/display_change_password.lib.php:67
 #: libraries/replication_gui.lib.php:379
 #: libraries/server_privileges.lib.php:1226
-#, fuzzy
 #| msgid "Re-type"
 msgid "Re-type:"
-msgstr "重新輸入"
+msgstr "重新輸入："
 
 #: libraries/display_change_password.lib.php:74
-#, fuzzy
 #| msgid "Password Hashing"
 msgid "Password Hashing:"
-msgstr "密碼加密方式"
+msgstr "密碼加密方式："
 
 #: libraries/display_change_password.lib.php:87
 msgid "MySQL 4.0 compatible"
@@ -6325,10 +6306,9 @@ msgid "Create"
 msgstr "建立"
 
 #: libraries/display_create_database.lib.php:43
-#, fuzzy
 #| msgid "Create database"
 msgid "Create database:"
-msgstr "建立新資料庫"
+msgstr "建立新資料庫："
 
 #: libraries/display_create_database.lib.php:47
 #: libraries/server_privileges.lib.php:2943 server_privileges.php:149
@@ -6514,13 +6494,13 @@ msgstr ""
 #, fuzzy, php-format
 #| msgid "Create version %s of %s.%s"
 msgid "committed on %1$s by %2$s"
-msgstr "爲 %2$s.%3$s 建立版本 %1$s"
+msgstr "%2$s 提交了 %1$s"
 
 #: libraries/display_git_revision.lib.php:75
 #, fuzzy, php-format
 #| msgid "Create version %s of %s.%s"
 msgid "authored on %1$s by %2$s"
-msgstr "爲 %2$s.%3$s 建立版本 %1$s"
+msgstr "%2$s 執筆於 %1$s"
 
 #: libraries/display_import.lib.php:69
 msgid ""
@@ -6537,10 +6517,9 @@ msgid "%s of %s"
 msgstr ""
 
 #: libraries/display_import.lib.php:86
-#, fuzzy
 #| msgid "Format of imported file"
 msgid "Uploading your import file…"
-msgstr "匯入檔案的格式"
+msgstr "正在上傳您的匯入檔案…"
 
 #: libraries/display_import.lib.php:94
 #, php-format
@@ -6609,7 +6588,6 @@ msgid ""
 msgstr "上一個匯入操作超時，隨後重新送出將會從 %d 處開始。"
 
 #: libraries/display_import.lib.php:289
-#, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
 #| "close to the PHP timeout limit. <i>(This might be good way to import "
@@ -6618,9 +6596,7 @@ msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be a good way to import large "
 "files, however it can break transactions.)</i>"
-msgstr ""
-"在匯入時指令若檢測到可能需要花費很長時間則允許中斷。<i>(儘管這會中斷交易，但"
-"在匯入大檔案時是個很好的方法。)</i>"
+msgstr "在 PHP 執行匯入時，若偵測到逾時則允許中斷。<i>(在匯入大檔案時這是個很好的方法，不過這樣會中斷交易。)</i>"
 
 #: libraries/display_import.lib.php:296
 msgid "Number of rows to skip, starting from the first row:"
@@ -6636,10 +6612,9 @@ msgid "Add index"
 msgstr "新增索引"
 
 #: libraries/display_indexes.lib.php:52
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit index"
-msgstr "編輯模式"
+msgstr "編輯索引"
 
 #: libraries/display_indexes.lib.php:63
 msgid "Index name:"
@@ -6651,10 +6626,9 @@ msgid ""
 msgstr "(“PRIMARY”<b>必須</b>而且<b>只能</b>作爲主鍵的名稱！)"
 
 #: libraries/display_indexes.lib.php:85
-#, fuzzy
 #| msgid "Comment"
 msgid "Comment:"
-msgstr "註解"
+msgstr "註解："
 
 #: libraries/display_indexes.lib.php:99
 msgid "Index type:"
@@ -7007,7 +6981,6 @@ msgid ""
 msgstr "點選相應的“選項”連結修改它的設定"
 
 #: libraries/import.lib.php:1193
-#, fuzzy
 #| msgid "Edit its structure by following the \"Structure\" link"
 msgid "Edit structure by following the \"Structure\" link"
 msgstr "點選「結構」連結以編輯"
@@ -7061,10 +7034,9 @@ msgid "Binary - do not edit"
 msgstr "二進制 - 無法編輯"
 
 #: libraries/insert_edit.lib.php:1187 libraries/sql_query_form.lib.php:482
-#, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
-msgstr "網站伺服器上傳資料夾"
+msgstr "網站伺服器上傳資料夾："
 
 #: libraries/insert_edit.lib.php:1402
 #, php-format
@@ -7129,16 +7101,14 @@ msgid "Convert to Kana"
 msgstr "轉換爲假名"
 
 #: libraries/mult_submits.inc.php:288
-#, fuzzy
 #| msgid "Replace table prefix"
 msgid "Replace table prefix:"
-msgstr "覆蓋資料表名稱的前綴文字"
+msgstr "取代資料表名稱的前綴文字："
 
 #: libraries/mult_submits.inc.php:290
-#, fuzzy
 #| msgid "Copy table with prefix"
 msgid "Copy table with prefix:"
-msgstr "複製資料表名稱的前綴文字"
+msgstr "複製資料表並在名稱加上前綴文字："
 
 #: libraries/mult_submits.inc.php:295
 msgid "From"
@@ -7154,20 +7124,18 @@ msgid "Submit"
 msgstr "送出"
 
 #: libraries/mult_submits.inc.php:317
-#, fuzzy
 #| msgid "Add table prefix"
 msgid "Add table prefix:"
-msgstr "新增資料表的前綴文字"
+msgstr "新增資料表的前綴文字："
 
 #: libraries/mult_submits.inc.php:320
 msgid "Add prefix"
 msgstr "新增前綴文字"
 
 #: libraries/mult_submits.inc.php:339 sql.php:416
-#, fuzzy
 #| msgid "Do you really want to "
 msgid "Do you really want to execute the following query?"
-msgstr "您真的要"
+msgstr "您真的要執行下列的查詢？"
 
 #: libraries/mult_submits.inc.php:616 tbl_replace.php:251
 msgid "No change"
@@ -7387,10 +7355,9 @@ msgid_plural "%s other results found"
 msgstr[0] ""
 
 #: libraries/navigation/NavigationTree.class.php:1042
-#, fuzzy
 #| msgid "filter tables by name"
 msgid "filter databases by name"
-msgstr "請輸入部分或完整的表名"
+msgstr "依資料庫名稱篩選"
 
 #: libraries/navigation/NavigationTree.class.php:1043
 #: libraries/navigation/NavigationTree.class.php:1076
@@ -7398,10 +7365,9 @@ msgid "Clear Fast Filter"
 msgstr ""
 
 #: libraries/navigation/NavigationTree.class.php:1075
-#, fuzzy
 #| msgid "filter tables by name"
 msgid "filter items by name"
-msgstr "請輸入部分或完整的表名"
+msgstr "依項目名稱篩選"
 
 #. l10n: The word "Node" must not be translated here
 #: libraries/navigation/NodeFactory.class.php:41
@@ -7478,10 +7444,9 @@ msgid "New"
 msgstr ""
 
 #: libraries/operations.lib.php:75
-#, fuzzy
 #| msgid "Rename database to"
 msgid "Rename database to:"
-msgstr "將資料庫改名為"
+msgstr "將資料庫改名為："
 
 #: libraries/operations.lib.php:107
 #, php-format
@@ -7512,10 +7477,9 @@ msgid "Data only"
 msgstr "僅資料"
 
 #: libraries/operations.lib.php:175
-#, fuzzy
 #| msgid "Copy database to"
 msgid "Copy database to:"
-msgstr "複製資料庫到"
+msgstr "複製資料庫到："
 
 #: libraries/operations.lib.php:186
 msgid "CREATE DATABASE before copying"
@@ -7713,10 +7677,9 @@ msgid "Username:"
 msgstr "使用者名稱："
 
 #: libraries/plugins/auth/AuthenticationCookie.class.php:225
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
-msgstr "選擇伺服器"
+msgstr "選擇伺服器："
 
 #: libraries/plugins/auth/AuthenticationCookie.class.php:386
 msgid "Entered captcha is wrong, try again!"
@@ -7837,10 +7800,9 @@ msgstr "Event"
 #: libraries/rte/rte_events.lib.php:513
 #: libraries/rte/rte_routines.lib.php:1031
 #: libraries/rte/rte_triggers.lib.php:401
-#, fuzzy
 #| msgid "Description"
 msgid "Definition"
-msgstr "說明"
+msgstr "定義"
 
 #: libraries/plugins/export/ExportHtmlword.class.php:553
 #: libraries/plugins/export/ExportOdt.class.php:643
@@ -7883,24 +7845,22 @@ msgstr "物件建立選項"
 
 #: libraries/plugins/export/ExportLatex.class.php:121
 #: libraries/plugins/export/ExportLatex.class.php:166
-#, fuzzy
 #| msgid "Table caption"
 msgid "Table caption:"
-msgstr "表的標題"
+msgstr "表的標題："
 
 #: libraries/plugins/export/ExportLatex.class.php:126
 #: libraries/plugins/export/ExportLatex.class.php:171
-#, fuzzy
 #| msgid "Table caption (continued)"
 msgid "Table caption (continued):"
-msgstr "表的副標題"
+msgstr "表的標題(續上)："
 
 #: libraries/plugins/export/ExportLatex.class.php:131
 #: libraries/plugins/export/ExportLatex.class.php:176
 #, fuzzy
 #| msgid "Label key"
 msgid "Label key:"
-msgstr "關鍵標籤"
+msgstr "標籤鍵值："
 
 #: libraries/plugins/export/ExportLatex.class.php:137
 #: libraries/plugins/export/ExportOdt.class.php:103
@@ -7920,71 +7880,63 @@ msgid "Display MIME types"
 msgstr "顯示 MIME 類型"
 
 #: libraries/plugins/export/ExportLatex.class.php:162
-#, fuzzy
 #| msgid "Put columns names in the first row"
 msgid "Put columns names in the first row:"
-msgstr "首行儲存欄位名稱"
+msgstr "首行儲存欄位名稱："
 
 #: libraries/plugins/export/ExportLatex.class.php:218
 #: libraries/plugins/export/ExportSql.class.php:601
 #: libraries/plugins/export/ExportXml.class.php:191
 #: libraries/replication_gui.lib.php:68 libraries/replication_gui.lib.php:293
 #: libraries/server_privileges.lib.php:1081 libraries/sql.lib.php:459
-#, fuzzy
 #| msgid "Host"
 msgid "Host:"
-msgstr "主機"
+msgstr "主機："
 
 #: libraries/plugins/export/ExportLatex.class.php:223
 #: libraries/plugins/export/ExportSql.class.php:608
 #: libraries/plugins/export/ExportXml.class.php:196 libraries/sql.lib.php:462
-#, fuzzy
 #| msgid "Generation Time"
 msgid "Generation Time:"
-msgstr "產生日期"
+msgstr "產生時間："
 
 #: libraries/plugins/export/ExportLatex.class.php:226
 #: libraries/plugins/export/ExportSql.class.php:614
 #: libraries/plugins/export/ExportXml.class.php:199
-#, fuzzy
 #| msgid "PHP Version"
 msgid "PHP Version:"
-msgstr "PHP 版本"
+msgstr "PHP 版本："
 
 #: libraries/plugins/export/ExportLatex.class.php:251
 #: libraries/plugins/export/ExportSql.class.php:760
 #: libraries/plugins/export/ExportXml.class.php:390
 #: libraries/plugins/export/PMA_ExportPdf.class.php:115
 #: libraries/sql.lib.php:460
-#, fuzzy
 #| msgid "Database"
 msgid "Database:"
-msgstr "資料庫"
+msgstr "資料庫："
 
 #: libraries/plugins/export/ExportLatex.class.php:303
 #: libraries/plugins/export/ExportSql.class.php:1546
-#, fuzzy
 #| msgid "Data"
 msgid "Data:"
-msgstr "資料"
+msgstr "資料："
 
 #: libraries/plugins/export/ExportLatex.class.php:487
-#, fuzzy
 #| msgid "Structure"
 msgid "Structure:"
-msgstr "結構"
+msgstr "結構："
 
 #: libraries/plugins/export/ExportMediawiki.class.php:84
 #, fuzzy
 #| msgid "Export contents"
 msgid "Export table names"
-msgstr "匯出內容"
+msgstr "要匯出資料表的名稱"
 
 #: libraries/plugins/export/ExportMediawiki.class.php:90
-#, fuzzy
 #| msgid "horizontal (rotated headers)"
 msgid "Export table headers"
-msgstr "水平 (旋轉標題)"
+msgstr "匯出資料表的標題"
 
 #: libraries/plugins/export/ExportPdf.class.php:97
 msgid "(Generates a report containing the data of a single table)"
@@ -8035,10 +7987,9 @@ msgstr ""
 "表)</i>"
 
 #: libraries/plugins/export/ExportSql.class.php:295
-#, fuzzy
 #| msgid "Object creation options"
 msgid "Data creation options"
-msgstr "物件建立選項"
+msgstr "資料建立選項"
 
 #: libraries/plugins/export/ExportSql.class.php:299
 #: libraries/plugins/export/ExportSql.class.php:1652
@@ -8144,10 +8095,9 @@ msgid "Export contents"
 msgstr "匯出內容"
 
 #: libraries/plugins/export/PMA_ExportPdf.class.php:116
-#, fuzzy
 #| msgid "Table"
 msgid "Table:"
-msgstr "表"
+msgstr "資料表："
 
 #: libraries/plugins/import/ImportCsv.class.php:63
 #: libraries/plugins/import/ImportOds.class.php:74
@@ -8207,10 +8157,10 @@ msgid "MediaWiki Table"
 msgstr "MediaWiki 表"
 
 #: libraries/plugins/import/ImportMediawiki.class.php:303
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid format of CSV input on line %d."
 msgid "Invalid format of mediawiki input on line: <br />%s."
-msgstr "CSV 輸入的第 %d 行格式有錯"
+msgstr "mediawiki 輸入在此行格式錯誤:<br />%s."
 
 #: libraries/plugins/import/ImportOds.class.php:88
 msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
@@ -8229,10 +8179,9 @@ msgid ""
 msgstr "該 XML 檔案有錯誤或者不完整。請修復錯誤後重試。"
 
 #: libraries/plugins/import/ImportOds.class.php:182
-#, fuzzy
 #| msgid "Open Document Spreadsheet"
 msgid "Could not parse OpenDocument Spreasheet!"
-msgstr "OpenOffice 表格"
+msgstr "無法解析 OpenOffice 表格!"
 
 #: libraries/plugins/import/ImportShp.class.php:53
 msgid "ESRI Shape File"
@@ -8414,7 +8363,6 @@ msgid "not OK"
 msgstr "錯誤"
 
 #: libraries/relation.lib.php:92
-#, fuzzy
 #| msgid "OK"
 msgctxt "Correctly working"
 msgid "OK"
@@ -8522,10 +8470,9 @@ msgstr ""
 
 #: libraries/replication_gui.lib.php:60 libraries/replication_gui.lib.php:273
 #: libraries/server_privileges.lib.php:1024
-#, fuzzy
 #| msgid "User name"
 msgid "User name:"
-msgstr "帳號"
+msgstr "帳號："
 
 #: libraries/replication_gui.lib.php:61 libraries/replication_gui.lib.php:276
 #: libraries/replication_gui.lib.php:283
@@ -8535,10 +8482,9 @@ msgid "User name"
 msgstr "帳號"
 
 #: libraries/replication_gui.lib.php:72
-#, fuzzy
 #| msgid "Port"
 msgid "Port:"
-msgstr "連接埠"
+msgstr "連接埠："
 
 #: libraries/replication_gui.lib.php:112
 msgid "Master status"
@@ -8585,10 +8531,9 @@ msgstr "任意使用者"
 #: libraries/replication_gui.lib.php:372
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:2292
-#, fuzzy
 #| msgid "Use text field"
 msgid "Use text field:"
-msgstr "使用文字域"
+msgstr "使用文字欄位："
 
 #: libraries/replication_gui.lib.php:326
 #: libraries/server_privileges.lib.php:1139
@@ -8623,10 +8568,9 @@ msgid "Re-type"
 msgstr "重新輸入"
 
 #: libraries/replication_gui.lib.php:386
-#, fuzzy
 #| msgid "Generate Password"
 msgid "Generate Password:"
-msgstr "產生密碼"
+msgstr "產生密碼："
 
 #: libraries/rte/rte_events.lib.php:110 libraries/rte/rte_events.lib.php:119
 #: libraries/rte/rte_events.lib.php:157 libraries/rte/rte_routines.lib.php:296
@@ -8672,17 +8616,15 @@ msgstr "編輯 Event"
 #: libraries/rte/rte_routines.lib.php:1481
 #: libraries/rte/rte_routines.lib.php:1521
 #: libraries/rte/rte_triggers.lib.php:230
-#, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
-msgstr "要求處理得程序中有錯誤"
+msgstr "處理要求時發生錯誤："
 
 #: libraries/rte/rte_events.lib.php:417 libraries/rte/rte_routines.lib.php:931
 #: libraries/rte/rte_triggers.lib.php:347
-#, fuzzy
 #| msgid "Details…"
 msgid "Details"
-msgstr "詳細…"
+msgstr "詳細"
 
 #: libraries/rte/rte_events.lib.php:420
 msgid "Event name"
@@ -8693,10 +8635,10 @@ msgid "Event type"
 msgstr "Event 類型"
 
 #: libraries/rte/rte_events.lib.php:463 libraries/rte/rte_routines.lib.php:954
-#, fuzzy, php-format
+#, php-format
 #| msgid "Change"
 msgid "Change to %s"
-msgstr "修改"
+msgstr "修改為 %s"
 
 #: libraries/rte/rte_events.lib.php:469
 msgid "Execute at"
@@ -8707,14 +8649,12 @@ msgid "Execute every"
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:496
-#, fuzzy
 #| msgid "Startup"
 msgctxt "Start of recurring event"
 msgid "Start"
-msgstr "起始頁"
+msgstr "起始"
 
 #: libraries/rte/rte_events.lib.php:505
-#, fuzzy
 #| msgid "End"
 msgctxt "End of recurring event"
 msgid "End"
@@ -8771,10 +8711,9 @@ msgid "Event scheduler status"
 msgstr "Event 排程狀態"
 
 #: libraries/rte/rte_list.lib.php:55
-#, fuzzy
 #| msgid "Return type"
 msgid "Returns"
-msgstr "返回類型"
+msgstr "返回"
 
 #: libraries/rte/rte_routines.lib.php:69
 msgid ""
@@ -8786,38 +8725,36 @@ msgstr ""
 
 #: libraries/rte/rte_routines.lib.php:281
 #: libraries/rte/rte_routines.lib.php:1118
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid server index: %s"
 msgid "Invalid routine type: \"%s\""
-msgstr "無效的伺服器索引: %s"
+msgstr "無效的函式類型: \"%s\""
 
 #: libraries/rte/rte_routines.lib.php:321
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
 #: libraries/rte/rte_routines.lib.php:332
-#, fuzzy, php-format
+#, php-format
 #| msgid "Column %s has been dropped"
 msgid "Routine %1$s has been modified."
-msgstr "已刪除欄位 %s "
+msgstr "函式的 %1$s 已被修改。"
 
 #: libraries/rte/rte_routines.lib.php:353
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Routine %1$s has been created."
-msgstr "建立資料表 %1$s 成功"
+msgstr "函式 %1$s 已建立成功。"
 
 #: libraries/rte/rte_routines.lib.php:434
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
-msgstr "編輯模式"
+msgstr "編輯函式"
 
 #: libraries/rte/rte_routines.lib.php:934
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
-msgstr "一般"
+msgstr "函式名稱"
 
 #: libraries/rte/rte_routines.lib.php:960
 msgid "Parameters"
@@ -8827,7 +8764,7 @@ msgstr ""
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
-msgstr "直接連線"
+msgstr "方向"
 
 #: libraries/rte/rte_routines.lib.php:969
 #: libraries/tbl_columns_definition_form.inc.php:98
@@ -8839,36 +8776,32 @@ msgid "Add parameter"
 msgstr ""
 
 #: libraries/rte/rte_routines.lib.php:988
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
-msgstr "刪除資料庫"
+msgstr "移除最後的參數"
 
 #: libraries/rte/rte_routines.lib.php:993
 msgid "Return type"
 msgstr "返回類型"
 
 #: libraries/rte/rte_routines.lib.php:1000
-#, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
-msgstr "長度/值"
+msgstr "返回長度/值"
 
 #: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy
 #| msgid "Table options"
 msgid "Return options"
-msgstr "表選項"
+msgstr "返回選項"
 
 #: libraries/rte/rte_routines.lib.php:1037
 msgid "Is deterministic"
 msgstr ""
 
 #: libraries/rte/rte_routines.lib.php:1047
-#, fuzzy
 #| msgid "Security"
 msgid "Security type"
-msgstr "安全"
+msgstr "安全類型"
 
 #: libraries/rte/rte_routines.lib.php:1056
 msgid "SQL data access"
@@ -8903,10 +8836,10 @@ msgid "You must provide a routine definition."
 msgstr ""
 
 #: libraries/rte/rte_routines.lib.php:1370
-#, fuzzy, php-format
+#, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
-msgstr "允許運行 Procedure"
+msgstr "執行函式 %s 的結果"
 
 #: libraries/rte/rte_routines.lib.php:1435
 #, php-format
@@ -8921,41 +8854,37 @@ msgstr ""
 
 #: libraries/rte/rte_routines.lib.php:1572
 #: libraries/rte/rte_routines.lib.php:1575
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
-msgstr "一般"
+msgstr "函式的參數"
 
 #: libraries/rte/rte_triggers.lib.php:106
 msgid "Sorry, we failed to restore the dropped trigger."
 msgstr ""
 
 #: libraries/rte/rte_triggers.lib.php:116
-#, fuzzy, php-format
+#, php-format
 #| msgid "Column %s has been dropped"
 msgid "Trigger %1$s has been modified."
-msgstr "已刪除欄位 %s "
+msgstr "觸發器 %1$s 已被修改。"
 
 #: libraries/rte/rte_triggers.lib.php:136
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Trigger %1$s has been created."
-msgstr "建立資料表 %1$s 成功"
+msgstr "建立觸發器 %1$s 成功。"
 
 #: libraries/rte/rte_triggers.lib.php:204
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Edit trigger"
-msgstr "新增伺服器"
+msgstr "編輯觸發器"
 
 #: libraries/rte/rte_triggers.lib.php:350
-#, fuzzy
 #| msgid "Triggers"
 msgid "Trigger name"
-msgstr "觸發器"
+msgstr "觸發器名稱"
 
 #: libraries/rte/rte_triggers.lib.php:373
-#, fuzzy
 #| msgid "Time"
 msgctxt "Trigger action time"
 msgid "Time"
@@ -8974,86 +8903,77 @@ msgid "You must provide a valid event for the trigger"
 msgstr "您必須為 Event 指定一個正確觸發條件"
 
 #: libraries/rte/rte_triggers.lib.php:474
-#, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a valid table name"
-msgstr "無效的資料資料表名稱"
+msgstr "您必須提供一個合法的資料表名稱"
 
 #: libraries/rte/rte_triggers.lib.php:480
 msgid "You must provide a trigger definition."
 msgstr ""
 
 #: libraries/rte/rte_words.lib.php:27
-#, fuzzy
 #| msgid "Add index"
 msgid "Add routine"
-msgstr "新增索引"
+msgstr "新增函式"
 
 #: libraries/rte/rte_words.lib.php:29
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export defaults"
 msgid "Export of routine %s"
-msgstr "匯出選項"
+msgstr "匯出函式 %s"
 
 #: libraries/rte/rte_words.lib.php:30
-#, fuzzy
 #| msgid "Routines"
 msgid "routine"
-msgstr "一般"
+msgstr "函式"
 
 #: libraries/rte/rte_words.lib.php:31
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a routine"
-msgstr "權限不足！"
+msgstr "您無建立函式的權限"
 
 #: libraries/rte/rte_words.lib.php:32
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No routine with name %1$s found in database %2$s"
-msgstr "沒有在資料庫中找到表"
+msgstr "在資料庫 %2$s 中無此函式名稱 %1$s"
 
 #: libraries/rte/rte_words.lib.php:33
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no routines to display."
-msgstr "沒有可上傳的檔案"
+msgstr "沒有函式可供顯示。"
 
 #: libraries/rte/rte_words.lib.php:39
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add trigger"
-msgstr "新增伺服器"
+msgstr "新增觸發器"
 
 #: libraries/rte/rte_words.lib.php:41
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of trigger %s"
-msgstr "匯出內容"
+msgstr "匯出觸發器 %s"
 
 #: libraries/rte/rte_words.lib.php:42
-#, fuzzy
 #| msgid "Triggers"
 msgid "trigger"
 msgstr "觸發器"
 
 #: libraries/rte/rte_words.lib.php:43
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a trigger"
-msgstr "權限不足！"
+msgstr "您無建立觸發器的權限"
 
 #: libraries/rte/rte_words.lib.php:44
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No trigger with name %1$s found in database %2$s"
-msgstr "沒有在資料庫中找到表"
+msgstr "資料庫 %2$s 中無此觸發器 %1$s"
 
 #: libraries/rte/rte_words.lib.php:45
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no triggers to display."
-msgstr "沒有可上傳的檔案"
+msgstr "沒有觸發器可供顯示。"
 
 #: libraries/rte/rte_words.lib.php:51
 msgid "Add event"
@@ -9078,10 +8998,9 @@ msgid "No event with name %1$s found in database %2$s"
 msgstr "在資料庫「%2$s」中找不到名為「%1$s」的 Event"
 
 #: libraries/rte/rte_words.lib.php:57
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no events to display."
-msgstr "沒有可上傳的檔案"
+msgstr "沒有事件可供顯示。"
 
 #: libraries/schema/Dia_Relation_Schema.class.php:240
 #: libraries/schema/Eps_Relation_Schema.class.php:429
@@ -9237,10 +9156,9 @@ msgid "Unknown language: %1$s."
 msgstr "未知的語言：%1$s."
 
 #: libraries/select_server.lib.php:39 libraries/select_server.lib.php:44
-#, fuzzy
 #| msgid "Current Server"
 msgid "Current Server:"
-msgstr "目前伺服器"
+msgstr "目前伺服器："
 
 #: libraries/server_bin_log.lib.php:31
 msgid "Select binary log to view"
@@ -9308,7 +9226,6 @@ msgid "License"
 msgstr ""
 
 #: libraries/server_plugins.lib.php:184
-#, fuzzy
 #| msgid "Disabled"
 msgid "disabled"
 msgstr "已關閉"
@@ -9610,10 +9527,9 @@ msgid "Grant"
 msgstr "授權"
 
 #: libraries/server_privileges.lib.php:1610
-#, fuzzy
 #| msgid "View %s has been dropped"
 msgid "User has been added."
-msgstr "已刪除 view %s"
+msgstr "已新增使用者。"
 
 #: libraries/server_privileges.lib.php:1618
 msgctxt "Create new user"
@@ -9682,20 +9598,18 @@ msgid "Column-specific privileges"
 msgstr "按欄位指定權限"
 
 #: libraries/server_privileges.lib.php:2288
-#, fuzzy
 #| msgid "Add privileges on the following database"
 msgid "Add privileges on the following database:"
-msgstr "在下列資料庫新增權限"
+msgstr "在下列資料庫新增權限："
 
 #: libraries/server_privileges.lib.php:2309
 msgid "Wildcards % and _ should be escaped with a \\ to use them literally"
 msgstr "要使用萬用字元 _ 和 % 本身，應使用用 \\ 轉義"
 
 #: libraries/server_privileges.lib.php:2327
-#, fuzzy
 #| msgid "Add privileges on the following table"
 msgid "Add privileges on the following table:"
-msgstr "在下列資料表新增權限"
+msgstr "在下列資料表新增權限："
 
 #: libraries/server_privileges.lib.php:2544
 msgid "Remove selected users"
@@ -9729,19 +9643,17 @@ msgid "You have updated the privileges for %s."
 msgstr "您已更新了 %s 的權限。"
 
 #: libraries/server_privileges.lib.php:2805
-#, fuzzy, php-format
+#, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
-msgstr "權限"
+msgstr "權限 %s"
 
 #: libraries/server_privileges.lib.php:2861
-#, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit Privileges:"
-msgstr "編輯權限"
+msgstr "編輯權限："
 
 #: libraries/server_privileges.lib.php:2915
-#, fuzzy
 #| msgid "User overview"
 msgid "Users overview"
 msgstr "查看使用者"
@@ -9771,56 +9683,49 @@ msgid "SQL result"
 msgstr "SQL 查詢結果"
 
 #: libraries/sql.lib.php:464
-#, fuzzy
 #| msgid "Generated by"
 msgid "Generated by:"
-msgstr "產生者"
+msgstr "產生者："
 
 #: libraries/sql.lib.php:495
 #, fuzzy
 #| msgid "Data file grow size"
 msgid "Detailed profile"
-msgstr "資料檔案增長大小"
+msgstr "簡介明細"
 
 #: libraries/sql.lib.php:498
-#, fuzzy
 #| msgid "Other"
 msgid "Order"
-msgstr "其他"
+msgstr "順序"
 
 #: libraries/sql.lib.php:500 libraries/sql.lib.php:546
-#, fuzzy
 #| msgid "Startup"
 msgid "State"
-msgstr "起始頁"
+msgstr "狀態"
 
 #: libraries/sql.lib.php:543
 msgid "Summary by state"
 msgstr ""
 
 #: libraries/sql.lib.php:551
-#, fuzzy
 #| msgid "Total time:"
 msgid "Total Time"
-msgstr "總計耗時："
+msgstr "總計耗時"
 
 #: libraries/sql.lib.php:553
-#, fuzzy
 #| msgid "Time"
 msgid "% Time"
-msgstr "時間"
+msgstr "% 時間"
 
 #: libraries/sql.lib.php:555
-#, fuzzy
 #| msgid "Close"
 msgid "Calls"
-msgstr "關閉"
+msgstr "次呼叫"
 
 #: libraries/sql.lib.php:557
-#, fuzzy
 #| msgid "Time"
 msgid "ø Time"
-msgstr "時間"
+msgstr "ø 時間"
 
 #: libraries/sql_query_form.lib.php:188
 #, php-format
@@ -9837,10 +9742,9 @@ msgid "Clear"
 msgstr "清除"
 
 #: libraries/sql_query_form.lib.php:318
-#, fuzzy
 #| msgid "Bookmark this SQL query"
 msgid "Bookmark this SQL query:"
-msgstr "將此 SQL 查詢加爲書籤"
+msgstr "將此 SQL 查詢加爲書籤："
 
 #: libraries/sql_query_form.lib.php:326 sql.php:1199
 msgid "Let every user access this bookmark"
@@ -10015,20 +9919,18 @@ msgid "Fulltext"
 msgstr "全文搜尋"
 
 #: libraries/structure.lib.php:1423 libraries/structure.lib.php:1519
-#, fuzzy
 #| msgid "Remove column(s)"
 msgid "Move columns"
-msgstr "刪除欄位"
+msgstr "移動欄位"
 
 #: libraries/structure.lib.php:1426
 msgid "Move the columns by dragging them up and down."
 msgstr ""
 
 #: libraries/structure.lib.php:1460
-#, fuzzy
 #| msgid "Print view"
 msgid "Edit view"
-msgstr "列印預覽"
+msgstr "編輯視表"
 
 #: libraries/structure.lib.php:1493
 msgid "Relation view"
@@ -10067,7 +9969,6 @@ msgid "After %s"
 msgstr "於 %s 之後"
 
 #: libraries/structure.lib.php:1670
-#, fuzzy
 #| msgid "Row Statistics"
 msgid "Row statistics"
 msgstr "行統計"
@@ -10108,10 +10009,9 @@ msgid "A primary key has been added on %s"
 msgstr "已將 %s 設爲主鍵"
 
 #: libraries/structure.lib.php:2003 libraries/structure.lib.php:2074
-#, fuzzy
 #| msgid "Browse distinct values"
 msgid "Distinct values"
-msgstr "瀏覽非重複值 (DISTINCT)"
+msgstr "不同的值"
 
 #: libraries/structure.lib.php:2006 libraries/structure.lib.php:2009
 msgid "Add primary key"
@@ -10122,10 +10022,9 @@ msgid "Add unique index"
 msgstr "新增唯一鍵"
 
 #: libraries/structure.lib.php:2024 libraries/structure.lib.php:2027
-#, fuzzy
 #| msgid "Add index"
 msgid "Add SPATIAL index"
-msgstr "新增索引"
+msgstr "新增 SPATIAL 索引"
 
 #: libraries/structure.lib.php:2030 libraries/structure.lib.php:2033
 msgid "Add FULLTEXT index"
@@ -10145,16 +10044,14 @@ msgid "Table %1$s has been altered successfully"
 msgstr "已成功修改表 %1$s"
 
 #: libraries/structure.lib.php:2413 tbl_tracking.php:457 tbl_tracking.php:481
-#, fuzzy
 #| msgid "Query type"
 msgid "Query error"
-msgstr "查詢方式"
+msgstr "查詢錯誤"
 
 #: libraries/structure.lib.php:2509
-#, fuzzy
 #| msgid "The selected users have been deleted successfully."
 msgid "The columns have been moved successfully."
-msgstr "已成功刪除選中的使用者"
+msgstr "欄位已搬移成功。"
 
 #: libraries/structure.lib.php:2557
 #, php-format
@@ -10178,10 +10075,9 @@ msgid ""
 msgstr "對於預設值，請只輸入單個值，不要加反斜槓或引號，請用此格式：a"
 
 #: libraries/tbl_columns_definition_form.inc.php:149
-#, fuzzy
 #| msgid "Remove column(s)"
 msgid "Move column"
-msgstr "刪除欄位"
+msgstr "搬移欄位"
 
 #: libraries/tbl_columns_definition_form.inc.php:159
 #, php-format
@@ -10226,7 +10122,7 @@ msgid "first"
 msgstr ""
 
 #: libraries/tbl_columns_definition_form.inc.php:644
-#, fuzzy, php-format
+#, php-format
 #| msgid "After %s"
 msgid "after %s"
 msgstr "於 %s 之後"
@@ -10236,28 +10132,25 @@ msgid "Table name"
 msgstr "資料資料表名稱"
 
 #: libraries/tbl_columns_definition_form.inc.php:838
-#, fuzzy
 #| msgid "Storage Engine"
 msgid "Storage Engine:"
-msgstr "儲存引擎"
+msgstr "儲存引擎："
 
 #: libraries/tbl_columns_definition_form.inc.php:842
-#, fuzzy
 #| msgid "Collation"
 msgid "Collation:"
-msgstr "排序規則"
+msgstr "排序規則："
 
 #: libraries/tbl_columns_definition_form.inc.php:876
-#, fuzzy
 #| msgid "PARTITION definition"
 msgid "PARTITION definition:"
-msgstr "分區定義"
+msgstr "分區定義："
 
 #: libraries/tbl_common.inc.php:54
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking of %s is activated."
-msgstr "%s.%s 的追蹤已啓用"
+msgstr "%s 的追蹤已啓用。"
 
 #: libraries/user_preferences.inc.php:29
 msgid "Manage your settings"
@@ -10350,10 +10243,9 @@ msgid "Toggle small/big"
 msgstr "反向收縮/展開"
 
 #: pmd_general.php:141
-#, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
-msgstr "要選擇關聯，點選："
+msgstr "請點選關聯行"
 
 #: pmd_general.php:147 pmd_pdf.php:102
 msgid "Import/Export coordinates for PDF schema"
@@ -10376,10 +10268,9 @@ msgid "Hide/Show Tables with no relation"
 msgstr "隱藏/顯示沒有關聯的表"
 
 #: pmd_general.php:218
-#, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
-msgstr "資料表數量"
+msgstr "資料表數量："
 
 #: pmd_general.php:467
 msgid "Delete relation"
@@ -10424,10 +10315,9 @@ msgid "Page creation failed"
 msgstr "頁面建立失敗"
 
 #: pmd_pdf.php:113
-#, fuzzy
 #| msgid "Page"
 msgid "Page:"
-msgstr "頁面"
+msgstr "頁面："
 
 #: pmd_pdf.php:123
 msgid "Import from selected page"
@@ -10446,10 +10336,9 @@ msgid "New page name: "
 msgstr "新頁面名: "
 
 #: pmd_pdf.php:141
-#, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Export/Import to scale:"
-msgstr "按比例匯出/匯入"
+msgstr "按比例匯出/匯入："
 
 #: pmd_pdf.php:146
 msgid "recommended"
@@ -10468,10 +10357,9 @@ msgid "FOREIGN KEY relation added"
 msgstr "已新增外部鍵關聯"
 
 #: pmd_relation_new.php:82
-#, fuzzy
 #| msgid "Error: Relation not added."
 msgid "Error: Relational features are disabled!"
-msgstr "錯誤：關聯未新增"
+msgstr "錯誤：關聯未啟用!"
 
 #: pmd_relation_new.php:98
 msgid "Internal relation added"
@@ -10562,10 +10450,9 @@ msgid "All"
 msgstr "全部"
 
 #: querywindow.php:154
-#, fuzzy
 #| msgid "SQL history"
 msgid "SQL history:"
-msgstr "SQL 歷史"
+msgstr "SQL 歷史："
 
 #: schema_edit.php:36 schema_edit.php:42 schema_edit.php:48 schema_edit.php:53
 #, php-format
@@ -10577,11 +10464,13 @@ msgid "File doesn't exist"
 msgstr "檔案不存在"
 
 #: server_databases.php:117
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
-msgstr[0] "已成功刪除 %s 個資料庫"
+msgstr[0] ""
+"已成功刪除 %1$d 個資料庫。\n"
+"已成功刪除 %1$d 個資料庫。"
 
 #: server_databases.php:138
 msgid "Databases statistics"
@@ -10811,10 +10700,10 @@ msgid "Network traffic since startup: %s"
 msgstr ""
 
 #: server_status.php:106
-#, fuzzy, php-format
+#, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "此 MySQL 伺服器已經運行了 %s，啓動時間爲 %s"
+msgstr "此 MySQL 伺服器已經運行了 %1$s，啓動時間爲 %2$s。"
 
 #: server_status.php:116
 msgid ""
@@ -10871,9 +10760,8 @@ msgid "Command"
 msgstr "命令"
 
 #: server_status_advisor.php:44
-#, fuzzy
 msgid "Instructions"
-msgstr "資料"
+msgstr "指令"
 
 #: server_status_advisor.php:50
 msgid ""
@@ -10903,9 +10791,8 @@ msgid ""
 msgstr ""
 
 #: server_status_monitor.php:453
-#, fuzzy
 msgid "Monitor Instructions"
-msgstr "資料"
+msgstr "監督指令"
 
 #: server_status_monitor.php:455
 msgid ""
@@ -10956,38 +10843,34 @@ msgid ""
 msgstr ""
 
 #: server_status_monitor.php:515 server_status_monitor.php:701
-#, fuzzy
 #| msgid "Add index"
 msgid "Add chart"
-msgstr "新增索引"
+msgstr "新增圖表"
 
 #: server_status_monitor.php:519
-#, fuzzy
 #| msgid "Remove database"
 msgid "Preset chart"
-msgstr "刪除資料庫"
+msgstr "預設圖表"
 
 #: server_status_monitor.php:523
 #, fuzzy
 #| msgid "See slave status table"
 msgid "Status variable(s)"
-msgstr "查看從伺服器狀態"
+msgstr "狀態變數值"
 
 #: server_status_monitor.php:526
-#, fuzzy
 #| msgid "Select Tables"
 msgid "Select series:"
-msgstr "選擇表"
+msgstr "選擇序列："
 
 #: server_status_monitor.php:528
 msgid "Commonly monitored"
 msgstr ""
 
 #: server_status_monitor.php:544
-#, fuzzy
 #| msgid "Invalid table name"
 msgid "or type variable name:"
-msgstr "無效的資料資料表名稱"
+msgstr "或變數型態名稱："
 
 #: server_status_monitor.php:551
 msgid "Display as differential value"
@@ -11002,32 +10885,28 @@ msgid "Append unit to data values"
 msgstr ""
 
 #: server_status_monitor.php:568
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add this series"
-msgstr "新增伺服器"
+msgstr "新增這個序列"
 
 #: server_status_monitor.php:570
 msgid "Clear series"
 msgstr ""
 
 #: server_status_monitor.php:573
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Series in Chart:"
-msgstr "SQL 查詢"
+msgstr "圖表中的序列："
 
 #: server_status_monitor.php:584
-#, fuzzy
 #| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "顯示統計"
+msgstr "紀錄統計"
 
 #: server_status_monitor.php:585
-#, fuzzy
 #| msgid "Select page"
 msgid "Selected time range:"
-msgstr "選擇頁"
+msgstr "選擇時間範圍："
 
 #: server_status_monitor.php:591
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
@@ -11046,30 +10925,33 @@ msgid "Results are grouped by query text."
 msgstr ""
 
 #: server_status_monitor.php:606
-#, fuzzy
 #| msgid "Query type"
 msgid "Query analyzer"
-msgstr "查詢方式"
+msgstr "查詢分析"
 
 #: server_status_monitor.php:654
-#, fuzzy, php-format
+#, php-format
 #| msgid "Second"
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "秒"
+msgstr[0] ""
+"%d 秒\n"
+"%d 秒"
 
 #: server_status_monitor.php:657
-#, fuzzy, php-format
+#, php-format
 #| msgid "Minute"
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "分"
+msgstr[0] ""
+"%d 分\n"
+"%d 分"
 
 #: server_status_monitor.php:674
 #, fuzzy
 #| msgid "Textarea rows"
 msgid "Start Monitor"
-msgstr "文字框行"
+msgstr "開始觀察(monitor)"
 
 #: server_status_monitor.php:681
 msgid "Instructions/Setup"
@@ -11080,27 +10962,24 @@ msgid "Done dragging (rearranging) charts"
 msgstr ""
 
 #: server_status_monitor.php:704
-#, fuzzy
 #| msgid "Enable highlighting"
 msgid "Enable charts dragging"
-msgstr "啓用醒目提示"
+msgstr "啓用圖表拖放"
 
 #: server_status_monitor.php:708
-#, fuzzy
 msgid "Refresh rate"
-msgstr "重新整理"
+msgstr "更新頻率"
 
 #: server_status_monitor.php:717
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Chart columns"
-msgstr "文本框列"
+msgstr "圖表欄位"
 
 #: server_status_monitor.php:733
 #, fuzzy
 #| msgid "Error management:"
 msgid "Chart arrangement"
-msgstr "錯誤管理:"
+msgstr "圖表排列"
 
 #: server_status_monitor.php:736
 msgid ""
@@ -11109,34 +10988,30 @@ msgid ""
 msgstr ""
 
 #: server_status_monitor.php:750
-#, fuzzy
 #| msgid "Restore default value"
 msgid "Reset to default"
 msgstr "還原預設值"
 
 #: server_status_queries.php:67
-#, fuzzy, php-format
+#, php-format
 #| msgid "Customize startup page"
 msgid "Questions since startup: %s"
-msgstr "自訂起始頁"
+msgstr "自啟動後的問題：%s"
 
 #: server_status_queries.php:79
-#, fuzzy
 #| msgid "per hour"
 msgid "per hour:"
-msgstr "每小時"
+msgstr "每小時："
 
 #: server_status_queries.php:82
-#, fuzzy
 #| msgid "per minute"
 msgid "per minute:"
-msgstr "每分鐘"
+msgstr "每分鐘："
 
 #: server_status_queries.php:86
-#, fuzzy
 #| msgid "per second"
 msgid "per second:"
-msgstr "每秒"
+msgstr "每秒："
 
 #: server_status_queries.php:119
 msgid "Statements"
@@ -11153,32 +11028,28 @@ msgid "Filters"
 msgstr "過濾"
 
 #: server_status_variables.php:82 server_variables.php:158
-#, fuzzy
 #| msgid "Do not change the password"
 msgid "Containing the word:"
-msgstr "保持原密碼"
+msgstr "包含這個字："
 
 #: server_status_variables.php:89
-#, fuzzy
 #| msgid "Show open tables"
 msgid "Show only alert values"
-msgstr "顯示開啟的表"
+msgstr "只顯示警示值"
 
 #: server_status_variables.php:94
 msgid "Filter by category…"
 msgstr ""
 
 #: server_status_variables.php:114
-#, fuzzy
 #| msgid "Show open tables"
 msgid "Show unformatted values"
-msgstr "顯示開啟的表"
+msgstr "顯示未格式化的值"
 
 #: server_status_variables.php:133
-#, fuzzy
 #| msgid "Related Links"
 msgid "Related links:"
-msgstr "相關連結"
+msgstr "相關連結："
 
 #: server_status_variables.php:330
 msgid ""
@@ -11187,10 +11058,9 @@ msgid ""
 msgstr ""
 
 #: server_status_variables.php:334
-#, fuzzy
 #| msgid "Could not connect to MySQL server"
 msgid "The number of failed attempts to connect to the MySQL server."
-msgstr "無法連線到 MySQL 伺服器"
+msgstr "無法連線到 MySQL 伺服器。"
 
 #: server_status_variables.php:337
 msgid ""
@@ -11562,10 +11432,9 @@ msgid ""
 msgstr "鍵快取中已經使用的塊數。該值指示在某個時刻使用了最多塊數的數量。"
 
 #: server_status_variables.php:596
-#, fuzzy
 #| msgid "Format of imported file"
 msgid "Percentage of used key cache (calculated value)"
-msgstr "匯入檔案的格式"
+msgstr "已使用鍵值緩存的百分比(計算值)"
 
 #: server_status_variables.php:599
 msgid "The number of requests to read a key block from the cache."
@@ -11801,10 +11670,9 @@ msgstr ""
 "thread_cache_size 的值 (如果程序狀況良好，這麼做通常並不會帶來顯著的性能提升)"
 
 #: server_status_variables.php:758
-#, fuzzy
 #| msgid "Tracking is not active."
 msgid "Thread cache hit rate (calculated value)"
-msgstr "追蹤已停用"
+msgstr "執行序緩存命中率(計算值)"
 
 #: server_status_variables.php:761
 msgid "The number of threads that are not sleeping."
@@ -11866,10 +11734,9 @@ msgid "Insecure connection"
 msgstr "非安全連線"
 
 #: setup/frames/index.inc.php:98
-#, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration saved."
-msgstr "修改已儲存"
+msgstr "設定已儲存。"
 
 #: setup/frames/index.inc.php:99
 msgid ""
@@ -12108,10 +11975,9 @@ msgid ""
 msgstr "此系統目前不支援 %sZip 解壓縮%s所必須的 (%s) 函數。"
 
 #: setup/lib/index.lib.php:348
-#, fuzzy
 #| msgid "You should use SSL connections if your web server supports it."
 msgid "You should use SSL connections if your database server supports it."
-msgstr "如果伺服器支援，您應該使用 SSL 連線"
+msgstr "如果資料庫支援，您應該使用 SSL 連線。"
 
 #: setup/lib/index.lib.php:363
 msgid "You should use mysqli for performance reasons."
@@ -12130,10 +11996,9 @@ msgid "Key should contain letters, numbers [em]and[/em] special characters."
 msgstr "短語密碼應包含字母、數字[em]和[/em]特殊字元。"
 
 #: setup/validate.php:22
-#, fuzzy
 #| msgid "No databases"
 msgid "Wrong data"
-msgstr "沒有資料庫"
+msgstr "錯誤的資料"
 
 #: sql.php:216
 #, php-format
@@ -12141,10 +12006,9 @@ msgid "Using bookmark \"%s\" as default browse query."
 msgstr "使用書籤 \"%s\" 作爲預設的查詢。"
 
 #: sql.php:298
-#, fuzzy
 #| msgid "Bookmark %s created"
 msgid "Bookmark not created"
-msgstr "已建立書籤 %s"
+msgstr "書籤並未建立"
 
 #: sql.php:842
 msgid "Showing as PHP code"
@@ -12155,14 +12019,14 @@ msgid "Validated SQL"
 msgstr "已校驗的 SQL"
 
 #: sql.php:1101
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
 #| "edit, checkbox, Edit, Copy and Delete links may not work after saving."
 msgid ""
 "Table %s does not contain a unique column. Grid edit, checkbox, Edit, Copy "
 "and Delete features are not available."
-msgstr "這個資料表不含唯一的資料欄位，跟修改、複製、刪除有關的功能可能會無效。"
+msgstr "資料表 %s 不含唯一的資料欄位，將無法執行修改、複製、刪除等相關的功能。"
 
 #: sql.php:1154
 #, php-format
@@ -12174,16 +12038,14 @@ msgid "Bookmark this SQL query"
 msgstr "將此 SQL 查詢加爲書籤"
 
 #: sql.php:1191
-#, fuzzy
 #| msgid "Label"
 msgid "Label:"
-msgstr "標籤"
+msgstr "標籤："
 
 #: tbl_chart.php:38
-#, fuzzy
 #| msgid "No databases"
 msgid "No data to display"
-msgstr "沒有資料庫"
+msgstr "無資料可顯示"
 
 #: tbl_chart.php:62 tbl_gis_visualization.php:24
 msgid "No SQL query was set to fetch data."
@@ -12194,21 +12056,18 @@ msgid "No numeric columns present in the table to plot."
 msgstr ""
 
 #: tbl_chart.php:154
-#, fuzzy
 #| msgid "Bar"
 msgctxt "Chart type"
 msgid "Bar"
-msgstr "柱狀圖"
+msgstr "長條圖"
 
 #: tbl_chart.php:156
-#, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "欄位"
 
 #: tbl_chart.php:159
-#, fuzzy
 #| msgid "Line"
 msgctxt "Chart type"
 msgid "Line"
@@ -12219,7 +12078,7 @@ msgstr "折線圖"
 #| msgid "Inline"
 msgctxt "Chart type"
 msgid "Spline"
-msgstr "行間"
+msgstr "Spline"
 
 #: tbl_chart.php:163
 msgctxt "Chart type"
@@ -12227,56 +12086,49 @@ msgid "Area"
 msgstr ""
 
 #: tbl_chart.php:166
-#, fuzzy
 #| msgid "Pie"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "餅圖"
 
 #: tbl_chart.php:170
-#, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
-msgstr "時間"
+msgstr "時間軸"
 
 #: tbl_chart.php:177
 msgid "Stacked"
 msgstr "堆疊"
 
 #: tbl_chart.php:180
-#, fuzzy
 #| msgid "Report title:"
 msgid "Chart title"
-msgstr "報告標題："
+msgstr "圖表標題"
 
 #: tbl_chart.php:184
 msgid "X-Axis:"
 msgstr ""
 
 #: tbl_chart.php:200
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
-msgstr "SQL 查詢"
+msgstr "序列："
 
 #: tbl_chart.php:229
-#, fuzzy
 #| msgid "X Axis label"
 msgid "X-Axis label:"
-msgstr "水平軸標籤"
+msgstr "水平軸標籤："
 
 #: tbl_chart.php:232
-#, fuzzy
 #| msgid "Value"
 msgid "X Values"
-msgstr "值"
+msgstr "水平軸值"
 
 #: tbl_chart.php:234
-#, fuzzy
 #| msgid "Y Axis label"
 msgid "Y-Axis label:"
-msgstr "豎直軸標籤"
+msgstr "垂直軸標籤："
 
 #: tbl_create.php:34
 #, php-format
@@ -12305,35 +12157,32 @@ msgstr "無效的資料資料表名稱"
 #, fuzzy
 #| msgid "Display servers selection"
 msgid "Display GIS Visualization"
-msgstr "顯示伺服器選擇"
+msgstr "顯示可視化地理訊息"
 
 #: tbl_gis_visualization.php:119
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Label column"
-msgstr "文本框列"
+msgstr "標籤欄位"
 
 #: tbl_gis_visualization.php:121
-#, fuzzy
 #| msgid "- none -"
 msgid "-- None --"
-msgstr "- 無 -"
+msgstr "-- 無 --"
 
 #: tbl_gis_visualization.php:135
 #, fuzzy
 #| msgid "Total count"
 msgid "Spatial column"
-msgstr "總數量"
+msgstr "Spatial 欄位"
 
 #: tbl_gis_visualization.php:150
 msgid "Redraw"
 msgstr "重繪"
 
 #: tbl_gis_visualization.php:178
-#, fuzzy
 #| msgid "Table name"
 msgid "File name"
-msgstr "資料資料表名稱"
+msgstr "檔案名稱"
 
 #: tbl_indexes.php:71
 msgid "The name of the primary key must be \"PRIMARY\"!"
@@ -12370,22 +12219,19 @@ msgid "The table name is empty!"
 msgstr "資料表名稱不能爲空！"
 
 #: tbl_printview.php:65
-#, fuzzy
 #| msgid "Show tables"
 msgid "Showing tables:"
-msgstr "顯示資料表"
+msgstr "顯示資料表："
 
 #: tbl_printview.php:296
-#, fuzzy
 #| msgid "Space usage"
 msgid "Space usage:"
-msgstr "已用空間"
+msgstr "已用空間："
 
 #: tbl_printview.php:345
-#, fuzzy
 #| msgid "Row Statistics"
 msgid "Row Statistics:"
-msgstr "行統計"
+msgstr "行統計："
 
 #: tbl_relation.php:213
 #, php-format
@@ -12407,28 +12253,24 @@ msgid "Foreign key constraint"
 msgstr "外部鍵約束"
 
 #: tbl_relation.php:500
-#, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
-msgstr "資料表的 Constraints"
+msgstr "約束名稱"
 
 #: tbl_relation.php:531
-#, fuzzy
 #| msgid "No index defined!"
 msgid "No index defined! Create one below"
-msgstr "沒有已定義的索引！"
+msgstr "未定義索引! 請建立一個"
 
 #: tbl_relation.php:546
-#, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
-msgstr "選擇要顯示的欄位"
+msgstr "選擇要顯示的欄位："
 
 #: tbl_structure.php:125
-#, fuzzy
 #| msgid "No rows selected"
 msgid "No column selected."
-msgstr "沒有選中任何行"
+msgstr "未選定欄位。"
 
 #: tbl_tracking.php:135
 #, php-format
@@ -12436,22 +12278,22 @@ msgid "Tracking report for table `%s`"
 msgstr "`%s` 的追蹤報告"
 
 #: tbl_tracking.php:205
-#, fuzzy, php-format
+#, php-format
 #| msgid "Version %s is created, tracking for %s.%s is activated."
 msgid "Version %1$s was created, tracking for %2$s is active."
-msgstr "已建立版本 %s，%s.%s 的追蹤已啓用"
+msgstr "已建立版本 %1$s，%2$s 的追蹤已啓用。"
 
 #: tbl_tracking.php:222
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking for %1$s was deactivated at version %2$s."
-msgstr "%s.%s 的追蹤已啓用"
+msgstr "在版本 %2$s 已停用 %1$s 的追蹤。"
 
 #: tbl_tracking.php:239
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking for %1$s was activated at version %2$s."
-msgstr "%s.%s 的追蹤已啓用"
+msgstr "在版本 %2$s 已啟用 %1$s 的追。"
 
 #: tbl_tracking.php:253
 msgid "SQL statements executed."
@@ -12477,10 +12319,9 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "版本 %s 的快照 (SQL 程式碼)"
 
 #: tbl_tracking.php:454
-#, fuzzy
 #| msgid "Track these data definition statements:"
 msgid "Tracking data definition successfully deleted"
-msgstr "追蹤這些資料定義的語句:"
+msgstr "追蹤資料定義已刪除"
 
 #: tbl_tracking.php:478
 #, fuzzy