diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b3185b32..eea0c735 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="token_help">Access Token Help</string>
+    <string name="token_help">存取權杖說明</string>
     <!-- menu items -->
     <string name="navMyRepos">我的儲存庫</string>
     <string name="navStarredRepos">已加星標的儲存庫</string>
@@ -371,15 +371,15 @@
     <string name="releaseCreatedText">已建立新發行版本</string>
     <string name="deleteReleaseConfirmation">您真的要刪除此發行版本嗎？</string>
     <string name="releaseDeleted">發行版本已刪除</string>
-    <string name="tagNameConflictError">Tag name already exists</string>
-    <string name="editReleaseSuccessMessage">Release updated successfully</string>
-    <string name="createRelease">Create Release</string>
-    <string name="createTag">Create Tag</string>
-    <string name="editRelease">Edit Release</string>
-    <string name="selectBranchError">Select a branch for release/tag</string>
-    <string name="add_release_branch">Tap to select a branch</string>
-    <string name="add_reviewers">Tap to select reviewers</string>
-    <string name="create_release_tag">Create Release/Tag</string>
+    <string name="tagNameConflictError">標籤名稱已存在</string>
+    <string name="editReleaseSuccessMessage">發佈更新成功</string>
+    <string name="createRelease">建立發佈</string>
+    <string name="createTag">建立標籤</string>
+    <string name="editRelease">編輯發佈</string>
+    <string name="selectBranchError">請選擇發佈/標籤的分支</string>
+    <string name="add_release_branch">點擊以選擇分支</string>
+    <string name="add_reviewers">點擊以選擇審查者</string>
+    <string name="create_release_tag">建立發佈/標籤</string>
     <!-- release -->
     <string name="openWebRepo">在瀏覽器中開啟</string>
     <string name="repoStargazersInMenu">加星者</string>
@@ -416,8 +416,8 @@
     <string name="branch_error_repo_locked">儲存庫已鎖定</string>
     <string name="create_branch">建立分支</string>
     <string name="default_branch">預設分支</string>
-    <string name="commit_message_empty">Commit message cannot be empty</string>
-    <string name="content_empty">File content cannot be empty</string>
+    <string name="commit_message_empty">提交訊息不能為空</string>
+    <string name="content_empty">檔案內容不能為空</string>
     <string name="strFilter">篩選器</string>
     <string name="strMarkdown">Markdown</string>
     <string name="copyIssueUrl">複製問題網址</string>
@@ -542,19 +542,19 @@
     <string name="directory">目錄</string>
     <string name="apply">套用</string>
     <string name="state">狀態</string>
-    <string name="update">Update</string>
-    <string name="select">Select</string>
-    <string name="collapse">Collapse</string>
-    <string name="fullscreen">Fullscreen</string>
-    <string name="type">Type</string>
-    <string name="reviewers">Reviewers</string>
-    <string name="change">Change</string>
-    <string name="editor">Editor</string>
-    <string name="mode">Mode</string>
-    <string name="source">Source</string>
-    <string name="collaborative">Collaborative</string>
-    <string name="mirror">Mirror</string>
-    <string name="fork">Fork</string>
+    <string name="update">更新</string>
+    <string name="select">選擇</string>
+    <string name="collapse">收合</string>
+    <string name="fullscreen">全螢幕</string>
+    <string name="type">類型</string>
+    <string name="reviewers">審查者</string>
+    <string name="change">變更</string>
+    <string name="editor">編輯器</string>
+    <string name="mode">模式</string>
+    <string name="source">原始碼</string>
+    <string name="collaborative">協作</string>
+    <string name="mirror">鏡像</string>
+    <string name="fork">分叉</string>
     <!-- generic copy -->
     <string name="exploreUsers">探索使用者</string>
     <string name="exploreIssues">探索議題</string>
@@ -597,8 +597,8 @@
     <string name="mergeNotAllowed">不允許合併【原因：審核數不足】</string>
     <string name="deleteBranch">刪除分支</string>
     <string name="switch_branch">切換分支</string>
-    <string name="allow_maintainer_edit">Allow maintainers to edit this pr</string>
-    <string name="edit_pr">Edit Pull Request</string>
+    <string name="allow_maintainer_edit">允許維護者編輯此拉取請求</string>
+    <string name="edit_pr">編輯拉取請求</string>
     <string name="waitLoadingDownloadFile">請稍候，正在將檔案載入記憶體</string>
     <string name="downloadFileSaved">檔案儲存成功</string>
     <string name="excludeFilesInFileViewer">此檔案類型或大小在檔案檢視器中不受支援。您可以從選單下載。</string>
@@ -702,7 +702,7 @@
     <string name="isUnread">未讀</string>
     <string name="repoSettingsTitle">儲存庫設定</string>
     <string name="repoSettingsEditProperties">編輯屬性</string>
-    <string name="repoSettingsEditPropertiesHint">Change name, description, visibility and features</string>
+    <string name="repoSettingsEditPropertiesHint">變更名稱、描述、可見度與功能</string>
     <string name="repoSettingsDelete">刪除儲存庫</string>
     <string name="repoSettingsDeleteHint">請小心，此操作『不可逆』</string>
     <string name="repoPropertiesTemplate">設定爲模板</string>
@@ -717,15 +717,15 @@
     <string name="repoPropertiesEnableSquash">啟用壓縮並合併</string>
     <string name="repoPropertiesEnableForceMerge">啟用重新基底並合併提交（&#8212;&#8212;no-ff）</string>
     <string name="repoPropertiesSaveSuccess">儲存庫屬性已成功更新</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.</string>
-    <string name="typeRepoNameToConfirm">Type the repository name to confirm</string>
+    <string name="repoSettingsDeleteDescription">刪除前須知：\n\n-此操作無法復原。\n此操作將永久刪除此儲存庫，包括程式碼、議題、留言、Wiki 資料及協作者設定。</string>
+    <string name="typeRepoNameToConfirm">輸入儲存庫名稱以確認</string>
     <string name="repoSettingsDeleteError">儲存庫名稱不相符</string>
     <string name="repoDeletionSuccess">儲存庫已成功刪除</string>
     <string name="repoSettingsTransferOwnership">轉移擁有權</string>
     <string name="repoSettingsTransferOwnershipHint">將這個儲存庫轉移給您擁有管理權限的使用者或組織。</string>
     <string name="repoSettingsTransferOwnershipDescription">轉移前需注意事項：\n\n- 如果將儲存庫轉移到個人使用者，您將失去對該儲存庫的存取權。\n- 如果將儲存庫轉移到您（共同）擁有的組織，您將保留對該儲存庫的存取權。\n\n請輸入儲存庫名稱以確認</string>
     <string name="repoTransferText">執行轉移</string>
-    <string name="repoTransferOwnerText">New Owner Username</string>
+    <string name="repoTransferOwnerText">新擁有者使用者名稱</string>
     <string name="repoTransferSuccess">儲存庫已成功轉移</string>
     <string name="repoTransferOwnerError">需要新擁有者</string>
     <string name="repoTransferError">擁有者名稱有問題。請確認新擁有者是否存在</string>
@@ -781,7 +781,7 @@
     <string name="userAvatar">頭像</string>
     <string name="tags">標記</string>
     <string name="releasesTags">發行版/標記</string>
-    <string name="create_tag">Tag Only</string>
+    <string name="create_tag">僅標籤</string>
     <string name="tagCreated">標籤已建立</string>
     <string name="asRef">作為參考使用</string>
     <string name="deleteTagConfirmation">您確定要刪除此標籤嗎？</string>
@@ -809,8 +809,8 @@
     <string name="createWikiPage">建立維基頁面</string>
     <string name="wikiUpdated">Wiki 頁面已成功更新</string>
     <string name="wikiCreated">Wiki 頁面已成功建立</string>
-    <string name="wikiPageAlreadyExists">A wiki page with this title already exists</string>
-    <string name="editWikiPage">Edit Wiki Page</string>
+    <string name="wikiPageAlreadyExists">具有此標題的維基頁面已存在</string>
+    <string name="editWikiPage">編輯維基頁面</string>
     <!-- notes -->
     <string name="newNote">新增備註</string>
     <string name="editNote">編輯備註</string>
@@ -901,8 +901,8 @@
     <string name="attachment">附件</string>
     <string name="attachments">附件</string>
     <string name="attachmentsSaveError">已建立議題，但目前無法處理附件。請檢查伺服器日誌以取得更多詳細資訊。</string>
-    <string name="issueCreatedWithAttachments">Issue created with attachments</string>
-    <string name="attachmentTypeNotSupported">File type .%s may not be supported by the server</string>
+    <string name="issueCreatedWithAttachments">已建立包含附件的議題</string>
+    <string name="attachmentTypeNotSupported">伺服器可能不支援 .%s 檔案類型</string>
     <string name="search_matches_found">找到 %1$d 個符合項目</string>
     <string name="search_no_matches">未找到符合項目</string>
     <string name="heatmap_contribution">在 %2$s 有 %1$d 項貢獻</string>
@@ -1007,49 +1007,49 @@
     <string name="labelColorHex">十六進位色碼</string>
     <string name="invalid_color">無效的色碼</string>
     <string name="invalid_length">必須為 6 個字元</string>
-    <string name="create_pr">Create Pull Request</string>
+    <string name="create_pr">建立拉取請求</string>
     <string name="search_filter">搜尋與篩選</string>
     <string name="create_issue">建立議題</string>
     <string name="search_repos">搜尋儲存庫</string>
     <string name="dashboard_search_repos_sub_title">在您的儲存庫中搜尋並使用篩選器以獲得更精確的結果</string>
-    <string name="edit_milestone">Edit Milestone</string>
-    <string name="add_labels">Tap to add labels</string>
-    <string name="add_milestone">Tap to add milestone</string>
-    <string name="add_assignees">Tap to assign assignees</string>
-    <string name="add_due_date">Tap to add due date</string>
-    <string name="add_attachments">Tap to add attachments</string>
-    <string name="no_attachments">No attachments</string>
-    <string name="attachment_limit_count">Maximum %d files allowed</string>
-    <string name="attachment_limit_size">File exceeds %s limit</string>
-    <string name="cannotAddSelfAsReviewer">You cannot add yourself as a reviewer</string>
-    <string name="deleteVariableConfirmation">Are you sure you want to delete this variable? This action cannot be undone.</string>
-    <string name="variable_deleted">Variable deleted successfully</string>
-    <string name="file_conflict_error">A file with this name already exists</string>
-    <string name="delete_file_info">This will stage the file for deletion in the selected branch.</string>
-    <string name="upload_file">Upload file</string>
-    <string name="binary_file_message">Binary file - will be uploaded as-is</string>
-    <string name="commit_new_file">Commit File</string>
-    <string name="commit_changes">Commit Changes</string>
-    <string name="commit_deletion">Commit Deletion</string>
-    <string name="large_file_warning">This file is large and may take time to upload</string>
-    <string name="file_read_error">Could not read file content</string>
-    <string name="update_filename">Update %s</string>
-    <string name="delete_filename">Delete %s</string>
-    <string name="file_name_empty">File name cannot be empty</string>
-    <string name="select_branch_error">Please select a branch</string>
-    <string name="create_pull_request_with_branch">Create pull request with this branch</string>
-    <string name="tap_to_upload_file">Tap to select a file</string>
-    <string name="plain_text">Plain Text</string>
-    <string name="cursor_position_format">Ln %d, Col %d</string>
-    <string name="image_load_error">Could not load image</string>
-    <string name="invalid_user">Invalid user</string>
-    <string name="dashboard_my_prs_sub_title">Browse and manage all your pull requests with search and filters</string>
-    <string name="review_requested">Review requested</string>
-    <string name="reviewed_by_me">Reviewed by me</string>
-    <string name="enter_version">Enter Instance Version</string>
-    <string name="version_required_explanation">Unable to detect server version automatically. Please enter the version manually in the format shown below.</string>
-    <string name="save_and_continue">Save &amp; Continue</string>
-    <string name="invalid_version_format">Invalid version format. Please use format like 1.26.1</string>
+    <string name="edit_milestone">編輯里程碑</string>
+    <string name="add_labels">點擊以新增標籤</string>
+    <string name="add_milestone">點擊以新增里程碑</string>
+    <string name="add_assignees">點擊以指派處理人</string>
+    <string name="add_due_date">點擊以新增截止日期</string>
+    <string name="add_attachments">點擊以新增附件</string>
+    <string name="no_attachments">沒有附件</string>
+    <string name="attachment_limit_count">最多允許 %d 個檔案</string>
+    <string name="attachment_limit_size">檔案超過 %s 限制</string>
+    <string name="cannotAddSelfAsReviewer">您不能將自己新增為審查者</string>
+    <string name="deleteVariableConfirmation">您確定要刪除此變數嗎？此動作無法復原。</string>
+    <string name="variable_deleted">變數刪除成功</string>
+    <string name="file_conflict_error">具有此名稱的檔案已存在</string>
+    <string name="delete_file_info">這將在選定的分支中將檔案標記為待刪除。</string>
+    <string name="upload_file">上傳檔案</string>
+    <string name="binary_file_message">二進位檔案 - 將按原樣上傳</string>
+    <string name="commit_new_file">提交檔案</string>
+    <string name="commit_changes">提交變更</string>
+    <string name="commit_deletion">提交刪除</string>
+    <string name="large_file_warning">此檔案較大，上傳可能需要一些時間</string>
+    <string name="file_read_error">無法讀取檔案內容</string>
+    <string name="update_filename">更新 %s</string>
+    <string name="delete_filename">刪除 %s</string>
+    <string name="file_name_empty">檔案名稱不能為空</string>
+    <string name="select_branch_error">請選擇一個分支</string>
+    <string name="create_pull_request_with_branch">使用此分支建立拉取請求</string>
+    <string name="tap_to_upload_file">點擊以選擇檔案</string>
+    <string name="plain_text">純文字</string>
+    <string name="cursor_position_format">第 %d 行，第 %d 欄</string>
+    <string name="image_load_error">無法載入圖片</string>
+    <string name="invalid_user">無效的使用者</string>
+    <string name="dashboard_my_prs_sub_title">透過搜尋和篩選來瀏覽與管理您所有的拉取請求</string>
+    <string name="review_requested">已請求審查</string>
+    <string name="reviewed_by_me">由我審查</string>
+    <string name="enter_version">輸入執行個體版本</string>
+    <string name="version_required_explanation">無法自動偵測伺服器版本。請以下方顯示的格式手動輸入版本。</string>
+    <string name="save_and_continue">儲存並繼續</string>
+    <string name="invalid_version_format">無效的版本格式。請使用如 1.26.1 的格式</string>
     <string name="time_in_moments">片刻後</string>
     <string name="time_in_minute">%d 分鐘後</string>
     <string name="time_in_minutes">%d 分鐘後</string>