diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 1ef4b008b2..de5c219691 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -666,8 +666,8 @@
     "Room Name": "聊天室名稱",
     "Room Topic": "聊天室主題",
     "Join": "加入",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "驗證此使用者以標記他們為受信任的。信任的使用者可以在使用端對端加密訊息時能更加放心。",
-    "Incoming Verification Request": "下一個驗證請求",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "驗證此工作階段，並標記為可受信任。由您將工作階段標記為可受信任後，可讓聊天夥伴傳送端到端加密訊息時能更加放心。",
+    "Incoming Verification Request": "收到的驗證請求",
     "Go back": "返回",
     "Username": "使用者名稱",
     "Email (optional)": "電子郵件（選擇性）",
@@ -696,8 +696,8 @@
     "Horse": "馬",
     "Unicorn": "獨角獸",
     "Pig": "豬",
-    "Elephant": "象",
-    "Rabbit": "兔",
+    "Elephant": "大象",
+    "Rabbit": "兔子",
     "Panda": "熊貓",
     "Rooster": "公雞",
     "Penguin": "企鵝",
@@ -711,22 +711,22 @@
     "Mushroom": "蘑菇",
     "Globe": "地球",
     "Moon": "月亮",
-    "Cloud": "雲",
+    "Cloud": "雲朵",
     "Fire": "火",
     "Banana": "香蕉",
     "Apple": "蘋果",
-    "Strawberry": "草苺",
+    "Strawberry": "草莓",
     "Corn": "玉米",
     "Pizza": "披薩",
     "Cake": "蛋糕",
-    "Heart": "心",
+    "Heart": "愛心",
     "Smiley": "笑臉",
     "Robot": "機器人",
     "Hat": "帽子",
     "Glasses": "眼鏡",
-    "Spanner": "Spanner資料庫",
+    "Spanner": "扳手",
     "Santa": "聖誕老人",
-    "Thumbs up": "豎起大姆指",
+    "Thumbs up": "讚",
     "Umbrella": "雨傘",
     "Hourglass": "沙漏",
     "Clock": "時鐘",
@@ -744,14 +744,14 @@
     "Aeroplane": "飛機",
     "Rocket": "火箭",
     "Trophy": "獎盃",
-    "Ball": "球",
+    "Ball": "足球",
     "Guitar": "吉他",
     "Trumpet": "喇叭",
-    "Bell": "鈴",
-    "Anchor": "錨",
+    "Bell": "鈴鐺",
+    "Anchor": "船錨",
     "Headphones": "耳機",
     "Folder": "資料夾",
-    "Pin": "釘選",
+    "Pin": "圖釘",
     "This homeserver would like to make sure you are not a robot.": "這個家伺服器想要確認您不是機器人。",
     "Change": "變更",
     "Couldn't load page": "無法載入頁面",
@@ -765,10 +765,10 @@
     "Back up your keys before signing out to avoid losing them.": "請在登出前備份您的金鑰，以免遺失。",
     "Start using Key Backup": "開始使用金鑰備份",
     "Credits": "感謝",
-    "I don't want my encrypted messages": "我不想要我的加密訊息",
+    "I don't want my encrypted messages": "我不要我的加密訊息了",
     "Manually export keys": "手動匯出金鑰",
-    "You'll lose access to your encrypted messages": "您將會失去對您的加密訊息的存取權",
-    "Are you sure you want to sign out?": "您想要登出嗎？",
+    "You'll lose access to your encrypted messages": "您將會失去您的加密訊息",
+    "Are you sure you want to sign out?": "您確定要登出嗎？",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>警告</b>：您應該只從信任的電腦設定金鑰備份。",
     "For maximum security, this should be different from your account password.": "為了最強的安全性，這應該與您的帳號密碼不一樣。",
     "Your keys are being backed up (the first backup could take a few minutes).": "您的金鑰正在備份（第一次備份會花費數分鐘）。",
@@ -1120,8 +1120,8 @@
     "Subscribe": "訂閱",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "您已忽略這個使用者，所以他們的訊息會隱藏。<a>無論如何都顯示。</a>",
     "Custom (%(level)s)": "自訂 (%(level)s)",
-    "Trusted": "已信任",
-    "Not trusted": "未經認證",
+    "Trusted": "受信任",
+    "Not trusted": "未受信任",
     "Messages in this room are end-to-end encrypted.": "此聊天室內的訊息有端對端加密。",
     "Security": "安全性",
     "Verify": "驗證",
@@ -1194,7 +1194,7 @@
     "Hide verified sessions": "隱藏已驗證的工作階段",
     "%(count)s verified sessions|other": "%(count)s 個已驗證的工作階段",
     "%(count)s verified sessions|one": "1 個已驗證的工作階段",
-    "Unable to set up secret storage": "無法設定秘密儲存空間",
+    "Unable to set up secret storage": "無法設定秘密資訊儲存空間",
     "Close preview": "關閉預覽",
     "Language Dropdown": "語言下拉式選單",
     "Country Dropdown": "國家下拉式選單",
@@ -1323,7 +1323,7 @@
     "Encryption enabled": "加密已啟用",
     "Encryption not enabled": "加密未啟用",
     "The encryption used by this room isn't supported.": "不支援此聊天室使用的加密。",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "驗證此裝置以標記其為受信任。信任此裝置能讓您和其他使用者使用端對端加密的訊息時，更加放心。",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "驗證此裝置，並標記為可受信任。由您將裝置標記為可受信任後，可讓聊天夥伴傳送端到端加密訊息時能更加放心。",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "驗證此裝置將會將其標記為受信任，且已驗證您的使用者將會信任此裝置。",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "如果您不小心這樣做了，您可以在此工作階段上設定安全訊息，這將會以新的復原方法重新加密此工作階段的訊息歷史。",
     "If disabled, messages from encrypted rooms won't appear in search results.": "若停用，從已加密的聊天室而來的訊息將不會出現在搜尋結果中。",
@@ -1348,7 +1348,7 @@
     "Scan this unique code": "掃描此獨特的條碼",
     "Compare unique emoji": "比較獨特的表情符號",
     "Compare a unique set of emoji if you don't have a camera on either device": "如果兩個裝置上都沒有相機的話，就比較一組獨特的表情符號",
-    "Not Trusted": "未經認證",
+    "Not Trusted": "未受信任",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s （%(userId)s）登入到未驗證的新工作階段：",
     "Ask this user to verify their session, or manually verify it below.": "要求此使用者驗證他們的工作階段，或在下方手動驗證。",
     "Verify by scanning": "透過掃描來驗證",
@@ -1436,7 +1436,7 @@
     "Enter": "Enter",
     "Space": "群組空間",
     "End": "End",
-    "Confirm by comparing the following with the User Settings in your other session:": "透過比較以下內容與您其他工作階段中使用者的設定來確認：",
+    "Confirm by comparing the following with the User Settings in your other session:": "透過將下列內容與您其他工作階段中的「使用者設定」所顯示的內容來確認：",
     "Confirm this user's session by comparing the following with their User Settings:": "比較將以下內容與其他使用者的設定來確認他們的工作階段：",
     "If they don't match, the security of your communication may be compromised.": "如果它們不相符，則可能會威脅到您的通訊安全。",
     "Toggle right panel": "切換右側面板",
@@ -2184,7 +2184,7 @@
     "Invite your teammates": "邀請您的團隊成員",
     "Failed to invite the following users to your space: %(csvUsers)s": "無法邀請以下使用者加入您的聊天空間：%(csvUsers)s",
     "A private space for you and your teammates": "專為您與您的團隊成員設計的私密空間",
-    "Me and my teammates": "我與我的團隊成員",
+    "Me and my teammates": "我與團隊成員",
     "Who are you working with?": "您與誰一起工作？",
     "Skip for now": "現在跳過",
     "Failed to create initial space rooms": "無法建立第一個聊天空間中的聊天室",
@@ -2228,7 +2228,7 @@
     "Click to copy": "點擊複製",
     "Your private space": "您的私密聊天空間",
     "Your public space": "您的公開聊天空間",
-    "Invite only, best for yourself or teams": "邀請制，最適合您自己或團隊",
+    "Invite only, best for yourself or teams": "邀請制，適用於您自己或團隊使用",
     "Private": "私密",
     "Open space for anyone, best for communities": "對所有人開放的聊天空間，最適合社群",
     "Public": "公開",
@@ -2239,7 +2239,7 @@
     "You're already in a call with this person.": "您正在與此人通話。",
     "Already in call": "已在通話中",
     "Make sure the right people have access. You can invite more later.": "確保合適的人有權存取。稍後您可以邀請更多人。",
-    "A private space to organise your rooms": "供您整理聊天室的私密空間",
+    "A private space to organise your rooms": "整理您聊天室的私密聊天空間",
     "Just me": "只有我",
     "Make sure the right people have access to %(name)s": "確保合適的人有權存取 %(name)s",
     "Go to my first room": "到我的第一個聊天室",
@@ -2270,7 +2270,7 @@
     "Let's create a room for each of them.": "讓我們為每個主題建立一個聊天室吧。",
     "Verify your identity to access encrypted messages and prove your identity to others.": "驗證您的身分來存取已加密的訊息並對其他人證明您的身分。",
     "Sends the given message as a spoiler": "將指定訊息以劇透傳送",
-    "Review to ensure your account is safe": "請審閱以確保您的帳號安全",
+    "Review to ensure your account is safe": "請確認您的帳號安全",
     "%(deviceId)s from %(ip)s": "從 %(ip)s 來的 %(deviceId)s",
     "Manage & explore rooms": "管理與探索聊天室",
     "Warn before quitting": "離開前警告",
@@ -2290,7 +2290,7 @@
     "You are the only person here. If you leave, no one will be able to join in the future, including you.": "您是這裡唯一的人。如果您離開，包含您在內的任何人都無法加入。",
     "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "如果您重設所有東西，您將會在沒有受信任的工作階段、沒有受信任的使用者的情況下重新啟動，且可能會看不到過去的訊息。",
     "Only do this if you have no other device to complete verification with.": "當您沒有其他裝置可以完成驗證時，才執行此動作。",
-    "Reset everything": "恢復所有設定",
+    "Reset everything": "重設所有東西",
     "Forgotten or lost all recovery methods? <a>Reset all</a>": "忘記或遺失了所有復原方法？<a>重設全部</a>",
     "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "如果這樣做，請注意，您的訊息不會被刪除，但在重新建立索引時，搜尋體驗可能會降低片刻",
     "View message": "檢視訊息",
@@ -2307,7 +2307,7 @@
     "View all %(count)s members|one": "檢視 1 個成員",
     "View all %(count)s members|other": "檢視全部 %(count)s 個成員",
     "Failed to send": "傳送失敗",
-    "Enter your Security Phrase a second time to confirm it.": "再次輸入您的安全密語以進行確認。",
+    "Enter your Security Phrase a second time to confirm it.": "再次輸入您的安全密語以確認。",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "挑選要新增的聊天室或對話。這是專屬於您的空間，不會有人被通知。您稍後可以再新增更多。",
     "What do you want to organise?": "您想要整理什麼？",
     "You have no ignored users.": "您沒有忽略的使用者。",
@@ -2788,7 +2788,7 @@
     "%(spaceName)s menu": "%(spaceName)s 選單",
     "Join public room": "加入公開聊天室",
     "Add people": "新增夥伴",
-    "You do not have permissions to invite people to this space": "您沒有權限邀請其他人加入此聊天空間",
+    "You do not have permissions to invite people to this space": "您沒有權限邀請夥伴到此聊天空間",
     "Invite to space": "邀請至聊天空間",
     "Start new chat": "開始新聊天",
     "Recently viewed": "最近檢視",
@@ -3023,7 +3023,7 @@
     "Insert a trailing colon after user mentions at the start of a message": "在使用者於訊息開頭提及之後插入跟隨冒號",
     "Show polls button": "顯示投票按鈕",
     "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "聊天空間是一種將聊天室與夥伴分組的新方式。您想要建立何種類型的聊天空間？您稍後仍可變更。",
-    "We'll create rooms for each of them.": "我們將會為每個人建立聊天室。",
+    "We'll create rooms for each of them.": "我們將為每個主題建立聊天室。",
     "Click to drop a pin": "點擊以放置圖釘",
     "Click to move the pin": "點擊以移動圖釘",
     "Click": "點擊",
@@ -3318,7 +3318,7 @@
     "It’s what you’re here for, so lets get to it": "這就是您來這裡的目的，所以讓我們開始吧",
     "Find and invite your friends": "尋找並邀請您的朋友",
     "You made it!": "您做到了！",
-    "Help": "協助",
+    "Help": "說明",
     "Google Play and the Google Play logo are trademarks of Google LLC.": "Google Play 與 Google Play logo 是 Google 公司的商標。",
     "App Store® and the Apple logo® are trademarks of Apple Inc.": "App Store® 與 Apple logo® 是蘋果公司的商標。",
     "Get it on F-Droid": "在 F-Droid 上取得",