diff --git a/CliClient/locales/zh_TW.po b/CliClient/locales/zh_TW.po
index 86396aac17..0e7ef1e979 100644
--- a/CliClient/locales/zh_TW.po
+++ b/CliClient/locales/zh_TW.po
@@ -7,14 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: penguinsam <samliu@gmail.com>\n"
+"Last-Translator: Ethan Chen <ethan42411@gmail.com>\n"
 "Language-Team: \n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/app-gui.js:445
 msgid "To delete a tag, untag the associated notes."
@@ -181,12 +183,11 @@ msgid "Note is not a to-do: \"%s\""
 msgstr "記事不等於待辨事項: \"%s\""
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-e2ee.js:18
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status`, `decrypt-file` and `target-status`."
 msgstr ""
-"管理 E2EE 設置。命令是 `enable`，`disable`，`decrypt`，`status` 和 `target-"
+"管理 E2EE 設定。指令為 `enable`，`disable`，`decrypt`，`status` 和 `target-"
 "status`。"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-e2ee.js:37
@@ -202,15 +203,13 @@ msgstr "操作已取消"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-e2ee.js:53
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/encryption-config.js:165
-#, fuzzy
 msgid "Confirm password:"
-msgstr "輸入主密碼:"
+msgstr "輸入確認密碼:"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-e2ee.js:59
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/encryption-config.js:143
-#, fuzzy
 msgid "Passwords do not match!"
-msgstr "密碼不能空白"
+msgstr "密碼不相符!"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-e2ee.js:76
 msgid ""
@@ -521,21 +520,23 @@ msgid ""
 "Start, stop or check the API server. To specify on which port it should run, "
 "set the api.port config variable. Commands are (%s)."
 msgstr ""
+"開始、停止或檢查API伺服器。若要指定在哪個連接埠上執行，請設定api.port設定變"
+"數。指令為 (%s)"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-server.js:37
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "伺服器已經在 %d連接埠執行"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-server.js:43
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "伺服器在%d連接埠執行"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-server.js:43
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-server.js:46
 msgid "Server is not running."
-msgstr ""
+msgstr "伺服器尚未運作。"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-set.js:22
 #, javascript-format
@@ -621,23 +622,22 @@ msgstr "正在啟動同步..."
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-sync.js:202
 msgid "Downloading resources..."
-msgstr ""
+msgstr "正在下載資源檔案..."
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-sync.js:226
 msgid "Cancelling... Please wait."
 msgstr "正在取消中...請稍候。"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-tag.js:14
-#, fuzzy
 msgid ""
 "<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
 "assign or remove [tag] from [note], to list notes associated with [tag], or "
 "to list tags associated with [note]. The command `tag list` can be used to "
 "list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> 可以是 \"add\" (新增)，\"remove\" (刪除) 或用 \"list\" 從 [記"
-"事] 中分配或移除 [標籤]，或列出與 [標籤] 關聯的記事。而命令 `tag list` 可以用"
-"來列出所有的標籤。"
+"<tag-command> 可以是 \"add\" (新增)，\"remove\" (刪除) 或\" notetags\" (記事"
+"標籤)，來從[note]中分配或刪除[tag]，列出與[tag]相關聯的筆記，或列出與[note]相"
+"關聯的標籤。 標籤列表命令可用於列出所有標籤(使用-l作為長選項)。"
 
 #: /Users/tessus/data/work/joplin/Tools/../CliClient/app/command-tag.js:90
 #, javascript-format
@@ -736,9 +736,8 @@ msgstr ""
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:643
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:726
-#, fuzzy
 msgid "&File"
-msgstr "檔案"
+msgstr "(&F)檔案"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:649
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:1029
@@ -747,7 +746,7 @@ msgstr "關於 Joplin"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:656
 msgid "Preferences..."
-msgstr ""
+msgstr "偏好設定..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:666
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:1008
@@ -757,7 +756,7 @@ msgstr "檢查更新..."
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:680
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:740
 msgid "Templates"
-msgstr ""
+msgstr "範本"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:687
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:745
@@ -789,12 +788,11 @@ msgstr "結束"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:733
 msgid "Close Window"
-msgstr ""
+msgstr "關閉視窗"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:771
-#, fuzzy
 msgid "&Edit"
-msgstr "編輯"
+msgstr "(&E)編輯"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:774
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:796
@@ -810,9 +808,8 @@ msgid "Paste"
 msgstr "貼上"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:789
-#, fuzzy
 msgid "Select all"
-msgstr "選擇日期"
+msgstr "選擇全部"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:797
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:1591
@@ -826,7 +823,7 @@ msgstr "斜體"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:819
 msgid "Link"
-msgstr ""
+msgstr "連結"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:830
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:1619
@@ -858,14 +855,12 @@ msgid "Search in all the notes"
 msgstr "在所有記事中搜尋"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:898
-#, fuzzy
 msgid "Search in current note"
-msgstr "在所有記事中搜尋"
+msgstr "在目前記事中搜尋"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:910
-#, fuzzy
 msgid "&View"
-msgstr "檢視"
+msgstr "(&V)檢視"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:912
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/MainScreen.min.js:459
@@ -874,41 +869,36 @@ msgstr "顯示 / 隱藏側邊欄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:925
 msgid "Layout button sequence"
-msgstr ""
+msgstr "頁面佈局"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:929
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/MainScreen.min.js:468
-#, fuzzy
 msgid "Toggle note list"
-msgstr "啟用加密"
+msgstr "切換筆記列表"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:938
 msgid "Toggle editor layout"
 msgstr "切換編輯器佈局"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:986
-#, fuzzy
 msgid "Focus"
-msgstr "游標置於內文"
+msgstr "焦點"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:992
-#, fuzzy
 msgid "&Tools"
-msgstr "工具"
+msgstr "(&T)工具"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:996
-#, fuzzy
 msgid "&Help"
-msgstr "說明"
+msgstr "(&H)說明"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:998
 msgid "Website and documentation"
 msgstr "官方網站及線上說明"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:1002
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin 官方網站"
+msgstr "Joplin 討論區"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:1005
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:421
@@ -916,9 +906,8 @@ msgid "Make a donation"
 msgstr "捐助"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:1017
-#, fuzzy
 msgid "Toggle development tools"
-msgstr "啟用加密"
+msgstr "切換開發工具"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/app.js:1151
 #, javascript-format
@@ -968,7 +957,7 @@ msgstr "此版本是最新的。"
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/checkForUpdates.js:146
 #, javascript-format
 msgid "%s (pre-release)"
-msgstr ""
+msgstr "%s (預先發行)"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/checkForUpdates.js:150
 msgid "An update is available, do you want to download it now?"
@@ -977,12 +966,12 @@ msgstr "有可用的更新，您需要立即下載嗎？"
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/checkForUpdates.js:150
 #, javascript-format
 msgid "Your version: %s"
-msgstr ""
+msgstr "您目前的版本: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/checkForUpdates.js:150
 #, javascript-format
 msgid "New version: %s"
-msgstr ""
+msgstr "最新版本: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/checkForUpdates.js:151
 msgid "Yes"
@@ -994,11 +983,11 @@ msgstr "否"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/checkForUpdates.js:151
 msgid "Full Release Notes"
-msgstr ""
+msgstr "完整的發行備註"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ClipperConfigScreen.min.js:39
 msgid "Token has been copied to the clipboard!"
-msgstr ""
+msgstr "Token已經被複製到剪貼簿!"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ClipperConfigScreen.min.js:69
 msgid "The web clipper service is enabled and set to auto-start."
@@ -1058,27 +1047,26 @@ msgid "Download and install the relevant extension for your browser:"
 msgstr "下載並安裝瀏覽器插件:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ClipperConfigScreen.min.js:174
-#, fuzzy
 msgid "Advanced options"
 msgstr "顯示進階選項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ClipperConfigScreen.min.js:179
 msgid "Authorisation token:"
-msgstr ""
+msgstr "授權書 token:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ClipperConfigScreen.min.js:189
 msgid "Copy token"
-msgstr ""
+msgstr "複製token"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ClipperConfigScreen.min.js:195
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
 "access Joplin."
-msgstr ""
+msgstr "此授權書token僅會被用來允許第三方應用程式存取Joplin。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:82
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "這將會開啟一個新視窗。儲存您目前的變更嗎?"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:139
 #, javascript-format
@@ -1091,53 +1079,47 @@ msgid "Check synchronisation configuration"
 msgstr "檢測同步設置"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:174
-#, fuzzy
 msgid "Unknown"
-msgstr "未知的標誌: %s"
+msgstr "不明"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:178
-#, fuzzy
 msgid "Checking..."
-msgstr "正在取消中..."
+msgstr "檢查中..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:182
-#, fuzzy
 msgid "Error"
-msgstr "僅顯示錯誤"
+msgstr "錯誤"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:193
 msgid ""
 "The Joplin Nextcloud App is either not installed or misconfigured. Please "
 "see the full error message below:"
 msgstr ""
+"尚未安裝Joplin Nextcloud APP或尚未進行設定。 請查看下面的完整錯誤訊息："
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:206
-#, fuzzy
 msgid "Show Log"
-msgstr "顯示全部"
+msgstr "顯示日誌"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:219
 msgid "Joplin Nextcloud App status:"
-msgstr ""
+msgstr "Joplin Nextcloud App 狀態:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:233
-#, fuzzy
 msgid "Check Status"
-msgstr "狀態"
+msgstr "檢查狀態"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:240
-#, fuzzy
 msgid "Help"
 msgstr "說明"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:259
-#, fuzzy
 msgid "Show Advanced Settings"
 msgstr "顯示進階選項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:516
 msgid "Browse..."
-msgstr ""
+msgstr "瀏覽..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ConfigScreen.min.js:637
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:859
@@ -1275,20 +1257,19 @@ msgstr "加密:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ExtensionBadge.min.js:10
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Firefox延伸模組"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ExtensionBadge.min.js:17
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome Web Store"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ExtensionBadge.min.js:44
 msgid "Get it now:"
-msgstr ""
+msgstr "立即取得:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/Header.min.js:210
-#, fuzzy
 msgid "Usage"
-msgstr "使用資訊: %s"
+msgstr "使用量"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ImportScreen.min.js:62
 #, javascript-format
@@ -1326,7 +1307,7 @@ msgstr "設置提醒:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/MainScreen.min.js:326
 msgid "Template file:"
-msgstr ""
+msgstr "範本檔案:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/MainScreen.min.js:477
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/action-button.js:69
@@ -1361,9 +1342,8 @@ msgid "View them now"
 msgstr "立即檢視"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/MainScreen.min.js:568
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "輸入主密碼:"
+msgstr "一個或多個主密鑰需要密碼。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/MainScreen.min.js:578
 msgid "Set the password"
@@ -1380,41 +1360,38 @@ msgstr "您當前沒有任何記事本。通過按一下 \"新增記事本\" 去
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NotePropertiesDialog.min.js:29
 msgid "Location"
-msgstr ""
+msgstr "地理位置"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NotePropertiesDialog.min.js:30
 msgid "URL"
-msgstr ""
+msgstr "網址"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NotePropertiesDialog.min.js:31
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:951
-#, fuzzy
 msgid "Note History"
-msgstr "記事本"
+msgstr "記事本歷史紀錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NotePropertiesDialog.min.js:32
 msgid "Markup"
-msgstr ""
+msgstr "標記"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NotePropertiesDialog.min.js:295
 msgid "Previous versions of this note"
-msgstr ""
+msgstr "此記事的先前版本"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NotePropertiesDialog.min.js:372
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:1735
-#, fuzzy
 msgid "Note properties"
-msgstr "記事本標題:"
+msgstr "記事本性質"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteRevisionViewer.min.js:75
 #, javascript-format
 msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
-msgstr ""
+msgstr "記事 \"%s\" 已經被成功還原到記事本 \"%s\"."
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteRevisionViewer.min.js:100
-#, fuzzy
 msgid "This note has no history"
-msgstr "此記事已被修改:"
+msgstr "此記事沒有歷史紀錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteRevisionViewer.min.js:139
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:853
@@ -1424,7 +1401,7 @@ msgstr "不支援的鏈接或訊息: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteRevisionViewer.min.js:174
 msgid "Restore"
-msgstr ""
+msgstr "還原"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteRevisionViewer.min.js:175
 #, javascript-format
@@ -1432,6 +1409,8 @@ msgid ""
 "Click \"%s\" to restore the note. It will be copied in the notebook named "
 "\"%s\". The current version of the note will not be replaced or modified."
 msgstr ""
+"點選 \"%s\" 來還原筆記。它將被複製到名為 \"%s\"的筆記本中。目前筆記的版本將不"
+"會被取代或修改。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:770
 msgid "Open..."
@@ -1457,7 +1436,7 @@ msgstr "複製鏈接位址"
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:824
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:149
 msgid "This attachment is not downloaded or not decrypted yet."
-msgstr ""
+msgstr "此附件尚未被下載或是尚未解密完成。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/NoteText.min.js:1046
 #, javascript-format
@@ -1566,53 +1545,52 @@ msgid "Synchronisation Status"
 msgstr "同步狀態"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ShareNoteDialog.js:163
-#, fuzzy
 msgid "Synchronising..."
-msgstr "顯示同步狀態"
+msgstr "同步中..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ShareNoteDialog.js:165
-#, fuzzy
 msgid "Generating link..."
 msgid_plural "Generating links..."
-msgstr[0] "建立新 %s..."
+msgstr[0] "建立連結..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ShareNoteDialog.js:167
 msgid "Link has been copied to clipboard!"
 msgid_plural "Links have been copied to clipboard!"
-msgstr[0] ""
+msgstr[0] "連結已被複製到剪貼簿!"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ShareNoteDialog.js:170
 msgid ""
 "Note: When a note is shared, it will no longer be encrypted on the server."
-msgstr ""
+msgstr "注意：當筆記被分享時，他將不會在伺服器上被加密。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ShareNoteDialog.js:175
-#, fuzzy
 msgid "Share Notes"
-msgstr "分享"
+msgstr "分享記事"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ShareNoteDialog.js:177
-#, fuzzy
 msgid "Copy Shareable Link"
 msgid_plural "Copy Shareable Links"
-msgstr[0] "分享"
+msgstr[0] "複製分享連結"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/ShareNoteDialog.js:180
 msgid "Close"
-msgstr ""
+msgstr "關閉"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:276
 msgid "Remove"
-msgstr ""
+msgstr "移除"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:279
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/side-menu-content.js:146
-#, fuzzy, javascript-format
+#, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
 "All notes and sub-notebooks within this notebook will also be deleted."
-msgstr "決定刪除記事本？此記事本中的所有記事和子記事本也將被刪除。"
+msgstr ""
+"確定刪除記事本 \"%s\"?\n"
+"\n"
+"此記事本中的所有記事和子記事本也將被刪除。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:280
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:164
@@ -1624,18 +1602,17 @@ msgid "Delete"
 msgstr "刪除"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:283
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
-msgstr "是否從所有記事中刪除此標籤？"
+msgstr "是否從所有記事中刪除此標籤 \"%s\"？"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:285
 msgid "Remove this search from the sidebar?"
 msgstr "是否從側邊欄中刪除此搜索？"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:297
-#, fuzzy
 msgid "New sub-notebook"
-msgstr "新增記事本"
+msgstr "新增子記事本"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:332
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:382
@@ -1656,9 +1633,9 @@ msgstr "正在解密項目: %d/%d 項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/SideBar.min.js:771
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/side-menu-content.js:327
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Fetching resources: %d/%d"
-msgstr "資源: %d/%d"
+msgstr "擷取資源檔案: %d/%d"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/StatusScreen.min.js:33
 msgid "Please select where the sync status should be exported to"
@@ -1667,7 +1644,7 @@ msgstr "請選擇將同步狀態導出到的位置"
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/StatusScreen.min.js:87
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/status.js:106
 msgid "Retry"
-msgstr ""
+msgstr "重試"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:26
 msgid "Add or remove tags"
@@ -1688,14 +1665,12 @@ msgid "Switch between note and to-do type"
 msgstr "切換到記事 / 待辦事項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:78
-#, fuzzy
 msgid "Switch to note type"
-msgstr "切換到記事 / 待辦事項"
+msgstr "切換為筆記"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:87
-#, fuzzy
 msgid "Switch to to-do type"
-msgstr "切換到記事 / 待辦事項"
+msgstr "切換為待辦事項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:97
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:711
@@ -1703,33 +1678,32 @@ msgid "Copy Markdown link"
 msgstr "複製 Markdown 連結"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:112
-#, fuzzy
 msgid "Share note..."
-msgstr "分享"
+msgstr "分享筆記..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:146
 msgid "PDF File"
 msgstr "PDF 檔案"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:181
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Delete note \"%s\"?"
-msgstr "刪除此記事？"
+msgstr "刪除此記事 \"%s\"?"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/gui/utils/NoteListUtils.js:183
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Delete these %d notes?"
-msgstr "刪除這些記事？"
+msgstr "刪除這些記事 %d ？"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/plugins/GotoAnything.min.js:339
 msgid ""
 "Type a note title to jump to it. Or type # followed by a tag name, or @ "
 "followed by a notebook name."
-msgstr ""
+msgstr "輸入筆記標題來跳轉。或輸入＃與標籤名稱，或者@與筆記本名稱。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ElectronClient/app/plugins/GotoAnything.min.js:377
 msgid "Goto Anything..."
-msgstr ""
+msgstr "前往任何地方..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/BaseApplication.js:109
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/BaseApplication.js:122
@@ -1751,6 +1725,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"無法連接到Joplin Nextcloud APP。 請在檢查同步設定畫面中的設定項目。完整錯誤訊"
+"息為:\n"
+"\n"
+"%s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/SyncTargetDropbox.js:25
 msgid "Dropbox"
@@ -1843,37 +1821,37 @@ msgstr "無法訪問 %s"
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:94
 #, javascript-format
 msgid "Created local items: %d."
-msgstr "已建立的本地項目: %d 項"
+msgstr "已建立的本地項目: %d 項。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:95
 #, javascript-format
 msgid "Updated local items: %d."
-msgstr "已更新的本地項目: %d 項"
+msgstr "已更新的本地項目: %d 項。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:96
 #, javascript-format
 msgid "Created remote items: %d."
-msgstr "已建立的遠端項目: %d 項"
+msgstr "已建立的遠端項目: %d 項。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:97
 #, javascript-format
 msgid "Updated remote items: %d."
-msgstr "已更新的遠端項目: %d 項"
+msgstr "已更新的遠端項目: %d 項。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:98
 #, javascript-format
 msgid "Deleted local items: %d."
-msgstr "已刪除的本地項目: %d 項"
+msgstr "已刪除的本地項目: %d 項。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:99
 #, javascript-format
 msgid "Deleted remote items: %d."
-msgstr "已刪除的遠端項目: %d 項"
+msgstr "已刪除的遠端項目: %d 項。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:100
 #, javascript-format
 msgid "Fetched items: %d/%d."
-msgstr "已擷取的本地項目: %d/%d 項"
+msgstr "已擷取的本地項目: %d/%d 項。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/synchronizer.js:102
 msgid "Cancelling..."
@@ -1953,23 +1931,24 @@ msgid ""
 "to it before syncing, otherwise all files will be removed! See the FAQ for "
 "more details: %s"
 msgstr ""
+"注意：如果更改此位置，請確保在同步之前將所有內容複製到該位置，否則將刪除所有"
+"文件！ 有關更多詳細資訊，請閱讀FAQ: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:45
 msgid "Keyboard Mode"
-msgstr ""
+msgstr "鍵盤模式"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:48
-#, fuzzy
 msgid "Default"
-msgstr "預設: %s"
+msgstr "預設"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:49
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:50
 msgid "Vim"
-msgstr ""
+msgstr "Vim"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:60
 msgid "Synchronisation target"
@@ -2013,7 +1992,7 @@ msgstr "WebDAV 密碼"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:175
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "附件下載動作"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:176
 msgid ""
@@ -2021,22 +2000,24 @@ msgid ""
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"在\"手動\"模式下，僅會在當您點選附件時才下載附件。 而\"自動\"模式，則是打開筆"
+"記時即會開始下載。若是\"總是\"模式，無論您是否打開筆記，都會下載所有附件。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:179
 msgid "Always"
-msgstr ""
+msgstr "總是"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:180
 msgid "Manual"
-msgstr ""
+msgstr "手動"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:181
 msgid "Auto"
-msgstr ""
+msgstr "自動"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:186
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "最大同時連接數"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:195
 msgid "Language"
@@ -2064,56 +2045,53 @@ msgstr "暗黑"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:245
 msgid "Dracula"
-msgstr ""
+msgstr "Dracula"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:246
 msgid "Solarised Light"
-msgstr ""
+msgstr "Solarised Light"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:247
 msgid "Solarised Dark"
-msgstr ""
+msgstr "Solarised Dark"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:248
 msgid "Nord"
-msgstr ""
+msgstr "Nord"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:253
-#, fuzzy
 msgid "Show note counts"
-msgstr "顯示系統匣圖示"
+msgstr "顯示筆記數量"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:261
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:262
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:263
-#, fuzzy
 msgid "Editor"
-msgstr "編輯"
+msgstr "編輯器"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:261
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:262
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:264
-#, fuzzy
 msgid "Viewer"
-msgstr "檢視"
+msgstr "閱讀器"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:261
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:263
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:264
 msgid "Split View"
-msgstr ""
+msgstr "分割顯示"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:261
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s / %s / %s"
-msgstr "%s = %s (%s)"
+msgstr "%s / %s / %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:262
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:263
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:264
 #, javascript-format
 msgid "%s / %s"
-msgstr ""
+msgstr "%s / %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:267
 msgid "Uncompleted to-dos on top"
@@ -2133,9 +2111,8 @@ msgid "Reverse sort order"
 msgstr "顛倒排序順序"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:294
-#, fuzzy
 msgid "Sort notebooks by"
-msgstr "排序記事"
+msgstr "排序記事方式"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:306
 msgid "Save geo-location with notes"
@@ -2161,60 +2138,59 @@ msgstr "當新增記事時:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:337
 msgid "Enable soft breaks"
-msgstr ""
+msgstr "啟用 soft breaks"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:338
 msgid "Enable typographer support"
-msgstr ""
+msgstr "啟用 typographer 支援"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:339
-#, fuzzy
 msgid "Enable math expressions"
-msgstr "啟用加密"
+msgstr "啟用數學表達式"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:340
 msgid "Enable ==mark== syntax"
-msgstr ""
+msgstr "啟用 ==mark== 語法"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:341
 msgid "Enable footnotes"
-msgstr ""
+msgstr "啟用註腳"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:342
 msgid "Enable table of contents extension"
-msgstr ""
+msgstr "啟用表格內容延伸模組"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:343
 msgid "Enable ~sub~ syntax"
-msgstr ""
+msgstr "啟用 ~sub~ 語法"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:344
 msgid "Enable ^sup^ syntax"
-msgstr ""
+msgstr "啟用 ^sup^ 語法"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:345
 msgid "Enable deflist syntax"
-msgstr ""
+msgstr "啟用 deflist 語法"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:346
 msgid "Enable abbreviation syntax"
-msgstr ""
+msgstr "啟用 abbreviation 語法"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:347
 msgid "Enable markdown emoji"
-msgstr ""
+msgstr "啟用 markdown 表情符號"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:348
 msgid "Enable ++insert++ syntax"
-msgstr ""
+msgstr "啟用 ++insert++ 語法"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:349
 msgid "Enable multimarkdown table extension"
-msgstr ""
+msgstr "啟用 multimarkdown  表格延伸模組"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:350
 msgid "Enable Fountain syntax support"
-msgstr ""
+msgstr "啟用Fountain syntax 支援"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:362
 msgid "Show tray icon"
@@ -2230,24 +2206,24 @@ msgid ""
 "this setting so that your notes are constantly being synchronised, thus "
 "reducing the number of conflicts."
 msgstr ""
+"這將會允許Joplin在背景執行。建議啟用此設定，以便不斷同步您的筆記，從而減少衝"
+"突次數。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:368
 msgid "Start application minimised in the tray icon"
-msgstr ""
+msgstr "啟動應用程式時最小化到任務欄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:376
 msgid "Global zoom percentage"
 msgstr "整體縮放比例 (%)"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:377
-#, fuzzy
 msgid "Editor font size"
-msgstr "編輯器字型系列"
+msgstr "編輯器字體大小"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:385
-#, fuzzy
 msgid "Editor font"
-msgstr "編輯器字型系列"
+msgstr "編輯器字型"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:409
 msgid "Editor font family"
@@ -2263,7 +2239,7 @@ msgstr ""
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:449
 msgid "Custom stylesheet for Joplin-wide app styles"
-msgstr ""
+msgstr "自定義樣式表，適用於整個Joplin-wide的應用程序風格"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:453
 msgid "Automatically update the application"
@@ -2271,12 +2247,12 @@ msgstr "自動更新應用程式"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:454
 msgid "Get pre-releases when checking for updates"
-msgstr ""
+msgstr "檢查更新時一併檢查預先發行"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:454
 #, javascript-format
 msgid "See the pre-release page for more details: %s"
-msgstr ""
+msgstr "有關更多詳細信息，請查閱預先發行頁面: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:462
 msgid "Synchronisation interval"
@@ -2314,43 +2290,43 @@ msgstr ""
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:481
 msgid "Page size for PDF export"
-msgstr ""
+msgstr "匯出PDF的頁面大小"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:483
 msgid "A4"
-msgstr ""
+msgstr "A4"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:484
 msgid "Letter"
-msgstr ""
+msgstr "Letter"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:485
 msgid "A3"
-msgstr ""
+msgstr "A3"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:486
 msgid "A5"
-msgstr ""
+msgstr "A5"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:487
 msgid "Tabloid"
-msgstr ""
+msgstr "文摘"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:488
 msgid "Legal"
-msgstr ""
+msgstr "法律規格紙"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:491
 msgid "Page orientation for PDF export"
-msgstr ""
+msgstr "匯出PDF的頁面方向"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:493
 msgid "Portrait"
-msgstr ""
+msgstr "直式"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:494
 msgid "Landscape"
-msgstr ""
+msgstr "橫式"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:509
 msgid "Custom TLS certificates"
@@ -2375,31 +2351,30 @@ msgstr "忽略 TLS 證書錯誤"
 msgid ""
 "Fail-safe: Do not wipe out local data when sync target is empty (often the "
 "result of a misconfiguration or bug)"
-msgstr ""
+msgstr "故障安全：當同步目標為空時(通常發生在設定錯誤或Bug)，請勿清除本機資料"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:528
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
-msgstr ""
+msgstr "指定API伺服器使用的連接埠。 如果未設定，將使用預設值。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:536
-#, fuzzy
 msgid "Enable note history"
-msgstr "啟用加密"
+msgstr "啟用筆記歷史紀錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:546
 msgid "days"
-msgstr ""
+msgstr "天數"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:546
 #, javascript-format
 msgid "%d days"
-msgstr ""
+msgstr "%d 天"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:548
 msgid "Keep note history for"
-msgstr ""
+msgstr "保留筆記歷史記錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:663
 #, javascript-format
@@ -2407,47 +2382,41 @@ msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "不正確選項值: \"%s\"。可能的值為: %s。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:945
-#, fuzzy
 msgid "General"
 msgstr "一般選項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:946
-#, fuzzy
 msgid "Synchronisation"
 msgstr "顯示同步狀態"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:947
 msgid "Appearance"
-msgstr ""
+msgstr "外觀"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:948
-#, fuzzy
 msgid "Note"
 msgstr "記事本"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:949
 msgid "Plugins"
-msgstr ""
+msgstr "延伸模組"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:950
-#, fuzzy
 msgid "Application"
-msgstr "離開本程式。"
+msgstr "應用程式"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:952
-#, fuzzy
 msgid "Encryption"
-msgstr "加密:"
+msgstr "加密"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Setting.js:953
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Web clipper 選項"
+msgstr "Web clipper"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/models/Tag.js:168
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
+msgstr "標籤 \"%s\" 已存在。 請選擇其他名稱。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:29
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:67
@@ -2465,29 +2434,24 @@ msgid "Joplin Export Directory"
 msgstr "Joplin 匯出目錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:47
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Evernote 匯出檔"
+msgstr "匯出Evernote檔案 (as Markdown)"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:55
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Evernote 匯出檔"
+msgstr "匯出Evernote檔案 (as HTML)"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:77
-#, fuzzy
 msgid "Json Export Directory"
-msgstr "Joplin 匯出目錄"
+msgstr "匯出Joplin目錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:88
-#, fuzzy
 msgid "HTML File"
-msgstr "檔案"
+msgstr "HTML檔案"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:93
-#, fuzzy
 msgid "HTML Directory"
-msgstr "目錄"
+msgstr "HTML目錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/InteropService.js:129
 msgid "File"
@@ -2524,7 +2488,7 @@ msgstr "請指定將記事匯入到的筆記本。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/RevisionService.js:211
 msgid "Restored Notes"
-msgstr ""
+msgstr "恢復的筆記"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/report.js:119
 msgid "Items that cannot be synchronised"
@@ -2540,19 +2504,18 @@ msgstr ""
 "(在上面的括弧中顯示) 搜索。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/report.js:128
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s (%s) could not be uploaded: %s"
-msgstr "無法開啟檔案: %s"
+msgstr "%s (%s)  無法上傳: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/report.js:130
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "無法開啟檔案: %s"
+msgstr "項目 \"%s\" 無法被下載: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/report.js:140
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "無法同步的項目"
+msgstr "項目無法被解密"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/report.js:142
 msgid ""
@@ -2560,6 +2523,8 @@ msgid ""
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin 未能多次解密這些項目，可能是因為它們已損壞或太大。 這些項目將保留在設"
+"備上，但Joplin將不再嘗試對其進行解密。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/services/report.js:161
 msgid "Sync status (synced items / total items)"
@@ -2605,21 +2570,19 @@ msgstr "在 %s: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/CameraView.js:178
 msgid "Permission to use camera"
-msgstr ""
+msgstr "允許使用相機"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/CameraView.js:179
 msgid "Your permission to use your camera is required."
-msgstr ""
+msgstr "必須獲得使用相機的權限。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/note-list.js:116
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "無使用中的記事本。"
+msgstr "您目前尚未擁有記事本。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/note-list.js:120
-#, fuzzy
 msgid "Create a notebook"
-msgstr "新增記事本。"
+msgstr "新增一個記事本"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/note-list.js:124
 msgid "There are currently no notes. Create one by clicking on the (+) button."
@@ -2643,9 +2606,8 @@ msgid "Press to set the decryption password."
 msgstr "按下以設置解密密碼。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/select-date-time-dialog.js:65
-#, fuzzy
 msgid "Clear alarm"
-msgstr "設置提醒"
+msgstr "清除提醒"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/select-date-time-dialog.js:68
 msgid "Save alarm"
@@ -2660,17 +2622,15 @@ msgid "Confirm"
 msgstr "確認"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/side-menu-content.js:124
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "記事本"
+msgstr "記事本: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/side-menu-content.js:130
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "無法修改已加密項目"
+msgstr "無法重新命名已加密項目"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/side-menu-content.js:309
-#, fuzzy
 msgid "New Notebook"
 msgstr "新增記事本"
 
@@ -2681,30 +2641,28 @@ msgstr "設置"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/side-menu-content.js:356
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/notes.js:177
-#, fuzzy
 msgid "All notes"
-msgstr "記事"
+msgstr "全部記事"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/shared/config-shared.js:46
-#, fuzzy
 msgid "Checking... Please wait."
-msgstr "正在取消中...請稍候。"
+msgstr "檢查中...請稍候。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/shared/config-shared.js:48
-#, fuzzy
 msgid "Success! Synchronisation configuration appears to be correct."
-msgstr "檢測同步設置"
+msgstr "成功! 同步設定看起來正確。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/shared/config-shared.js:50
 msgid ""
 "Error. Please check that URL, username, password, etc. are correct and that "
 "the sync target is accessible. The reported error was:"
 msgstr ""
+"錯誤。 請檢查網址、使用者名稱、密碼等是否正確以及同步目標是否可以被存取。 錯"
+"誤回報訊息為:"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/shared/dropbox-login-shared.js:39
-#, fuzzy
 msgid "The application has been authorised!"
-msgstr "應用程式已成功取得權限。"
+msgstr "此應用程式已被授權！"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/shared/dropbox-login-shared.js:43
 #, javascript-format
@@ -2715,11 +2673,16 @@ msgid ""
 "\n"
 "Please try again."
 msgstr ""
+"無法申請授權申請:\n"
+"\n"
+"%s\n"
+"\n"
+"請再次重試。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/shared/encryption-config-shared.js:71
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Decrypted items: %s / %s"
-msgstr "正在解密項目: %d/%d 項"
+msgstr "解密項目: %s / %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/NoteTagsDialog.js:161
 msgid "New tags:"
@@ -2731,13 +2694,13 @@ msgstr "輸入新標籤，或在清單中選擇"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:48
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:48
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
-msgstr ""
+msgstr "為了使用檔案系統同步，您需要具有寫入外部儲存裝置的權限。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:269
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/encryption-config.js:265
@@ -2745,14 +2708,12 @@ msgid "Encryption Config"
 msgstr "加密設置"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:380
-#, fuzzy
 msgid "Tools"
 msgstr "工具"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:382
-#, fuzzy
 msgid "Sync Status"
-msgstr "狀態"
+msgstr "同步狀態"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:383
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/log.js:108
@@ -2760,9 +2721,8 @@ msgid "Log"
 msgstr "日誌"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:384
-#, fuzzy
 msgid "Creating report..."
-msgstr "建立新 %s..."
+msgstr "正在建立新報告 %s..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:384
 msgid "Export Debug Report"
@@ -2770,22 +2730,23 @@ msgstr "匯出除錯報告"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:385
 msgid "Fixing search index..."
-msgstr ""
+msgstr "正在修正搜尋索引..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:385
 msgid "Fix search index"
-msgstr ""
+msgstr "修正搜尋索引"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:385
 msgid ""
 "Use this to rebuild the search index if there is a problem with search. It "
 "may take a long time depending on the number of notes."
 msgstr ""
+"如果搜尋出現問題，請使用它來重新建立搜尋索引。 根據筆記的數量，可能會花費很長"
+"時間。"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:387
-#, fuzzy
 msgid "More information"
-msgstr "設置"
+msgstr "更多資訊"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:397
 msgid ""
@@ -2816,12 +2777,12 @@ msgstr "Joplin 官方網站"
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:463
 #, javascript-format
 msgid "Database v%s"
-msgstr ""
+msgstr "資料庫 V%s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/config.js:469
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "FTS enabled: %d"
-msgstr "標示刪除: %d"
+msgstr "FTS已啟用: %d"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/dropbox-login.js:50
 msgid "Login with Dropbox"
@@ -2829,7 +2790,7 @@ msgstr "以 Dropbox 登錄"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/dropbox-login.js:61
 msgid "Enter code here"
-msgstr ""
+msgstr "請在此輸入驗證碼"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/encryption-config.js:122
 #, javascript-format
@@ -2852,9 +2813,8 @@ msgid "Password cannot be empty"
 msgstr "密碼不能空白"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/encryption-config.js:142
-#, fuzzy
 msgid "Confirm password cannot be empty"
-msgstr "密碼不能空白"
+msgstr "確認密碼不能空白"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/encryption-config.js:178
 msgid "Enable"
@@ -2870,9 +2830,8 @@ msgid "Edit notebook"
 msgstr "編輯記事本"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/folder.js:110
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "記事本標題:"
+msgstr "輸入記事本標題"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/log.js:113
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/onedrive-login.js:109
@@ -2913,7 +2872,7 @@ msgstr "Joplin 移動應用程式暫時不支援此類型的連結: %s"
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:157
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "不支援 \"%s\" 通訊協定"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:485
 #, javascript-format
@@ -2921,9 +2880,9 @@ msgid "Unsupported image type: %s"
 msgstr "不支援的圖像類型: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:632
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "已更新: %d。"
+msgstr "已更新: %s"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:636
 msgid "View on map"
@@ -2931,22 +2890,19 @@ msgstr "在地圖上顯示"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:643
 msgid "Go to source URL"
-msgstr ""
+msgstr "前往來源網址"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:670
-#, fuzzy
 msgid "Attach..."
-msgstr "搜尋..."
+msgstr "附加..."
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:672
-#, fuzzy
 msgid "Choose an option"
-msgstr "顯示進階選項"
+msgstr "選擇一個選項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:672
-#, fuzzy
 msgid "Take photo"
-msgstr "附加相片"
+msgstr "拍攝相片"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:672
 msgid "Attach photo"
@@ -2970,16 +2926,15 @@ msgstr "轉換為待辦事項"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:717
 msgid "Properties"
-msgstr ""
+msgstr "屬性"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:852
 msgid "Add body"
-msgstr ""
+msgstr "新增內文"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/note.js:887
-#, fuzzy
 msgid "Add title"
-msgstr "標題"
+msgstr "新增標題"
 
 #: /Users/tessus/data/work/joplin/Tools/../ReactNativeClient/lib/components/screens/onedrive-login.js:98
 msgid "Login with OneDrive"