diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index a2c5d2c31b..46cdbde1fc 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -1,11 +1,11 @@
 {
   "label.access-code": "存取碼",
-  "label.actions": "行動",
-  "label.activity": "活動日誌",
+  "label.actions": "行為",
+  "label.activity": "活動紀錄",
   "label.add": "新增",
   "label.add-description": "新增描述",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.add-member": "新增成員",
+  "label.add-step": "新增步驟",
   "label.add-website": "新增網站",
   "label.admin": "管理員",
   "label.after": "之後",
@@ -16,7 +16,7 @@
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
-  "label.breakdown": "分解",
+  "label.breakdown": "細項分析",
   "label.browser": "瀏覽器",
   "label.browsers": "瀏覽器",
   "label.cancel": "取消",
@@ -24,21 +24,21 @@
   "label.cities": "城市",
   "label.city": "城市",
   "label.clear-all": "全部清除",
-  "label.compare": "Compare",
+  "label.compare": "比較",
   "label.confirm": "確認",
   "label.confirm-password": "確認密碼",
   "label.contains": "包含",
   "label.continue": "繼續",
-  "label.count": "Count",
+  "label.count": "數量",
   "label.countries": "國家",
   "label.country": "國家",
   "label.create": "建立",
-  "label.create-report": "建立報告",
+  "label.create-report": "建立報表",
   "label.create-team": "建立團隊",
   "label.create-user": "建立使用者",
   "label.created": "已建立",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "建立者",
+  "label.current": "目前",
   "label.current-password": "目前密碼",
   "label.custom-range": "自訂範圍",
   "label.dashboard": "儀表板",
@@ -48,7 +48,7 @@
   "label.day": "日",
   "label.default-date-range": "預設日期範圍",
   "label.delete": "刪除",
-  "label.delete-report": "Delete report",
+  "label.delete-report": "刪除報表",
   "label.delete-team": "刪除團隊",
   "label.delete-user": "刪除使用者",
   "label.delete-website": "刪除網站",
@@ -60,89 +60,89 @@
   "label.dismiss": "關閉",
   "label.does-not-contain": "不包含",
   "label.domain": "網域",
-  "label.dropoff": "退出",
+  "label.dropoff": "離開",
   "label.edit": "編輯",
   "label.edit-dashboard": "編輯儀表板",
-  "label.edit-member": "Edit member",
-  "label.enable-share-url": "啟用分享網址",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.edit-member": "編輯成員",
+  "label.enable-share-url": "啟用分享連結",
+  "label.end-step": "結束步驟",
+  "label.entry": "進入網址",
   "label.event": "事件",
   "label.event-data": "事件資料",
   "label.events": "事件",
-  "label.exit": "Exit URL",
+  "label.exit": "離開網址",
   "label.false": "否",
   "label.field": "欄位",
   "label.fields": "欄位",
   "label.filter": "篩選器",
   "label.filter-combined": "組合",
   "label.filter-raw": "原始",
-  "label.filters": "篩選器",
-  "label.first-seen": "First seen",
-  "label.funnel": "漏斗",
-  "label.funnel-description": "瞭解使用者的轉換率和退出率",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.filters": "篩選條件",
+  "label.first-seen": "首次造訪",
+  "label.funnel": "漏斗分析",
+  "label.funnel-description": "瞭解使用者的轉換率與流失率。",
+  "label.goal": "目標",
+  "label.goals": "目標",
+  "label.goals-description": "追蹤網頁瀏覽和事件的目標。",
   "label.greater-than": "大於",
   "label.greater-than-equals": "大於或等於",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.host": "主機名稱",
+  "label.hosts": "主機名稱",
   "label.insights": "洞察",
-  "label.insights-description": "透過使用區段和篩選器來深入探索你的數據",
+  "label.insights-description": "使用區段和篩選器來深入分析您的資料。",
   "label.is": "是",
   "label.is-not": "不是",
   "label.is-not-set": "未設定",
   "label.is-set": "已設定",
   "label.join": "加入",
   "label.join-team": "加入團隊",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey": "使用者旅程",
+  "label.journey-description": "瞭解使用者如何瀏覽您的網站。",
   "label.language": "語言",
   "label.languages": "語言",
   "label.laptop": "筆記型電腦",
   "label.last-days": "最近 {x} 天",
   "label.last-hours": "最近 {x} 小時",
-  "label.last-months": "Last {x} months",
-  "label.last-seen": "Last seen",
+  "label.last-months": "最近 {x} 個月",
+  "label.last-seen": "最後造訪",
   "label.leave": "離開",
   "label.leave-team": "離開團隊",
   "label.less-than": "小於",
   "label.less-than-equals": "小於或等於",
   "label.login": "登入",
   "label.logout": "登出",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
-  "label.max": "最大",
-  "label.member": "Member",
+  "label.manage": "管理",
+  "label.manager": "管理者",
+  "label.max": "最大值",
+  "label.member": "成員",
   "label.members": "成員",
-  "label.min": "最小",
+  "label.min": "最小值",
   "label.mobile": "行動裝置",
   "label.more": "更多",
-  "label.my-account": "My account",
+  "label.my-account": "我的帳號",
   "label.my-websites": "我的網站",
   "label.name": "名稱",
   "label.new-password": "新密碼",
   "label.none": "無",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+  "label.number-of-records": "{x} 筆紀錄",
   "label.ok": "OK",
   "label.os": "作業系統",
-  "label.overview": "概覽",
+  "label.overview": "總覽",
   "label.owner": "擁有者",
-  "label.page-of": "頁面 {current} / {total}",
-  "label.page-views": "頁面瀏覽",
-  "label.pageTitle": "頁面標題",
-  "label.pages": "頁面",
+  "label.page-of": "第 {current} 頁，共 {total} 頁",
+  "label.page-views": "網頁瀏覽次數",
+  "label.pageTitle": "網頁標題",
+  "label.pages": "網頁",
   "label.password": "密碼",
-  "label.path": "Path",
-  "label.paths": "Paths",
-  "label.powered-by": "由 {name} 提供",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
-  "label.profile": "個人資料",
-  "label.properties": "Properties",
-  "label.property": "Property",
+  "label.path": "路徑",
+  "label.paths": "路徑",
+  "label.powered-by": "由 {name} 提供技術支援",
+  "label.previous": "上一個",
+  "label.previous-period": "上一期間",
+  "label.previous-year": "去年",
+  "label.profile": "個人檔案",
+  "label.properties": "屬性",
+  "label.property": "屬性",
   "label.queries": "查詢",
   "label.query": "查詢",
   "label.query-parameters": "查詢參數",
@@ -151,44 +151,44 @@
   "label.referrers": "參照來源",
   "label.refresh": "重新整理",
   "label.regenerate": "重新產生",
-  "label.region": "區域",
-  "label.regions": "區域",
+  "label.region": "地區",
+  "label.regions": "地區",
   "label.remove": "移除",
-  "label.remove-member": "Remove member",
-  "label.reports": "報告",
+  "label.remove-member": "移除成員",
+  "label.reports": "報表",
   "label.required": "必填",
   "label.reset": "重設",
-  "label.reset-website": "重設網站",
-  "label.retention": "保留",
+  "label.reset-website": "重設網站統計資料",
+  "label.retention": "留存率",
   "label.retention-description": "透過追蹤使用者回訪的頻率來衡量您的網站黏著度。",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue": "營收",
+  "label.revenue-description": "查看您的營收趨勢。",
+  "label.revenue-property": "營收屬性",
   "label.role": "角色",
   "label.run-query": "執行查詢",
   "label.save": "儲存",
   "label.screens": "螢幕",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "選擇日期",
-  "label.select-role": "Select role",
-  "label.select-website": "選擇網站",
-  "label.session": "Session",
+  "label.search": "搜尋",
+  "label.select": "選取",
+  "label.select-date": "選取日期",
+  "label.select-role": "選取角色",
+  "label.select-website": "選取網站",
+  "label.session": "工作階段",
   "label.sessions": "工作階段",
   "label.settings": "設定",
-  "label.share-url": "分享網址",
+  "label.share-url": "分享連結",
   "label.single-day": "單日",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "起始步驟",
+  "label.steps": "步驟",
   "label.sum": "總和",
   "label.tablet": "平板",
   "label.team": "團隊",
   "label.team-id": "團隊 ID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "團隊管理者",
   "label.team-member": "團隊成員",
   "label.team-name": "團隊名稱",
   "label.team-owner": "團隊擁有者",
-  "label.team-view-only": "Team view only",
+  "label.team-view-only": "團隊僅供檢視",
   "label.team-websites": "團隊網站",
   "label.teams": "團隊",
   "label.theme": "主題",
@@ -200,80 +200,80 @@
   "label.today": "今天",
   "label.toggle-charts": "切換圖表",
   "label.total": "總計",
-  "label.total-records": "總記錄",
+  "label.total-records": "紀錄總數",
   "label.tracking-code": "追蹤代碼",
-  "label.transactions": "Transactions",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
+  "label.transactions": "交易",
+  "label.transfer": "轉移",
+  "label.transfer-website": "轉移網站",
   "label.true": "是",
   "label.type": "類型",
-  "label.unique": "獨立",
-  "label.unique-visitors": "獨立訪客",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.unique": "不重複",
+  "label.unique-visitors": "不重複訪客",
+  "label.uniqueCustomers": "不重複客戶",
   "label.unknown": "未知",
-  "label.untitled": "無標題",
-  "label.update": "Update",
+  "label.untitled": "未命名",
+  "label.update": "更新",
   "label.url": "網址",
   "label.urls": "網址",
   "label.user": "使用者",
-  "label.user-property": "User Property",
+  "label.user-property": "使用者屬性",
   "label.username": "使用者名稱",
   "label.users": "使用者",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "透過 UTM 參數追蹤您的行銷活動。",
   "label.value": "值",
   "label.view": "檢視",
   "label.view-details": "檢視詳細資訊",
   "label.view-only": "僅供檢視",
-  "label.views": "檢視",
-  "label.views-per-visit": "Views per visit",
-  "label.visit-duration": "平均造訪時間",
+  "label.views": "瀏覽次數",
+  "label.views-per-visit": "每次造訪的瀏覽次數",
+  "label.visit-duration": "造訪時間",
   "label.visitors": "訪客",
-  "label.visits": "Visits",
+  "label.visits": "造訪次數",
   "label.website": "網站",
   "label.website-id": "網站 ID",
   "label.websites": "網站",
   "label.window": "視窗",
   "label.yesterday": "昨天",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
-  "message.active-users": "目前有 {x} 個活躍的訪客",
-  "message.collected-data": "Collected data",
+  "message.action-confirmation": "請在下方欄位輸入 {confirmation} 以確認。",
+  "message.active-users": "目前有 {x} 位訪客",
+  "message.collected-data": "已蒐集的資料",
   "message.confirm-delete": "您確定要刪除 {target} 嗎？",
   "message.confirm-leave": "您確定要離開 {target} 嗎？",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
-  "message.confirm-reset": "您確定要重設 {target} 嗎？",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
-  "message.delete-website-warning": "所有網站資料將被刪除。",
+  "message.confirm-remove": "您確定要移除 {target} 嗎？",
+  "message.confirm-reset": "您確定要重設 {target} 的統計資料嗎？",
+  "message.delete-team-warning": "刪除團隊的同時也會刪除所有團隊的網站。",
+  "message.delete-website-warning": "所有網站資料都將被刪除。",
   "message.error": "發生錯誤。",
-  "message.event-log": "{event} 在 {url}",
+  "message.event-log": "在 {url} 上的 {event}",
   "message.go-to-settings": "前往設定",
-  "message.incorrect-username-password": "使用者名稱和/或密碼不正確。",
-  "message.invalid-domain": "無效的網域。請不要包含 http/https。",
-  "message.min-password-length": "最少需要 {n} 個字元",
-  "message.new-version-available": "Umami {version} 的新版本已經可以使用！",
+  "message.incorrect-username-password": "使用者名稱或密碼不正確。",
+  "message.invalid-domain": "無效的網域。請勿包含 http/https。",
+  "message.min-password-length": "密碼長度至少需 {n} 個字元",
+  "message.new-version-available": "Umami {version} 的新版本已推出！",
   "message.no-data-available": "沒有可用的資料。",
   "message.no-event-data": "沒有可用的事件資料。",
   "message.no-match-password": "密碼不一致。",
   "message.no-results-found": "找不到結果。",
   "message.no-team-websites": "此團隊沒有任何網站。",
   "message.no-teams": "您尚未建立任何團隊。",
-  "message.no-users": "沒有使用者。",
+  "message.no-users": "沒有任何使用者。",
   "message.no-websites-configured": "您尚未設定任何網站。",
-  "message.page-not-found": "找不到頁面",
-  "message.reset-website": "要重設此網站，請在下方的方框中輸入 {confirmation} 以確認。",
-  "message.reset-website-warning": "此網站的所有統計將被刪除，但您的設定將保持不變。",
+  "message.page-not-found": "找不到網頁",
+  "message.reset-website": "要重設此網站的統計資料，請在下方欄位輸入 {confirmation} 以確認。",
+  "message.reset-website-warning": "此網站的所有統計資料都將被刪除，但您的設定將保持不變。",
   "message.saved": "已儲存。",
-  "message.share-url": "您的網站統計資料可以在以下網址公開檢視：",
-  "message.team-already-member": "您已經是團隊的成員。",
+  "message.share-url": "您的網站統計資料可在以下網址公開檢視：",
+  "message.team-already-member": "您已是該團隊的成員。",
   "message.team-not-found": "找不到團隊。",
-  "message.team-websites-info": "團隊的任何成員都可以檢視網站。",
-  "message.tracking-code": "要追蹤此網站的統計，請將以下代碼放在您的 HTML 的 <head>...</head> 區段中。",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
+  "message.team-websites-info": "團隊中的所有成員都可以檢視網站。",
+  "message.tracking-code": "要追蹤此網站的統計資料，請將以下程式碼放在您 HTML 的 <head>...</head> 區段中。",
+  "message.transfer-team-website-to-user": "要將此網站轉移至您的帳號嗎？",
+  "message.transfer-user-website-to-team": "請選擇要轉移此網站的團隊。",
+  "message.transfer-website": "將網站所有權轉移至您的帳號或其他團隊。",
+  "message.triggered-event": "已觸發的事件",
   "message.user-deleted": "使用者已刪除。",
-  "message.viewed-page": "Viewed page",
+  "message.viewed-page": "已瀏覽的網頁",
   "message.visitor-log": "來自 {country} 的訪客在 {device} 上的 {os} 使用 {browser} 瀏覽。",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "訪客已離開"
 }