1
0
mirror of https://github.com/laurent22/joplin.git synced 2026-02-01 07:49:31 +02:00

Compare commits

..

4 Commits

Author SHA1 Message Date
Laurent Cozic
23d9ab7a3a update 2021-08-30 12:55:05 +01:00
Laurent Cozic
53f7f3c738 Merge branch 'dev' into master_password 2021-08-29 18:31:41 +01:00
Laurent Cozic
66123fcabb update 2021-08-29 17:58:54 +01:00
Laurent Cozic
cb4a027975 update 2021-08-29 13:12:03 +01:00
4 changed files with 31 additions and 29 deletions

View File

@@ -1,12 +1,12 @@
{
"name": "@joplin/app-desktop",
"version": "2.4.4",
"version": "2.4.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@joplin/app-desktop",
"version": "2.4.4",
"version": "2.4.3",
"license": "MIT",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0",

View File

@@ -1,6 +1,6 @@
{
"name": "@joplin/app-desktop",
"version": "2.4.4",
"version": "2.4.3",
"description": "Joplin for Desktop",
"main": "main.js",
"private": true,

View File

@@ -110,7 +110,7 @@ export async function findMasterKeyPassword(service: EncryptionService, masterKe
return masterPassword;
}
logger.info('findMasterKeyPassword: No master password is defined - trying to get master key specific password');
logger.warn('findMasterKeyPassword: No master password is defined - trying to get master key specific password');
const passwords = Setting.value('encryption.passwordCache');
return passwords[masterKey.id];

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: SiderealArt <nelson22768384@gmail.com>\n"
"Last-Translator: Po-Chiang Chao (BobChao) <bobchao@gmail.com>\n"
"Language-Team: yaozeye <yaozeye@yaozeye.onmicrosoft.com>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
@@ -15,8 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 3.0\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
#: packages/app-cli/app/app-gui.js:452
msgid "To delete a tag, untag the associated notes."
@@ -873,7 +871,7 @@ msgstr "下載"
#: packages/app-desktop/checkForUpdates.js:189
msgid "Skip this version"
msgstr "跳過此版本"
msgstr "這版不更新"
#: packages/app-desktop/checkForUpdates.js:189
msgid "Full changelog"
@@ -910,7 +908,7 @@ msgstr "切換安全模式"
#: packages/app-desktop/gui/ClipperConfigScreen.js:34
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
msgid "Token has been copied to the clipboard!"
msgstr "Token 已經被複製到剪貼簿"
msgstr "Token 已經被複製到剪貼簿!"
#: packages/app-desktop/gui/ClipperConfigScreen.js:37
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
@@ -926,13 +924,13 @@ msgstr "網頁剪輯服務已啟用,並設置為自動啟動。"
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
#, javascript-format
msgid "Status: Started on port %d"
msgstr "狀態已在 %d 埠上啟動"
msgstr "狀態: 已在 %d 埠上啟動"
#: packages/app-desktop/gui/ClipperConfigScreen.js:72
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
#, javascript-format
msgid "Status: %s"
msgstr "狀態%s"
msgstr "狀態: %s"
#: packages/app-desktop/gui/ClipperConfigScreen.js:74
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
@@ -1096,7 +1094,7 @@ msgstr "已安裝"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:140
msgid "Update"
msgstr "更新"
msgstr "更新"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:142
msgid "Updating..."
@@ -1107,7 +1105,7 @@ msgstr "更新中..."
#: packages/app-desktop/gui/EncryptionConfigScreen.min.js:324
#: packages/app-desktop/gui/NotePropertiesDialog.min.js:30
msgid "Updated"
msgstr "更新"
msgstr "更新時間"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js:154
msgid "Please upgrade Joplin to use this plugin"
@@ -1197,8 +1195,9 @@ msgid "Save"
msgstr "儲存"
#: packages/app-desktop/gui/EncryptionConfigScreen.js:87
#, fuzzy
msgid "Disable"
msgstr "停用"
msgstr "停用"
#: packages/app-desktop/gui/EncryptionConfigScreen.js:87
#: packages/app-mobile/components/screens/encryption-config.js:157
@@ -1327,7 +1326,7 @@ msgstr "使用中"
#: packages/app-desktop/gui/EncryptionConfigScreen.js:149
msgid "Date"
msgstr "日期"
msgstr ""
#: packages/app-desktop/gui/EncryptionConfigScreen.js:150
#: packages/app-desktop/gui/EncryptionConfigScreen.min.js:329
@@ -1604,8 +1603,9 @@ msgid "Use the arrows to move the layout items. Press \"Escape\" to exit."
msgstr "使用方向鍵移動佈局項,點擊「Esc」退出。"
#: packages/app-desktop/gui/MainScreen/commands/commandPalette.js:18
#, fuzzy
msgid "Command palette..."
msgstr "命令選擇區..."
msgstr "命令模式"
#: packages/app-desktop/gui/MainScreen/commands/editAlarm.js:20
#: packages/app-mobile/components/SelectDateTimeDialog.js:84
@@ -2398,7 +2398,7 @@ msgstr "注意:分享記事後,該記事將不會在伺服器上加密。"
#: packages/app-desktop/gui/ShareNoteDialog.js:187
msgid "Publish Notes"
msgstr "發布記事"
msgstr ""
#: packages/app-desktop/gui/ShareNoteDialog.js:189
msgid "Copy Shareable Link"
@@ -2486,12 +2486,13 @@ msgid "Export debug report"
msgstr "匯出除錯報告"
#: packages/app-desktop/gui/SyncWizard/Dialog.js:157
#, fuzzy
msgid "Sync your notes"
msgstr "同步您的筆記"
msgstr "記事排序依據"
#: packages/app-desktop/gui/SyncWizard/Dialog.js:158
msgid "Publish notes to the internet"
msgstr "將記事發布至網路上"
msgstr ""
#: packages/app-desktop/gui/SyncWizard/Dialog.js:159
#, fuzzy
@@ -2513,15 +2514,16 @@ msgstr ""
#: packages/app-desktop/gui/SyncWizard/Dialog.js:203
msgid "Login below."
msgstr "於下方登入。"
msgstr ""
#: packages/app-desktop/gui/SyncWizard/Dialog.js:205
#, fuzzy
msgid "Or create an account."
msgstr "或是建立帳號。"
msgstr "新增記事。"
#: packages/app-desktop/gui/SyncWizard/Dialog.js:210
msgid "Login"
msgstr "登入"
msgstr ""
#: packages/app-desktop/gui/SyncWizard/Dialog.js:231
#, fuzzy
@@ -3003,7 +3005,7 @@ msgstr "Nextcloud"
#: packages/lib/SyncTargetNone.js:22
msgid "(None)"
msgstr "(無)"
msgstr ""
#: packages/lib/SyncTargetOneDrive.js:32
msgid "OneDrive"
@@ -3293,7 +3295,7 @@ msgstr "纯黑 (OLED)"
#: packages/lib/models/Setting.js:152
msgid "Open Sync Wizard..."
msgstr "開啟同步精靈..."
msgstr ""
#: packages/lib/models/Setting.js:162
msgid "Synchronisation target"
@@ -3520,7 +3522,7 @@ msgstr "啟用音效播放器"
#: packages/lib/models/Setting.js:689
msgid "Enable video player"
msgstr "啟用影片播放器"
msgstr "啟用視頻播放器"
#: packages/lib/models/Setting.js:690
msgid "Enable PDF viewer"
@@ -3626,11 +3628,11 @@ msgstr ""
#: packages/lib/models/Setting.js:783
msgid "Editor maximum width"
msgstr "編輯器最大寬度"
msgstr ""
#: packages/lib/models/Setting.js:783
msgid "Set it to 0 to make it take the complete available space."
msgstr "設置為 0 將占滿可用空間。"
msgstr ""
#: packages/lib/models/Setting.js:802
msgid "Custom stylesheet for rendered Markdown"
@@ -3751,7 +3753,7 @@ msgstr "Vim"
#: packages/lib/models/Setting.js:920
msgid "Do not resize images"
msgstr "不要縮放圖片"
msgstr ""
#: packages/lib/models/Setting.js:935
msgid "Custom TLS certificates"
@@ -3902,7 +3904,7 @@ msgstr "標籤「%s」已存在,請選擇其他名稱。"
#: packages/lib/onedrive-api-node-utils.js:46
#, javascript-format
msgid "All potential ports are in use - please report the issue at %s"
msgstr "所有預設埠號都在使用中 - 請到 %s 回報此問題"
msgstr "所有預設埠號都在使用中 - 請到%s回報此問題"
#: packages/lib/onedrive-api-node-utils.js:86
msgid ""