self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Merge branch 'master' into resource_cleanup

Browse Source
This commit is contained in:
Laurent Cozic
2018-03-14 17:41:06 +00:00
parent f595be07d4 26331f61e1
commit c9e130a771
46 changed files with 624 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CliClient/app/app-gui.js
View File

@@ -496,7 +496,7 @@ class AppGui {
cmd = cmd.trim();
if (!cmd.length) return;
this.logger().info('Got command: ' + cmd);
// this.logger().debug('Got command: ' + cmd);
try {
let note = this.widget('noteList').currentItem;
@@ -757,7 +757,7 @@ class AppGui {
if (statusBar.promptActive) processShortcutKeys = false;
if (processShortcutKeys) {
this.logger().info('Shortcut:', shortcutKey, keymapItem);
this.logger().debug('Shortcut:', shortcutKey, keymapItem);
this.currentShortcutKeys_ = [];

2
CliClient/app/app.js
View File

@@ -292,7 +292,7 @@ class Application extends BaseApplication {
async execCommand(argv) {
if (!argv.length) return this.execCommand(['help']);
reg.logger().info('execCommand()', argv);
// reg.logger().debug('execCommand()', argv);
const commandName = argv[0];
this.activeCommand_ = this.findCommandByName(commandName);

252
CliClient/locales/de_DE.po
View File

@@ -18,7 +18,8 @@ msgstr ""
msgid "To delete a tag, untag the associated notes."
msgstr ""
"Hebe die Markierungen zugehöriger Notizen auf, um eine Markierung zu löschen."
"Um eine Markierung zu löschen, entferne diese bei allen damit verbundenen "
"Notizen."
msgid "Please select the note or notebook to be deleted first."
msgstr ""
@@ -26,19 +27,18 @@ msgstr ""
"soll."
msgid "Press Ctrl+D or type \"exit\" to exit the application"
msgstr "Drücke Strg+D oder tippe \"exit\", um das Programm zu verlassen"
msgstr "Drücke Strg+D oder tippe \"exit\" um das Programm zu verlassen"
#, javascript-format
msgid "More than one item match \"%s\". Please narrow down your query."
msgstr ""
"Mehr als eine Notiz stimmt mit \"%s\" überein. Bitte schränke deine Suche "
"ein."
"Mehr als eine Notiz stimmt mit \"%s\" überein. Bitte die Suche einschränken."
msgid "No notebook selected."
msgstr "Kein Notizbuch ausgewählt."
msgid "No notebook has been specified."
msgstr "Kein Notizbuch wurde angegeben."
msgstr "Kein Notizbuch wurde ausgewählt."
msgid "Y"
msgstr "J"
@@ -68,7 +68,7 @@ msgstr "Kann verschlüsseltes Objekt nicht ändern"
#, javascript-format
msgid "Missing required argument: %s"
msgstr "Fehlendes benötigtes Argument: %s"
msgstr "Fehlendes erforderliches Argument: %s"
#, javascript-format
msgid "%s: %s"
@@ -104,8 +104,7 @@ msgstr ""
"gegeben sind, wird eine Liste der momentanen Konfiguration angezeigt."
msgid "Also displays unset and hidden config variables."
msgstr ""
"Zeigt auch nicht angegebene oder versteckte Konfigurationsvariablen an."
msgstr "Zeigt auch nicht gesetzte und versteckte Konfigurationsvariablen an."
#, javascript-format
msgid "%s = %s (%s)"
@@ -119,12 +118,12 @@ msgid ""
"Duplicates the notes matching <note> to [notebook]. If no notebook is "
"specified the note is duplicated in the current notebook."
msgstr ""
"Dupliziert die Notizen die mit <note> übereinstimmen zu [Notizbuch]. Wenn "
"kein Notizbuch angegeben ist, wird die Notiz in das momentane Notizbuch "
"Dupliziert die Notizen die mit <note> übereinstimmen in [Notizbuch]. Wenn "
"kein Notizbuch angegeben ist, wird die Notiz in das aktuelle Notizbuch "
"kopiert."
msgid "Marks a to-do as done."
msgstr "Markiert ein To-Do als abgeschlossen."
msgstr "Markiert ein To-Do als erledigt."
#, javascript-format
msgid "Note is not a to-do: \"%s\""
@@ -134,7 +133,7 @@ msgid ""
"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
"`status` and `target-status`."
msgstr ""
"Verwaltet die E2EE-Konfiguration. Die Befehle sind `enable`, `disable`, "
"Verwaltet die E2EE-Konfiguration. Die Befehle lauten `enable`, `disable`, "
"`decrypt`, `status` und `target-status`."
msgid "Enter master password:"
@@ -147,8 +146,8 @@ msgid ""
"Starting decryption... Please wait as it may take several minutes depending "
"on how much there is to decrypt."
msgstr ""
"Entschlüsselung starten.... Warte bitte, da es einige Minuten dauern kann, "
"je nachdem, wie viel es zu entschlüsseln gibt."
"Starte Entschlüsselung.... Bitte warten, da dies je nach Anzahl der "
"betreffenden Objekte einige Minuten dauern kann."
msgid "Completed decryption."
msgstr "Entschlüsselung abgeschlossen."
@@ -161,7 +160,7 @@ msgstr "Deaktiviert"
#, javascript-format
msgid "Encryption is: %s"
msgstr "Die Verschlüsselung ist: %s"
msgstr "Verschlüsselung ist: %s"
msgid "Edit note."
msgstr "Notiz bearbeiten."
@@ -169,8 +168,8 @@ msgstr "Notiz bearbeiten."
msgid ""
"No text editor is defined. Please set it using `config editor <editor-path>`"
msgstr ""
"Kein Textverarbeitungsprogramm angegeben. Bitte lege eines mit `config "
"editor <Pfad-Zum-Textverarbeitungsprogramm>` fest"
"Kein Texteditor definiert. Bitte lege einen mit `config editor <Pfad-Zum-"
"Texteditor>` fest"
msgid "No active notebook."
msgstr "Kein aktives Notizbuch."
@@ -192,20 +191,19 @@ msgid "Note has been saved."
msgstr "Die Notiz wurde gespeichert."
msgid "Exits the application."
msgstr "Schließt das Programm."
msgstr "Beendet das Programm."
#, fuzzy
msgid ""
"Exports Joplin data to the given path. By default, it will export the "
"complete database including notebooks, notes, tags and resources."
msgstr ""
"Exportiert Joplins Dateien zu dem angegebenen Pfad. Standardmäßig wird die "
"Exportiert Joplin Dateien in den angegebenen Pfad. Standardmäßig wird die "
"komplette Datenbank inklusive Notizbüchern, Notizen, Markierungen und "
"Anhängen exportiert."
#, fuzzy, javascript-format
#, javascript-format
msgid "Destination format: %s"
msgstr "Datumsformat"
msgstr "Zielformat: %s"
msgid "Exports only the given note."
msgstr "Exportiert nur die angegebene Notiz."
@@ -222,6 +220,8 @@ msgstr "Zeigt die Nutzungsstatistik an."
#, javascript-format
msgid "For information on how to customise the shortcuts please visit %s"
msgstr ""
"Für weitere Informationen über die Anpassung von Tastenkürzel besuche bitte "
"%s"
msgid "Shortcuts are not available in CLI mode."
msgstr "Tastenkürzel sind im CLI Modus nicht verfügbar."
@@ -230,11 +230,12 @@ msgid ""
"Type `help [command]` for more information about a command; or type `help "
"all` for the complete usage information."
msgstr ""
"Tippe `help [Befehl]` für weitere Informationen über einen Befehl; oder "
"tippe `help all` für die vollständigen Informationen zur Befehlsverwendung."
"Tippe `help [Befehl]` um weitere Informationen über einen Befehl zu erhalten "
"oder tippe `help all` für die vollständigen Informationen zur "
"Befehlsverwendung."
msgid "The possible commands are:"
msgstr "Mögliche Befehle sind:"
msgstr "Mögliche Befehle lauten:"
msgid ""
"In any command, a note or notebook can be refered to by title or ID, or "
@@ -243,13 +244,13 @@ msgid ""
msgstr ""
"In jedem Befehl können Notizen oder Notizbücher durch ihren Titel oder ihre "
"ID spezifiziert werden, oder durch die Abkürzung `$n` oder `$b` um entweder "
"das momentan ausgewählte Notizbuch oder die momentan ausgewählte Notiz zu "
"wählen. `$c` kann benutzt werden, um auf die momentane Auswahl zu verweisen."
"das momentan ausgewählte Notizbuch oder die momentan ausgewählte Notiz "
"auszuwählen. `$c` kann benutzt werden, um auf die momentane Auswahl zu "
"verweisen."
msgid "To move from one pane to another, press Tab or Shift+Tab."
msgstr ""
"Um ein von einem Fenster zu einem anderen zu wechseln, drücke Tab oder Shift"
"+Tab."
"Um von einem Fenster zu einem anderen zu wechseln, drücke Tab oder Shift+Tab."
msgid ""
"Use the arrows and page up/down to scroll the lists and text areas "
@@ -267,19 +268,18 @@ msgstr "Um den Kommandozeilen Modus aufzurufen, drücke \":\""
msgid "To exit command line mode, press ESCAPE"
msgstr "Um den Kommandozeilen Modus zu beenden, drücke ESCAPE"
#, fuzzy
msgid ""
"For the list of keyboard shortcuts and config options, type `help keymap`"
msgstr ""
"Um die komplette Liste von verfügbaren Tastenkürzeln anzuzeigen, tippe `help "
"shortcuts` ein"
"Um die komplette Liste aller verfügbaren Tastenkürzeln anzuzeigen, tippe "
"`help keymap` ein"
msgid "Imports data into Joplin."
msgstr ""
msgstr "Importiert Daten in Joplin."
#, fuzzy, javascript-format
#, javascript-format
msgid "Source format: %s"
msgstr "Ungültiger Befehl: %s"
msgstr "Quellformat: %s"
msgid "Do not ask for confirmation."
msgstr "Nicht nach einer Bestätigung fragen."
@@ -458,7 +458,7 @@ msgid "Starting synchronisation..."
msgstr "Starte Synchronisation..."
msgid "Cancelling... Please wait."
msgstr "Abbrechen... Bitte warten."
msgstr "Abbrechen… Bitte warten."
msgid ""
"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
@@ -580,17 +580,18 @@ msgstr ""
#, javascript-format
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "Datei"
msgid "Directory"
msgstr ""
msgstr "Exportiere „%s“ ins „%s“ Format. Bitte warten..."
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgstr "Importiere „%s“ ins „%s“ Format. Bitte warten…"
#, fuzzy
msgid "PDF File"
msgstr "Datei"
msgid "File"
msgstr "Datei"
msgid "New note"
msgstr "Neue Notiz"
@@ -604,13 +605,15 @@ msgstr "Neues Notizbuch"
msgid "Import"
msgstr "Importieren"
#, fuzzy
msgid "Export"
msgstr "Importieren"
msgstr "Exportieren"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
msgstr "%s ausblenden"
msgid "Quit"
msgstr "Verlassen"
@@ -631,10 +634,10 @@ msgid "Search in all the notes"
msgstr "Alle Notizen durchsuchen"
msgid "View"
msgstr ""
msgstr "Ansicht"
msgid "Toggle editor layout"
msgstr ""
msgstr "Editor Layout umschalten"
msgid "Tools"
msgstr "Werkzeuge"
@@ -643,7 +646,7 @@ msgid "Synchronisation status"
msgstr "Status der Synchronisation"
msgid "Encryption options"
msgstr "Verschlüsselungsoptionen"
msgstr "Verschlüsselung"
msgid "General Options"
msgstr "Allgemeine Einstellungen"
@@ -659,7 +662,7 @@ msgid "Make a donation"
msgstr "Webseite und Dokumentation"
msgid "Check for updates..."
msgstr ""
msgstr "Überprüfe auf Updates..."
msgid "About Joplin"
msgstr "Über Joplin"
@@ -668,12 +671,12 @@ msgstr "Über Joplin"
msgid "%s %s (%s, %s)"
msgstr "%s %s (%s, %s)"
#, fuzzy, javascript-format
#, javascript-format
msgid "Open %s"
msgstr "Auf %s: %s"
msgstr "Öffne %s"
msgid "Exit"
msgstr ""
msgstr "Verlassen"
msgid "OK"
msgstr "OK"
@@ -681,33 +684,24 @@ msgstr "OK"
msgid "Cancel"
msgstr "Abbrechen"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "Notizen löschen?"
msgid "Current version is up-to-date."
msgstr "Die aktuelle Version ist up-to-date."
msgid "An update is available, do you want to download it now?"
msgstr ""
msgstr "Es ist ein Update verfügbar! Soll dies jetzt heruntergeladen werden?"
msgid "Yes"
msgstr ""
msgstr "Ja"
#, fuzzy
msgid "No"
msgstr "N"
msgstr "Nein"
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "Synchronisation abbrechen"
msgstr "Überprüfen der Synchronisationseinstellungen"
#, javascript-format
msgid "Notes and settings are stored in: %s"
msgstr "Notizen und Einstellungen gespeichert in: %s"
msgstr "Notizen und Einstellungen werden gespeichert in: %s"
msgid "Save"
msgstr "Speichern"
@@ -773,15 +767,14 @@ msgstr ""
"verwendet werden, abhängig davon, wie die jeweiligen Notizen oder "
"Notizbücher ursprünglich verschlüsselt wurden."
#, fuzzy
msgid "Missing Master Keys"
msgstr "Hauptschlüssel"
msgstr "Fehlender Master-Key"
msgid ""
"The master keys with these IDs are used to encrypt some of your items, "
"however the application does not currently have access to them. It is likely "
"they will eventually be downloaded via synchronisation."
msgstr ""
msgstr "Die Master-Keas dieser IDs werden für die Verschlüsselung einiger ..."
msgid "Status"
msgstr "Status"
@@ -796,7 +789,7 @@ msgstr "Zurück"
msgid ""
"New notebook \"%s\" will be created and file \"%s\" will be imported into it"
msgstr ""
"Neues Notizbuch \"%s\" wird erstellt und die Datei \"%s\" wird hinein "
"Neues Notizbuch \"%s\" wird erstellt und die Datei \"%s\" wird dort hinein "
"importiert"
msgid "Please create a notebook first."
@@ -815,7 +808,7 @@ msgid "Separate each tag by a comma."
msgstr "Trenne jede Markierung mit einem Komma."
msgid "Rename notebook:"
msgstr "Benne Notizbuch um:"
msgstr "Notizbuch umbenennen:"
msgid "Set alarm:"
msgstr "Alarm erstellen:"
@@ -862,11 +855,10 @@ msgstr ""
"(+) Knopf drückst."
msgid "Open..."
msgstr ""
msgstr "Öffne..."
#, fuzzy
msgid "Save as..."
msgstr "Änderungen speichern"
msgstr "Sichern unter..."
#, javascript-format
msgid "Unsupported link or message: %s"
@@ -886,18 +878,18 @@ msgid ""
"This note has no content. Click on \"%s\" to toggle the editor and edit the "
"note."
msgstr ""
"Diese Notiz hat keinen Inhalt. Klicke auf „%s“ um den Editor zu aktivieren "
"und die Notiz zu bearbeiten."
#, fuzzy
msgid "to-do"
msgstr "Neues To-Do"
msgstr "To-Do"
#, fuzzy
msgid "note"
msgstr "Neue Notiz"
msgstr "Notiz"
#, fuzzy, javascript-format
#, javascript-format
msgid "Creating new %s..."
msgstr "Importiere Notizen..."
msgstr "Erstelle neue %s..."
msgid "Refresh"
msgstr "Aktualisieren"
@@ -950,9 +942,8 @@ msgstr "Unbekanntes Argument: %s"
msgid "File system"
msgstr "Dateisystem"
#, fuzzy
msgid "Nextcloud"
msgstr "Nextcloud (Beta)"
msgstr "Nextcloud"
msgid "OneDrive"
msgstr "OneDrive"
@@ -960,9 +951,8 @@ msgstr "OneDrive"
msgid "OneDrive Dev (For testing only)"
msgstr "OneDrive Dev (Nur für Tests)"
#, fuzzy
msgid "WebDAV"
msgstr "Nextcloud WebDAV URL"
msgstr "WebDAV"
#, javascript-format
msgid "Unknown log level: %s"
@@ -1037,6 +1027,16 @@ msgstr "Abbrechen..."
msgid "Completed: %s"
msgstr "Abgeschlossen: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Schwerwiegender Fehler:"
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "Synchronisation ist bereits im Gange. Status: %s"
@@ -1045,7 +1045,7 @@ msgid "Encrypted"
msgstr "Verschlüsselt"
msgid "Encrypted items cannot be modified"
msgstr "Verschlüsselte Objekte können nicht verändert werden."
msgstr "Verschlüsselte Objekte können nicht verändert werden"
msgid "Conflicts"
msgstr "Konflikte"
@@ -1102,49 +1102,45 @@ msgstr "Hell"
msgid "Dark"
msgstr "Dunkel"
#, fuzzy
msgid "Uncompleted to-dos on top"
msgstr "Zeige unvollständige To-Dos oben in der Liste"
msgstr "Zeige unvollständige To-Dos an oberster Stelle"
msgid "Sort notes by"
msgstr ""
msgstr "Sortiere Notizen nach"
#, fuzzy
msgid "Reverse sort order"
msgstr "Dreht die Sortierreihenfolge um."
msgstr "Sortierreihenfolge umdrehen"
msgid "Save geo-location with notes"
msgstr "Momentanen Standort zusammen mit Notizen speichern"
#, fuzzy
msgid "When creating a new to-do:"
msgstr "Erstellt ein neues To-Do."
msgstr "Wenn eine neue To-Do erstellt wird:"
#, fuzzy
msgid "Focus title"
msgstr "Notiz Titel:"
msgstr "Fokussiere Titel"
msgid "Focus body"
msgstr ""
msgstr "Fokussiere Inhalt"
#, fuzzy
msgid "When creating a new note:"
msgstr "Erstellt eine neue Notiz."
msgstr "Wenn eine neue Notiz erstellt wird:"
msgid "Show tray icon"
msgstr ""
msgstr "Zeige Tray Icon"
#, fuzzy
msgid "Global zoom percentage"
msgstr "Einstellen des Anwendungszooms"
msgstr "Zoomstufe der Benutzeroberfläche"
msgid "Editor font family"
msgstr ""
msgstr "Editor Schriftenfamilie"
msgid ""
"The font name will not be checked. If incorrect or empty, it will default to "
"a generic monospace font."
msgstr ""
"Der Name der Schrift wird nicht überprüft. Ist dieser inkorrekt oder leer "
"wird eine generische Monospace Schrift verwendet."
msgid "Automatically update the application"
msgstr "Die Applikation automatisch aktualisieren"
@@ -1197,57 +1193,56 @@ msgstr "Nextcloud Benutzername"
msgid "Nextcloud password"
msgstr "Nextcloud Passwort"
#, fuzzy
msgid "WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgstr "WebDAV URL"
#, fuzzy
msgid "WebDAV username"
msgstr "Nextcloud Benutzername"
msgstr "WebDAV Benutzername"
#, fuzzy
msgid "WebDAV password"
msgstr "Setze ein Passwort"
msgstr "WebDAV Passwort"
#, javascript-format
msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr "Ungültiger Optionswert: \"%s\". Mögliche Werte sind: %s."
#, fuzzy
msgid "Joplin Export File"
msgstr "Evernote Export Dateien"
msgstr "Joplin Export Datei"
msgid "Markdown"
msgstr ""
msgstr "Markdown"
msgid "Joplin Export Directory"
msgstr ""
msgstr "Joplin Export Verzeichnis"
#, fuzzy
msgid "Evernote Export File"
msgstr "Evernote Export Dateien"
msgstr "Evernote Export Datei"
msgid "Directory"
msgstr "Verzeichnis"
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
msgstr "Das Modul „%s“ für das Format „%s“ kann nicht geladen werden"
#, javascript-format
msgid "Please specify import format for %s"
msgstr ""
msgstr "Bitte das Exportformat für %s angeben"
#, javascript-format
msgid ""
"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
"decrypted and try again."
msgstr ""
"Dieses Objekt ist zur Zeit verschlüsselt: %s „%s“. Bitte warten bis alle "
"Objekte entschlüsselt wurden und versuche es dann erneut."
msgid "There is no data to export."
msgstr ""
msgstr "Keine Daten für den Export vorhanden."
#, fuzzy
msgid "Please specify the notebook where the notes should be imported to."
msgstr ""
"Bitte wähle aus, wohin der Synchronisations Status exportiert werden soll"
"Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll."
msgid "Items that cannot be synchronised"
msgstr "Objekte können nicht synchronisiert werden"
@@ -1365,10 +1360,10 @@ msgid "Edit notebook"
msgstr "Notizbuch bearbeiten"
msgid "Show all"
msgstr ""
msgstr "Zeige Alles"
msgid "Errors only"
msgstr ""
msgstr "Nur Fehler"
msgid "This note has been modified:"
msgstr "Diese Notiz wurde verändert:"
@@ -1426,6 +1421,15 @@ msgstr ""
msgid "Welcome"
msgstr "Willkommen"
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr ""
#~ "Versionshinweise:\n"
#~ "\n"
#~ "%s"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Importiert eine Evernote Notizbuch-Datei (.enex Datei)."

37
CliClient/locales/en_GB.po
View File

@@ -493,16 +493,16 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr ""
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "PDF File"
msgstr ""
msgid "File"
msgstr ""
msgid "New note"
msgstr ""
@@ -518,6 +518,9 @@ msgstr ""
msgid "Export"
msgstr ""
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -590,11 +593,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
#, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
@@ -606,9 +605,6 @@ msgstr ""
msgid "No"
msgstr ""
msgid "Current version is up-to-date."
msgstr ""
msgid "Check synchronisation configuration"
msgstr ""
@@ -911,6 +907,16 @@ msgstr ""
msgid "Completed: %s"
msgstr ""
#, javascript-format
msgid "Last error: %s"
msgstr ""
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr ""
@@ -1081,6 +1087,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr ""
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""

54
CliClient/locales/es_ES.po
View File

@@ -16,8 +16,6 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
msgid "To delete a tag, untag the associated notes."
msgstr "Desmarque las notas asociadas para eliminar una etiqueta."
@@ -569,16 +567,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr "Exportando el formato de \"%s\" a \"%s\". Por favor espere..."
msgid "File"
msgstr "Archivo"
msgid "Directory"
msgstr "Directorio"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
#, fuzzy
msgid "PDF File"
msgstr "Archivo"
msgid "File"
msgstr "Archivo"
msgid "New note"
msgstr "Nueva nota"
@@ -594,6 +593,9 @@ msgstr "Importar"
msgid "Export"
msgstr "Exportar"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr "Oculta %s"
@@ -666,15 +668,8 @@ msgstr "OK"
msgid "Cancel"
msgstr "Cancelar"
#, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr ""
"Notas de la versión:\n"
"\n"
"%s"
msgid "Current version is up-to-date."
msgstr "La versión actual está actualizada."
msgid "An update is available, do you want to download it now?"
msgstr "Hay disponible una actualización. ¿Quiere descargarla ahora?"
@@ -685,9 +680,6 @@ msgstr "Sí"
msgid "No"
msgstr "No"
msgid "Current version is up-to-date."
msgstr "La versión actual está actualizada."
msgid "Check synchronisation configuration"
msgstr "Comprobar sincronización"
@@ -1013,6 +1005,16 @@ msgstr "Cancelando..."
msgid "Completed: %s"
msgstr "Completado: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Error fatal:"
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "La sincronización ya está en progreso. Estado: %s"
@@ -1193,6 +1195,9 @@ msgstr "Directorio para exportar de Joplin"
msgid "Evernote Export File"
msgstr "Archivo exportado de Evernote"
msgid "Directory"
msgstr "Directorio"
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr "No se puede cargar el módulo \"%s\" para el formato \"%s\""
@@ -1388,6 +1393,15 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenido"
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr ""
#~ "Notas de la versión:\n"
#~ "\n"
#~ "%s"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Importar una libreta de Evernote (archivo .enex)."

47
CliClient/locales/eu.po
View File

@@ -564,16 +564,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "Fitxategia"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "Fitxategia"
msgid "File"
msgstr "Fitxategia"
msgid "New note"
msgstr "Ohar berria"
@@ -590,6 +591,9 @@ msgstr "Inportatu"
msgid "Export"
msgstr "Inportatu"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -663,12 +667,8 @@ msgstr "OK"
msgid "Cancel"
msgstr "Utzi"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "Oharrak ezabatu?"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -680,9 +680,6 @@ msgstr ""
msgid "No"
msgstr "E"
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "Sinkronizazioa utzi"
@@ -1014,6 +1011,16 @@ msgstr "Bertan behera uzten..."
msgid "Completed: %s"
msgstr "Osatuta: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Aio! Agur! :_( "
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "Sinkronizazioa hasita dago. Egoera: %s"
@@ -1201,6 +1208,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Evernotetik esportatutako fitxategiak"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1393,6 +1403,13 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
msgid "Welcome"
msgstr "Ongi etorri!"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "Oharrak ezabatu?"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Inportatu Evernote koaderno fitxategia (.enex fitxategia)."

53
CliClient/locales/fr_FR.po
View File

@@ -564,16 +564,16 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr "Exporter vers \"%s\" au format \"%s\". Veuillez patienter..."
msgid "File"
msgstr "Fichier"
msgid "Directory"
msgstr "Dossier"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
msgid "PDF File"
msgstr "Fichier PDF"
msgid "File"
msgstr "Fichier"
msgid "New note"
msgstr "Nouvelle note"
@@ -589,6 +589,9 @@ msgstr "Importer"
msgid "Export"
msgstr "Exporter"
msgid "Print"
msgstr "Imprimer"
#, javascript-format
msgid "Hide %s"
msgstr "Cacher %s"
@@ -661,15 +664,8 @@ msgstr "OK"
msgid "Cancel"
msgstr "Annuler"
#, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr ""
"Notes de version :\n"
"\n"
"%s"
msgid "Current version is up-to-date."
msgstr "La version actuelle est à jour."
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -681,9 +677,6 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
msgid "Current version is up-to-date."
msgstr "La version actuelle est à jour."
msgid "Check synchronisation configuration"
msgstr "Vérifier config synchronisation"
@@ -1017,6 +1010,16 @@ msgstr "Annulation..."
msgid "Completed: %s"
msgstr "Terminé : %s"
#, javascript-format
msgid "Last error: %s"
msgstr "Dernière erreur : %s"
msgid "Idle"
msgstr "Arrêté"
msgid "In progress"
msgstr "En cours"
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "La synchronisation est déjà en cours. État : %s"
@@ -1087,7 +1090,7 @@ msgid "Sort notes by"
msgstr "Trier les notes par"
msgid "Reverse sort order"
msgstr "Inverser l'ordre."
msgstr "Inverser l'ordre"
msgid "Save geo-location with notes"
msgstr "Enregistrer l'emplacement avec les notes"
@@ -1196,6 +1199,9 @@ msgstr "Dossier d'export Joplin"
msgid "Evernote Export File"
msgstr "Fichiers d'export Evernote"
msgid "Directory"
msgstr "Dossier"
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr "Impossible de charger module \"%s\" pour le format \"%s\""
@@ -1394,6 +1400,15 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenue"
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr ""
#~ "Notes de version :\n"
#~ "\n"
#~ "%s"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Importer un carnet Evernote (fichier .enex)."

47
CliClient/locales/hr_HR.po
View File

@@ -566,16 +566,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "Datoteka"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "Datoteka"
msgid "File"
msgstr "Datoteka"
msgid "New note"
msgstr "Nova bilješka"
@@ -592,6 +593,9 @@ msgstr "Uvoz"
msgid "Export"
msgstr "Uvoz"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -666,12 +670,8 @@ msgstr "U redu"
msgid "Cancel"
msgstr "Odustani"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "Obriši bilješke?"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -683,9 +683,6 @@ msgstr ""
msgid "No"
msgstr "N"
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "Prekini sinkronizaciju"
@@ -1001,6 +998,16 @@ msgstr "Prekidam..."
msgid "Completed: %s"
msgstr "Dovršeno: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Fatalna greška:"
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "Sinkronizacija je već u toku. Stanje: %s"
@@ -1183,6 +1190,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Evernote izvozne datoteke"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1374,6 +1384,13 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
msgid "Welcome"
msgstr "Dobro došli"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "Obriši bilješke?"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Uvozi Evernote bilježnicu (.enex datoteku)."

47
CliClient/locales/it_IT.po
View File

@@ -548,16 +548,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "File"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "File"
msgid "File"
msgstr "File"
msgid "New note"
msgstr "Nuova nota"
@@ -574,6 +575,9 @@ msgstr "Importa"
msgid "Export"
msgstr "Importa"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -648,12 +652,8 @@ msgstr "OK"
msgid "Cancel"
msgstr "Cancella"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "Eliminare le note?"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -665,9 +665,6 @@ msgstr ""
msgid "No"
msgstr "N"
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "Cancella la sincronizzazione"
@@ -987,6 +984,16 @@ msgstr "Cancellazione..."
msgid "Completed: %s"
msgstr "Completata: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Errore fatale:"
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "La sincronizzazione è già in corso. Stato: %s"
@@ -1169,6 +1176,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Esposta i files di Evernote"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1362,6 +1372,13 @@ msgstr ""
msgid "Welcome"
msgstr "Benvenuto"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "Eliminare le note?"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Importa un file blocco note di Evernote (.enex file)."

47
CliClient/locales/ja_JP.po
View File

@@ -549,16 +549,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "ファイル"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "ファイル"
msgid "File"
msgstr "ファイル"
msgid "New note"
msgstr "新しいノート"
@@ -575,6 +576,9 @@ msgstr "インポート"
msgid "Export"
msgstr "インポート"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -649,12 +653,8 @@ msgstr ""
msgid "Cancel"
msgstr "キャンセル"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "ノートを削除しますか？"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -665,9 +665,6 @@ msgstr ""
msgid "No"
msgstr ""
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "同期の中止"
@@ -989,6 +986,16 @@ msgstr "中止中..."
msgid "Completed: %s"
msgstr "完了: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "致命的なエラー: "
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "同期作業はすでに実行中です。状態: %s"
@@ -1173,6 +1180,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Evernote Exportファイル"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1366,6 +1376,13 @@ msgstr ""
msgid "Welcome"
msgstr "ようこそ"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "ノートを削除しますか？"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Evernoteノートブックファイル(.enex)のインポート"

37
CliClient/locales/joplin.pot
View File

@@ -493,16 +493,16 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr ""
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "PDF File"
msgstr ""
msgid "File"
msgstr ""
msgid "New note"
msgstr ""
@@ -518,6 +518,9 @@ msgstr ""
msgid "Export"
msgstr ""
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -590,11 +593,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
#, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
@@ -606,9 +605,6 @@ msgstr ""
msgid "No"
msgstr ""
msgid "Current version is up-to-date."
msgstr ""
msgid "Check synchronisation configuration"
msgstr ""
@@ -911,6 +907,16 @@ msgstr ""
msgid "Completed: %s"
msgstr ""
#, javascript-format
msgid "Last error: %s"
msgstr ""
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr ""
@@ -1081,6 +1087,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr ""
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""

47
CliClient/locales/nl_BE.po
View File

@@ -566,16 +566,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "Bestand"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "Bestand"
msgid "File"
msgstr "Bestand"
msgid "New note"
msgstr "Nieuwe notitie"
@@ -592,6 +593,9 @@ msgstr "Importeer"
msgid "Export"
msgstr "Importeer"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -665,12 +669,8 @@ msgstr "OK"
msgid "Cancel"
msgstr "Annuleer"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "Notities verwijderen?"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -682,9 +682,6 @@ msgstr ""
msgid "No"
msgstr "N"
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "Annuleer synchronisatie"
@@ -1016,6 +1013,16 @@ msgstr "Annuleren..."
msgid "Completed: %s"
msgstr "Voltooid: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Fatale fout:"
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "Synchronisatie is reeds bezig. Status: %s"
@@ -1201,6 +1208,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Exporteer Evernote bestanden"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1397,6 +1407,13 @@ msgstr ""
msgid "Welcome"
msgstr "Welkom"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "Notities verwijderen?"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Importeer een Evernote notitieboek (.enex bestand)."

47
CliClient/locales/pt_BR.po
View File

@@ -544,16 +544,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "Arquivo"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "Arquivo"
msgid "File"
msgstr "Arquivo"
msgid "New note"
msgstr "Nova nota"
@@ -570,6 +571,9 @@ msgstr "Importar"
msgid "Export"
msgstr "Importar"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -645,12 +649,8 @@ msgstr "OK"
msgid "Cancel"
msgstr "Cancelar"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "Excluir notas?"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -662,9 +662,6 @@ msgstr ""
msgid "No"
msgstr "N"
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "Cancelar sincronização"
@@ -987,6 +984,16 @@ msgstr "Cancelando..."
msgid "Completed: %s"
msgstr "Completado: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Erro fatal:"
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "Sincronização já em andamento. Estado: %s"
@@ -1170,6 +1177,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Arquivos de Exportação do Evernote"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1361,6 +1371,13 @@ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
msgid "Welcome"
msgstr "Bem-vindo"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "Excluir notas?"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Importa um arquivo de caderno do Evernote (arquivo .enex)."

47
CliClient/locales/ru_RU.po
View File

@@ -568,16 +568,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "Файл"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "Файл"
msgid "File"
msgstr "Файл"
msgid "New note"
msgstr "Новая заметка"
@@ -594,6 +595,9 @@ msgstr "Импорт"
msgid "Export"
msgstr "Импорт"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -667,12 +671,8 @@ msgstr "OK"
msgid "Cancel"
msgstr "Отмена"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "Удалить заметки?"
msgid "Current version is up-to-date."
msgstr "Вы используете самую свежую версию."
#, fuzzy
msgid "An update is available, do you want to download it now?"
@@ -685,9 +685,6 @@ msgstr ""
msgid "No"
msgstr "N"
msgid "Current version is up-to-date."
msgstr "Вы используете самую свежую версию."
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "Отменить синхронизацию"
@@ -1017,6 +1014,16 @@ msgstr "Отмена..."
msgid "Completed: %s"
msgstr "Завершено: %s"
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "Фатальная ошибка:"
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "Синхронизация уже выполняется. Статус: %s"
@@ -1201,6 +1208,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Файлы экспорта Evernote"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1395,6 +1405,13 @@ msgstr "У вас сейчас нет блокнота. Создайте его
msgid "Welcome"
msgstr "Добро пожаловать"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "Удалить заметки?"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "Импортирует файл блокнотов Evernote (.enex-файл)."

47
CliClient/locales/zh_CN.po
View File

@@ -519,16 +519,17 @@ msgstr ""
msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "File"
msgstr "文件"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
msgstr ""
#, fuzzy
msgid "PDF File"
msgstr "文件"
msgid "File"
msgstr "文件"
msgid "New note"
msgstr "新笔记"
@@ -545,6 +546,9 @@ msgstr "导入"
msgid "Export"
msgstr "导入"
msgid "Print"
msgstr ""
#, javascript-format
msgid "Hide %s"
msgstr ""
@@ -619,12 +623,8 @@ msgstr "确认"
msgid "Cancel"
msgstr "取消"
#, fuzzy, javascript-format
msgid ""
"Release notes:\n"
"\n"
"%s"
msgstr "是否删除笔记？"
msgid "Current version is up-to-date."
msgstr ""
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -636,9 +636,6 @@ msgstr ""
msgid "No"
msgstr "否"
msgid "Current version is up-to-date."
msgstr ""
#, fuzzy
msgid "Check synchronisation configuration"
msgstr "取消同步"
@@ -955,6 +952,16 @@ msgstr "正在取消..."
msgid "Completed: %s"
msgstr "已完成：\"%s\""
#, fuzzy, javascript-format
msgid "Last error: %s"
msgstr "严重错误："
msgid "Idle"
msgstr ""
msgid "In progress"
msgstr ""
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr "同步正在进行中。状态：%s"
@@ -1133,6 +1140,9 @@ msgstr ""
msgid "Evernote Export File"
msgstr "Evernote导出文件"
msgid "Directory"
msgstr ""
#, javascript-format
msgid "Cannot load \"%s\" module for format \"%s\""
msgstr ""
@@ -1322,6 +1332,13 @@ msgstr "您当前没有任何笔记本。点击(+)按钮创建新笔记本。"
msgid "Welcome"
msgstr "欢迎"
#, fuzzy
#~ msgid ""
#~ "Release notes:\n"
#~ "\n"
#~ "%s"
#~ msgstr "是否删除笔记？"
#~ msgid "Imports an Evernote notebook file (.enex file)."
#~ msgstr "导入Evernote笔记本文件（.enex文件）。"

142
ElectronClient/app/checkForUpdates.js
View File

@@ -1,31 +1,15 @@
const { dialog } = require('electron')
const { autoUpdater } = require('electron-updater')
const { Logger } = require('lib/logger.js');
const { _ } = require('lib/locale.js');
const fetch = require('node-fetch');
const packageInfo = require('./packageInfo.js');
const compareVersions = require('compare-versions');
let autoUpdateLogger_ = new Logger();
let checkInBackground_ = false;
let isCheckingForUpdate_ = false;
let parentWindow_ = null;
// Note: Electron Builder's autoUpdater is incredibly buggy so currently it's only used
// to detect if a new version is present. If it is, the download link is simply opened
// in a new browser window.
autoUpdater.autoDownload = false;
function htmlToText_(html) {
let output = html.replace(/\n/g, '');
output = output.replace(/<li>/g, '- ');
output = output.replace(/<p>/g, '');
output = output.replace(/<\/p>/g, '\n');
output = output.replace(/<\/li>/g, '\n');
output = output.replace(/<ul>/g, '');
output = output.replace(/<\/ul>/g, '');
output = output.replace(/<.*?>/g, '');
output = output.replace(/<\/.*?>/g, '');
return output;
}
function showErrorMessageBox(message) {
return dialog.showMessageBox(parentWindow_, {
type: 'error',
@@ -43,81 +27,45 @@ function onCheckEnded() {
isCheckingForUpdate_ = false;
}
autoUpdater.on('error', (error) => {
autoUpdateLogger_.error(error);
if (checkInBackground_) return onCheckEnded();
async function fetchLatestRelease() {
const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases/latest');
let msg = error == null ? "unknown" : (error.stack || error).toString();
// Error messages can be very long even without stack trace so shorten
// then so that the dialog box doesn't take the whole screen.
msg = msg.substr(0,512).replace(/\\n/g, '\n');
showErrorMessageBox(msg)
if (!response.ok) {
const responseText = await response.text();
throw new Error('Cannot get latest release info: ' + responseText.substr(0,500));
}
const json = await response.json();
onCheckEnded();
})
const version = json.tag_name.substr(1);
let downloadUrl = null;
const platform = process.platform;
for (let i = 0; i < json.assets.length; i++) {
const asset = json.assets[i];
let found = false;
if (platform === 'win32' && asset.name.indexOf('.exe') >= 0) {
found = true;
} else if (platform === 'darwin' && asset.name.indexOf('.dmg') >= 0) {
found = true;
} else if (platform === 'linux' && asset.name.indexOf('.AppImage') >= 0) {
found = true;
}
function findDownloadFilename_(info) {
// { version: '1.0.64',
// files:
// [ { url: 'Joplin-1.0.64-mac.zip',
// sha512: 'OlemXqhq/fSifx7EutvMzfoCI/1kGNl10i8nkvACEDfVXwP8hankDBXEC0+GxSArsZuxOh3U1+C+4j72SfIUew==' },
// { url: 'Joplin-1.0.64.dmg',
// sha512: 'jAewQQoJ3nCaOj8hWDgf0sc3LBbAWQtiKqfTflK8Hc3Dh7fAy9jRHfFAZKFUZ9ll95Bun0DVsLq8wLSUrdsMXw==',
// size: 77104485 } ],
// path: 'Joplin-1.0.64-mac.zip',
// sha512: 'OlemXqhq/fSifx7EutvMzfoCI/1kGNl10i8nkvACEDfVXwP8hankDBXEC0+GxSArsZuxOh3U1+C+4j72SfIUew==',
// releaseDate: '2018-02-16T00:13:01.634Z',
// releaseName: 'v1.0.64',
// releaseNotes: '<p>Still more fixes and im...' }
if (!info) return null;
if (!info.files) {
// info.path seems to contain a default, though not a good one,
// so the loop below if preferable to find the right file.
return info.path;
if (found) {
downloadUrl = asset.browser_download_url;
break;
}
}
for (let i = 0; i < info.files.length; i++) {
const f = info.files[i].url; // Annoyingly this is called "url" but it's obviously not a url, so hopefully it won't change later on and become one.
if (f.indexOf('.exe') >= 0) return f;
if (f.indexOf('.dmg') >= 0) return f;
}
if (!downloadUrl) throw new Error('Cannot find download Url: ' + JSON.stringify(json).substr(0,500));
return info.path;
return {
version: version,
downloadUrl: downloadUrl,
notes: json.body,
};
}
autoUpdater.on('update-available', (info) => {
const filename = findDownloadFilename_(info);
if (!info.version || !filename) {
if (checkInBackground_) return onCheckEnded();
showErrorMessageBox(('Could not get version info: ' + JSON.stringify(info)));
return onCheckEnded();
}
const downloadUrl = 'https://github.com/laurent22/joplin/releases/download/v' + info.version + '/' + filename;
let releaseNotes = info.releaseNotes + '';
if (releaseNotes) releaseNotes = '\n\n' + _('Release notes:\n\n%s', htmlToText_(releaseNotes));
const buttonIndex = dialog.showMessageBox(parentWindow_, {
type: 'info',
message: _('An update is available, do you want to download it now?' + releaseNotes),
buttons: [_('Yes'), _('No')]
});
onCheckEnded();
if (buttonIndex === 0) require('electron').shell.openExternal(downloadUrl);
})
autoUpdater.on('update-not-available', () => {
if (checkInBackground_) return onCheckEnded();
dialog.showMessageBox({ message: _('Current version is up-to-date.') })
onCheckEnded();
})
function checkForUpdates(inBackground, window, logFilePath) {
if (isCheckingForUpdate_) {
autoUpdateLogger_.info('checkForUpdates: Skipping check because it is already running');
@@ -133,18 +81,30 @@ function checkForUpdates(inBackground, window, logFilePath) {
autoUpdateLogger_.addTarget('file', { path: logFilePath });
autoUpdateLogger_.setLevel(Logger.LEVEL_DEBUG);
autoUpdateLogger_.info('checkForUpdates: Initializing...');
autoUpdater.logger = autoUpdateLogger_;
}
checkInBackground_ = inBackground;
try {
autoUpdater.checkForUpdates()
} catch (error) {
fetchLatestRelease().then(release => {
if (compareVersions(release.version, packageInfo.version) <= 0) {
if (!checkInBackground_) dialog.showMessageBox({ message: _('Current version is up-to-date.') })
} else {
const releaseNotes = release.notes.trim() ? "\n\n" + release.notes.trim() : '';
const buttonIndex = dialog.showMessageBox(parentWindow_, {
type: 'info',
message: _('An update is available, do you want to download it now?' + releaseNotes),
buttons: [_('Yes'), _('No')]
});
if (buttonIndex === 0) require('electron').shell.openExternal(release.downloadUrl);
}
}).catch(error => {
autoUpdateLogger_.error(error);
if (!checkInBackground_) showErrorMessageBox(error.message);
}).then(() => {
onCheckEnded();
}
});
}
module.exports.checkForUpdates = checkForUpdates

2
ElectronClient/app/locales/de_DE.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/en_GB.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/es_ES.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/eu.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/fr_FR.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/hr_HR.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/it_IT.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/ja_JP.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/nl_BE.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/pt_BR.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/ru_RU.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/zh_CN.json
View File

File diff suppressed because one or more lines are too long

81
ElectronClient/app/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.72",
"version": "1.0.70",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -614,12 +614,14 @@
"bluebird": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
"dev": true
},
"bluebird-lst": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.5.tgz",
"integrity": "sha512-Ey0bDNys5qpYPhZ/oQ9vOEvD0TYQDTILMXWP2iGfvMg7rSDde+oV4aQQgqRH+CvBFNz2BSDQnPGMUl6LKBUUQA==",
"dev": true,
"requires": {
"bluebird": "3.5.1"
}
@@ -848,6 +850,7 @@
"version": "4.0.5",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz",
"integrity": "sha512-NT8AxWH6miZQHnZzaTVjVp1uc6C/mWlxi6GQXKpd4CwyTQd3rT7+poOGrcOhtIiHYCL9VEbRsVfxUAPPsgqJdg==",
"dev": true,
"requires": {
"bluebird-lst": "1.0.5",
"debug": "3.1.0",
@@ -859,6 +862,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dev": true,
"requires": {
"ms": "2.0.0"
}
@@ -867,6 +871,7 @@
"version": "4.5.2",
"resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.5.2.tgz",
"integrity": "sha512-ZYqFpBdy9w7PsK+vB30j+TnHOyWHm/CJbUq1qqoE8tb71m6qgk5Wa7gp3MYQdlGFxb9vfznF+yD4jcl8l+y91A==",
"dev": true,
"requires": {
"bluebird-lst": "1.0.5",
"fs-extra": "5.0.0"
@@ -1084,6 +1089,11 @@
"integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
"dev": true
},
"compare-versions": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.1.0.tgz",
"integrity": "sha512-4hAxDSBypT/yp2ySFD346So6Ragw5xmBn/e/agIGl3bZr6DLUqnoRZPusxKrXdYRZpgexO9daejmIenlq/wrIQ=="
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1642,11 +1652,6 @@
"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.1.2.tgz",
"integrity": "sha1-ihBD4ys6HaHD9VPc4oznZCRhZ+M="
},
"electron-log": {
"version": "2.2.11",
"resolved": "https://registry.npmjs.org/electron-log/-/electron-log-2.2.11.tgz",
"integrity": "sha512-e+DHJkLJoaawDxyy9i2SMIViG/GV12DUE3T9a6yMdFp695c2u/kWYUZbUy31RzgX9uC/JuewXrO54tXdANgRRQ=="
},
"electron-osx-sign": {
"version": "0.4.8",
"resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz",
@@ -1737,47 +1742,6 @@
}
}
},
"electron-updater": {
"version": "2.20.1",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.20.1.tgz",
"integrity": "sha512-7LJBcHY0T8So5Q/NZqYlU43DPXfyVssGq9ObamXbSL01mRt/gdpcJlXPU1w3vA/L6tC1IMVI9cAulAjI2oSYAw==",
"requires": {
"bluebird-lst": "1.0.5",
"builder-util-runtime": "4.0.5",
"electron-is-dev": "0.3.0",
"fs-extra-p": "4.5.2",
"js-yaml": "3.10.0",
"lazy-val": "1.0.3",
"lodash.isequal": "4.5.0",
"semver": "5.5.0",
"source-map-support": "0.5.3"
},
"dependencies": {
"electron-is-dev": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
"integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4="
},
"semver": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"source-map-support": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz",
"integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==",
"requires": {
"source-map": "0.6.1"
}
}
}
},
"electron-window-state": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-4.1.1.tgz",
@@ -1848,7 +1812,8 @@
"esprima": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
"dev": true
},
"esutils": {
"version": "2.0.2",
@@ -2091,15 +2056,6 @@
"universalify": "0.1.1"
}
},
"fs-extra-p": {
"version": "4.5.2",
"resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.5.2.tgz",
"integrity": "sha512-ZYqFpBdy9w7PsK+vB30j+TnHOyWHm/CJbUq1qqoE8tb71m6qgk5Wa7gp3MYQdlGFxb9vfznF+yD4jcl8l+y91A==",
"requires": {
"bluebird-lst": "1.0.5",
"fs-extra": "5.0.0"
}
},
"fs-minipass": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
@@ -2559,8 +2515,7 @@
"jsbn": {
"version": "0.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"json-schema": {
"version": "0.2.3",
@@ -3593,6 +3548,7 @@
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
"integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
"dev": true,
"requires": {
"argparse": "1.0.9",
"esprima": "4.0.0"
@@ -3695,11 +3651,6 @@
"package-json": "4.0.1"
}
},
"lazy-val": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz",
"integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg=="
},
"lcid": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",

3
ElectronClient/app/package.json
View File

@@ -59,9 +59,8 @@
"app-module-path": "^2.2.0",
"async-mutex": "^0.1.3",
"base-64": "^0.1.0",
"compare-versions": "^3.1.0",
"electron-context-menu": "^0.9.1",
"electron-log": "^2.2.11",
"electron-updater": "^2.18.2",
"electron-window-state": "^4.1.1",
"follow-redirects": "^1.2.5",
"form-data": "^2.3.1",

14
README.md
View File

@@ -230,15 +230,15 @@ Current translations:
---|---|---|---|---
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/es/basque_country.png) | Basque | [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po) | juan.abasolo@ehu.eus | 80%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/hr.png) | Croatian | [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po) | Hrvoje Mandić <trbuhom@net.hr> | 65%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png) | Deutsch | [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po) | Tobias Strobel <git@strobeltobias.de> | 83%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png) | Deutsch | [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po) | Tobias Strobel <git@strobeltobias.de> | 97%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/gb.png) | English | [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po) | | 100%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/es.png) | Español | [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po) | Fernando Martín <f@mrtn.es> | 99%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/es.png) | Español | [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po) | Fernando Martín <f@mrtn.es> | 98%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/fr.png) | Français | [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po) | Laurent Cozic | 100%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/it.png) | Italiano | [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po) | | 67%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/be.png) | Nederlands | [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po) | | 81%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/br.png) | Português (Brasil) | [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po) | | 66%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png) | Русский | [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po) | Artyom Karlov <artyom.karlov@gmail.com> | 84%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png) | 中文 (简体) | [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po) | RCJacH <RCJacH@outlook.com> | 67%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/it.png) | Italiano | [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po) | | 66%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/be.png) | Nederlands | [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po) | | 80%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/br.png) | Português (Brasil) | [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po) | | 65%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png) | Русский | [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po) | Artyom Karlov <artyom.karlov@gmail.com> | 83%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png) | 中文 (简体) | [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po) | RCJacH <RCJacH@outlook.com> | 66%
![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/jp.png) | 日本語 | [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po) | | 65%
<!-- LOCALE-TABLE-AUTO-GENERATED -->

2
ReactNativeClient/lib/MdToHtml.js
View File

@@ -196,7 +196,7 @@ class MdToHtml {
let openTag = null;
let closeTag = null;
let attrs = t.attrs ? t.attrs : [];
let tokenContent = t.content ? t.content : null;
let tokenContent = t.content ? t.content : '';
const isCodeBlock = tag === 'code' && t.block;
const isInlineCode = t.type === 'code_inline';
const codeBlockLanguage = t && t.info ? t.info : null;

12
ReactNativeClient/lib/models/Note.js
View File

@@ -82,7 +82,17 @@ class Note extends BaseItem {
static defaultTitle(note) {
if (note.body && note.body.length) {
const lines = note.body.trim().split("\n");
return lines[0].trim().substr(0, 80).trim();
let output = lines[0].trim();
// Remove the first #, *, etc.
while (output.length) {
const c = output[0];
if (['#', ' ', "\n", "\t", '*', '`', '-'].indexOf(c) >= 0) {
output = output.substr(1);
} else {
break;
}
}
return output.substr(0, 80).trim();
}
return _('Untitled');

2
ReactNativeClient/locales/de_DE.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/en_GB.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/es_ES.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/eu.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/fr_FR.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/hr_HR.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/it_IT.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/ja_JP.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/nl_BE.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/pt_BR.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/ru_RU.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/zh_CN.json
View File

File diff suppressed because one or more lines are too long

24
docs/index.html
View File

@@ -409,15 +409,15 @@ $$
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/hr.png" alt=""></td>
<td>Croatian</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po">hr_HR</a></td>
<td>Hrvoje Mandić <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x74;&#114;&#x62;&#117;&#x68;&#111;&#109;&#x40;&#x6e;&#x65;&#116;&#x2e;&#x68;&#114;">&#x74;&#114;&#x62;&#117;&#x68;&#111;&#109;&#x40;&#x6e;&#x65;&#116;&#x2e;&#x68;&#114;</a></td>
<td>Hrvoje Mandić <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#116;&#114;&#x62;&#117;&#x68;&#x6f;&#109;&#x40;&#110;&#x65;&#116;&#46;&#104;&#114;">&#116;&#114;&#x62;&#117;&#x68;&#x6f;&#109;&#x40;&#110;&#x65;&#116;&#46;&#104;&#114;</a></td>
<td>65%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png" alt=""></td>
<td>Deutsch</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po">de_DE</a></td>
<td>Tobias Strobel <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#x3a;&#103;&#x69;&#x74;&#64;&#x73;&#x74;&#114;&#111;&#x62;&#101;&#108;&#116;&#x6f;&#x62;&#105;&#97;&#x73;&#x2e;&#x64;&#x65;">&#103;&#x69;&#x74;&#64;&#x73;&#x74;&#114;&#111;&#x62;&#101;&#108;&#116;&#x6f;&#x62;&#105;&#97;&#x73;&#x2e;&#x64;&#x65;</a></td>
<td>83%</td>
<td>Tobias Strobel <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x67;&#x69;&#x74;&#64;&#115;&#116;&#114;&#x6f;&#98;&#101;&#108;&#116;&#x6f;&#98;&#105;&#97;&#115;&#x2e;&#x64;&#101;">&#x67;&#x69;&#x74;&#64;&#115;&#116;&#114;&#x6f;&#98;&#101;&#108;&#116;&#x6f;&#98;&#105;&#97;&#115;&#x2e;&#x64;&#101;</a></td>
<td>97%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/gb.png" alt=""></td>
@@ -430,8 +430,8 @@ $$
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/es.png" alt=""></td>
<td>Español</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po">es_ES</a></td>
<td>Fernando Martín <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#102;&#64;&#109;&#114;&#116;&#x6e;&#x2e;&#101;&#115;">&#102;&#64;&#109;&#114;&#116;&#x6e;&#x2e;&#101;&#115;</a></td>
<td>99%</td>
<td>Fernando Martín <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x66;&#x40;&#109;&#114;&#116;&#110;&#x2e;&#101;&#x73;">&#x66;&#x40;&#109;&#114;&#116;&#110;&#x2e;&#101;&#x73;</a></td>
<td>98%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/fr.png" alt=""></td>
@@ -445,35 +445,35 @@ $$
<td>Italiano</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po">it_IT</a></td>
<td></td>
<td>67%</td>
<td>66%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/be.png" alt=""></td>
<td>Nederlands</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po">nl_BE</a></td>
<td></td>
<td>81%</td>
<td>80%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/br.png" alt=""></td>
<td>Português (Brasil)</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po">pt_BR</a></td>
<td></td>
<td>66%</td>
<td>65%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png" alt=""></td>
<td>Русский</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po">ru_RU</a></td>
<td>Artyom Karlov <a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#97;&#x72;&#116;&#121;&#111;&#109;&#x2e;&#107;&#x61;&#114;&#x6c;&#111;&#x76;&#64;&#x67;&#x6d;&#97;&#105;&#108;&#46;&#x63;&#111;&#x6d;">&#97;&#x72;&#116;&#121;&#111;&#109;&#x2e;&#107;&#x61;&#114;&#x6c;&#111;&#x76;&#64;&#x67;&#x6d;&#97;&#105;&#108;&#46;&#x63;&#111;&#x6d;</a></td>
<td>84%</td>
<td>Artyom Karlov <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#97;&#x72;&#x74;&#x79;&#x6f;&#x6d;&#x2e;&#x6b;&#x61;&#114;&#x6c;&#x6f;&#x76;&#x40;&#x67;&#x6d;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#109;">&#97;&#x72;&#x74;&#x79;&#x6f;&#x6d;&#x2e;&#x6b;&#x61;&#114;&#x6c;&#x6f;&#x76;&#x40;&#x67;&#x6d;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#109;</a></td>
<td>83%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png" alt=""></td>
<td>中文 (简体)</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po">zh_CN</a></td>
<td>RCJacH <a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#x3a;&#82;&#x43;&#74;&#97;&#99;&#72;&#64;&#111;&#x75;&#116;&#108;&#111;&#x6f;&#107;&#46;&#99;&#111;&#109;">&#82;&#x43;&#74;&#97;&#99;&#72;&#64;&#111;&#x75;&#116;&#108;&#111;&#x6f;&#107;&#46;&#99;&#111;&#109;</a></td>
<td>67%</td>
<td>RCJacH <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#82;&#67;&#74;&#97;&#99;&#x48;&#x40;&#111;&#117;&#x74;&#x6c;&#x6f;&#x6f;&#x6b;&#x2e;&#x63;&#111;&#x6d;">&#82;&#67;&#74;&#97;&#99;&#x48;&#x40;&#111;&#117;&#x74;&#x6c;&#x6f;&#x6f;&#x6b;&#x2e;&#x63;&#111;&#x6d;</a></td>
<td>66%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/jp.png" alt=""></td>