From a98a586295f9f94b57ab1c06abefb877105e41ce Mon Sep 17 00:00:00 2001 From: JRaiden Date: Tue, 1 Oct 2019 15:32:11 -0500 Subject: [PATCH 1/2] Update es_ES.po (#1929) I added some translations and change a couple more in order to improve there meaning in Spanish. I am a native spanish speaker so I could help with some more translate if you want. --- CliClient/locales/es_ES.po | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/CliClient/locales/es_ES.po b/CliClient/locales/es_ES.po index 0e83cf502d..7f1aa7b439 100644 --- a/CliClient/locales/es_ES.po +++ b/CliClient/locales/es_ES.po @@ -54,7 +54,7 @@ msgid "y" msgstr "y" msgid "Cancelling background synchronisation... Please wait." -msgstr "Cancelando sincronización de segundo plano... Por favor espere." +msgstr "Cancelando sincronización en segundo plano... Por favor espere." #, javascript-format msgid "No such command: %s" @@ -87,7 +87,7 @@ msgstr "Adjuntar archivo a la nota." #, javascript-format msgid "Cannot find \"%s\"." -msgstr "No se encuentra \"%s\"." +msgstr "No se puede encontrar \"%s\"." msgid "Displays the given note." msgstr "Mostrar la nota dada." @@ -345,7 +345,7 @@ msgid "Creates a new note." msgstr "Crea una nueva nota." msgid "Notes can only be created within a notebook." -msgstr "Notas solamente pueden ser creadas dentro de una libreta." +msgstr "Solo se pueden crear notas dentro de una libreta." msgid "Creates a new to-do." msgstr "Crea una nueva lista de tareas." @@ -397,10 +397,10 @@ msgstr "" #, javascript-format msgid "Server is running on port %d" -msgstr "" +msgstr "El servidor se está ejecutando en el puerto %d" msgid "Server is not running." -msgstr "" +msgstr "El servidor no se está ejecutando." #, javascript-format msgid "" @@ -1902,12 +1902,14 @@ msgid "Type new tags or select from list" msgstr "Escriba nuevas etiquetas o seleccionelas de la lista" msgid "Warning" -msgstr "" +msgstr "Advertencia" msgid "" "In order to use file system synchronisation your permission to write to " "external storage is required." msgstr "" +"Para utilizar la sincronización del sistema de archivos se requieren sus permisos" +"para escribir en el almacenamiento externo." msgid "Encryption Config" msgstr "Configuración de cifrado" @@ -1925,21 +1927,22 @@ msgstr "Log" #, fuzzy msgid "Creating report..." -msgstr "Creando nuevo %s..." +msgstr "Creando reporte..." msgid "Export Debug Report" msgstr "Exportar informe de depuración" msgid "Fixing search index..." -msgstr "" +msgstr "Reparando indice de busqueda" msgid "Fix search index" -msgstr "" +msgstr "Repara indice de busqueda" 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 "" +msgstr "Use esto para reparar el indice de busqueda si hay un problema con la busqueda." +"Puede tomar un largo periodo de tiempo dependiendo del número de notas." #, fuzzy msgid "More information" From 4b8026cf83f74e6cc5f7f9b8a2ff82dbfb840daa Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 1 Oct 2019 21:37:55 +0100 Subject: [PATCH 2/2] Update PULL_REQUEST_TEMPLATE --- .github/PULL_REQUEST_TEMPLATE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index e9b04468d0..6cd9722699 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -6,6 +6,8 @@ Please prefix the title with the platform you are targetting: - "Mobile" for the mobile app (or "Android" / "iOS" if the pull request only applies to one of the mobile platforms) - "CLI" for the CLI app +If it's not related to any platform (such as a translation, change to the documentation, etc.), simply don't add a platform. + For example: "Desktop: Added new setting to change font", or "Mobile: Fixed config screen error" PLEASE READ THE GUIDE FIRST: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md