diff --git a/public/language/zh-TW/admin/general/languages.json b/public/language/zh-TW/admin/general/languages.json
index bdd57849b3..de8ef3e3a4 100644
--- a/public/language/zh-TW/admin/general/languages.json
+++ b/public/language/zh-TW/admin/general/languages.json
@@ -1,6 +1,6 @@
 {
-	"language-settings": "Language Settings",
-	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "Default Language",
-	"auto-detect": "Auto Detect Language Setting for Guests"
+	"language-settings": "語言設定",
+	"description": "所有使用者的預設語言，使用者可以在個人設定內修改",
+	"default-language": "預設語言",
+	"auto-detect": "使用者為訪客時，自動偵測語言設定"
 }
\ No newline at end of file
diff --git a/public/language/zh-TW/flags.json b/public/language/zh-TW/flags.json
index 5d8e09a48a..cac2293840 100644
--- a/public/language/zh-TW/flags.json
+++ b/public/language/zh-TW/flags.json
@@ -6,20 +6,20 @@
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "更新",
-	"updated": "Updated",
+	"updated": "更新完成",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"quick-filters": "快速篩選",
 	"filter-active": "There are one or more filters active in this list of flags",
-	"filter-reset": "Remove Filters",
+	"filter-reset": "移除篩選",
 	"filters": "Filter Options",
 	"filter-reporterId": "Reporter UID",
 	"filter-targetUid": "Flagged UID",
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "文章",
-	"filter-type-user": "User",
-	"filter-state": "State",
+	"filter-type-user": "用戶",
+	"filter-state": "狀態",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "分類",
 	"filter-quick-mine": "Assigned to me",
@@ -32,11 +32,11 @@
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
 
-	"user-view": "View Profile",
-	"user-edit": "Edit Profile",
+	"user-view": "查看個人資料",
+	"user-edit": "編輯個人資料",
 
-	"notes": "Flag Notes",
-	"add-note": "Add Note",
+	"notes": "標記備註",
+	"add-note": "新增備註",
 	"no-notes": "No shared notes.",
 
 	"history": "Flag History",
@@ -47,7 +47,7 @@
 	"state-open": "New/Open",
 	"state-wip": "Work in Progress",
 	"state-resolved": "Resolved",
-	"state-rejected": "Rejected",
+	"state-rejected": "已拒絕",
 	"no-assignee": "Not Assigned",
 	"note-added": "Note Added",