diff --git a/po/zh_TW.po b/po/zh_TW.po
index fdfbc2ed25..5f8c26aac6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2015-09-06 07:31-0400\n"
-"PO-Revision-Date: 2015-08-27 13:45+0200\n"
+"PO-Revision-Date: 2015-09-16 05:36+0200\n"
 "Last-Translator: Chien Wei Lin <cwlin0416@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
-"phpmyadmin/master/zh_TW/>\n"
+"Language-Team: Chinese (Taiwan) "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -631,7 +631,6 @@ msgstr ""
 "及 pma 使用者。這兒有更多的資訊 %s。"
 
 #: index.php:163
-#, fuzzy
 #| msgid "General Settings"
 msgid "General settings"
 msgstr "一般設定"
@@ -647,7 +646,6 @@ msgid "Server connection collation"
 msgstr "伺服器連線編碼與排序"
 
 #: index.php:229
-#, fuzzy
 #| msgid "Appearance Settings"
 msgid "Appearance settings"
 msgstr "外觀設定"
@@ -971,7 +969,6 @@ msgid ""
 msgstr "您確定您要更改所有欄位編碼與排序(Collation)並轉換資料？"
 
 #: js/messages.php:88
-#, fuzzy
 #| msgid "Save & Close"
 msgid "Save & close"
 msgstr "儲存並關閉"
@@ -983,7 +980,6 @@ msgid "Reset"
 msgstr "重新設定"
 
 #: js/messages.php:90
-#, fuzzy
 #| msgid "Reset All"
 msgid "Reset all"
 msgstr "全部重設"
@@ -1009,7 +1005,6 @@ msgid "Add index"
 msgstr "新增索引"
 
 #: js/messages.php:98
-#, fuzzy
 #| msgid "Edit Index"
 msgid "Edit index"
 msgstr "編輯索引"
@@ -1060,7 +1055,6 @@ msgstr "SQL 查詢："
 
 #. l10n: Default label for the y-Axis of Charts
 #: js/messages.php:118
-#, fuzzy
 #| msgid "Y Values"
 msgid "Y values"
 msgstr "Y 軸值"
@@ -1155,7 +1149,6 @@ msgid "Query cache used"
 msgstr "查詢快取已使用"
 
 #: js/messages.php:151
-#, fuzzy
 #| msgid "System CPU Usage"
 msgid "System CPU usage"
 msgstr "系統 CPU 使用率"
@@ -1193,28 +1186,24 @@ msgid "Used memory"
 msgstr "已使用記憶體"
 
 #: js/messages.php:162
-#, fuzzy
 #| msgid "Total Swap"
 msgid "Total swap"
-msgstr "暫存區總計"
+msgstr "交換空間總計"
 
 #: js/messages.php:163
-#, fuzzy
 #| msgid "Cached Swap"
 msgid "Cached swap"
-msgstr "已快取暫存區"
+msgstr "已快取交換空間"
 
 #: js/messages.php:164
-#, fuzzy
 #| msgid "Used Swap"
 msgid "Used swap"
-msgstr "已使用暫存區"
+msgstr "已使用交換空間"
 
 #: js/messages.php:165
-#, fuzzy
 #| msgid "Free Swap"
 msgid "Free swap"
-msgstr "閒置的暫存區"
+msgstr "未使用交換空間"
 
 #: js/messages.php:167
 msgid "Bytes sent"
@@ -1615,7 +1604,6 @@ msgid "No files available on server for import!"
 msgstr "伺服器上無可用來匯入的檔案！"
 
 #: js/messages.php:275
-#, fuzzy
 #| msgid "Analyse Query"
 msgid "Analyse query"
 msgstr "分析查詢"
@@ -1681,28 +1669,24 @@ msgid "Loading…"
 msgstr "載入中…"
 
 #: js/messages.php:301
-#, fuzzy
 #| msgid "Request Aborted!!"
 msgid "Request aborted!!"
-msgstr "請求失敗!!"
+msgstr "已放棄請求!!"
 
 #: js/messages.php:302
-#, fuzzy
 #| msgid "Processing Request"
 msgid "Processing request"
 msgstr "請求處理中"
 
 #: js/messages.php:303
-#, fuzzy
 #| msgid "Request Failed!!"
 msgid "Request failed!!"
 msgstr "請求失敗!!"
 
 #: js/messages.php:304
-#, fuzzy
 #| msgid "Error in processing request:"
 msgid "Error in processing request"
-msgstr "處理要求時發生錯誤："
+msgstr "處理要求時發生錯誤"
 
 #: js/messages.php:305
 #, php-format
@@ -1720,16 +1704,14 @@ msgid "No databases selected."
 msgstr "尚未選擇任何資料庫。"
 
 #: js/messages.php:308
-#, fuzzy
 #| msgid "Dropping Column"
 msgid "Dropping column"
 msgstr "刪除欄位"
 
 #: js/messages.php:309
-#, fuzzy
 #| msgid "Add primary key"
 msgid "Adding primary key"
-msgstr "新增主鍵"
+msgstr "新增主鍵中"
 
 #: js/messages.php:310
 #: templates/database/designer/aggregate_query_panel.phtml:59
@@ -1746,19 +1728,16 @@ msgid "Click to dismiss this notification"
 msgstr "點選關閉此通知"
 
 #: js/messages.php:314
-#, fuzzy
 #| msgid "Renaming Databases"
 msgid "Renaming databases"
 msgstr "更改資料庫名稱中"
 
 #: js/messages.php:315
-#, fuzzy
 #| msgid "Copying Database"
 msgid "Copying database"
 msgstr "複製資料庫中"
 
 #: js/messages.php:316
-#, fuzzy
 #| msgid "Changing Charset"
 msgid "Changing charset"
 msgstr "更改字元編碼"
@@ -2141,16 +2120,14 @@ msgid "Geometry"
 msgstr "幾何形"
 
 #: js/messages.php:440
-#, fuzzy
 #| msgid "Inner Ring"
 msgid "Inner ring"
 msgstr "內環"
 
 #: js/messages.php:441
-#, fuzzy
 #| msgid "Outer ring:"
 msgid "Outer ring"
-msgstr "外環:"
+msgstr "外環"
 
 #: js/messages.php:445
 msgid "Do you want to copy encryption key?"
@@ -2381,16 +2358,14 @@ msgid "More"
 msgstr "更多"
 
 #: js/messages.php:531
-#, fuzzy
 #| msgid "Show Panel"
 msgid "Show panel"
-msgstr "顯示控制面板"
+msgstr "顯示面板"
 
 #: js/messages.php:532
-#, fuzzy
 #| msgid "Hide Panel"
 msgid "Hide panel"
-msgstr "隱藏控制面板"
+msgstr "隱藏面板"
 
 #: js/messages.php:533
 msgid "Show hidden navigation tree items."
@@ -2461,13 +2436,11 @@ msgid "Create view"
 msgstr "新增檢視表"
 
 #: js/messages.php:556
-#, fuzzy
 #| msgid "Send error reports"
 msgid "Send error report"
 msgstr "傳送錯誤報告"
 
 #: js/messages.php:557
-#, fuzzy
 #| msgid "Submit Error Report"
 msgid "Submit error report"
 msgstr "送出錯誤報告"
@@ -2479,13 +2452,11 @@ msgid ""
 msgstr "發生 JavaScript 嚴重錯誤，您是否要回報錯誤報告?"
 
 #: js/messages.php:561
-#, fuzzy
 #| msgid "Change Report Settings"
 msgid "Change report settings"
 msgstr "更改報告設定"
 
 #: js/messages.php:562
-#, fuzzy
 #| msgid "Show Report Details"
 msgid "Show report details"
 msgstr "顯示報告詳細資訊"
@@ -3438,7 +3409,6 @@ msgstr "於下列資料表中:"
 
 #: libraries/DbSearch.class.php:450 libraries/display_export.lib.php:50
 #: libraries/replication_gui.lib.php:380
-#, fuzzy
 #| msgid "Unselect All"
 msgid "Unselect all"
 msgstr "全部取消"
@@ -3611,7 +3581,6 @@ msgstr "已選擇項目:"
 #: libraries/server_user_groups.lib.php:231
 #: templates/database/structure/check_all_tables.phtml:3
 #: templates/database/structure/check_all_tables.phtml:4
-#, fuzzy
 #| msgid "Check All"
 msgid "Check all"
 msgstr "全選"
@@ -4682,7 +4651,6 @@ msgid "Without PHP Code"
 msgstr "關閉 PHP 程式碼"
 
 #: libraries/Util.class.php:1223 libraries/config/messages.inc.php:898
-#, fuzzy
 #| msgid "Create PHP Code"
 msgid "Create PHP code"
 msgstr "產生 PHP 程式碼"
@@ -4812,7 +4780,6 @@ msgid "Check privileges for database \"%s\"."
 msgstr "檢查資料庫 「%s」 之權限."
 
 #: libraries/build_html_for_db.lib.php:181
-#, fuzzy
 #| msgid "Check Privileges"
 msgid "Check privileges"
 msgstr "檢查權限"
@@ -4880,7 +4847,7 @@ msgstr "屬性"
 #: libraries/central_columns.lib.php:710
 #: libraries/central_columns.lib.php:1384
 msgid "A_I"
-msgstr ""
+msgstr "流水號(A_I)"
 
 #: libraries/central_columns.lib.php:750
 msgid "Select a table"
@@ -5395,7 +5362,7 @@ msgid ""
 "Restricts the MySQL servers the user can enter when a login to an arbitrary "
 "MySQL server is enabled by matching the IP or hostname of the MySQL server "
 "to the given regular expression."
-msgstr ""
+msgstr "限制使用者登入任意 MySQL 伺服器時，該 MySQL 伺服器的 IP 或主機名稱需要符合指定的正規表示法。"
 
 #: libraries/config/messages.inc.php:26
 msgid "Restrict login to MySQL server"
@@ -6439,7 +6406,6 @@ msgid "Maximum tables"
 msgstr "資料表數量上限"
 
 #: libraries/config/messages.inc.php:465
-#, fuzzy
 #| msgid ""
 #| "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] "
 #| "([kbd]0[/kbd] for no limit)."
@@ -6447,7 +6413,8 @@ msgid ""
 "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] "
 "([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change)."
 msgstr ""
-"執行 Script 時可配置的記憶體大小，例 [kbd]32MB[/kbd] ([kbd]0[/kbd]爲不限制)。"
+"執行 Script 時可配置的記憶體大小，例 [kbd]32MB[/kbd] ([kbd]-1[/kbd] 爲不限制、[kbd]0[/kbd] "
+"為不做變更)。"
 
 #: libraries/config/messages.inc.php:468
 msgid "Memory limit"
@@ -7349,10 +7316,9 @@ msgid "Show or hide a column displaying the Creation timestamp for all tables."
 msgstr "顯示或隱藏所有資料表欄位建立的時間。"
 
 #: libraries/config/messages.inc.php:853
-#, fuzzy
 #| msgid "Show Creation timestamp"
 msgid "Show creation timestamp"
-msgstr "顯示建立時間戳記"
+msgstr "顯示建立時間"
 
 #: libraries/config/messages.inc.php:855
 msgid ""
@@ -7360,10 +7326,9 @@ msgid ""
 msgstr "顯示或隱藏所有資料表的最後更新時間欄位。"
 
 #: libraries/config/messages.inc.php:857
-#, fuzzy
 #| msgid "Show Last update timestamp"
 msgid "Show last update timestamp"
-msgstr "顯示最後更新的時間戳記"
+msgstr "顯示最後更新時間"
 
 #: libraries/config/messages.inc.php:859
 msgid ""
@@ -7371,10 +7336,9 @@ msgid ""
 msgstr "顯示或隱藏所有資料表的最後檢查時間欄位。"
 
 #: libraries/config/messages.inc.php:861
-#, fuzzy
 #| msgid "Show Last check timestamp"
 msgid "Show last check timestamp"
-msgstr "顯示最後檢查時間戳記"
+msgstr "顯示最後檢查時間"
 
 #: libraries/config/messages.inc.php:863
 msgid ""
@@ -8011,10 +7975,9 @@ msgid "Custom - display all possible options"
 msgstr "自訂 - 顯示所有可用的選項"
 
 #: libraries/display_export.lib.php:335
-#, fuzzy
 #| msgid "Databases"
 msgid "Databases:"
-msgstr "資料庫"
+msgstr "資料庫："
 
 #: libraries/display_export.lib.php:337
 #: libraries/navigation/Navigation.class.php:196
@@ -8216,10 +8179,9 @@ msgid ""
 msgstr "壓縮檔案名稱必須以 <b>.[格式].[壓縮方式]</b> 結尾。如: <b>.sql.zip</b>"
 
 #: libraries/display_import.lib.php:224
-#, fuzzy
 #| msgid "File to Import:"
 msgid "File to import:"
-msgstr "要匯入的檔案:"
+msgstr "要匯入的檔案："
 
 #: libraries/display_import.lib.php:234 libraries/display_import.lib.php:251
 msgid "You may also drag and drop a file on any page."
@@ -8230,10 +8192,9 @@ msgid "File uploads are not allowed on this server."
 msgstr "此伺服器不允許上傳檔案。"
 
 #: libraries/display_import.lib.php:278
-#, fuzzy
 #| msgid "Partial Import:"
 msgid "Partial import:"
-msgstr "部分匯入:"
+msgstr "部分匯入："
 
 #: libraries/display_import.lib.php:285
 #, php-format
@@ -8258,7 +8219,6 @@ msgid ""
 msgstr "跳過此數量的查詢(SQL)或者行數(其他格式)，由第一行開始:"
 
 #: libraries/display_import.lib.php:340
-#, fuzzy
 #| msgid "Other Options:"
 msgid "Other options:"
 msgstr "其他選項："
@@ -9403,7 +9363,7 @@ msgid ""
 "For each column below, please select the <b>minimal set</b> of columns among "
 "given set whose values combined together are sufficient to determine the "
 "value of the column."
-msgstr ""
+msgstr "以下欄位，請選擇可足夠用來辨識欄位值的<b>最少</b>欄位值組合。"
 
 #: libraries/normalization.lib.php:372 libraries/normalization.lib.php:764
 #, php-format
@@ -9464,7 +9424,7 @@ msgid ""
 "given set whose values combined together are sufficient to determine the "
 "value of the column.<br />Note: A column may have no transitive dependency, "
 "in that case you don't have to select any."
-msgstr ""
+msgstr "以下欄位，請選擇可足夠用來辨識欄位值的<b>最少</b>欄位值組合。<br />注意：欄位可能沒有遞移相依，因此您可能不用做任何選擇。"
 
 #: libraries/normalization.lib.php:777
 msgid ""
@@ -9525,7 +9485,6 @@ msgstr "您的權限不足以執行此操作，請參考說明文件了解詳細
 #: libraries/operations.lib.php:879 libraries/operations.lib.php:973
 #: libraries/operations.lib.php:1327 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
-#, fuzzy
 #| msgid "Adjust Privileges"
 msgid "Adjust privileges"
 msgstr "調整權限"
@@ -9703,10 +9662,9 @@ msgid "Truncate"
 msgstr "清空"
 
 #: libraries/operations.lib.php:1619
-#, fuzzy
 #| msgid "Collapse"
 msgid "Coalesce"
-msgstr "Coalesce"
+msgstr "合併"
 
 #: libraries/operations.lib.php:1628
 msgid "Partition maintenance"
@@ -10082,7 +10040,7 @@ msgstr "檢視結構"
 
 #: libraries/plugins/export/ExportPdf.class.php:289
 msgid "Stand in"
-msgstr ""
+msgstr "加入"
 
 #: libraries/plugins/export/ExportSql.class.php:91
 msgid ""
@@ -10499,7 +10457,6 @@ msgstr "顯示網格"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
 #: templates/database/structure/print_view_data_dictionary_link.phtml:6
-#, fuzzy
 #| msgid "Data Dictionary"
 msgid "Data dictionary"
 msgstr "資料字典"
@@ -11209,10 +11166,9 @@ msgid "Re-type"
 msgstr "重新輸入"
 
 #: libraries/replication_gui.lib.php:895
-#, fuzzy
 #| msgid "Generate password"
 msgid "Generate password:"
-msgstr "產生密碼"
+msgstr "產生密碼："
 
 #: libraries/replication_gui.lib.php:933
 msgid "Replication started successfully."
@@ -11672,10 +11628,9 @@ msgid "Ignoring unsupported language code."
 msgstr "忽略不支援的語言代碼。"
 
 #: libraries/select_server.lib.php:43 libraries/select_server.lib.php:48
-#, fuzzy
 #| msgid "Current server"
 msgid "Current server:"
-msgstr "目前伺服器"
+msgstr "目前伺服器："
 
 #: libraries/server_bin_log.lib.php:30
 msgid "Select binary log to view"
@@ -11733,7 +11688,6 @@ msgstr ""
 
 #: libraries/server_databases.lib.php:366
 #: libraries/server_databases.lib.php:371
-#, fuzzy
 #| msgid "Enable Statistics"
 msgid "Enable statistics"
 msgstr "開啟統計資訊"
@@ -12166,10 +12120,9 @@ msgid "table-specific"
 msgstr "指定資料表"
 
 #: libraries/server_privileges.lib.php:2628
-#, fuzzy
 #| msgid "Edit privileges:"
 msgid "Edit privileges"
-msgstr "編輯權限："
+msgstr "編輯權限"
 
 #: libraries/server_privileges.lib.php:2631
 msgid "Revoke"
@@ -12564,10 +12517,9 @@ msgid "Clear series"
 msgstr "清除序列"
 
 #: libraries/server_status_monitor.lib.php:233
-#, fuzzy
 #| msgid "Series in Chart:"
 msgid "Series in chart:"
-msgstr "圖表中的序列:"
+msgstr "圖表中的序列："
 
 #: libraries/server_status_monitor.lib.php:254
 msgid "Start Monitor"
@@ -13990,16 +13942,14 @@ msgid "Username and hostname didn't change."
 msgstr "使用者名稱與主機名稱未變更。"
 
 #: server_status.php:39
-#, fuzzy
 #| msgid "Not enough privilege to view users."
 msgid "Not enough privilege to view server status."
-msgstr "權限不足檢視使用者。"
+msgstr "權限不足檢視伺服器狀態。"
 
 #: server_status_advisor.php:39
-#, fuzzy
 #| msgid "Not enough privilege to view users."
 msgid "Not enough privilege to view the advisor."
-msgstr "權限不足檢視使用者。"
+msgstr "權限不足檢視建議。"
 
 #: server_status_processes.php:36
 #, php-format
@@ -14013,22 +13963,20 @@ msgid ""
 msgstr "phpMyAdmin 無法中止程序 %s。該程序可能已經關閉。"
 
 #: server_status_queries.php:55
-#, fuzzy
 #| msgid "Not enough privilege to view users."
 msgid "Not enough privilege to view query statistics."
-msgstr "權限不足檢視使用者。"
+msgstr "權限不足檢視查詢統計資訊。"
 
 #: server_status_variables.php:57
-#, fuzzy
 #| msgid "Not enough privilege to view users."
 msgid "Not enough privilege to view status variables."
-msgstr "權限不足檢視使用者。"
+msgstr "權限不足檢視狀態變數。"
 
 #: server_variables.php:83
-#, fuzzy, php-format
+#, php-format
 #| msgid "Not enough privilege to view users."
 msgid "Not enough privilege to view server variables and settings. %s"
-msgstr "權限不足檢視使用者。"
+msgstr "權限不足檢視伺服器變數與設定。%s"
 
 #: setup/frames/config.inc.php:41 setup/frames/index.inc.php:277
 msgid "Download"
@@ -14387,10 +14335,9 @@ msgid "Operator"
 msgstr "運算子"
 
 #: templates/database/designer/database_tables.phtml:29
-#, fuzzy
 #| msgid "Move columns"
 msgid "Show/hide columns"
-msgstr "移動欄位"
+msgstr "顯示/隱藏欄位"
 
 #: templates/database/designer/database_tables.phtml:40
 msgid "See table structure"