From 3358c461228282b55d00ee1668f33bf691a22d93 Mon Sep 17 00:00:00 2001 From: Ji-Hyeon Gim Date: Mon, 12 Oct 2020 11:42:18 +0900 Subject: [PATCH 1/3] All: Translation: Update ko.po (#3890) It updates fuzzy/missing translations for Korean. Signed-off-by: Ji-Hyeon Gim --- CliClient/locales/ko.po | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/CliClient/locales/ko.po b/CliClient/locales/ko.po index e639b8746a..af0d7391d9 100644 --- a/CliClient/locales/ko.po +++ b/CliClient/locales/ko.po @@ -15,6 +15,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.4.1\n" "Plural-Forms: nplurals=1; plural=0;\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" #: ElectronClient/services/plugins/UserWebviewDialogButtonBar.js:20 #: ElectronClient/checkForUpdates.js:139 @@ -799,7 +801,6 @@ msgid "Toggle sidebar" msgstr "사이드바 표시 전환" #: ElectronClient/gui/MainScreen/commands/toggleEditors.js:17 -#, fuzzy msgid "Toggle editors" msgstr "편집기 배치 형태 전환" @@ -1389,9 +1390,9 @@ msgstr "" #: ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js:62 #: ReactNativeClient/lib/services/KeymapService.js:142 -#, fuzzy, javascript-format +#, javascript-format msgid "Error: %s" -msgstr "오류" +msgstr "오류: %s" #: ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js:125 msgid "Command" @@ -1463,9 +1464,8 @@ msgid "Exit" msgstr "종료" #: ElectronClient/commands/copyDevCommand.js:17 -#, fuzzy msgid "Copy dev mode command to clipboard" -msgstr "경로를 클립보드에 복사" +msgstr "개발자 모드 명령을 클립보드에 복사" #: ElectronClient/commands/startExternalEditing.js:18 msgid "Edit in external editor" @@ -1477,13 +1477,12 @@ msgid "Error opening note in editor: %s" msgstr "편집기에서 노트를 열 수 없는 오류가 발생하였습니다: %s" #: ElectronClient/commands/toggleExternalEditing.js:16 -#, fuzzy msgid "Toggle external editing" -msgstr "외부 편집을 그만 두시려면 클릭하세요" +msgstr "외부 편집 전환" #: ElectronClient/commands/toggleExternalEditing.js:42 msgid "Stop" -msgstr "" +msgstr "중지" #: ElectronClient/commands/stopExternalEditing.js:16 msgid "Stop external editing" @@ -2203,9 +2202,9 @@ msgid "Cannot load \"%s\" module for format \"%s\" and output \"%s\"" msgstr "\"%s\" 모듈(\"%s\" 포맷과 \"%s\" 출력을 위한)을 불러올 수 없습니다" #: ReactNativeClient/lib/services/interop/InteropService.js:152 -#, fuzzy, javascript-format +#, javascript-format msgid "Cannot load \"%s\" module for format \"%s\" and target \"%s\"" -msgstr "\"%s\" 모듈(\"%s\" 포맷과 \"%s\" 출력을 위한)을 불러올 수 없습니다" +msgstr "\"%s\" 모듈(\"%s\" 포맷과 \"%s\" 대상을 위한)을 불러올 수 없습니다" #: ReactNativeClient/lib/services/interop/InteropService.js:187 #, javascript-format @@ -2221,25 +2220,24 @@ msgid "Restored Notes" msgstr "복구된 노트들" #: ReactNativeClient/lib/services/KeymapService.js:236 -#, fuzzy msgid "command" msgstr "명령" #: ReactNativeClient/lib/services/KeymapService.js:236 #: ReactNativeClient/lib/services/KeymapService.js:241 -#, fuzzy, javascript-format +#, javascript-format msgid "\"%s\" is missing the required \"%s\" property." -msgstr "키맵 항목 %s에 필수 속성인 \"명령\"이 없습니다." +msgstr "\"%s\"에 \"%s\" 필수 속성이 없습니다." #: ReactNativeClient/lib/services/KeymapService.js:241 #: ReactNativeClient/lib/services/KeymapService.js:248 msgid "accelerator" -msgstr "" +msgstr "단축키" #: ReactNativeClient/lib/services/KeymapService.js:248 -#, fuzzy, javascript-format +#, javascript-format msgid "Invalid %s: %s." -msgstr "잘못된 답: %s" +msgstr "유효하지 않은 %s: %s." #: ReactNativeClient/lib/services/KeymapService.js:266 #, javascript-format From 987890ba984112d83888243f5fd3079ee5726113 Mon Sep 17 00:00:00 2001 From: Rasul Kireev Date: Mon, 12 Oct 2020 11:40:06 +0300 Subject: [PATCH 2/3] Docs: Fixed broken link in plugins.md (#3901) The link to the plugin tutorial was broken. --- readme/api/get_started/plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme/api/get_started/plugins.md b/readme/api/get_started/plugins.md index 01c261252d..50e546c9bc 100644 --- a/readme/api/get_started/plugins.md +++ b/readme/api/get_started/plugins.md @@ -43,5 +43,5 @@ Restart the app, and Joplin should load the plugin and execute its `onStart` han # Next steps -- You might want to check the [plugin tutorial](https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin/) to get a good overview of how to create a complete plugin and how to use the plugin API. +- You might want to check the [plugin tutorial](https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md) to get a good overview of how to create a complete plugin and how to use the plugin API. - For more information about the plugin API, check the [Plugin API reference](https://joplinapp.org/api/references/plugin_api/classes/joplin.html). From 3c0b9ee5226515a721b3b66daf181bd6a2b0e634 Mon Sep 17 00:00:00 2001 From: Caleb John Date: Mon, 12 Oct 2020 03:01:40 -0600 Subject: [PATCH 3/3] Desktop: Actually enter insert mode after pressing o/O in CodeMirror vim mode (#3897) --- .../gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts index bdd2cf4581..7a681a5018 100644 --- a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts +++ b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts @@ -141,7 +141,7 @@ export default function useListIdent(CodeMirror: any) { cm.setCursor({ line: anchor.line, ch: line.length }); cm.execCommand('insertListElement'); - cm.setOption('disableInput', true); + CodeMirror.Vim.handleKey(cm, 'i', 'macro'); }; CodeMirror.commands.insertListElement = function(cm: any) {