From 442b7ce0d371c335b002727f94ceebef4b9c129b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 26 Oct 2020 23:19:52 +0000 Subject: [PATCH 1/4] litner --- .../lib/joplin-renderer/assets/mermaid/mermaid_render.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js b/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js index 15b4bac5c5..3208822363 100644 --- a/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js +++ b/ReactNativeClient/lib/joplin-renderer/assets/mermaid/mermaid_render.js @@ -12,7 +12,7 @@ function mermaidReady() { //

Mermaid

// // And that's going to make the lib set the `mermaid` object to the H1 element. - // So below, we double-check that what we have really is an instance of the library. + // So below, we double-check that what we have really is an instance of the library. return typeof mermaid !== 'undefined' && mermaid !== null && typeof mermaid === 'object' && !!mermaid.init; } From 8f4031572a82f040658dc095810760b7b4bf841c Mon Sep 17 00:00:00 2001 From: Mario Campo Date: Thu, 29 Oct 2020 12:15:53 +0100 Subject: [PATCH 2/4] Update es_ES.po (#3978) Several corrections in spanish language --- CliClient/locales/es_ES.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CliClient/locales/es_ES.po b/CliClient/locales/es_ES.po index ded79dabc4..c0edabe50c 100644 --- a/CliClient/locales/es_ES.po +++ b/CliClient/locales/es_ES.po @@ -9,12 +9,12 @@ # Germán Martín , 2019. # Fernando Pindado , 2020. # Andros Fenollosa , 2020. -# +# Mario Campo , 2020 msgid "" msgstr "" "Project-Id-Version: Joplin-CLI 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Andros Fenollosa \n" +"Last-Translator: Mario Campo \n" "Language-Team: Spanish \n" "Language: es_ES\n" "MIME-Version: 1.0\n" @@ -279,13 +279,13 @@ msgstr "Las notas han sido importadas: %s" #: ElectronClient/gui/ConfigScreen.min.js:84 #: ElectronClient/gui/ConfigScreen/ConfigScreen.js:99 msgid "This will open a new screen. Save your current changes?" -msgstr "Esto abrirá una nueva pantalla. ¿Quieres salvar los cambios actuales?" +msgstr "Esto abrirá una nueva pantalla. ¿Quieres guardar los cambios actuales?" #: ElectronClient/gui/ConfigScreen.min.js:172 #: ElectronClient/gui/ConfigScreen/ConfigScreen.js:162 #: ReactNativeClient/lib/components/screens/config.js:307 msgid "Check synchronisation configuration" -msgstr "Comprobar sincronización" +msgstr "Comprobar sincronización de la configuración" #: ElectronClient/gui/ConfigScreen.min.js:181 #: ElectronClient/gui/ConfigScreen/ConfigScreen.js:167 @@ -1050,7 +1050,7 @@ msgstr "Descifrando elementos: %d/%d" #: ReactNativeClient/lib/components/side-menu-content.js:330 #, javascript-format msgid "Fetching resources: %d/%d" -msgstr "Obteniendo refuersos: %d/%d" +msgstr "Obteniendo recursos: %d/%d" #: ElectronClient/gui/SideBar/commands/focusElementSideBar.js:16 msgid "Sidebar" From f133229287105b9aa6469cf270e38e37b8974bf0 Mon Sep 17 00:00:00 2001 From: Eduardo Braga Date: Thu, 29 Oct 2020 08:16:18 -0300 Subject: [PATCH 3/4] Add some missing translations to pt_BR.po (#3994) --- CliClient/locales/pt_BR.po | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/CliClient/locales/pt_BR.po b/CliClient/locales/pt_BR.po index 6aaa330903..1833f5adbb 100644 --- a/CliClient/locales/pt_BR.po +++ b/CliClient/locales/pt_BR.po @@ -141,7 +141,7 @@ msgstr "Ir para qualquer coisa..." #: ElectronClient/plugins/GotoAnything.js:463 #: ElectronClient/gui/KeymapConfig/utils/getLabel.js:28 msgid "Command palette" -msgstr "" +msgstr "Paleta de Comandos" #: ElectronClient/plugins/GotoAnything.min.js:459 msgid "" @@ -549,6 +549,8 @@ msgid "" "The attachments will no longer be watched when you switch to a different " "note." msgstr "" +"Os anexos não serão mais observados quando você mudar para uma nota" +"diferente." #: ElectronClient/gui/NoteEditor/NoteEditor.js:387 #, javascript-format @@ -665,6 +667,9 @@ msgid "" "may take a few minutes to complete and the app needs to be restarted. To " "proceed please click on the link." msgstr "" +"O alvo da sincroniação precisa ser atualizado antes que o Joplin possa sincronizar. A operação" +"pode levar alguns minutos para completar e o app terá que ser reiniciado. Para" +"proceder, por favor, clique neste link." #: ElectronClient/gui/MainScreen/MainScreen.js:416 #: ElectronClient/gui/MainScreen/MainScreen.min.js:306 @@ -1411,13 +1416,15 @@ msgstr "Anexos da nota" #: ElectronClient/gui/KeymapConfig/ShortcutRecorder.js:49 msgid "Press the shortcut" -msgstr "" +msgstr "Digite o atalho" #: ElectronClient/gui/KeymapConfig/ShortcutRecorder.js:49 msgid "" "Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the " "shortcut." msgstr "" +"Digite o atalho e então aperte ENTER. Ou, pressione BARRA DE ESPAÇO para limpar o" +"atalho" #: ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js:63 #: ReactNativeClient/lib/services/KeymapService.js:144 @@ -1427,7 +1434,7 @@ msgstr "Erro" #: ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js:126 msgid "Command" -msgstr "" +msgstr "Command" #: ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js:127 #, fuzzy @@ -1487,6 +1494,7 @@ msgstr "Estatísticas" msgid "" "The app is now going to close. Please relaunch it to complete the process." msgstr "" +"O app irá fechar agora. Por favor, reabra-o para completar o processo." #: ElectronClient/app.js:340 #, javascript-format @@ -1514,7 +1522,7 @@ msgstr "Encerrar edição externa" #: ElectronClient/commands/toggleExternalEditing.js:37 msgid "Stop" -msgstr "" +msgstr "Parar" #: ElectronClient/commands/stopExternalEditing.js:18 msgid "Stop external editing" @@ -1741,7 +1749,7 @@ msgstr "" #: CliClient/app/command-sync.js:35 msgid "Upgrade the sync target to the latest version." -msgstr "" +msgstr "Atualizar o alvo de sincronização para a última versão." #: CliClient/app/command-sync.js:105 #, javascript-format From 805d16abda0442b8e261ad2e51b09546a229f44c Mon Sep 17 00:00:00 2001 From: Ji-Hyeon Gim Date: Thu, 29 Oct 2020 20:18:01 +0900 Subject: [PATCH 4/4] All: Translation: Update ko.po (#3995) It updates fuzzy translations for Korean. Signed-off-by: Ji-Hyeon Gim --- CliClient/locales/ko.po | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/CliClient/locales/ko.po b/CliClient/locales/ko.po index e5363afd83..56e0a690cf 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 @@ -121,14 +123,14 @@ msgid "Could not export notes: %s" msgstr "노트를 내보낼 수 없습니다: %s" #: ElectronClient/plugins/GotoAnything.js:431 -#, fuzzy msgid "" "Type a note title or part of its content to jump to it. Or type # followed " "by a tag name, or @ followed by a notebook name. Or type : to search for " "commands." msgstr "" -"노트 제목을 적거나 혹은 건너뛰세요. 혹은 #으로 시작하는 태그 이름이나, @로 시" -"작하는 노트북 이름을 적으세요." +"노트 제목이나 내용의 일부를 입력하여 바로 이동하세요. 혹은 #으로 시작하는 태" +"그 이름이나 @로 시작하는 노트북 이름을 입력하거나, :을 입력하여 명령을 검색하" +"세요.\"" #: ElectronClient/plugins/GotoAnything.js:456 #: ElectronClient/plugins/GotoAnything.min.js:499 @@ -138,9 +140,8 @@ msgstr "가고자 하는 곳으로 이동..." #: ElectronClient/plugins/GotoAnything.js:463 #: ElectronClient/gui/KeymapConfig/utils/getLabel.js:28 -#, fuzzy msgid "Command palette" -msgstr "명령" +msgstr "명령 팔레트" #: ElectronClient/plugins/GotoAnything.min.js:459 msgid "" @@ -2709,11 +2710,14 @@ msgid "" "\n" "You may turn off this option at any time in the Configuration screen." msgstr "" +"노트에 지리적 위치 정보를 포함하기 위해서는 위치 정보에 접근이 필요하고, 이" +"를 위해선 권한이 요구됩니다.\n" +"\n" +"설정 화면에서 언제든지 이 설정을 끌 수 있습니다." #: ReactNativeClient/lib/components/screens/Note.js:341 -#, fuzzy msgid "Permission needed" -msgstr "카메라 사용 허가" +msgstr "권한 요구" #: ReactNativeClient/lib/components/screens/Note.js:501 #: ReactNativeClient/lib/shim-init-node.js:91 @@ -2971,9 +2975,8 @@ msgstr "" "다:" #: ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js:28 -#, fuzzy msgid "Open" -msgstr "열기..." +msgstr "열기" #: ReactNativeClient/lib/components/note-list.js:97 msgid "You currently have no notebooks." @@ -3182,9 +3185,8 @@ msgid "AWS S3 bucket" msgstr "AWS S3 버킷" #: ReactNativeClient/lib/models/Setting.js:226 -#, fuzzy msgid "AWS S3 URL" -msgstr "AWS S3" +msgstr "AWS S3 URL" #: ReactNativeClient/lib/models/Setting.js:237 msgid "AWS key"