1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00

Merge branch 'dev' of github.com:laurent22/joplin into dev

This commit is contained in:
Laurent Cozic 2021-06-18 17:15:01 +01:00
commit 63f7349c17
10 changed files with 92 additions and 96 deletions

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/app-desktop",
"version": "2.0.11",
"version": "2.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -604,4 +604,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 6f558aa823c0fd07348253cc01996e4ee3de75c4
COCOAPODS: 1.10.1
COCOAPODS: 1.8.4

View File

@ -1,5 +1,5 @@
module.exports = {
hash:"45572502e8b0a8e9b85192de7291684c", files: {
hash:"6608023b8053b48e0eec248644475e33", files: {
'highlight.js/atom-one-dark-reasonable.css': { data: require('./highlight.js/atom-one-dark-reasonable.css.base64.js'), mime: 'text/css', encoding: 'base64' },
'highlight.js/atom-one-light.css': { data: require('./highlight.js/atom-one-light.css.base64.js'), mime: 'text/css', encoding: 'base64' },
'katex/fonts/KaTeX_AMS-Regular.woff2': { data: require('./katex/fonts/KaTeX_AMS-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/lib",
"version": "2.0.3",
"version": "2.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/renderer",
"version": "2.0.3",
"version": "2.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -4757,9 +4757,9 @@
}
},
"khroma": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/khroma/-/khroma-1.1.0.tgz",
"integrity": "sha512-aTO+YX22tYOLEQJYFiatAj1lc5QZ+H5sHWFRBWNCiKwc5NWNUJZyeSeiHEPeURJ2a1GEVYcmyMUwGjjLe5ec5A=="
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/khroma/-/khroma-1.4.1.tgz",
"integrity": "sha512-+GmxKvmiRuCcUYDgR7g5Ngo0JEDeOsGdNONdU2zsiBQaK4z19Y2NvXqfEDE0ZiIrg45GTZyAnPLVsLZZACYm3Q=="
},
"kind-of": {
"version": "6.0.3",
@ -4998,9 +4998,9 @@
"dev": true
},
"mermaid": {
"version": "8.8.4",
"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.8.4.tgz",
"integrity": "sha512-YPn35uEAIrOcsDPjCiKNXXBdO1Aoazsv2zTZjG4+oXa7+tTVUb5sI81NqaTYa47RnoH9Vl4waLlEEJfB8KM9VA==",
"version": "8.10.2",
"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.10.2.tgz",
"integrity": "sha512-Za5MrbAOMbEsyY4ONgGjfYz06sbwF1iNGRzp1sQqpOtvXxjxGu/J1jRJ8QyE9kD/D9zj1/KlRrYegWEvA7eZ5Q==",
"requires": {
"@braintree/sanitize-url": "^3.1.0",
"d3": "^5.7.0",
@ -6539,9 +6539,9 @@
"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
},
"uglify-js": {
"version": "3.12.1",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz",
"integrity": "sha512-o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ=="
"version": "3.13.9",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz",
"integrity": "sha512-wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="
},
"union-value": {
"version": "1.0.1",

View File

@ -45,7 +45,7 @@
"markdown-it-sup": "^1.0.0",
"markdown-it-toc-done-right": "^4.1.0",
"md5": "^2.2.1",
"mermaid": "^8.8.4",
"mermaid": "^8.10.2",
"uslug": "git+https://github.com/laurent22/uslug.git#emoji-support"
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"

View File

@ -14,15 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: Mario Campo <mario.campo@gmail.com>\n"
"Last-Translator: Francisco Mora <francisco.m.collao@gmail.com>\n"
"Language-Team: Spanish <lucas.vieites@gmail.com>\n"
"Language: es_ES\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.2\n"
"X-Generator: Poedit 3.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
#: packages/app-desktop/bridge.js:106 packages/app-desktop/bridge.js:110
#: packages/app-desktop/bridge.js:126 packages/app-desktop/bridge.js:134
@ -131,11 +133,11 @@ msgstr "Descargar"
#: packages/app-desktop/checkForUpdates.js:189
msgid "Skip this version"
msgstr ""
msgstr "Omitir esta versión"
#: packages/app-desktop/checkForUpdates.js:189
msgid "Full changelog"
msgstr ""
msgstr "Registro de cambios completo"
#: packages/app-desktop/gui/NoteRevisionViewer.min.js:75
#: packages/lib/services/RevisionService.js:242
@ -280,14 +282,12 @@ msgid "Retry"
msgstr "Reintentar"
#: packages/app-desktop/gui/StatusScreen/StatusScreen.js:137
#, fuzzy
msgid "Advanced tools"
msgstr "Opciones avanzadas"
msgstr "Herramientas avanzadas"
#: packages/app-desktop/gui/StatusScreen/StatusScreen.js:139
#, fuzzy
msgid "Export debug report"
msgstr "Exportar Informe de Depuración"
msgstr "Exportar Informe de depuración"
#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js:183
msgid "strong text"
@ -345,23 +345,23 @@ msgstr "Casillas"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js:17
msgid "Highlight"
msgstr ""
msgstr "Destacar"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js:22
msgid "Strikethrough"
msgstr ""
msgstr "Tachado"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js:27
msgid "Insert"
msgstr ""
msgstr "Insertar"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js:33
msgid "Superscript"
msgstr ""
msgstr "Superindice"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js:39
msgid "Subscript"
msgstr ""
msgstr "Subíndice"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js:564
#: packages/app-mobile/components/screens/Note.js:1016
@ -527,9 +527,8 @@ msgid "Delete line"
msgstr "Borrar línea"
#: packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.js:92
#, fuzzy
msgid "Duplicate line"
msgstr "Duplicar"
msgstr "Duplicar linea"
#: packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.js:96
msgid "Undo"
@ -722,10 +721,12 @@ msgid ""
"Safe mode is currently active. Note rendering and all plugins are "
"temporarily disabled."
msgstr ""
"El modo seguro está activo actualmente. La representación de notas y todos "
"los complementos están temporalmente deshabilitados."
#: packages/app-desktop/gui/MainScreen/MainScreen.js:447
msgid "Disable safe mode and restart"
msgstr ""
msgstr "Desactivar el modo seguro y reiniciar"
#: packages/app-desktop/gui/MainScreen/MainScreen.js:451
msgid ""
@ -771,15 +772,15 @@ msgstr "Más información"
#: packages/app-desktop/gui/MainScreen/MainScreen.js:477
#, javascript-format
msgid "%s (%s) would like to share a notebook with you."
msgstr ""
msgstr "%s (%s) le gustaría compartir una libreta contigo."
#: packages/app-desktop/gui/MainScreen/MainScreen.js:479
msgid "Accept"
msgstr ""
msgstr "Aceptar"
#: packages/app-desktop/gui/MainScreen/MainScreen.js:481
msgid "Reject"
msgstr ""
msgstr "Rechazar"
#: packages/app-desktop/gui/MainScreen/MainScreen.js:485
msgid "Some items cannot be synchronised."
@ -865,9 +866,8 @@ msgid "Toggle editors"
msgstr "Alternar editores"
#: packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js:16
#, fuzzy
msgid "Share notebook..."
msgstr "Compartir nota..."
msgstr "Compartir libreta..."
#: packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js:16
msgid "Change application layout"
@ -947,7 +947,7 @@ msgstr "¡El token ha sido copiado al portapapeles!"
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
msgid "Are you sure you want to renew the authorisation token?"
msgstr ""
msgstr "¿Está seguro de que desea renovar el token de autorización?"
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
msgid "The web clipper service is enabled and set to auto-start."
@ -1031,7 +1031,7 @@ msgstr ""
#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
msgid "Renew token"
msgstr ""
msgstr "Renovar token"
#: packages/app-desktop/gui/MenuBar.js:167
#, javascript-format
@ -1124,9 +1124,8 @@ msgid "&Go"
msgstr "&Ir"
#: packages/app-desktop/gui/MenuBar.js:631
#, fuzzy
msgid "Note&book"
msgstr "Libretas"
msgstr "Libreta"
#: packages/app-desktop/gui/MenuBar.js:637
msgid "&Note"
@ -1524,13 +1523,12 @@ msgid "You do not have any installed plugin."
msgstr "No tiene ningún plugin instalado."
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:232
#, fuzzy
msgid "Could not connect to plugin repository"
msgstr "No se pudo instalar el plugin: %s"
msgstr "No se pudo conectar con el repositorio del plugin: %s"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:234
msgid "Try again"
msgstr ""
msgstr "Intenta nuevamente"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js:242
msgid "Plugin tools"
@ -1718,9 +1716,8 @@ msgstr ""
"(límite: %s)."
#: packages/app-desktop/gui/ShareNoteDialog.js:141
#, fuzzy
msgid "Unshare note"
msgstr "Compartir"
msgstr "Dejar de compartir nota"
#: packages/app-desktop/gui/ShareNoteDialog.js:168
msgid "Synchronising..."
@ -1755,19 +1752,20 @@ msgstr[0] "Copiar Enlace Compartible"
msgstr[1] "Copiar Enlaces Compartible"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:138
#, fuzzy
msgid "Unshare"
msgstr "Compartir"
msgstr "Dejar de compartir"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:180
msgid ""
"Delete this invitation? The recipient will no longer have access to this "
"shared notebook."
msgstr ""
"¿Eliminar esta invitación? El destinatario ya no tendrá acceso a esta "
"libreta compartida."
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:194
msgid "Add recipient:"
msgstr ""
msgstr "Agregar destinatario:"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:197
#: packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.js:28
@ -1777,45 +1775,43 @@ msgstr "Compartir"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:206
msgid "Recipient has not yet accepted the invitation"
msgstr ""
msgstr "El destinatario aún no ha aceptado la invitación"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:207
msgid "Recipient has rejected the invitation"
msgstr ""
msgstr "El destinatario ha rechazado la invitación"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:208
msgid "Recipient has accepted the invitation"
msgstr ""
msgstr "El destinatario ha aceptado la invitación"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:218
msgid "Recipients:"
msgstr ""
msgstr "Destinatarios:"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:230
#, fuzzy
msgid "Synchronizing..."
msgstr "Sincronizando..."
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:231
#, fuzzy
msgid "Sharing notebook..."
msgstr "Compartir nota..."
msgstr "Compartir libreta..."
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:241
msgid ""
"Unshare this notebook? The recipients will no longer have access to its "
"content."
msgstr ""
"¿Dejar de compartir esta libreta? Los destinatarios ya no tendrán acceso a "
"su contenido."
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js:251
#, fuzzy
msgid "Share Notebook"
msgstr "Compartir Notas"
msgstr "Compartir Libreta"
#: packages/app-desktop/commands/toggleSafeMode.js:18
#, fuzzy
msgid "Toggle safe mode"
msgstr "Alternar la barra lateral"
msgstr "Alternar modo seguro"
#: packages/app-desktop/commands/toggleExternalEditing.js:18
msgid "Toggle external editing"
@ -1907,7 +1903,7 @@ msgstr "Configuración"
#: packages/app-mobile/components/side-menu-content.js:351
msgid "Mobile data - auto-sync disabled"
msgstr ""
msgstr "Datos móviles: sincronización automática deshabilitada"
#: packages/app-mobile/components/note-list.js:97
msgid "You currently have no notebooks."
@ -2257,15 +2253,15 @@ msgstr ""
"cambiada! [Cambiarla ahora](%s)"
#: packages/server/dist/models/UserModel.js:134
#, fuzzy
msgid "attachment"
msgstr "Adjuntos"
msgstr "adjunto"
#: packages/server/dist/models/UserModel.js:134
#, javascript-format
msgid ""
"Cannot save %s \"%s\" because it is larger than than the allowed limit (%s)"
msgstr ""
"No se puede guardar %s \"%s\" porque es mayor que el límite permitido (%s)"
#: packages/lib/onedrive-api-node-utils.js:46
#, javascript-format
@ -2456,23 +2452,20 @@ msgid "Joplin Server URL"
msgstr "URL del Servidor de Joplin"
#: packages/lib/models/Setting.js:327
#, fuzzy
msgid "Joplin Server email"
msgstr "Servidor de Joplin"
msgstr "Email del servidor Joplin"
#: packages/lib/models/Setting.js:338
msgid "Joplin Server password"
msgstr "Contraseña del Servidor de Joplin"
#: packages/lib/models/Setting.js:365
#, fuzzy
msgid "Joplin Cloud email"
msgstr "Servidor de Joplin"
msgstr "Email del servidor Joplin"
#: packages/lib/models/Setting.js:376
#, fuzzy
msgid "Joplin Cloud password"
msgstr "Contraseña del Servidor de Joplin"
msgstr "Contraseña del servidor Joplin"
#: packages/lib/models/Setting.js:388
msgid "Attachment download behaviour"
@ -2714,11 +2707,12 @@ msgid ""
"Used for most text in the markdown editor. If not found, a generic "
"proportional (variable width) font is used."
msgstr ""
"Se utiliza para la mayor parte del texto en el editor markdown. Si no se "
"encuentra, se utiliza una fuente genérica proporcional (ancho variable)."
#: packages/lib/models/Setting.js:758
#, fuzzy
msgid "Editor monospace font family"
msgstr "Familia de fuente del editor"
msgstr "Familia de fuente monoespaciada del editor"
#: packages/lib/models/Setting.js:759
msgid ""
@ -2726,6 +2720,10 @@ msgid ""
"tables, checkboxes, code). If not found, a generic monospace (fixed width) "
"font is used."
msgstr ""
"Se utiliza cuando se necesita una fuente de ancho fijo para presentar el "
"texto de manera legible (por ejemplo, tablas, casillas de verificación, "
"código). Si no se encuentra, se utiliza una fuente genérica monoespaciada "
"(ancho fijo)."
#: packages/lib/models/Setting.js:780
msgid "Custom stylesheet for rendered Markdown"
@ -2737,11 +2735,13 @@ msgstr "Hoja de estilos para personalizar todo Joplin"
#: packages/lib/models/Setting.js:806
msgid "Re-upload local data to sync target"
msgstr ""
msgstr "Vuelva a cargar datos locales para sincronizar el destino"
#: packages/lib/models/Setting.js:816
msgid "Delete local data and re-download from sync target"
msgstr ""
"Elimine los datos locales y vuelva a descargarlos desde el destino de "
"sincronización"
#: packages/lib/models/Setting.js:821
msgid "Automatically update the application"
@ -2778,7 +2778,7 @@ msgstr "%d horas"
#: packages/lib/models/Setting.js:849
msgid "Synchronise only over WiFi connection"
msgstr ""
msgstr "Sincronizar solo a través de una conexión WiFi"
#: packages/lib/models/Setting.js:856
msgid "Text editor command"
@ -3064,9 +3064,8 @@ msgid "Encrypted items cannot be modified"
msgstr "Los elementos cifrados no pueden ser modificados"
#: packages/lib/SyncTargetJoplinCloud.js:28
#, fuzzy
msgid "Joplin Cloud"
msgstr "Foro de Joplin"
msgstr "Nube de Joplin"
#: packages/lib/BaseApplication.js:152 packages/lib/BaseApplication.js:164
#: packages/lib/BaseApplication.js:196
@ -3224,16 +3223,15 @@ msgstr ""
"Joplin a la última versión"
#: packages/lib/JoplinServerApi.js:80
#, fuzzy, javascript-format
#, javascript-format
msgid ""
"Could not connect to Joplin Server. Please check the Synchronisation options "
"in the config screen. Full error was:\n"
"\n"
"%s"
msgstr ""
"No se pudo conectar con la aplicación de Joplin de Nextcloud. Verifique la "
"configuración en la pantalla de configuración de Sincronización. El error "
"completo fue:\n"
"No se pudo conectar al servidor Joplin. Compruebe las opciones de "
"sincronización en la pantalla de configuración. El error completo fue:\n"
"\n"
"%s"
@ -3908,6 +3906,8 @@ msgid ""
"Runs the commands contained in the text file. There should be one command "
"per line."
msgstr ""
"Ejecuta los comandos contenidos en el archivo de texto. Debe haber un "
"comando por línea."
#: packages/app-cli/app/command-version.js:11
msgid "Displays version information"

View File

@ -6,13 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"Last-Translator: 南宫小骏 <jackytsu@vip.qq.com>\n"
"Language-Team: zh_CN <jackytsu.vip.qq.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.3\n"
"X-Generator: Poedit 3.0\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: packages/app-desktop/bridge.js:106 packages/app-desktop/bridge.js:110
@ -1087,9 +1089,8 @@ msgid "&Go"
msgstr "跳转 (&G)"
#: packages/app-desktop/gui/MenuBar.js:631
#, fuzzy
msgid "Note&book"
msgstr "笔记本"
msgstr "笔记本 (&B)"
#: packages/app-desktop/gui/MenuBar.js:637
msgid "&Note"
@ -1658,9 +1659,8 @@ msgid "Warning: not all resources shown for performance reasons (limit: %s)."
msgstr "警告: 由于性能原因无法显示所有资源 (最多:%s)。"
#: packages/app-desktop/gui/ShareNoteDialog.js:141
#, fuzzy
msgid "Unshare note"
msgstr "取消分享"
msgstr "取消分享笔记"
#: packages/app-desktop/gui/ShareNoteDialog.js:168
msgid "Synchronising..."
@ -2172,7 +2172,6 @@ msgid ""
msgstr "默认管理员密码不安全且尚未更改![现在更改](%s)"
#: packages/server/dist/models/UserModel.js:134
#, fuzzy
msgid "attachment"
msgstr "附件"
@ -2180,7 +2179,7 @@ msgstr "附件"
#, javascript-format
msgid ""
"Cannot save %s \"%s\" because it is larger than than the allowed limit (%s)"
msgstr ""
msgstr "无法保存 %s “%s”,因为超过了允许的限制大小(%s)。"
#: packages/lib/onedrive-api-node-utils.js:46
#, javascript-format
@ -2370,14 +2369,12 @@ msgid "Joplin Server password"
msgstr "Joplin 服务器密码"
#: packages/lib/models/Setting.js:365
#, fuzzy
msgid "Joplin Cloud email"
msgstr "Joplin Server 邮箱"
msgstr "Joplin 论坛邮箱"
#: packages/lib/models/Setting.js:376
#, fuzzy
msgid "Joplin Cloud password"
msgstr "Joplin 服务器密码"
msgstr "Joplin 论坛密码"
#: packages/lib/models/Setting.js:388
msgid "Attachment download behaviour"
@ -2956,7 +2953,6 @@ msgid "Encrypted items cannot be modified"
msgstr "无法修改已加密的条目"
#: packages/lib/SyncTargetJoplinCloud.js:28
#, fuzzy
msgid "Joplin Cloud"
msgstr "Joplin 论坛"