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

Merge branch 'master' into encryption

This commit is contained in:
Laurent Cozic 2018-01-03 20:23:26 +01:00
commit 6252a4d8c8
52 changed files with 3112 additions and 486 deletions

6
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,6 @@
# Adding new features
If you want to add a new feature, consider asking about it before implementing it to make sure it is within the scope of the project. Of course you are free to create the pull request directly but it is not guaranteed it is going to be accepted.
# Style
- Only use tabs for indentation, not spaces.
- Do not remove or add optional characters from other lines (such as colons or new line characters) as it can make the commit needlessly big.

View File

@ -2,21 +2,19 @@
# Copyright (C) YEAR Laurent Cozic
# This file is distributed under the same license as the Joplin-CLI package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#
msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Last-Translator: Samuel Blickle <blickle.samuel@gmail.com>\n"
"Language-Team: \n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.4\n"
"X-Generator: Poedit 2.0.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
msgid "Give focus to next pane"
msgstr "Das nächste Fenster fokussieren"
@ -40,7 +38,7 @@ msgid "Exit the application."
msgstr "Das Programm verlassen."
msgid "Delete the currently selected note or notebook."
msgstr "Die momentan ausgewählte Notiz(-buch) löschen."
msgstr "Die/das momentan ausgewählte Notiz(-buch) löschen."
msgid "To delete a tag, untag the associated notes."
msgstr ""
@ -81,7 +79,7 @@ msgid "Move the note to a notebook."
msgstr "Die Notiz zu einem Notizbuch verschieben."
msgid "Press Ctrl+D or type \"exit\" to exit the application"
msgstr "Drücke Strg+D oder schreibe \"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."
@ -108,11 +106,11 @@ msgid "y"
msgstr "j"
msgid "Cancelling background synchronisation... Please wait."
msgstr "Breche Hintergrund-Synchronisations ab....Bitte warten."
msgstr "Breche Hintergrund-Synchronisation ab... Bitte warten."
#, fuzzy, javascript-format
#, javascript-format
msgid "No such command: %s"
msgstr "Ungültiger Befehl: \"%s\""
msgstr "Ungültiger Befehl: %s"
#, javascript-format
msgid "The command \"%s\" is only available in GUI mode"
@ -152,12 +150,12 @@ msgid ""
"current configuration."
msgstr ""
"Zeigt an oder stellt einen Optionswert. Wenn kein [Wert] angegeben ist, wird "
"der Wert vom gegebenenen [Namen] angezeigt. Wenn weder [Name] noch [Wert] "
"der Wert vom gegebenen [Namen] angezeigt. Wenn weder [Name] noch [Wert] "
"gegeben sind, wird eine Liste der momentanen Konfiguration angezeigt."
msgid "Also displays unset and hidden config variables."
msgstr ""
"Zeige auch nicht angegebene oder versteckte Konfigurationsvariablen an."
"Zeigt auch nicht angegebene oder versteckte Konfigurationsvariablen an."
#, javascript-format
msgid "%s = %s (%s)"
@ -171,8 +169,8 @@ msgid ""
"Duplicates the notes matching <note> to [notebook]. If no notebook is "
"specified the note is duplicated in the current notebook."
msgstr ""
"Vervielfältigt 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 zu [Notizbuch]. Wenn "
"kein Notizbuch angegeben ist, wird die Notiz in das momentane Notizbuch "
"kopiert."
msgid "Marks a to-do as done."
@ -188,8 +186,8 @@ msgstr "Notiz bearbeiten."
msgid ""
"No text editor is defined. Please set it using `config editor <editor-path>`"
msgstr ""
"Kein Textbearbeitungsprogramm angegeben. Bitte lege eines mit `config editor "
"<Pfad-Zum-Textbearbeitungsprogramm>` fest"
"Kein Textverarbeitungsprogramm angegeben. Bitte lege eines mit `config "
"editor <Pfad-Zum-Textverarbeitungsprogramm>` fest"
msgid "No active notebook."
msgstr "Kein aktives Notizbuch."
@ -200,8 +198,8 @@ msgstr "Notiz \"%s\" existiert nicht. Soll sie erstellt werden?"
msgid "Starting to edit note. Close the editor to get back to the prompt."
msgstr ""
"Beginne die Notiz zu bearbeiten. Schließ das Textbearbeitungsprogramm, um "
"zurück zum Terminal zu kommen."
"Beginne die Notiz zu bearbeiten. Schließe das Textverarbeitungsprogramm, um "
"zurück zum Terminal zu gelangen."
msgid "Note has been saved."
msgstr "Die Notiz wurde gespeichert."
@ -213,9 +211,9 @@ msgid ""
"Exports Joplin data to the given directory. By default, it will export the "
"complete database including notebooks, notes, tags and resources."
msgstr ""
"Exportiert Joplins Datein zu dem angegebenen Pfad. Standardmäßig wird die "
"komplette Datenbank inklusive Notizbüchern, Notizen, Markierungen usw. "
"exportiert."
"Exportiert Joplins Dateien zu dem angegebenen Pfad. Standardmäßig wird die "
"komplette Datenbank inklusive Notizbüchern, Notizen, Markierungen und "
"Anhängen exportiert."
msgid "Exports only the given note."
msgstr "Exportiert nur die angegebene Notiz."
@ -227,10 +225,10 @@ msgid "Displays a geolocation URL for the note."
msgstr "Zeigt die Standort-URL der Notiz an."
msgid "Displays usage information."
msgstr "Zeigt die Benutzungsstatistik an."
msgstr "Zeigt die Nutzungsstatistik an."
msgid "Shortcuts are not available in CLI mode."
msgstr ""
msgstr "Tastenkürzel sind im CLI Modus nicht verfügbar."
#, fuzzy
msgid ""
@ -250,8 +248,8 @@ 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 augewählte Notizbuch oder die momentan ausgewählte Notiz zu "
"wählen. `$c` kann benutzt werden, um die momentane Auswahl zu verweisen."
"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."
msgid "To move from one pane to another, press Tab or Shift+Tab."
msgstr ""
@ -263,16 +261,16 @@ msgid ""
"(including this console)."
msgstr ""
"Benutze die Pfeiltasten und Bild hoch/runter um durch Listen und Texte zu "
"scrollen ( inklusive diesem Terminal )."
"scrollen (inklusive diesem Terminal)."
msgid "To maximise/minimise the console, press \"TC\"."
msgstr "Um das Terminal zu maximieren/minimieren, drücke \"TC\"."
msgid "To enter command line mode, press \":\""
msgstr ""
msgstr "Um den Kommandozeilen Modus aufzurufen, drücke \":\""
msgid "To exit command line mode, press ESCAPE"
msgstr ""
msgstr "Um den Kommandozeilen Modus zu beenden, drücke ESCAPE"
msgid ""
"For the complete list of available keyboard shortcuts, type `help shortcuts`"
@ -289,7 +287,7 @@ msgstr "Nicht nach einer Bestätigung fragen."
#, javascript-format
msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
msgstr ""
"Datei \"%s\" wird importiert in das existierende Notizbuch \"%s\". "
"Datei \"%s\" wird in das existierende Notizbuch \"%s\" importiert. "
"Fortfahren?"
#, javascript-format
@ -297,7 +295,7 @@ msgid ""
"New notebook \"%s\" will be created and file \"%s\" will be imported into "
"it. Continue?"
msgstr ""
"Ein neues Notizbuch \"%s\" wird erstellt und die Datei \"%s\" wird in es "
"Neues Notizbuch \"%s\" wird erstellt und die Datei \"%s\" wird hinein "
"importiert. Fortfahren?"
#, javascript-format
@ -318,7 +316,7 @@ msgstr "Übersprungen: %d."
#, javascript-format
msgid "Resources: %d."
msgstr ""
msgstr "Anhänge: %d."
#, javascript-format
msgid "Tagged: %d."
@ -339,11 +337,12 @@ msgstr ""
"aller Notizbücher anzuzeigen."
msgid "Displays only the first top <num> notes."
msgstr "Zeigt nur die Top-<num> Notizen an."
msgstr "Zeigt nur die ersten <num> Notizen an."
#, fuzzy
msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
msgstr "Sortiert nach <field> ( z.B. Titel,"
msgstr ""
"Sortiert nach <field> ( z.B. Titel, Bearbeitungszeitpunkt, "
"Erstellungszeitpunkt)"
msgid "Reverses the sorting order."
msgstr "Dreht die Sortierreihenfolge um."
@ -353,9 +352,9 @@ msgid ""
"for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the "
"to-dos, while `-ttd` would display notes and to-dos."
msgstr ""
"Zeige nur bestimmt Typen an. Kann `n` für Notizen sein, `t` für To-Dos, oder "
"`nt` für Notizen und To-Dos ( z.B. würde `-tt` nur To-Dos anzeigen, während "
"`-ttd` Notizen und To-Dos anzeigen würde )."
"Zeigt nur bestimmte Item Typen an. Kann `n` für Notizen sein, `t` für To-"
"Dos, oder `nt` für Notizen und To-Dos ( z.B. zeigt `-tt` nur To-Dos an, "
"während `-ttd` Notizen und To-Dos anzeigt)."
msgid "Either \"text\" or \"json\""
msgstr "Entweder \"text\" oder \"json\""
@ -364,6 +363,8 @@ msgid ""
"Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
"TODO_CHECKED (for to-dos), TITLE"
msgstr ""
"Verwende ausführliches Listen Format. Das Format lautet: ID, NOTIZEN_ANZAHL "
"(für Notizbuch), DATUM, TODO_BEARBEITET (für To-Dos), TITEL"
msgid "Please select a notebook first."
msgstr "Bitte wähle erst ein Notizbuch aus."
@ -384,16 +385,17 @@ msgid "Moves the notes matching <note> to [notebook]."
msgstr "Verschiebt die Notizen, die mit <note> übereinstimmen, zu [Notizbuch]"
msgid "Renames the given <item> (note or notebook) to <name>."
msgstr "Benennt das gegebene <item> ( Notiz oder Notizbuch ) zu <name> um."
msgstr "Benennt das angegebene <item> ( Notiz oder Notizbuch ) zu <name> um."
msgid "Deletes the given notebook."
msgstr "Löscht das gegebene Notizbuch."
msgstr "Löscht das ausgewählte Notizbuch."
msgid "Deletes the notebook without asking for confirmation."
msgstr "Löscht das Notizbuch, ohne nach einer Bestätigung zu fragen."
msgid "Delete notebook? All notes within this notebook will also be deleted."
msgstr ""
"Notizbuch wirklich löschen? Alle Notizen darin werden ebenfalls gelöscht."
msgid "Deletes the notes matching <note-pattern>."
msgstr "Löscht die Notizen, die mit <note-pattern> übereinstimmen."
@ -410,27 +412,29 @@ msgid "Delete note?"
msgstr "Notiz löschen?"
msgid "Searches for the given <pattern> in all the notes."
msgstr "Sucht nach dem gegebenen <pattern> in allen Notizen."
msgstr "Sucht nach dem angegebenen <pattern> in allen Notizen."
#, fuzzy, javascript-format
#, javascript-format
msgid ""
"Sets the property <name> of the given <note> to the given [value]. Possible "
"properties are:\n"
"\n"
"%s"
msgstr ""
"Setzt die Eigenschaft <name> der gegebenen <note> zu dem gegebenen [Wert]."
"Setzt die Eigenschaft <name> der gegebenen <note> auf den gegebenen [Wert]. "
"Mögliche Werte sind:\n"
"\n"
"%s"
msgid "Displays summary about the notes and notebooks."
msgstr "Zeigt eine Zusammenfassung über die Notizen und Notizbücher an."
msgstr "Zeigt eine Zusammenfassung der Notizen und Notizbücher an."
#, fuzzy
msgid "Synchronises with remote storage."
msgstr "Synchronisiert mit "
msgstr "Synchronisiert mit Remotespeicher."
msgid "Sync to provided target (defaults to sync.target config value)"
msgstr ""
"Mit dem gegebenen Ziel synchronisieren ( voreingestellt auf den sync.target "
"Mit dem angegebenen Ziel synchronisieren (voreingestellt auf den sync.target "
"Optionswert)"
msgid "Synchronisation is already in progress."
@ -444,12 +448,12 @@ msgid ""
msgstr ""
"Eine Sperrdatei ist vorhanden. Wenn du dir sicher bist, dass keine "
"Synchronisation im Gange ist, kannst du die Sperrdatei \"%s\" löschen und "
"vortfahren."
"fortfahren."
msgid ""
"Authentication was not completed (did not receive an authentication token)."
msgstr ""
"Authentikation wurde nicht abgeschlossen (keinen Authentikations-Token "
"Authentifizierung wurde nicht abgeschlossen (keinen Authentifizierung-Token "
"erhalten)."
#, javascript-format
@ -480,7 +484,6 @@ msgstr ""
msgid "Invalid command: \"%s\""
msgstr "Ungültiger Befehl: \"%s\""
#, fuzzy
msgid ""
"<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
"toggle the given to-do between completed and uncompleted state (If the "
@ -489,8 +492,8 @@ msgid ""
msgstr ""
"<todo-command> kann entweder \"toggle\" oder \"clear\" sein. Benutze \"toggle"
"\", um ein To-Do abzuschließen, oder es zu beginnen (Wenn das Ziel eine "
"normale Notiz ist, wird es zu einem To-Do umgewandelt). Benutze \"clear\", "
"um es zurück zu einem To-Do zu verwandeln."
"normale Notiz ist, wird diese in ein To-Do umgewandelt). Benutze \"clear\", "
"um es zurück in ein To-Do zu verwandeln."
msgid "Marks a to-do as non-completed."
msgstr "Makiert ein To-Do als nicht-abgeschlossen."
@ -499,8 +502,8 @@ msgid ""
"Switches to [notebook] - all further operations will happen within this "
"notebook."
msgstr ""
"Wechselt zu [Notizbuch] - alle weiteren Tätigkeiten werden in diesem "
"Notizbuch verrichtet."
"Wechselt zu [Notizbuch] - alle weiteren Aktionen werden in diesem Notizbuch "
"ausgeführt."
msgid "Displays version information"
msgstr "Zeigt die Versionsnummer an"
@ -533,10 +536,10 @@ msgstr "Schwerwiegender Fehler:"
msgid ""
"The application has been authorised - you may now close this browser tab."
msgstr ""
"Das Programm wurde authorisiert - Du kannst nun diesen Browsertab schließen."
"Das Programm wurde autorisiert - Du kannst diesen Browsertab nun schließen."
msgid "The application has been successfully authorised."
msgstr "Das Programm wurde erfolgreich authorisiert."
msgstr "Das Programm wurde erfolgreich autorisiert."
msgid ""
"Please open the following URL in your browser to authenticate the "
@ -548,8 +551,8 @@ msgstr ""
"Bitte öffne die folgende URL in deinem Browser, um das Programm zu "
"authentifizieren. Das Programm wird einen Ordner in \"Apps/Joplin\" "
"erstellen und wird nur in diesem Ordner schreiben und lesen. Es wird weder "
"Zugriff auf Dateien außerhalb dieses Ordners haben, noch auf persönliche "
"Daten. Es werden keine Daten mit Dritten geteilt."
"Zugriff auf Dateien außerhalb dieses Ordners haben, noch auf andere "
"persönliche Daten. Es werden keine Daten mit Dritten geteilt."
msgid "Search:"
msgstr "Suchen:"
@ -562,6 +565,13 @@ msgid ""
"\n"
"For example, to create a notebook press `mb`; to create a note press `mn`."
msgstr ""
"Willkommen bei Joplin!\n"
"\n"
"Tippe `:help shortcuts` für eine Liste der Shortcuts oder `:help` für "
"Nutzungsinformationen ein.\n"
"\n"
"Um zum Beispiel ein Notizbuch zu erstellen, drücke `mb`; um eine Notiz zu "
"erstellen drücke `mn`."
msgid "File"
msgstr "Datei"
@ -579,7 +589,7 @@ msgid "Import Evernote notes"
msgstr "Evernote Notizen importieren"
msgid "Evernote Export Files"
msgstr ""
msgstr "Evernote Export Dateien"
msgid "Quit"
msgstr "Verlassen"
@ -602,9 +612,8 @@ msgstr "Alle Notizen durchsuchen"
msgid "Tools"
msgstr "Werkzeuge"
#, fuzzy
msgid "Synchronisation status"
msgstr "Synchronisationsziel"
msgstr "Status der Synchronisation"
msgid "Options"
msgstr "Optionen"
@ -630,11 +639,77 @@ msgstr "Abbrechen"
#, javascript-format
msgid "Notes and settings are stored in: %s"
msgstr ""
msgstr "Notizen und Einstellungen gespeichert in: %s"
msgid "Save"
msgstr "Speichern"
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr "Aktiv"
msgid "ID"
msgstr "ID"
msgid "Source"
msgstr "Quelle"
msgid "Created"
msgstr "Erstellt"
msgid "Updated"
msgstr "Aktualisiert"
msgid "Password"
msgstr "Passwort"
msgid "Password OK"
msgstr "Passwort OK"
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
"Hinweis: Nur ein Hauptschlüssel wird für die Verschlüsselung verwendet (der "
"als \"aktiv\" markierte). Jeder der Schlüssel kann für die Entschlüsselung "
"verwendet werden, abhängig davon, wie die jeweiligen Notizen oder "
"Notizbücher ursprünglich verschlüsselt wurden."
msgid "Status"
msgstr "Status"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Deaktiviert"
msgid "Disabled"
msgstr "Deaktiviert"
msgid "Back"
msgstr "Zurück"
@ -642,14 +717,14 @@ msgstr "Zurück"
msgid ""
"New notebook \"%s\" will be created and file \"%s\" will be imported into it"
msgstr ""
"Ein neues Notizbuch \"%s\" wird erstellt und die Datei \"%s\" wird in es "
"Neues Notizbuch \"%s\" wird erstellt und die Datei \"%s\" wird hinein "
"importiert"
msgid "Please create a notebook first."
msgstr "Bitte erstelle zuerst ein Notizbuch."
msgid "Note title:"
msgstr "Notiz Titel:"
msgstr "Notizen Titel:"
msgid "Please create a notebook first"
msgstr "Bitte erstelle zuerst ein Notizbuch"
@ -675,40 +750,17 @@ msgstr "Alarm erstellen:"
msgid "Layout"
msgstr "Layout"
#, fuzzy
msgid "Some items cannot be synchronised."
msgstr "Kann Synchronisierer nicht initialisieren."
msgstr "Manche Objekte können nicht synchronisiert werden."
msgid "View them now"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
msgstr "Zeige sie jetzt an"
#, fuzzy
msgid "Created"
msgstr "Erstellt: %d."
msgid "Some items cannot be decrypted."
msgstr "Kann Synchronisierer nicht initialisieren."
#, fuzzy
msgid "Updated"
msgstr "Aktualisiert: %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -728,12 +780,11 @@ msgstr ""
"Hier sind noch keine Notizen. Erstelle eine, indem du auf \"Neue Notiz\" "
"drückst."
#, fuzzy
msgid ""
"There is currently no notebook. Create one by clicking on \"New notebook\"."
msgstr ""
"Momentan existieren noch keine Notizen. Erstelle eine, indem du auf den (+) "
"Knopf drückst."
"Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf den "
"(+) Knopf drückst."
#, javascript-format
msgid "Unsupported link or message: %s"
@ -752,17 +803,19 @@ msgid "Clear"
msgstr ""
msgid "OneDrive Login"
msgstr "OneDrive login"
msgstr "OneDrive Login"
msgid "Import"
msgstr "Importieren"
#, fuzzy
msgid "Synchronisation Status"
msgstr "Synchronisationsziel"
msgstr "Synchronisations Status"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "Diese Markierung von allen Notizen löschen?"
msgstr "Diese Markierung von allen Notizen entfernen?"
msgid "Remove this search from the sidebar?"
msgstr "Diese Suche von der Seitenleiste entfernen?"
@ -782,15 +835,13 @@ msgstr "Markierungen"
msgid "Searches"
msgstr "Suchen"
#, fuzzy
msgid "Please select where the sync status should be exported to"
msgstr ""
"Wähle bitte zuerst eine Notiz oder ein Notizbuch aus, das gelöscht werden "
"soll."
"Bitte wähle aus, wohin der Synchronisations Status exportiert werden soll"
#, fuzzy, javascript-format
#, javascript-format
msgid "Usage: %s"
msgstr "Benutzung: %s"
msgstr "Nutzung: %s"
#, javascript-format
msgid "Unknown flag: %s"
@ -803,22 +854,22 @@ msgid "OneDrive"
msgstr "OneDrive"
msgid "OneDrive Dev (For testing only)"
msgstr "OneDrive Dev ( Nur für Tests )"
msgstr "OneDrive Dev (Nur für Tests)"
#, javascript-format
msgid "Unknown log level: %s"
msgstr "Unbekanntes Loglevel: %s"
msgstr "Unbekanntes Log Level: %s"
#, javascript-format
msgid "Unknown level ID: %s"
msgstr "Unbekannte Level-ID: %s"
msgstr "Unbekannte Level ID: %s"
msgid ""
"Cannot refresh token: authentication data is missing. Starting the "
"synchronisation again may fix the problem."
msgstr ""
"Kann Token nicht erneuern: Authentikationsdaten nicht vorhanden. Ein "
"Neustart der Synchronisation behebt das Problem vielleicht."
"Kann Token nicht erneuern: Authentifikationsdaten nicht vorhanden. Ein "
"Neustart der Synchronisation könnte das Problem beheben."
msgid ""
"Could not synchronize with OneDrive.\n"
@ -833,7 +884,7 @@ msgstr ""
"Dieser Fehler kommt oft vor, wenn OneDrive Business benutzt wird, das leider "
"nicht unterstützt wird.\n"
"\n"
"Bitte benutze stattdessen einen normalen OneDrive account."
"Bitte benutze stattdessen einen normalen OneDrive Account."
#, javascript-format
msgid "Cannot access %s"
@ -841,27 +892,27 @@ msgstr "Kann nicht auf %s zugreifen"
#, javascript-format
msgid "Created local items: %d."
msgstr ""
msgstr "Lokale Objekte erstellt: %d."
#, javascript-format
msgid "Updated local items: %d."
msgstr ""
msgstr "Lokale Objekte aktualisiert: %d."
#, javascript-format
msgid "Created remote items: %d."
msgstr ""
msgstr "Remote Objekte erstellt: %d."
#, javascript-format
msgid "Updated remote items: %d."
msgstr ""
msgstr "Remote Objekte aktualisiert: %d."
#, javascript-format
msgid "Deleted local items: %d."
msgstr ""
msgstr "Lokale Objekte gelöscht: %d."
#, javascript-format
msgid "Deleted remote items: %d."
msgstr ""
msgstr "Remote Objekte gelöscht: %d."
#, javascript-format
msgid "State: \"%s\"."
@ -905,15 +956,15 @@ msgid "Cannot move note to \"%s\" notebook"
msgstr "Kann Notiz nicht zu Notizbuch \"%s\" verschieben"
msgid "Text editor"
msgstr "Textbearbeitungsprogramm"
msgstr "Textverarbeitungsprogramm"
msgid ""
"The editor that will be used to open a note. If none is provided it will try "
"to auto-detect the default editor."
msgstr ""
"Das Textbearbeitungsprogramm, mit dem Notizen geöffnet werden. Wenn keines "
"Das Textverarbeitungsprogramm, mit dem Notizen geöffnet werden. Wenn keines "
"ausgewählt wurde, wird Joplin versuchen das standard-"
"Textbearbeitungsprogramm zu erkennen."
"Textverarbeitungsprogramm zu erkennen."
msgid "Language"
msgstr "Sprache"
@ -934,7 +985,7 @@ msgid "Dark"
msgstr "Dunkel"
msgid "Show uncompleted todos on top of the lists"
msgstr "Unvollständige To-Dos oben in der Liste anzeigen"
msgstr "Zeige unvollständige To-Dos oben in der Liste"
msgid "Save geo-location with notes"
msgstr "Momentanen Standort zusammen mit Notizen speichern"
@ -942,9 +993,6 @@ msgstr "Momentanen Standort zusammen mit Notizen speichern"
msgid "Synchronisation interval"
msgstr "Synchronisationsinterval"
msgid "Disabled"
msgstr "Deaktiviert"
#, javascript-format
msgid "%d minutes"
msgstr "%d Minuten"
@ -971,11 +1019,11 @@ msgid ""
"`sync.2.path` to specify the target directory."
msgstr ""
"Das Synchronisationsziel, mit dem synchronisiert werden soll. Wenn mit dem "
"Dateisystem synchronisiert werden soll, setz den Wert zu `sync.2.path`, um "
"Dateisystem synchronisiert werden soll, setze den Wert zu `sync.2.path`, um "
"den Zielpfad zu spezifizieren."
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgstr "Verzeichnis zum synchronisieren (absoluter Pfad)"
msgid ""
"The path to synchronise with when file system synchronisation is enabled. "
@ -989,15 +1037,14 @@ msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr "Ungültiger Optionswert: \"%s\". Mögliche Werte sind: %s."
msgid "Items that cannot be synchronised"
msgstr ""
msgstr "Objekte können nicht synchronisiert werden"
#, javascript-format
msgid "\"%s\": \"%s\""
msgstr "\"%s\": \"%s\""
msgid "Sync status (synced items / total items)"
msgstr ""
"Synchronisationsstatus (synchronisierte Notizen / vorhandenen Notizen )"
msgstr "Synchronisationsstatus (synchronisierte Objekte / gesamte Objekte)"
#, javascript-format
msgid "%s: %d/%d"
@ -1009,11 +1056,11 @@ msgstr "Insgesamt: %d/%d"
#, javascript-format
msgid "Conflicted: %d"
msgstr ""
msgstr "In Konflikt %d"
#, fuzzy, javascript-format
#, javascript-format
msgid "To delete: %d"
msgstr "Zu löschende Notizen: %d"
msgstr "Zu löschen: %d"
msgid "Folders"
msgstr "Ordner"
@ -1040,9 +1087,6 @@ msgstr "Sollen diese Notizen gelöscht werden?"
msgid "Log"
msgstr "Log"
msgid "Status"
msgstr "Status"
msgid "Export Debug Report"
msgstr "Fehlerbreicht exportieren"
@ -1050,14 +1094,14 @@ msgid "Configuration"
msgstr "Konfiguration"
msgid "Move to notebook..."
msgstr "Zu Notizbuch verschieben..."
msgstr "In Notizbuch verschieben..."
#, javascript-format
msgid "Move %d notes to notebook \"%s\"?"
msgstr "%d Notizen zu dem Notizbuch \"%s\" verschieben?"
msgstr "%d Notizen in das Notizbuch \"%s\" verschieben?"
msgid "Select date"
msgstr "Datum ausswählen"
msgstr "Datum auswählen"
msgid "Confirm"
msgstr "Bestätigen"
@ -1092,10 +1136,10 @@ msgid "Attach any file"
msgstr "Beliebige Datei anhängen"
msgid "Convert to note"
msgstr "Zu einer Notiz umwandeln"
msgstr "In eine Notiz umwandeln"
msgid "Convert to todo"
msgstr "Zu einem To-Do umwandeln"
msgstr "In ein To-Do umwandeln"
msgid "Hide metadata"
msgstr "Metadaten verstecken"
@ -1117,19 +1161,16 @@ msgid ""
"menu to access your existing notebooks."
msgstr ""
"Drücke auf den (+) Knopf, um eine neue Notiz oder ein neues Notizbuch zu "
"erstellen."
"erstellen. Tippe auf die Seitenleiste, um auf deine existierenden "
"Notizbücher zuzugreifen."
msgid "You currently have no notebook. Create one by clicking on (+) button."
msgstr ""
"Du hast noch kein Notizbuch. Du kannst eines erstellen, indem du auf den (+) "
"Knopf drückst."
"Du hast noch kein Notizbuch. Erstelle eines, indem du auf den (+) Knopf "
"drückst."
msgid "Welcome"
msgstr "Wilkommen"
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Kann Synchronisierer nicht initialisieren."
msgstr "Willkommen"
#~ msgid "Delete notebook?"
#~ msgstr "Notizbuch löschen?"

View File

@ -559,6 +559,67 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
msgid "Created"
msgstr ""
msgid "Updated"
msgstr ""
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr ""
msgid "Encryption is:"
msgstr ""
msgid "Enabled"
msgstr ""
msgid "Disabled"
msgstr ""
msgid "Back"
msgstr ""
@ -603,31 +664,10 @@ msgstr ""
msgid "View them now"
msgstr ""
msgid "Active"
msgid "Some items cannot be decrypted."
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
msgid "Created"
msgstr ""
msgid "Updated"
msgstr ""
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -674,6 +714,9 @@ msgstr ""
msgid "Synchronisation Status"
msgstr ""
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr ""
@ -840,9 +883,6 @@ msgstr ""
msgid "Synchronisation interval"
msgstr ""
msgid "Disabled"
msgstr ""
#, javascript-format
msgid "%d minutes"
msgstr ""
@ -930,9 +970,6 @@ msgstr ""
msgid "Log"
msgstr ""
msgid "Status"
msgstr ""
msgid "Export Debug Report"
msgstr ""

View File

@ -615,6 +615,70 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Creado: %d."
#, fuzzy
msgid "Updated"
msgstr "Actualizado: %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr "Estatus"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Deshabilitado"
msgid "Disabled"
msgstr "Deshabilitado"
#, fuzzy
msgid "Back"
msgstr "Retroceder"
@ -662,33 +726,11 @@ msgstr "No se puede inicializar sincronizador."
msgid "View them now"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Creado: %d."
msgid "Some items cannot be decrypted."
msgstr "No se puede inicializar sincronizador."
#, fuzzy
msgid "Updated"
msgstr "Actualizado: %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -739,6 +781,9 @@ msgstr "Importar"
msgid "Synchronisation Status"
msgstr "Sincronización de objetivo"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "Remover esta etiqueta de todas las notas?"
@ -922,9 +967,6 @@ msgstr "Guardar notas con geo-licalización"
msgid "Synchronisation interval"
msgstr "Intervalo de sincronización"
msgid "Disabled"
msgstr "Deshabilitado"
#, javascript-format
msgid "%d minutes"
msgstr "%d minutos"
@ -1021,9 +1063,6 @@ msgstr "Borrar estas notas?"
msgid "Log"
msgstr "Log"
msgid "Status"
msgstr "Estatus"
#, fuzzy
msgid "Export Debug Report"
msgstr "Exportar reporte depuracion"
@ -1111,10 +1150,6 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenido"
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "No se puede inicializar sincronizador."
#~ msgid "Delete notebook?"
#~ msgstr "Eliminar libreta?"

View File

@ -629,6 +629,68 @@ msgstr "Las notas y los ajustes se guardan en: %s"
msgid "Save"
msgstr "Guardar"
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr "ID"
msgid "Source"
msgstr "Origen"
msgid "Created"
msgstr "Creado"
msgid "Updated"
msgstr "Actualizado"
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr "Estado"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Deshabilitado"
msgid "Disabled"
msgstr "Deshabilitado"
msgid "Back"
msgstr "Atrás"
@ -673,31 +735,11 @@ msgstr "No se han podido sincronizar algunos de los elementos."
msgid "View them now"
msgstr "Verlos ahora"
msgid "Active"
msgstr ""
#, fuzzy
msgid "Some items cannot be decrypted."
msgstr "No se han podido sincronizar algunos de los elementos."
msgid "ID"
msgstr "ID"
msgid "Source"
msgstr "Origen"
msgid "Created"
msgstr "Creado"
msgid "Updated"
msgstr "Actualizado"
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -744,6 +786,9 @@ msgstr "Importar"
msgid "Synchronisation Status"
msgstr "Estado de la sincronización"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "¿Desea eliminar esta etiqueta de todas las notas?"
@ -921,9 +966,6 @@ msgstr "Guardar geolocalización en las notas"
msgid "Synchronisation interval"
msgstr "Intervalo de sincronización"
msgid "Disabled"
msgstr "Deshabilitado"
#, javascript-format
msgid "%d minutes"
msgstr "%d minutos"
@ -1015,9 +1057,6 @@ msgstr "¿Desea borrar estas notas?"
msgid "Log"
msgstr "Log"
msgid "Status"
msgstr "Estado"
msgid "Export Debug Report"
msgstr "Exportar informe de depuración"
@ -1101,10 +1140,6 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenido"
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "No se han podido sincronizar algunos de los elementos."
#~ msgid "Delete notebook?"
#~ msgstr "Eliminar libreta?"

View File

@ -611,6 +611,70 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Créés : %d."
#, fuzzy
msgid "Updated"
msgstr "Mis à jour : %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr "État"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Désactivé"
msgid "Disabled"
msgstr "Désactivé"
msgid "Back"
msgstr "Retour"
@ -659,33 +723,11 @@ msgstr "Impossible d'initialiser la synchronisation."
msgid "View them now"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Créés : %d."
msgid "Some items cannot be decrypted."
msgstr "Impossible d'initialiser la synchronisation."
#, fuzzy
msgid "Updated"
msgstr "Mis à jour : %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -738,6 +780,9 @@ msgstr "Importer"
msgid "Synchronisation Status"
msgstr "Cible de la synchronisation"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "Enlever cette étiquette de toutes les notes ?"
@ -909,9 +954,6 @@ msgstr "Enregistrer l'emplacement avec les notes"
msgid "Synchronisation interval"
msgstr "Intervalle de synchronisation"
msgid "Disabled"
msgstr "Désactivé"
#, javascript-format
msgid "%d minutes"
msgstr "%d minutes"
@ -1005,9 +1047,6 @@ msgstr "Supprimer ces notes ?"
msgid "Log"
msgstr "Journal"
msgid "Status"
msgstr "État"
msgid "Export Debug Report"
msgstr "Exporter rapport de débogage"
@ -1092,10 +1131,6 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenue"
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Impossible d'initialiser la synchronisation."
#~ msgid "Delete notebook?"
#~ msgstr "Supprimer le carnet ?"

View File

@ -637,6 +637,68 @@ msgstr "Bilješke i postavke su pohranjene u: %s"
msgid "Save"
msgstr "Spremi"
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr "ID"
msgid "Source"
msgstr "Izvor"
msgid "Created"
msgstr "Stvoreno"
msgid "Updated"
msgstr "Ažurirano"
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr "Status"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Onemogućeno"
msgid "Disabled"
msgstr "Onemogućeno"
msgid "Back"
msgstr "Natrag"
@ -683,31 +745,11 @@ msgstr "Neke stavke se ne mogu sinkronizirati."
msgid "View them now"
msgstr "Pogledaj ih sada"
msgid "Active"
msgstr ""
#, fuzzy
msgid "Some items cannot be decrypted."
msgstr "Neke stavke se ne mogu sinkronizirati."
msgid "ID"
msgstr "ID"
msgid "Source"
msgstr "Izvor"
msgid "Created"
msgstr "Stvoreno"
msgid "Updated"
msgstr "Ažurirano"
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -754,6 +796,9 @@ msgstr "Uvoz"
msgid "Synchronisation Status"
msgstr "Status Sinkronizacije"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "Makni ovu oznaku iz svih bilješki?"
@ -928,9 +973,6 @@ msgstr "Spremi geolokacijske podatke sa bilješkama"
msgid "Synchronisation interval"
msgstr "Interval sinkronizacije"
msgid "Disabled"
msgstr "Onemogućeno"
#, javascript-format
msgid "%d minutes"
msgstr "%d minuta"
@ -1022,9 +1064,6 @@ msgstr "Obriši ove bilješke?"
msgid "Log"
msgstr "Log"
msgid "Status"
msgstr "Status"
msgid "Export Debug Report"
msgstr "Izvezi Debug izvještaj"
@ -1106,7 +1145,3 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
msgid "Welcome"
msgstr "Dobro došli"
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Neke stavke se ne mogu sinkronizirati."

View File

@ -615,6 +615,70 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Creato: %d."
#, fuzzy
msgid "Updated"
msgstr "Aggiornato: %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr "Stato"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Disabilitato"
msgid "Disabled"
msgstr "Disabilitato"
msgid "Back"
msgstr "Indietro"
@ -659,33 +723,11 @@ msgstr "Alcuni elementi non possono essere sincronizzati."
msgid "View them now"
msgstr "Mostrali ora"
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Creato: %d."
msgid "Some items cannot be decrypted."
msgstr "Alcuni elementi non possono essere sincronizzati."
#, fuzzy
msgid "Updated"
msgstr "Aggiornato: %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -733,6 +775,9 @@ msgstr "Importa"
msgid "Synchronisation Status"
msgstr "Stato della Sincronizzazione"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "Rimuovere questa etichetta da tutte le note?"
@ -910,9 +955,6 @@ msgstr "Salva geo-localizzazione con le note"
msgid "Synchronisation interval"
msgstr "Intervallo di sincronizzazione"
msgid "Disabled"
msgstr "Disabilitato"
#, javascript-format
msgid "%d minutes"
msgstr "%d minuti"
@ -1005,9 +1047,6 @@ msgstr "Cancellare queste note?"
msgid "Log"
msgstr "Log"
msgid "Status"
msgstr "Stato"
msgid "Export Debug Report"
msgstr "Esporta il Report di Debug"
@ -1092,10 +1131,6 @@ msgstr ""
msgid "Welcome"
msgstr "Benvenuto"
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Alcuni elementi non possono essere sincronizzati."
#~ msgid "Delete notebook?"
#~ msgstr "Eliminare il blocco note?"

1134
CliClient/locales/ja_JP.po Normal file

File diff suppressed because it is too large Load Diff

View File

@ -559,6 +559,67 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
msgid "Created"
msgstr ""
msgid "Updated"
msgstr ""
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr ""
msgid "Encryption is:"
msgstr ""
msgid "Enabled"
msgstr ""
msgid "Disabled"
msgstr ""
msgid "Back"
msgstr ""
@ -603,31 +664,10 @@ msgstr ""
msgid "View them now"
msgstr ""
msgid "Active"
msgid "Some items cannot be decrypted."
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
msgid "Created"
msgstr ""
msgid "Updated"
msgstr ""
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -674,6 +714,9 @@ msgstr ""
msgid "Synchronisation Status"
msgstr ""
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr ""
@ -840,9 +883,6 @@ msgstr ""
msgid "Synchronisation interval"
msgstr ""
msgid "Disabled"
msgstr ""
#, javascript-format
msgid "%d minutes"
msgstr ""
@ -930,9 +970,6 @@ msgstr ""
msgid "Log"
msgstr ""
msgid "Status"
msgstr ""
msgid "Export Debug Report"
msgstr ""

View File

@ -610,6 +610,70 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Criado: %d."
#, fuzzy
msgid "Updated"
msgstr "Atualizado: %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr "Status"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Desabilitado"
msgid "Disabled"
msgstr "Desabilitado"
msgid "Back"
msgstr "Voltar"
@ -656,33 +720,11 @@ msgstr "Não é possível inicializar o sincronizador."
msgid "View them now"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr ""
msgid "Source"
msgstr ""
#, fuzzy
msgid "Created"
msgstr "Criado: %d."
msgid "Some items cannot be decrypted."
msgstr "Não é possível inicializar o sincronizador."
#, fuzzy
msgid "Updated"
msgstr "Atualizado: %d."
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -731,6 +773,9 @@ msgstr "Importar"
msgid "Synchronisation Status"
msgstr "Alvo de sincronização"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "Remover esta tag de todas as notas?"
@ -909,9 +954,6 @@ msgstr "Salvar geolocalização com notas"
msgid "Synchronisation interval"
msgstr "Intervalo de sincronização"
msgid "Disabled"
msgstr "Desabilitado"
#, javascript-format
msgid "%d minutes"
msgstr "%d minutos"
@ -1003,9 +1045,6 @@ msgstr "Excluir estas notas?"
msgid "Log"
msgstr "Log"
msgid "Status"
msgstr "Status"
msgid "Export Debug Report"
msgstr "Exportar Relatório de Debug"
@ -1088,10 +1127,6 @@ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
msgid "Welcome"
msgstr "Bem-vindo"
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Não é possível inicializar o sincronizador."
#~ msgid "Delete notebook?"
#~ msgstr "Excluir caderno?"

View File

@ -624,6 +624,68 @@ msgstr "Заметки и настройки сохранены в: %s"
msgid "Save"
msgstr "Сохранить"
msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent unencrypted to the sync target. Do you wish to "
"continue?"
msgstr ""
msgid ""
"Enabling encryption means *all* your notes and attachments are going to be "
"re-synchronised and sent encrypted to the sync target. Do not lose the "
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
msgid "Disable encryption"
msgstr ""
msgid "Enable encryption"
msgstr ""
msgid "Master Keys"
msgstr ""
msgid "Active"
msgstr ""
msgid "ID"
msgstr "ID"
msgid "Source"
msgstr "Источник"
msgid "Created"
msgstr "Создана"
msgid "Updated"
msgstr "Обновлена"
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgstr ""
msgid "Status"
msgstr "Статус"
msgid "Encryption is:"
msgstr ""
#, fuzzy
msgid "Enabled"
msgstr "Отключена"
msgid "Disabled"
msgstr "Отключена"
msgid "Back"
msgstr "Назад"
@ -668,31 +730,11 @@ msgstr "Некоторые элементы не могут быть синхр
msgid "View them now"
msgstr "Просмотреть их сейчас"
msgid "Active"
msgstr ""
#, fuzzy
msgid "Some items cannot be decrypted."
msgstr "Некоторые элементы не могут быть синхронизированы."
msgid "ID"
msgstr "ID"
msgid "Source"
msgstr "Источник"
msgid "Created"
msgstr "Создана"
msgid "Updated"
msgstr "Обновлена"
msgid "Password"
msgstr ""
msgid "Password OK"
msgstr ""
msgid ""
"Note: Only one master key is going to be used for encryption (the one marked "
"as \"active\"). Any of the keys might be used for decryption, depending on "
"how the notes or notebooks were originally encrypted."
msgid "Set the password"
msgstr ""
msgid "Add or remove tags"
@ -739,6 +781,9 @@ msgstr "Импорт"
msgid "Synchronisation Status"
msgstr "Статус синхронизации"
msgid "Encryption Options"
msgstr ""
msgid "Remove this tag from all the notes?"
msgstr "Убрать этот тег со всех заметок?"
@ -915,9 +960,6 @@ msgstr "Сохранять информацию о геолокации в за
msgid "Synchronisation interval"
msgstr "Интервал синхронизации"
msgid "Disabled"
msgstr "Отключена"
#, javascript-format
msgid "%d minutes"
msgstr "%d минут"
@ -1009,9 +1051,6 @@ msgstr "Удалить эти заметки?"
msgid "Log"
msgstr "Лог"
msgid "Status"
msgstr "Статус"
msgid "Export Debug Report"
msgstr "Экспортировать отладочный отчёт"

1093
CliClient/locales/zh_CN.po Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "joplin",
"version": "0.10.83",
"version": "0.10.85",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -14,11 +14,12 @@
"title": "Joplin CLI",
"years": [
2016,
2017
2017,
2018
],
"owner": "Laurent Cozic"
},
"version": "0.10.84",
"version": "0.10.85",
"bin": {
"joplin": "./main.js"
},

View File

@ -19,7 +19,8 @@
"title": "Demo for Joplin CLI",
"years": [
2016,
2017
2017,
2018
],
"owner": "Laurent Cozic"
},

View File

@ -300,7 +300,7 @@ class Application extends BaseApplication {
let message = [
p.description,
'',
'Copyright © 2016-2017 Laurent Cozic',
'Copyright © 2016-2018 Laurent Cozic',
_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
];
bridge().showMessageBox({

View File

@ -36,7 +36,7 @@ class NoteTextComponent extends React.Component {
isLoading: true,
webviewReady: false,
scrollHeight: null,
editorScrollTop: 0,
editorScrollTop: 0
};
this.lastLoadedNoteId_ = null;
@ -167,6 +167,12 @@ class NoteTextComponent extends React.Component {
async componentWillReceiveProps(nextProps) {
if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) {
await this.reloadNote(nextProps);
if(this.editor_){
const session = this.editor_.editor.getSession();
const undoManager = session.getUndoManager();
undoManager.reset();
session.setUndoManager(undoManager);
}
}
if ('syncStarted' in nextProps && !nextProps.syncStarted && !this.isModified()) {
@ -334,6 +340,7 @@ class NoteTextComponent extends React.Component {
this.scheduleSave();
}
async commandAttachFile() {
const noteId = this.props.noteId;
if (!noteId) return;
@ -549,7 +556,6 @@ class NoteTextComponent extends React.Component {
delete editorRootStyle.width;
delete editorRootStyle.height;
delete editorRootStyle.fontSize;
const editor = <AceEditor
value={body}
mode="markdown"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,8 @@ locales['es_ES'] = require('./es_ES.json');
locales['fr_FR'] = require('./fr_FR.json');
locales['hr_HR'] = require('./hr_HR.json');
locales['it_IT'] = require('./it_IT.json');
locales['ja_JP'] = require('./ja_JP.json');
locales['pt_BR'] = require('./pt_BR.json');
locales['ru_RU'] = require('./ru_RU.json');
locales['zh_CN'] = require('./zh_CN.json');
module.exports = { locales: locales };

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "0.10.39",
"version": "0.10.40",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "0.10.39",
"version": "0.10.40",
"description": "Joplin for Desktop",
"main": "main.js",
"scripts": {

View File

@ -14,4 +14,4 @@ echo "Create a draft release at: https://github.com/laurent22/joplin/releases/ta
echo ""
echo "Then run:"
echo ""
echo "node $APP_DIR/update-readme-download.js && git add -A && git commit -m 'Update website' && git push"
echo "git pull && node $APP_DIR/update-readme-download.js && git add -A && git commit -m 'Update website' && git push && git push --tags"

View File

@ -1,4 +1,4 @@
Copyright (c) 2017 Laurent Cozic
Copyright (c) 2016-2018 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View File

@ -1,4 +1,4 @@
Copyright (c) 2017 Laurent Cozic
Copyright (c) 2016-2018 Laurent Cozic
L'autorisation est accordée, gracieusement, à toute personne acquérant une copie de ce logiciel et des fichiers de documentation associés (le "Logiciel"), de commercialiser le Logiciel sans restriction, notamment les droits d'utiliser, de copier, de modifier, de fusionner, de publier, de distribuer, de sous-licencier et/ou de vendre des copies du Logiciel, ainsi que d'autoriser les personnes auxquelles le Logiciel est fourni à le faire, sous réserve des conditions suivantes :

View File

@ -18,9 +18,9 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
Operating System | Download
-----------------|--------
Windows | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.39/Joplin-Setup-0.10.39.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a>
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.39/Joplin-0.10.39.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a>
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.39/Joplin-0.10.39-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a>
Windows | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.40/Joplin-Setup-0.10.40.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a>
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.40/Joplin-0.10.40.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a>
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.40/Joplin-0.10.40-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a>
## Mobile applications
@ -76,6 +76,13 @@ On the **desktop application**, open the "File" menu, click "Import Evernote not
On the **terminal application**, in [command-line mode](/terminal#command-line-mode), type `import-enex /path/to/file.enex`. This will import the notes into a new notebook named after the filename.
# Importing notes from other applications
In general the way to import notes from any application into Joplin is to convert the notes to ENEX files (Evernote format) and to import these ENEX files into Joplin using the method above. Most note-taking applications support ENEX files so it should be relatively straightforward. For help about specific applications, see below:
* Standard Notes: Please see [this tutorial](https://programadorwebvalencia.com/migrate-notes-from-standard-notes-to-joplin/)
* Tomboy Notes: Export the notes to ENEX files [as described here](https://askubuntu.com/questions/243691/how-can-i-export-my-tomboy-notes-into-evernote/608551) for example, and import these ENEX files into Joplin.
# Synchronisation
One of the goals of Joplin was to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. Most of the synchronisation process is done at an abstract level and access to external services, such as OneDrive or Dropbox, is done via lightweight drivers. It is easy to support new services by creating simple drivers that provide a filesystem-like interface, i.e. the ability to read, write, delete and list items. It is also simple to switch from one service to another or to even sync to multiple services at once. Each note, notebook, tags, as well as the relation between items is transmitted as plain text files during synchronisation, which means the data can also be moved to a different application, can be easily backed up, inspected, etc.
@ -108,7 +115,7 @@ If for any reason the notifications do not work, please [open an issue](https://
# Localisation
Joplin is currently available in English, French, Spanish, German, Portuguese and Italian. If you would like to contribute a translation, it is quite straightforward, please follow these steps:
Joplin is currently available in English, French, Spanish, German, Portuguese, Chinese, Japanese, Russian, Croatian and Italian. If you would like to contribute a translation, it is quite straightforward, please follow these steps:
- [Download Poedit](https://poedit.net/), the translation editor, and install it.
- [Download the file to be translated](https://raw.githubusercontent.com/laurent22/joplin/master/CliClient/locales/joplin.pot).
@ -134,7 +141,7 @@ This translation will apply to the three applications - desktop, mobile and term
# License
Copyright (c) 2016-2017 Laurent Cozic
Copyright (c) 2016-2018 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View File

@ -359,7 +359,7 @@ The following commands are available in [command-line mode](#command-line-mode):
# License
Copyright (c) 2016-2017 Laurent Cozic
Copyright (c) 2016-2018 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View File

@ -90,8 +90,8 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion 16
targetSdkVersion 22
versionCode 80
versionName "0.10.65"
versionCode 81
versionName "0.10.66"
ndk {
abiFilters "armeabi-v7a", "x86"
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,8 @@ locales['es_ES'] = require('./es_ES.json');
locales['fr_FR'] = require('./fr_FR.json');
locales['hr_HR'] = require('./hr_HR.json');
locales['it_IT'] = require('./it_IT.json');
locales['ja_JP'] = require('./ja_JP.json');
locales['pt_BR'] = require('./pt_BR.json');
locales['ru_RU'] = require('./ru_RU.json');
locales['zh_CN'] = require('./zh_CN.json');
module.exports = { locales: locales };

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -218,15 +218,15 @@
<tbody>
<tr>
<td>Windows</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.39/Joplin-Setup-0.10.39.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a></td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.40/Joplin-Setup-0.10.40.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a></td>
</tr>
<tr>
<td>macOS</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.39/Joplin-0.10.39.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a></td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.40/Joplin-0.10.40.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a></td>
</tr>
<tr>
<td>Linux</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.39/Joplin-0.10.39-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a></td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.40/Joplin-0.10.40-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a></td>
</tr>
</tbody>
</table>
@ -284,6 +284,12 @@ sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
<p>To import Evernote data, first export your Evernote notebooks to ENEX files as described <a href="https://help.evernote.com/hc/en-us/articles/209005557-How-to-back-up-export-and-restore-import-notes-and-notebooks">here</a>. Then follow these steps:</p>
<p>On the <strong>desktop application</strong>, open the &quot;File&quot; menu, click &quot;Import Evernote notes&quot; and select your ENEX file. This will open a new screen which will display the import progress. The notes will be imported into a new separate notebook (so that, in case of a mistake, the notes are not mixed up with any existing notes). If needed then can then be moved to a different notebook, or the notebook can be renamed, etc.</p>
<p>On the <strong>terminal application</strong>, in <a href="/terminal#command-line-mode">command-line mode</a>, type <code>import-enex /path/to/file.enex</code>. This will import the notes into a new notebook named after the filename.</p>
<h1 id="importing-notes-from-other-applications">Importing notes from other applications</h1>
<p>In general the way to import notes from any application into Joplin is to convert the notes to ENEX files (Evernote format) and to import these ENEX files into Joplin using the method above. Most note-taking applications support ENEX files so it should be relatively straightforward. For help about specific applications, see below:</p>
<ul>
<li>Standard Notes: Please see <a href="https://programadorwebvalencia.com/migrate-notes-from-standard-notes-to-joplin/">this tutorial</a></li>
<li>Tomboy Notes: Export the notes to ENEX files <a href="https://askubuntu.com/questions/243691/how-can-i-export-my-tomboy-notes-into-evernote/608551">as described here</a> for example, and import these ENEX files into Joplin.</li>
</ul>
<h1 id="synchronisation">Synchronisation</h1>
<p>One of the goals of Joplin was to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. Most of the synchronisation process is done at an abstract level and access to external services, such as OneDrive or Dropbox, is done via lightweight drivers. It is easy to support new services by creating simple drivers that provide a filesystem-like interface, i.e. the ability to read, write, delete and list items. It is also simple to switch from one service to another or to even sync to multiple services at once. Each note, notebook, tags, as well as the relation between items is transmitted as plain text files during synchronisation, which means the data can also be moved to a different application, can be easily backed up, inspected, etc.</p>
<p>Currently, synchronisation is possible with OneDrive (by default) or the local filesystem. A NextCloud driver, and a Dropbox one will also be available once <a href="https://github.com/facebook/react-native/issues/14445">this React Native bug</a> is fixed. When syncing with OneDrive, Joplin creates a sub-directory in OneDrive, in /Apps/Joplin and read/write the notes and notebooks from it. The application does not have access to anything outside this directory.</p>
@ -303,7 +309,7 @@ sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
<p>On mobile, the alarms will be displayed using the built-in notification system.</p>
<p>If for any reason the notifications do not work, please <a href="https://github.com/laurent22/joplin/issues">open an issue</a>.</p>
<h1 id="localisation">Localisation</h1>
<p>Joplin is currently available in English, French, Spanish, German, Portuguese and Italian. If you would like to contribute a translation, it is quite straightforward, please follow these steps:</p>
<p>Joplin is currently available in English, French, Spanish, German, Portuguese, Chinese, Japanese, Russian, Croatian and Italian. If you would like to contribute a translation, it is quite straightforward, please follow these steps:</p>
<ul>
<li><a href="https://poedit.net/">Download Poedit</a>, the translation editor, and install it.</li>
<li><a href="https://raw.githubusercontent.com/laurent22/joplin/master/CliClient/locales/joplin.pot">Download the file to be translated</a>.</li>
@ -327,7 +333,7 @@ sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
<li>While the mobile can sync and load tags, it is not currently possible to create new ones. The desktop and terminal apps can create, delete and edit tags.</li>
</ul>
<h1 id="license">License</h1>
<p>Copyright (c) 2016-2017 Laurent Cozic</p>
<p>Copyright (c) 2016-2018 Laurent Cozic</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>

View File

@ -516,7 +516,7 @@ version
Displays version information
</code></pre><h1 id="license">License</h1>
<p>Copyright (c) 2016-2017 Laurent Cozic</p>
<p>Copyright (c) 2016-2018 Laurent Cozic</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>