Electron release v1.0.106

added support for 'tag list -l [tag]' to show long format as for 'not…

CONTRIBUTING.md

@@ -17,3 +17,10 @@ Again, please check that it has not already been requested. If it has, simply **
 If you want to add a new feature, consider asking about it before implementing it or checking existing discussions 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.
 
 Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
+
+# Coding style
+
+There are only two rules, but not following them means the pull request will not be accepted (it can be accepted once the issues are fixed):
+
+- **Please use tabs, NOT spaces.**
+- **Please do not add or remove optional characters, such as spaces or colons.** Please setup your editor so that it only changes what you are working on and is not making automated changes elsewhere. The reason for this is that small white space changes make diff hard to read and can cause needless conflicts.

CliClient/app/command-e2ee.js

@@ -47,30 +47,35 @@ class Command extends BaseCommand {
 		}
 
 		if (args.command === 'decrypt') {
-			this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
+			if (args.path) {
+				const plainText = await EncryptionService.instance().decryptString(args.path);
+				this.stdout(plainText);
+			} else {
+				this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
 
-			while (true) {
-				try {
-					await DecryptionWorker.instance().start();
-					break;
-				} catch (error) {
-					if (error.code === 'masterKeyNotLoaded') {
-						const masterKeyId = error.masterKeyId;
-						const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
-						if (!password) {
-							this.stdout(_('Operation cancelled'));
-							return;
+				while (true) {
+					try {
+						await DecryptionWorker.instance().start();
+						break;
+					} catch (error) {
+						if (error.code === 'masterKeyNotLoaded') {
+							const masterKeyId = error.masterKeyId;
+							const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
+							if (!password) {
+								this.stdout(_('Operation cancelled'));
+								return;
+							}
+							Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
+							await EncryptionService.instance().loadMasterKeysFromSettings();
+							continue;
 						}
-						Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
-						await EncryptionService.instance().loadMasterKeysFromSettings();
-						continue;
+
+						throw error;
 					}
-
-					throw error;
 				}
-			}
 
-			this.stdout(_('Completed decryption.'));
+				this.stdout(_('Completed decryption.'));
+			}
 
 			return;
 		}

CliClient/app/command-ls.js

@@ -22,7 +22,7 @@ class Command extends BaseCommand {
 	enabled() {
 		return false;
 	}
-	
+
 	options() {
 		return [
 			['-n, --limit <num>', _('Displays only the first top <num> notes.')],
@@ -93,7 +93,7 @@ class Command extends BaseCommand {
 						row.push(await Folder.noteCount(item.id));
 					}
 
-					row.push(time.unixMsToLocalDateTime(item.user_updated_time));
+					row.push(time.formatMsToLocal(item.user_updated_time));
 				}
 
 				let title = item.title;
@@ -123,4 +123,4 @@ class Command extends BaseCommand {
 
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-tag.js

@@ -3,6 +3,7 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
+const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
 
@@ -11,11 +12,19 @@ class Command extends BaseCommand {
 	}
 
 	description() {
-		return _('<tag-command> can be "add", "remove" or "list" to assign or remove [tag] from [note], or to list the notes associated with [tag]. The command `tag list` can be used to list all the tags.');
+		return _('<tag-command> can be "add", "remove" or "list" to assign or remove [tag] from [note], or to list the notes associated with [tag]. The command `tag list` can be used to list all the tags (use -l for long option).');
 	}
-	
+
+	options() {
+		return [
+			['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE')],
+		];
+	}
+
 	async action(args) {
 		let tag = null;
+		let options = args.options;
+
 		if (args.tag) tag = await app().loadItem(BaseModel.TYPE_TAG, args.tag);
 		let notes = [];
 		if (args.note) {
@@ -41,7 +50,28 @@ class Command extends BaseCommand {
 		} else if (command == 'list') {
 			if (tag) {
 				let notes = await Tag.notes(tag.id);
-				notes.map((note) => { this.stdout(note.title); });
+				notes.map((note) => {
+					let line = '';
+					if (options.long) {
+						line += BaseModel.shortId(note.id);
+						line += ' ';
+						line += time.formatMsToLocal(note.user_updated_time);
+						line += ' ';
+					}
+					if (note.is_todo) {
+						line += '[';
+						if (note.todo_completed) {
+						   line += 'X';
+						} else {
+							line += ' ';
+						}
+						line += '] ';
+					} else {
+						line += '	';
+					}
+					line += note.title;
+					this.stdout(line);
+				});
 			} else {
 				let tags = await Tag.all();
 				tags.map((tag) => { this.stdout(tag.title); });

CliClient/locales/ca.po

@@ -638,6 +638,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -769,12 +772,15 @@ msgstr "Comprova la configuració de la sincronització"
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes i la configuració es desen a: %s"
 
-msgid "Save"
-msgstr "Desa"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr "Tramet"
 
+msgid "Save"
+msgstr "Desa"
+
 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 "
@@ -913,6 +919,13 @@ msgstr "Establiu la contrasenya"
 msgid "Add or remove tags"
 msgstr "Afegeix o suprimeix etiquetes"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Copia"
+
 msgid "Switch between note and to-do type"
 msgstr "Alterna entre el tipus nota i tasques pendents"
 
@@ -947,6 +960,9 @@ msgstr "Anomena i desa..."
 msgid "Copy path to clipboard"
 msgstr "Copia el camí al porta-retalls"
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Missatge o enllaç no suportat: %s"
@@ -1220,16 +1236,6 @@ msgstr "No es pot copiar la nota al bloc de notes «%s»"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "No es pot moure la nota al bloc de notes «%s»"
 
-msgid "Text editor"
-msgstr "Editor de text"
-
-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 ""
-"L'editor que s'usarà per a obrir una nota. Si no s'indica cap, intentarà "
-"detectar automàticament l'editor predeterminat."
-
 msgid "Language"
 msgstr "Llengua"
 
@@ -1313,6 +1319,18 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d hores"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Editor de text"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"L'editor que s'usarà per a obrir una nota. Si no s'indica cap, intentarà "
+"detectar automàticament l'editor predeterminat."
+
 msgid "Show advanced options"
 msgstr "Mostra les opcions avançades"
 
@@ -1360,7 +1378,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/cs_CZ.po

@@ -620,6 +620,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -744,12 +747,15 @@ msgstr "Zkontrolujte nastavení synchronizace"
 msgid "Notes and settings are stored in: %s"
 msgstr "Poznámky a nastavení uloženo v: %s"
 
-msgid "Save"
-msgstr "Uložit"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr ""
 
+msgid "Save"
+msgstr "Uložit"
+
 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 "
@@ -885,6 +891,13 @@ msgstr "Nastavit heslo"
 msgid "Add or remove tags"
 msgstr "Přidat či odebrat tagy"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopírovat"
+
 msgid "Switch between note and to-do type"
 msgstr "Přepnout mezi poznámkou a to-do"
 
@@ -918,6 +931,9 @@ msgstr "Uložit jako..."
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodporovaný link či zpráva: %s"
@@ -1194,16 +1210,6 @@ msgstr "Poznámku \"%s\" nelze zkopírovat do zápisníku"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Poznámku nelze přesunout do zápisníku \"%s\""
 
-msgid "Text editor"
-msgstr "Textový editor"
-
-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 ""
-"Editor ve kterém budou otvírány poznámky. Pokud není specifikováno, aplikace "
-"se pokusí o autodetekci defaultního editoru."
-
 msgid "Language"
 msgstr "Jazyk"
 
@@ -1288,6 +1294,18 @@ msgstr "%d hodina"
 msgid "%d hours"
 msgstr "%d hodin"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Textový editor"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Editor ve kterém budou otvírány poznámky. Pokud není specifikováno, aplikace "
+"se pokusí o autodetekci defaultního editoru."
+
 msgid "Show advanced options"
 msgstr "Ukázat pokročilé volby"
 
@@ -1335,7 +1353,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/da_DK.po

@@ -625,6 +625,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -749,12 +752,15 @@ msgstr "Check synkroniserings Indstillinger"
 msgid "Notes and settings are stored in: %s"
 msgstr "Noter og indstillinger er gemt i: %s"
 
-msgid "Save"
-msgstr "Gem"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr "Gem"
 
+msgid "Save"
+msgstr "Gem"
+
 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 "
@@ -894,6 +900,13 @@ msgstr "Indstil kodeord"
 msgid "Add or remove tags"
 msgstr "Tilføj eller slet mærker"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopier"
+
 msgid "Switch between note and to-do type"
 msgstr "Skift mellem note-  og opgave type"
 
@@ -927,6 +940,9 @@ msgstr "Gem som..."
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Ugyldigt- eller ulovligt link eller besked: %s"
@@ -1203,16 +1219,6 @@ msgstr "Kan ikke kopiere note til \"%s\" notesbog"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Kan ikke flytte note til \"%s\" notesbog"
 
-msgid "Text editor"
-msgstr "Tekst editor"
-
-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 ""
-"Editor der bruges til at åbne note. Hvis ingen valgt/udfyldt, vil auto-"
-"funktion søge efter standard editor."
-
 msgid "Language"
 msgstr "Sprog"
 
@@ -1297,6 +1303,18 @@ msgstr "%d time"
 msgid "%d hours"
 msgstr "%d timer"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Tekst editor"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Editor der bruges til at åbne note. Hvis ingen valgt/udfyldt, vil auto-"
+"funktion søge efter standard editor."
+
 msgid "Show advanced options"
 msgstr "Vis avancerede indstillinger"
 
@@ -1344,7 +1362,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/de_DE.po

@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Philipp Zumstein <zuphilip@gmail.com>\n"
+"Last-Translator: Michael Sonntag <ms@editorei.de>\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.7\n"
+"X-Generator: Poedit 2.0.8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr ""
-"Um eine Markierung zu löschen, entferne diese bei allen damit verbundenen "
+"Um ein Schlagwort zu löschen, entferne es bei allen damit verbundenen "
 "Notizen."
 
 msgid "Please select the note or notebook to be deleted first."
@@ -53,7 +53,7 @@ msgid "y"
 msgstr "j"
 
 msgid "Cancelling background synchronisation... Please wait."
-msgstr "Breche Hintergrund-Synchronisation ab... Bitte warten."
+msgstr "Breche Hintergrundsynchronisation ab… Bitte warten."
 
 #, javascript-format
 msgid "No such command: %s"
@@ -480,10 +480,10 @@ msgid ""
 "[tag] from [note], or to list the notes associated with [tag]. The command "
 "`tag list` can be used to list all the tags."
 msgstr ""
-"<tag-command> kann \"add\", \"remove\" or \"list\" sein, um eine "
-"[Markierung] zu [Notiz] zuzuweisen oder zu entfernen, oder um mit "
-"[Markierung] markierte Notizen anzuzeigen. Mit dem Befehl `tag list` können "
-"alle Markierungen angezeigt werden."
+"<tag-command> kann \"add\", \"remove\" or \"list\" sein, um ein [Schlagwort] "
+"zu [Notiz] zuzuweisen oder zu entfernen, oder um mit [Schlagwort] markierte "
+"Notizen anzuzeigen. Mit dem Befehl `tag list` können alle Schlagwörter "
+"angezeigt werden."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -644,13 +644,16 @@ msgid "Paste"
 msgstr "Einfügen"
 
 msgid "Bold"
-msgstr ""
+msgstr "Fett"
 
 msgid "Italic"
-msgstr ""
+msgstr "Kursiv"
+
+msgid "Insert Date Time"
+msgstr "Datum / Uhrzeit einfügen"
 
 msgid "Edit in external editor"
-msgstr ""
+msgstr "Im externen Editor bearbeiten"
 
 msgid "Search in all the notes"
 msgstr "Alle Notizen durchsuchen"
@@ -689,7 +692,7 @@ msgid "Make a donation"
 msgstr "Spenden"
 
 msgid "Check for updates..."
-msgstr "Überprüfe auf Updates..."
+msgstr "Überprüfe auf Updates…"
 
 msgid "About Joplin"
 msgstr "Über Joplin"
@@ -715,7 +718,7 @@ 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 "Es ist ein Update verfügbar! Soll dies jetzt heruntergeladen werden?"
+msgstr "Es ist ein Update verfügbar! Soll es jetzt heruntergeladen werden?"
 
 msgid "Yes"
 msgstr "Ja"
@@ -723,10 +726,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#, fuzzy
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
-"Der Web Clipper Service ist bereits aktiviert und auf Autostart eingestellt."
+"Der Webclipperservice ist bereits aktiviert und auf Autostart eingestellt."
 
 #, javascript-format
 msgid "Status: Started on port %d"
@@ -782,12 +784,15 @@ msgstr "Überprüfen der Synchronisationseinstellungen"
 msgid "Notes and settings are stored in: %s"
 msgstr "Notizen und Einstellungen werden gespeichert in: %s"
 
-msgid "Save"
-msgstr "Speichern"
+msgid "Apply"
+msgstr "Anwenden"
 
 msgid "Submit"
 msgstr "Absenden"
 
+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 "
@@ -891,16 +896,16 @@ msgid "Notebook title:"
 msgstr "Notizbuch Titel:"
 
 msgid "Add or remove tags:"
-msgstr "Füge hinzu oder entferne Markierungen:"
+msgstr "Füge hinzu oder entferne Schlagwörter:"
 
 msgid "Separate each tag by a comma."
-msgstr "Trenne jede Markierung mit einem Komma."
+msgstr "Trenne jedes Schlagwort mit einem Komma."
 
 msgid "Rename notebook:"
 msgstr "Notizbuch umbenennen:"
 
 msgid "Rename tag:"
-msgstr "Markierung umbenennen:"
+msgstr "Schlagwort umbenennen:"
 
 msgid "Set alarm:"
 msgstr "Alarm erstellen:"
@@ -924,7 +929,14 @@ msgid "Set the password"
 msgstr "Setze ein Passwort"
 
 msgid "Add or remove tags"
-msgstr "Markierungen hinzufügen oder entfernen"
+msgstr "Schlagwörter hinzufügen oder entfernen"
+
+msgid "Duplicate"
+msgstr "Duplizieren"
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr "%s kopieren"
 
 msgid "Switch between note and to-do type"
 msgstr "Zwischen Notiz und To-Do Typ wechseln"
@@ -952,9 +964,9 @@ msgstr ""
 msgid "Open..."
 msgstr "Öffne..."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "This file could not be opened: %s"
-msgstr "Dieses Notizbuch konnte nicht gespeichert werden: %s"
+msgstr "Dieses Notizbuch konnte nicht geöffnet werden: %s"
 
 msgid "Save as..."
 msgstr "Sichern unter..."
@@ -962,6 +974,9 @@ msgstr "Sichern unter..."
 msgid "Copy path to clipboard"
 msgstr "Pfad in Zwischenablage kopieren"
 
+msgid "Copy Link Address"
+msgstr "Link-Adresse kopieren"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nicht unterstützter Link oder Nachricht: %s"
@@ -975,16 +990,16 @@ msgstr ""
 "und die Notiz zu bearbeiten."
 
 msgid "strong text"
-msgstr ""
+msgstr "Fetter Text"
 
 msgid "emphasized text"
-msgstr ""
+msgstr "hervorgehobener Text"
 
 msgid "List item"
-msgstr ""
+msgstr "Listeneintrag"
 
 msgid "Insert Hyperlink"
-msgstr ""
+msgstr "Weblink einfügen"
 
 msgid "Attach file"
 msgstr "Datei anhängen"
@@ -995,37 +1010,37 @@ msgstr "Markierungen"
 msgid "Set alarm"
 msgstr "Alarm erstellen"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "In: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Weblink"
 
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "Nummerierte Liste"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "Aufzählung"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "Kontrollkästchen"
 
 msgid "Heading"
-msgstr ""
+msgstr "Überschrift"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "Horizontale Linie"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "Klicken Sie hier, um die externe Bearbeitung anzuhalten"
 
 #, fuzzy
 msgid "Watching..."
-msgstr "Abbrechen..."
+msgstr "Ansehen…"
 
 msgid "to-do"
 msgstr "To-Do"
@@ -1062,7 +1077,7 @@ msgid "Clipper Options"
 msgstr "Clipper Einstellungen"
 
 msgid "Remove this tag from all the notes?"
-msgstr "Diese Markierung von allen Notizen entfernen?"
+msgstr "Dieses Schlagwort von allen Notizen entfernen?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Diese Suche von der Seitenleiste entfernen?"
@@ -1173,7 +1188,7 @@ msgid "State: %s."
 msgstr "Status: %s."
 
 msgid "Cancelling..."
-msgstr "Abbrechen..."
+msgstr "Abbrechen…"
 
 #, javascript-format
 msgid "Completed: %s"
@@ -1184,7 +1199,7 @@ msgid "Last error: %s"
 msgstr "Letzte Fehlermeldung: %s"
 
 msgid "Idle"
-msgstr "wartend"
+msgstr "Wartend"
 
 msgid "In progress"
 msgstr "In Bearbeitung"
@@ -1214,17 +1229,14 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
 "Notizbuch kann nicht \"%s\" genannt werden. Dies ist ein reservierter Titel."
 
-#, fuzzy
 msgid "title"
-msgstr "Unbenannt"
+msgstr "Titel"
 
-#, fuzzy
 msgid "updated date"
-msgstr "Aktualisiert: %d."
+msgstr "Aktualsierungsdatum"
 
-#, fuzzy
 msgid "created date"
-msgstr "Erstellt: %d."
+msgstr "Erstelldatum"
 
 msgid "Untitled"
 msgstr "Unbenannt"
@@ -1240,17 +1252,6 @@ msgstr "Kann Notiz nicht zu Notizbuch \"%s\" kopieren"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Kann Notiz nicht zu Notizbuch \"%s\" verschieben"
 
-msgid "Text editor"
-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 Textverarbeitungsprogramm, mit dem Notizen geöffnet werden. Wenn keines "
-"ausgewählt wurde, wird Joplin versuchen das standard-"
-"Textverarbeitungsprogramm zu erkennen."
-
 msgid "Language"
 msgstr "Sprache"
 
@@ -1334,6 +1335,16 @@ msgstr "%d Stunde"
 msgid "%d hours"
 msgstr "%d Stunden"
 
+msgid "Text editor command"
+msgstr "Editoraufruf"
+
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Der Editor, mit dem Notizen geöffnet werden. Wenn keiner ausgewählt wurde, "
+"wird Joplin versuchen den Standardeditor zu erkennen."
+
 msgid "Show advanced options"
 msgstr "Erweiterte Optionen anzeigen"
 
@@ -1377,16 +1388,22 @@ msgid "WebDAV password"
 msgstr "WebDAV Passwort"
 
 msgid "Custom TLS certificates"
-msgstr ""
+msgstr "Benutzerdefinierte TLS-Zertifikate"
 
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
+"Kommagetrennte Liste von Pfaden zu Verzeichnissen, aus denen die Zertifikate "
+"geladen werden, oder Pfad zu einzelnen Zertifikatsdateien. Zum Beispiel: / "
+"my / cert_dir, /other/custom.pem. Wenn Sie Änderungen an den TLS-"
+"Einstellungen vornehmen, müssen Sie Ihre Änderungen speichern, bevor Sie auf "
+"\"Synchronisierungskonfiguration prüfen\" klicken."
 
 msgid "Ignore TLS certificate errors"
-msgstr ""
+msgstr "Ignoriere TLS-Zertifikatfehler"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1409,7 +1426,7 @@ msgstr "Verzeichnis"
 
 #, javascript-format
 msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr "Das Modul „%s“ für das Format „%s“ kann nicht geladen werden"
+msgstr "Das Modul \"%s\" für das Format \"%s\" kann nicht geladen werden"
 
 #, javascript-format
 msgid "Please specify import format for %s"
@@ -1521,15 +1538,15 @@ msgstr "Bestätigen"
 msgid "Cancel synchronisation"
 msgstr "Synchronisation abbrechen"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Decrypting items: %d/%d"
-msgstr "Geladene Objekte: %d/%d."
+msgstr "Entschlüsselte Objekte: %d/%d"
 
 msgid "New tags:"
-msgstr "Neue Markierungen:"
+msgstr "Neue Schlagwörter:"
 
 msgid "Type new tags or select from list"
-msgstr "Neue Markierungen eingeben oder aus der Liste auswählen"
+msgstr "Neues Schlagwort eingeben oder aus der Liste auswählen"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1648,8 +1665,8 @@ msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
 msgstr ""
-"Drücke auf den (+) Knopf, um eine neue Notiz oder ein neues Notizbuch zu "
-"erstellen. Tippe auf die Seitenleiste, um auf deine existierenden "
+"Drücke auf die (+)-Schaltfläche, um eine neue Notiz oder ein neues Notizbuch "
+"zu erstellen. Tippe auf die Seitenleiste, um auf deine existierenden "
 "Notizbücher zuzugreifen."
 
 msgid "You currently have no notebook. Create one by clicking on (+) button."

CliClient/locales/en_GB.po

@@ -558,6 +558,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -682,12 +685,15 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Save"
+msgid "Apply"
 msgstr ""
 
 msgid "Submit"
 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 "
@@ -810,6 +816,13 @@ msgstr ""
 msgid "Add or remove tags"
 msgstr ""
 
+msgid "Duplicate"
+msgstr ""
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr ""
+
 msgid "Switch between note and to-do type"
 msgstr ""
 
@@ -842,6 +855,9 @@ msgstr ""
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -1104,14 +1120,6 @@ msgstr ""
 msgid "Cannot move note to \"%s\" notebook"
 msgstr ""
 
-msgid "Text editor"
-msgstr ""
-
-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 ""
-
 msgid "Language"
 msgstr ""
 
@@ -1192,6 +1200,14 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
+msgid "Text editor command"
+msgstr ""
+
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+
 msgid "Show advanced options"
 msgstr ""
 
@@ -1235,7 +1251,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/es_ES.po

@@ -629,13 +629,16 @@ msgid "Paste"
 msgstr "Pegar"
 
 msgid "Bold"
-msgstr ""
+msgstr "Negrita"
 
 msgid "Italic"
-msgstr ""
+msgstr "Cursiva"
+
+msgid "Insert Date Time"
+msgstr "Introduce fecha"
 
 msgid "Edit in external editor"
-msgstr ""
+msgstr "Editar con un editor externo"
 
 msgid "Search in all the notes"
 msgstr "Buscar en todas las notas"
@@ -708,11 +711,10 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#, fuzzy
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
-"El servicio de recorte web está habilitado y configurado para inicie "
-"automaticamente"
+"El servicio de recorte web está habilitado y configurado para que inicie "
+"automáticamente."
 
 #, javascript-format
 msgid "Status: Started on port %d"
@@ -766,12 +768,15 @@ msgstr "Comprobar sincronización"
 msgid "Notes and settings are stored in: %s"
 msgstr "Las notas y los ajustes se guardan en: %s"
 
-msgid "Save"
-msgstr "Guardar"
+msgid "Apply"
+msgstr "Aplicar"
 
 msgid "Submit"
 msgstr "Aceptar"
 
+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 "
@@ -909,6 +914,13 @@ msgstr "Establecer la contraseña"
 msgid "Add or remove tags"
 msgstr "Añadir o borrar etiquetas"
 
+msgid "Duplicate"
+msgstr "Duplicado"
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr "%s - Copiar"
+
 msgid "Switch between note and to-do type"
 msgstr "Cambiar entre nota y lista de tareas"
 
@@ -931,9 +943,9 @@ msgstr "No hay ninguna libreta. Cree una pulsando en «Libreta nueva»."
 msgid "Open..."
 msgstr "Abrir..."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "This file could not be opened: %s"
-msgstr "No se ha podido guardar esta libreta: %s"
+msgstr "No se ha podido abrir este archivo: %s"
 
 msgid "Save as..."
 msgstr "Guardar como..."
@@ -941,6 +953,9 @@ msgstr "Guardar como..."
 msgid "Copy path to clipboard"
 msgstr "Copiar la ruta en el portapapeles"
 
+msgid "Copy Link Address"
+msgstr "Copiar enlace"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Enlace o mensaje no soportado: %s"
@@ -954,16 +969,16 @@ msgstr ""
 "editar la nota."
 
 msgid "strong text"
-msgstr ""
+msgstr "texto destacado"
 
 msgid "emphasized text"
-msgstr ""
+msgstr "texto resaltado"
 
 msgid "List item"
-msgstr ""
+msgstr "Listar elementos"
 
 msgid "Insert Hyperlink"
-msgstr ""
+msgstr "Insertar hipervínculo"
 
 msgid "Attach file"
 msgstr "Adjuntar archivo"
@@ -974,37 +989,36 @@ msgstr "Etiquetas"
 msgid "Set alarm"
 msgstr "Establecer alarma"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "En: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Hipervínculo"
 
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "Lista numerada"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "Lista con viñetas"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "Casilla"
 
 msgid "Heading"
-msgstr ""
+msgstr "Título"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "Regla horizontal"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "Pulsa para detener la edición externa"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "Cancelando..."
+msgstr "Mirando..."
 
 msgid "to-do"
 msgstr "lista de tareas"
@@ -1192,17 +1206,14 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
 "No se puede usar el nombre «%s» para una libreta; es un título reservado."
 
-#, fuzzy
 msgid "title"
-msgstr "Sin título"
+msgstr "título"
 
-#, fuzzy
 msgid "updated date"
-msgstr "Actualizado: %d."
+msgstr "fecha de actualización"
 
-#, fuzzy
 msgid "created date"
-msgstr "Creado: %d."
+msgstr "fecha de creación"
 
 msgid "Untitled"
 msgstr "Sin título"
@@ -1218,16 +1229,6 @@ msgstr "No se ha podido copiar la nota a la libreta «%s»"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "No se ha podido mover la nota a la libreta «%s»"
 
-msgid "Text editor"
-msgstr "Editor de texto"
-
-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 ""
-"El editor que se usará para abrir una nota. Se intentará auto-detectar el "
-"editor predeterminado si no se proporciona ninguno."
-
 msgid "Language"
 msgstr "Idioma"
 
@@ -1311,6 +1312,17 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d horas"
 
+msgid "Text editor command"
+msgstr "Editor de texto"
+
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"El comando del editor (puede incluir argumentos) que se utilizará para abrir "
+"una nota. Si no se provee ninguno se intentará auto detectar el editor por "
+"defecto."
+
 msgid "Show advanced options"
 msgstr "Mostrar opciones avanzadas"
 
@@ -1354,16 +1366,22 @@ msgid "WebDAV password"
 msgstr "Contraseña de WebDAV"
 
 msgid "Custom TLS certificates"
-msgstr ""
+msgstr "Certificados TLS personalizados"
 
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
+"Lista de rutas de los directorios de dónde cargar los certificados separados "
+"por comas, o la ruta individual de los certificados. Por ejemplo: /mi/"
+"cert_dir, /otro/personalizado.pem. Tenga en cuenta que si realiza cambios en "
+"la configuración de los certificados debe guardar los cambios antes de "
+"pulsar en \"Comprobar la configuración de sincronización\"."
 
 msgid "Ignore TLS certificate errors"
-msgstr ""
+msgstr "Ignorar errores en certificados TLS"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1483,7 +1501,6 @@ msgstr "¿Desea mover %d notas a libreta «%s»?"
 msgid "Press to set the decryption password."
 msgstr "Presione para establecer la contraseña de descifrado."
 
-#, fuzzy
 msgid "Save alarm"
 msgstr "Establecer alarma"
 
@@ -1496,9 +1513,9 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Decrypting items: %d/%d"
-msgstr "Elementos obtenidos: %d/%d."
+msgstr "Descifrando elementos: %d/%d."
 
 msgid "New tags:"
 msgstr "Nuevas etiquetas:"

CliClient/locales/eu.po

@@ -633,6 +633,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -760,12 +763,15 @@ msgstr "Sinkronizazioa utzi"
 msgid "Notes and settings are stored in: %s"
 msgstr "Oharrak eta ezarpenak hemen daude gordeta: %s"
 
-msgid "Save"
-msgstr "Gorde"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr ""
 
+msgid "Save"
+msgstr "Gorde"
+
 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 "
@@ -904,6 +910,13 @@ msgstr "Ezarri pasahitza"
 msgid "Add or remove tags"
 msgstr "Gehitu edo ezabatu etiketak"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopiatu"
+
 msgid "Switch between note and to-do type"
 msgstr "Aldatu oharra eta zeregin eren artean."
 
@@ -937,6 +950,9 @@ msgstr "Gorde aldaketak"
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Esteka edo mezu ez dago onartua: %s"
@@ -1219,16 +1235,6 @@ msgstr "Ezin kopia daiteke oharra \"%s\" koadernora"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Ezin eraman daiteke oharra \"%s\" koadernora"
 
-msgid "Text editor"
-msgstr "Testu editorea"
-
-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 ""
-"Editorea erabiliko da oharra zabaltzeko. Ez badago zehaztutakorik lehenetsia "
-"igartzen ahaleginduko da."
-
 msgid "Language"
 msgstr "Hizkuntza"
 
@@ -1315,6 +1321,18 @@ msgstr "% ordua"
 msgid "%d hours"
 msgstr "% orduak"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Testu editorea"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Editorea erabiliko da oharra zabaltzeko. Ez badago zehaztutakorik lehenetsia "
+"igartzen ahaleginduko da."
+
 msgid "Show advanced options"
 msgstr "Erakutsi aukera aurreratuak"
 
@@ -1365,7 +1383,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/fr_FR.po

@@ -59,7 +59,7 @@ msgstr ""
 "La commande \"%s\" est disponible uniquement en mode d'interface graphique"
 
 msgid "Cannot change encrypted item"
-msgstr "Un objet crypté ne peut pas être modifié"
+msgstr "Un objet chiffré ne peut pas être modifié"
 
 #, javascript-format
 msgid "Missing required argument: %s"
@@ -127,7 +127,7 @@ msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status` and `target-status`."
 msgstr ""
-"Gérer la configuration E2EE (Cryptage de bout à bout). Les commandes sont "
+"Gérer la configuration E2EE (Chiffrement de bout à bout). Les commandes sont "
 "`enable`, `disable`, `decrypt` et `status` et `target-status`."
 
 msgid "Enter master password:"
@@ -140,11 +140,11 @@ msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
 msgstr ""
-"Démarrage du décryptage... Veuillez patienter car cela pourrait prendre "
-"plusieurs minutes selon le nombre d'objets à décrypter."
+"Démarrage du déchiffrement... Veuillez patienter car cela pourrait prendre "
+"plusieurs minutes selon le nombre d'objets à déchiffrer."
 
 msgid "Completed decryption."
-msgstr "Décryptage complété."
+msgstr "Déchiffrement complété."
 
 msgid "Enabled"
 msgstr "Activé"
@@ -154,7 +154,7 @@ msgstr "Désactivé"
 
 #, javascript-format
 msgid "Encryption is: %s"
-msgstr "Le cryptage est : %s"
+msgstr "Le chiffrement est : %s"
 
 msgid "Edit note."
 msgstr "Éditer la note."
@@ -571,10 +571,10 @@ msgid ""
 "supplied the password, the encrypted items are being decrypted in the "
 "background and will be available soon."
 msgstr ""
-"Au moins un objet est actuellement crypté et il se peut que vous deviez "
+"Au moins un objet est actuellement chiffré et il se peut que vous deviez "
 "fournir votre mot de passe maître. Pour se faire, veuillez taper `e2ee "
-"decrypt`. Si vous avez déjà fourni ce mot de passe, les objets cryptés vont "
-"être décrypté en tâche de fond et seront disponible prochainement."
+"decrypt`. Si vous avez déjà fourni ce mot de passe, les objets chiffrés vont "
+"être déchiffré en tâche de fond et seront disponible prochainement."
 
 #, javascript-format
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
@@ -633,6 +633,9 @@ msgstr "Gras"
 msgid "Italic"
 msgstr "Italique"
 
+msgid "Insert Date Time"
+msgstr "Insérer la date et l'heure"
+
 msgid "Edit in external editor"
 msgstr "Ouvrir dans un éditeur externe"
 
@@ -658,7 +661,7 @@ msgid "Web clipper options"
 msgstr "Options du Web Clipper"
 
 msgid "Encryption options"
-msgstr "Options de cryptage"
+msgstr "Options de chiffrement"
 
 msgid "General Options"
 msgstr "Options générales"
@@ -765,19 +768,22 @@ msgstr "Vérifier config synchronisation"
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes et paramètres se trouve dans : %s"
 
-msgid "Save"
-msgstr "Enregistrer"
+msgid "Apply"
+msgstr "Appliquer"
 
 msgid "Submit"
 msgstr "Envoyer"
 
+msgid "Save"
+msgstr "Enregistrer"
+
 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 ""
-"Désactiver le cryptage signifie que *toutes* les notes et fichiers vont être "
-"re-synchronisés et envoyés décryptés sur la cible de la synchronisation. "
+"Désactiver le chiffrement signifie que *toutes* les notes et fichiers vont être "
+"re-synchronisés et envoyés déchiffrés sur la cible de la synchronisation. "
 "Souhaitez vous continuer ?"
 
 msgid ""
@@ -786,17 +792,17 @@ msgid ""
 "password as, for security purposes, this will be the *only* way to decrypt "
 "the data! To enable encryption, please enter your password below."
 msgstr ""
-"Activer le cryptage signifie que *toutes* les notes et fichiers vont être re-"
-"synchronisés et envoyés cryptés vers la cible de la synchronisation. Ne "
+"Activer le chiffrement signifie que *toutes* les notes et fichiers vont être re-"
+"synchronisés et envoyés chiffrés vers la cible de la synchronisation. Ne "
 "perdez pas votre mot de passe car, pour des raisons de sécurité, ce sera la "
-"*seule* façon de décrypter les données ! Pour activer le cryptage, veuillez "
+"*seule* façon de déchiffrer les données ! Pour activer le chiffrement, veuillez "
 "entrer votre mot de passe ci-dessous."
 
 msgid "Disable encryption"
-msgstr "Désactiver le cryptage"
+msgstr "Désactiver le chiffrement"
 
 msgid "Enable encryption"
-msgstr "Activer le cryptage"
+msgstr "Activer le chiffrement"
 
 msgid "Master Keys"
 msgstr "Clefs maître"
@@ -827,9 +833,9 @@ msgid ""
 "as \"active\"). Any of the keys might be used for decryption, depending on "
 "how the notes or notebooks were originally encrypted."
 msgstr ""
-"Note : seule une clef maître va être utilisée pour le cryptage (celle "
+"Note : seule une clef maître va être utilisée pour le chiffrement (celle "
 "marquée comme \"actif\" ci-dessus). N'importe quelle clef peut être utilisée "
-"pour le décryptage, selon la façon dont les notes ou carnets étaient cryptés "
+"pour le déchiffrement, selon la façon dont les notes ou carnets étaient chiffrés "
 "à l'origine."
 
 msgid "Missing Master Keys"
@@ -840,7 +846,7 @@ msgid ""
 "however the application does not currently have access to them. It is likely "
 "they will eventually be downloaded via synchronisation."
 msgstr ""
-"Les clefs maître avec ces identifiants sont utilisées pour crypter certains "
+"Les clefs maître avec ces identifiants sont utilisées pour chiffrer certains "
 "de vos objets, cependant le logiciel n'y a pour l'instant pas accès. Il est "
 "probable qu'elle vont être prochainement disponible via la synchronisation."
 
@@ -848,14 +854,14 @@ msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
 "to enable it please check the documentation:"
 msgstr ""
-"Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
+"Pour plus d'informations sur le chiffrement de bout en bout, ainsi que des "
 "conseils pour l'activer, veuillez consulter la documentation :"
 
 msgid "Status"
 msgstr "État"
 
 msgid "Encryption is:"
-msgstr "Le cryptage est :"
+msgstr "Le chiffrement est :"
 
 msgid "Back"
 msgstr "Retour"
@@ -904,7 +910,7 @@ msgid "View them now"
 msgstr "Les voir maintenant"
 
 msgid "Some items cannot be decrypted."
-msgstr "Certains objets ne peuvent être décryptés."
+msgstr "Certains objets ne peuvent être déchiffrés."
 
 msgid "Set the password"
 msgstr "Définir le mot de passe"
@@ -912,6 +918,13 @@ msgstr "Définir le mot de passe"
 msgid "Add or remove tags"
 msgstr "Gérer les étiquettes"
 
+msgid "Duplicate"
+msgstr "Dupliquer"
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr "%s - Copie"
+
 msgid "Switch between note and to-do type"
 msgstr "Alterner entre note et tâche"
 
@@ -947,6 +960,9 @@ msgstr "Enregistrer sous..."
 msgid "Copy path to clipboard"
 msgstr "Copier le chemin"
 
+msgid "Copy Link Address"
+msgstr "Copier l'adresse du lien"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Lien ou message non géré : %s"
@@ -1040,7 +1056,7 @@ msgid "Synchronisation Status"
 msgstr "État de la synchronisation"
 
 msgid "Encryption Options"
-msgstr "Options de cryptage"
+msgstr "Options de chiffrement"
 
 msgid "Clipper Options"
 msgstr "Options du Web Clipper"
@@ -1178,16 +1194,16 @@ msgid "Synchronisation is already in progress. State: %s"
 msgstr "La synchronisation est déjà en cours. État : %s"
 
 msgid "Encrypted"
-msgstr "Crypté"
+msgstr "Chiffré"
 
 msgid "Encrypted items cannot be modified"
-msgstr "Les objets cryptés ne peuvent être modifiés"
+msgstr "Les objets chiffrés ne peuvent être modifiés"
 
 msgid "Conflicts"
 msgstr "Conflits"
 
 msgid "Cannot move notebook to this location"
-msgstr "Impossible de déplacer le carnet vers le carnet \"%s\""
+msgstr "Impossible de déplacer le carnet à cet endroit"
 
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
@@ -1201,10 +1217,10 @@ msgid "title"
 msgstr "titre"
 
 msgid "updated date"
-msgstr "Date modification"
+msgstr "date de modification"
 
 msgid "created date"
-msgstr "Date création"
+msgstr "date de création"
 
 msgid "Untitled"
 msgstr "Sans titre"
@@ -1220,16 +1236,6 @@ msgstr "Impossible de copier la note vers le carnet \"%s\""
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Impossible de déplacer la note vers le carnet \"%s\""
 
-msgid "Text editor"
-msgstr "Éditeur de texte"
-
-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 ""
-"L'éditeur de texte pour ouvrir et modifier les notes. Si aucun n'est "
-"spécifié, il sera détecté automatiquement."
-
 msgid "Language"
 msgstr "Langue"
 
@@ -1313,6 +1319,16 @@ msgstr "%d heure"
 msgid "%d hours"
 msgstr "%d heures"
 
+msgid "Text editor command"
+msgstr "Commande de l'éditeur de texte"
+
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"La commande de l'éditeur de texte (peut inclure des options) pour ouvrir et "
+"modifier les notes. Si non-spécifiée, elle sera détectée automatiquement."
+
 msgid "Show advanced options"
 msgstr "Montrer les options avancées"
 
@@ -1361,11 +1377,14 @@ msgstr "Certificats TLS personnalisés"
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 "Liste séparée par des virgules contenant les chemins des répertoires "
 "contenants des certificats, ou les chemins de certificats individuels. Par "
-"exemple : /my/cert_dir, /other/custom.pem"
+"exemple : /my/cert_dir, /other/custom.pem. Remarquez que si vous changez les "
+"paramètres TLS, vous devez enregistrer vos changements avant de cliquer sur "
+"\"Vérifier config synchronisation\"."
 
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorer les erreurs de certificats TLS"
@@ -1402,7 +1421,7 @@ msgid ""
 "This item is currently encrypted: %s \"%s\". Please wait for all items to be "
 "decrypted and try again."
 msgstr ""
-"Cet objet est crypté : %s \"%s\". Veuillez attendre que tout soit décrypté "
+"Cet objet est chiffré : %s \"%s\". Veuillez attendre que tout soit déchiffré "
 "et réessayez."
 
 msgid "There is no data to export."
@@ -1475,7 +1494,7 @@ msgid "Export Debug Report"
 msgstr "Exporter rapport de débogage"
 
 msgid "Encryption Config"
-msgstr "Config cryptage"
+msgstr "Config chiffrement"
 
 msgid "Configuration"
 msgstr "Configuration"
@@ -1504,7 +1523,7 @@ msgstr "Annuler synchronisation"
 
 #, javascript-format
 msgid "Decrypting items: %d/%d"
-msgstr "Décryptage des objets : %d/%d."
+msgstr "Déchiffrement des objets : %d/%d"
 
 msgid "New tags:"
 msgstr "Nouvelles étiquettes :"
@@ -1644,7 +1663,7 @@ msgstr "Bienvenue"
 #~ "For more information about End-To-End Encryption (E2EE) and advices on "
 #~ "how to enable it please check the documentation"
 #~ msgstr ""
-#~ "Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
+#~ "Pour plus d'informations sur le chiffrement de bout en bout, ainsi que des "
 #~ "conseils pour l'activer, veuillez consulter la documentation"
 
 #~ msgid "Searches"

CliClient/locales/gl_ES.po

@@ -625,6 +625,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -749,12 +752,15 @@ msgstr "Comprobar a configuración da sincronización"
 msgid "Notes and settings are stored in: %s"
 msgstr "As notas e axustes gardáronse en: %s"
 
-msgid "Save"
-msgstr "Gardar"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr ""
 
+msgid "Save"
+msgstr "Gardar"
+
 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 "
@@ -891,6 +897,13 @@ msgstr "Estabelecer un contrasinal"
 msgid "Add or remove tags"
 msgstr "Engadir ou eliminar etiquetas"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Copiar"
+
 msgid "Switch between note and to-do type"
 msgstr "Cambiar entre notas e tarefas"
 
@@ -924,6 +937,9 @@ msgstr "Gardar como…"
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Ligazón ou mensaxe incompatíbeis: %s"
@@ -1202,16 +1218,6 @@ msgstr "Non é posíbel copiar a nota ao caderno «%s»"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Non é posíbel mover a nota ao caderno «%s»"
 
-msgid "Text editor"
-msgstr "Editor de texto"
-
-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 ""
-"Editor a usar para abrir unha nota. Se non se indica ningún tentará detectar "
-"automaticamente o editor predeterminado."
-
 msgid "Language"
 msgstr "Idioma"
 
@@ -1296,6 +1302,18 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d horas"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Editor de texto"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Editor a usar para abrir unha nota. Se non se indica ningún tentará detectar "
+"automaticamente o editor predeterminado."
+
 msgid "Show advanced options"
 msgstr "Mostrar opcións avanzadas"
 
@@ -1343,7 +1361,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/hr_HR.po

@@ -631,6 +631,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -759,12 +762,15 @@ msgstr "Prekini sinkronizaciju"
 msgid "Notes and settings are stored in: %s"
 msgstr "Bilješke i postavke su pohranjene u: %s"
 
-msgid "Save"
-msgstr "Spremi"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr ""
 
+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 "
@@ -892,6 +898,13 @@ msgstr ""
 msgid "Add or remove tags"
 msgstr "Dodaj ili makni oznake"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopiraj"
+
 msgid "Switch between note and to-do type"
 msgstr "Zamijeni bilješku i zadatak"
 
@@ -925,6 +938,9 @@ msgstr "Spremi promjene"
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana poveznica ili poruka: %s"
@@ -1202,16 +1218,6 @@ msgstr "Ne mogu kopirati bilješku u bilježnicu %s"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Ne mogu premjestiti bilješku u bilježnicu %s"
 
-msgid "Text editor"
-msgstr "Uređivač teksta"
-
-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 ""
-"Program za uređivanje koji će biti korišten za uređivanje bilješki. Ako ni "
-"jedan nije odabran, pokušati će se sa default programom."
-
 msgid "Language"
 msgstr "Jezik"
 
@@ -1298,6 +1304,18 @@ msgstr "%d sat"
 msgid "%d hours"
 msgstr "%d sati"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Uređivač teksta"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Program za uređivanje koji će biti korišten za uređivanje bilješki. Ako ni "
+"jedan nije odabran, pokušati će se sa default programom."
+
 msgid "Show advanced options"
 msgstr "Prikaži napredne opcije"
 
@@ -1343,7 +1361,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/ja_JP.po

@@ -618,6 +618,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -745,12 +748,15 @@ msgstr "同期の中止"
 msgid "Notes and settings are stored in: %s"
 msgstr "ノートと設定は、%sに保存されます。"
 
-msgid "Save"
-msgstr "保存"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 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 "
@@ -882,6 +888,13 @@ msgstr ""
 msgid "Add or remove tags"
 msgstr "タグの追加・削除"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "コピー"
+
 msgid "Switch between note and to-do type"
 msgstr "ノートとToDoを切り替え"
 
@@ -915,6 +928,9 @@ msgstr "変更を保存"
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -1196,16 +1212,6 @@ msgstr "ノートをノートブック \"%s\"にコピーできませんでし
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "ノートをノートブック \"%s\"に移動できませんでした。"
 
-msgid "Text editor"
-msgstr "テキストエディタ"
-
-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 ""
-"ノートを開くために使用されるエディタです。特に指定がなければ、デフォルトのエ"
-"ディタの検出を試みます。"
-
 msgid "Language"
 msgstr "言語"
 
@@ -1292,6 +1298,18 @@ msgstr "%d 時間"
 msgid "%d hours"
 msgstr "%d 時間"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "テキストエディタ"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"ノートを開くために使用されるエディタです。特に指定がなければ、デフォルトのエ"
+"ディタの検出を試みます。"
+
 msgid "Show advanced options"
 msgstr "詳細な設定の表示"
 
@@ -1337,7 +1355,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/joplin.pot

@@ -558,6 +558,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -682,12 +685,15 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Save"
+msgid "Apply"
 msgstr ""
 
 msgid "Submit"
 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 "
@@ -810,6 +816,13 @@ msgstr ""
 msgid "Add or remove tags"
 msgstr ""
 
+msgid "Duplicate"
+msgstr ""
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr ""
+
 msgid "Switch between note and to-do type"
 msgstr ""
 
@@ -842,6 +855,9 @@ msgstr ""
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -1104,14 +1120,6 @@ msgstr ""
 msgid "Cannot move note to \"%s\" notebook"
 msgstr ""
 
-msgid "Text editor"
-msgstr ""
-
-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 ""
-
 msgid "Language"
 msgstr ""
 
@@ -1192,6 +1200,14 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
+msgid "Text editor command"
+msgstr ""
+
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+
 msgid "Show advanced options"
 msgstr ""
 
@@ -1235,7 +1251,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/nl_BE.po

@@ -635,6 +635,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -762,12 +765,15 @@ msgstr "Annuleer synchronisatie"
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen zijn opgeslaan in %s"
 
-msgid "Save"
-msgstr "Sla op"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr ""
 
+msgid "Save"
+msgstr "Sla op"
+
 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 "
@@ -906,6 +912,13 @@ msgstr "Stel wachtwoord in"
 msgid "Add or remove tags"
 msgstr "Voeg tag toe of verwijder tag"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopieer"
+
 msgid "Switch between note and to-do type"
 msgstr "Wissel tussen notitie en to-do type"
 
@@ -941,6 +954,9 @@ msgstr "Sla wijzigingen op"
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Link of bericht \"%s\" wordt niet ondersteund"
@@ -1222,17 +1238,6 @@ msgstr "Kan notitie niet naar notitieboek \"%s\" kopiëren."
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Kan notitie niet naar notitieboek \"%s\" verplaatsen."
 
-msgid "Text editor"
-msgstr "Tekst editor"
-
-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 ""
-"De editor die zal gebruikt worden bij het openen van een notitie. Als er "
-"geen meegegeven wordt, zal het programma de standaard editor proberen te "
-"detecteren. "
-
 msgid "Language"
 msgstr "Taal"
 
@@ -1318,6 +1323,19 @@ msgstr "%d uur"
 msgid "%d hours"
 msgstr "%d uren"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Tekst editor"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"De editor die zal gebruikt worden bij het openen van een notitie. Als er "
+"geen meegegeven wordt, zal het programma de standaard editor proberen te "
+"detecteren. "
+
 msgid "Show advanced options"
 msgstr "Toon geavanceerde opties"
 
@@ -1365,7 +1383,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/pt_BR.po

@@ -246,9 +246,8 @@ msgstr ""
 "Use as setas e a Page Up/Page Down para rolar as listas e áreas de texto "
 "(incluindo este console)."
 
-#, fuzzy
 msgid "To maximise/minimise the console, press \"tc\"."
-msgstr "Para maximizar / minimizar o console, pressione \"TC\"."
+msgstr "Para maximizar / minimizar o console, pressione \"tc\"."
 
 msgid "To enter command line mode, press \":\""
 msgstr "Para entrar no modo de linha de comando, pressione \":\""
@@ -363,12 +362,11 @@ msgstr "Exclui o caderno informado."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Exclui o caderno sem pedir confirmação."
 
-#, fuzzy
 msgid ""
 "Delete notebook? All notes and sub-notebooks within this notebook will also "
 "be deleted."
 msgstr ""
-"Excluir o caderno? Todas as notas deste caderno notebook também serão "
+"Excluir o caderno? Todas as notas e sub-cadernos dentro deste também serão "
 "excluídas."
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -627,13 +625,16 @@ msgid "Paste"
 msgstr "Colar"
 
 msgid "Bold"
-msgstr ""
+msgstr "Negrito"
 
 msgid "Italic"
-msgstr ""
+msgstr "Itálico"
+
+msgid "Insert Date Time"
+msgstr "Inserir Data e Hora"
 
 msgid "Edit in external editor"
-msgstr ""
+msgstr "Editar com editor externo"
 
 msgid "Search in all the notes"
 msgstr "Pesquisar em todas as notas"
@@ -642,7 +643,7 @@ msgid "View"
 msgstr "Visualizar"
 
 msgid "Toggle sidebar"
-msgstr ""
+msgstr "Alternar barra lateral"
 
 msgid "Toggle editor layout"
 msgstr "Alternar layout do editor"
@@ -654,7 +655,7 @@ msgid "Synchronisation status"
 msgstr "Status de sincronização"
 
 msgid "Web clipper options"
-msgstr ""
+msgstr "Opções do Web clipper"
 
 msgid "Encryption options"
 msgstr "Opções de Encriptação"
@@ -708,46 +709,52 @@ msgstr "Não"
 
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
+"O serviço de web clipper está habilitado e configurado para auto-start."
 
 #, javascript-format
 msgid "Status: Started on port %d"
-msgstr ""
+msgstr "Status: Iniciado, na porta %d"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Status: %s"
-msgstr "Estado: \"%s\"."
+msgstr "Status: \"%s\"."
 
 msgid "Disable Web Clipper Service"
-msgstr ""
+msgstr "Desabilitar serviço Web Clipper"
 
 msgid "The web clipper service is not enabled."
-msgstr ""
+msgstr "O serviço de web clipper não está habilitado."
 
 msgid "Enable Web Clipper Service"
-msgstr ""
+msgstr "Habilitar serviço Web Clipper"
 
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
 "to Joplin."
 msgstr ""
+"O serviço de Web Clipper do Joplin permite salvar páginas da web e "
+"screenshots do seu browser, no Joplin."
 
 msgid "In order to use the web clipper, you need to do the following:"
-msgstr ""
+msgstr "Para usar o web clipper, você precisa fazer o seguinte:"
 
 msgid "Step 1: Enable the clipper service"
-msgstr ""
+msgstr "Passo 1: Habilitar o serviço do clipper"
 
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
 "enabling it your firewall may ask you to give permission to Joplin to listen "
 "to a particular port."
 msgstr ""
+"Este serviço permite a extensão do browser se comunicat com o Joplin. Quando "
+"habilitar, talvez seu firewall peça que você conceda permissão ao Joplin "
+"para escutar determinada porta."
 
 msgid "Step 2: Install the extension"
-msgstr ""
+msgstr "Passo 2: Instalar a extensão"
 
 msgid "Download and install the relevant extension for your browser:"
-msgstr ""
+msgstr "Baixe e instale a extensão relevante para seu browser:"
 
 msgid "Check synchronisation configuration"
 msgstr "Verificar a configuração da sincronização"
@@ -756,12 +763,15 @@ msgstr "Verificar a configuração da sincronização"
 msgid "Notes and settings are stored in: %s"
 msgstr "Notas e configurações estão armazenadas em: %s"
 
-msgid "Save"
-msgstr "Salvar"
+msgid "Apply"
+msgstr "Aplicar"
 
 msgid "Submit"
 msgstr "Enviar"
 
+msgid "Save"
+msgstr "Salvar"
+
 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 "
@@ -873,9 +883,8 @@ msgstr "Separe cada tag por vírgula."
 msgid "Rename notebook:"
 msgstr "Renomear caderno:"
 
-#, fuzzy
 msgid "Rename tag:"
-msgstr "Renomear"
+msgstr "Renomear tag:"
 
 msgid "Set alarm:"
 msgstr "Definir alarme:"
@@ -901,12 +910,18 @@ msgstr "Configurar a senha"
 msgid "Add or remove tags"
 msgstr "Adicionar ou remover tags"
 
+msgid "Duplicate"
+msgstr "Duplicar"
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr "%s - Copiar"
+
 msgid "Switch between note and to-do type"
 msgstr "Alternar entre os tipos Nota e Tarefa"
 
-#, fuzzy
 msgid "Copy Markdown link"
-msgstr "Markdown"
+msgstr "Copiar link de Markdown"
 
 msgid "Delete"
 msgstr "Excluir"
@@ -924,15 +939,18 @@ msgstr "Atualmente, não há cadernos. Crie um, clicando em \"Novo caderno\"."
 msgid "Open..."
 msgstr "Abrir..."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "This file could not be opened: %s"
-msgstr "O caderno não pôde ser salvo: %s"
+msgstr "Este arquivo não pôde ser aberto: %s"
 
 msgid "Save as..."
 msgstr "Salvar como..."
 
 msgid "Copy path to clipboard"
-msgstr ""
+msgstr "Copiar caminho para a área de transferência"
+
+msgid "Copy Link Address"
+msgstr "Copiar endereço do link"
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -947,16 +965,16 @@ msgstr ""
 "e edite a nota."
 
 msgid "strong text"
-msgstr ""
+msgstr "texto forte"
 
 msgid "emphasized text"
-msgstr ""
+msgstr "texto enfatizado"
 
 msgid "List item"
-msgstr ""
+msgstr "Listar item"
 
 msgid "Insert Hyperlink"
-msgstr ""
+msgstr "Inserir Hiperlink"
 
 msgid "Attach file"
 msgstr "Anexar arquivo"
@@ -967,37 +985,36 @@ msgstr "Tags"
 msgid "Set alarm"
 msgstr "Definir alarme"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "Em: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Hiperlink"
 
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "Lista numerada"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "Lista com bullets"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "Checkbox"
 
 msgid "Heading"
-msgstr ""
+msgstr "Cabeçalho"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "Régua horizontal"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "Clique para encerrar edição externa"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "Cancelando..."
+msgstr "Verificando..."
 
 msgid "to-do"
 msgstr "tarefa"
@@ -1030,9 +1047,8 @@ msgstr "Status de sincronização"
 msgid "Encryption Options"
 msgstr "Opções de Encriptação"
 
-#, fuzzy
 msgid "Clipper Options"
-msgstr "Opções Gerais"
+msgstr "Opções do clipper"
 
 msgid "Remove this tag from all the notes?"
 msgstr "Remover esta tag de todas as notas?"
@@ -1176,9 +1192,8 @@ msgstr "Itens encriptados não podem ser modificados"
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#, fuzzy
 msgid "Cannot move notebook to this location"
-msgstr "Não é possível mover a nota para o caderno \"%s\""
+msgstr "Não é possível mover a nota para este local"
 
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
@@ -1189,17 +1204,14 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
 "Os cadernos não podem ser nomeados como\"%s\", que é um título reservado."
 
-#, fuzzy
 msgid "title"
-msgstr "Sem título"
+msgstr "título"
 
-#, fuzzy
 msgid "updated date"
-msgstr "Atualizado: %d."
+msgstr "data de ataualização"
 
-#, fuzzy
 msgid "created date"
-msgstr "Criado: %d."
+msgstr "data de criação"
 
 msgid "Untitled"
 msgstr "Sem título"
@@ -1215,16 +1227,6 @@ msgstr "Não é possível copiar a nota para o caderno \"%s\""
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Não é possível mover a nota para o caderno \"%s\""
 
-msgid "Text editor"
-msgstr "Editor de texto"
-
-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 ""
-"O editor que será usado para abrir uma nota. Se nenhum for indicado, ele "
-"tentará detectar automaticamente o editor padrão."
-
 msgid "Language"
 msgstr "Idioma"
 
@@ -1246,9 +1248,8 @@ msgstr "Dark"
 msgid "Uncompleted to-dos on top"
 msgstr "Mostrar tarefas incompletas no topo"
 
-#, fuzzy
 msgid "Show completed to-dos"
-msgstr "Mostrar tarefas incompletas no topo"
+msgstr "Mostrar tarefas completas"
 
 msgid "Sort notes by"
 msgstr "Ordenar notas por"
@@ -1275,7 +1276,7 @@ msgid "Show tray icon"
 msgstr "Exibir tray icon"
 
 msgid "Note: Does not work in all desktop environments."
-msgstr ""
+msgstr "Nota: não funciona em todos os ambientes de desktop"
 
 msgid "Global zoom percentage"
 msgstr "Porcentagem global do zoom"
@@ -1283,13 +1284,12 @@ msgstr "Porcentagem global do zoom"
 msgid "Editor font family"
 msgstr "Família de fontes do editor"
 
-#, fuzzy
 msgid ""
 "This must be *monospace* font or it will not work properly. If the font is "
 "incorrect or empty, it will default to a generic monospace font."
 msgstr ""
-"O nomes da fonte não será verificado. Se estiver incorreto ou vazio, será "
-"usado por default uma fonte genérica monospace."
+"Deve ser uma fonte *monospace\" ou não vai funcionar direito. Se a fonte "
+"estiver incorreta ou vazia, será usada uma fonte genérica monospace default."
 
 msgid "Automatically update the application"
 msgstr "Atualizar automaticamente o aplicativo"
@@ -1309,6 +1309,17 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d horas"
 
+msgid "Text editor command"
+msgstr "Comando do editor de texto"
+
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"O comando do editor (pode incluir argumentos) que será usado para abrir uma "
+"nota. Se nenhum for indicado, ele tentará detectar automaticamente o editor "
+"padrão."
+
 msgid "Show advanced options"
 msgstr "Mostrar opções avançadas"
 
@@ -1351,16 +1362,22 @@ msgid "WebDAV password"
 msgstr "Senha do WebDAV"
 
 msgid "Custom TLS certificates"
-msgstr ""
+msgstr "Certificados TLS customizados"
 
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
+"Lista de caminhos para diretórios, separados por vírgula, de onde carregar "
+"os certificados, ou caminhos para arquivos cert. Por exemplo, /my/cert_dir, /"
+"other/custom.pem. Note que se você fizer mudanças nas configurações de TLS, "
+"você tem que salvar as mudanças antes de clicar em \"Verificar a "
+"configuração da sincronização\""
 
 msgid "Ignore TLS certificate errors"
-msgstr ""
+msgstr "Ignorar erros de certificados TLS"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1481,9 +1498,8 @@ msgstr "Mover %d notas para o caderno \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Pressione para configurar a senha de decriptação."
 
-#, fuzzy
 msgid "Save alarm"
-msgstr "Definir alarme"
+msgstr "Salvar alarme"
 
 msgid "Select date"
 msgstr "Selecionar data"
@@ -1494,9 +1510,9 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronização"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Decrypting items: %d/%d"
-msgstr "Itens pesquisados: %d/%d."
+msgstr "Decriptando itens: %d/%d."
 
 msgid "New tags:"
 msgstr "Novas tags:"
@@ -1508,17 +1524,24 @@ msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
 "them in your phone settings, in Apps > Joplin > Permissions"
 msgstr ""
+"Para funcionar corretamente, o app precisa das seguintes permissões. Por "
+"favor, habilite-as nas configurações do seu telefone, em Apps >Joplin > "
+"Permissões"
 
 msgid ""
 "- Storage: to allow attaching files to notes and to enable filesystem "
 "synchronisation."
 msgstr ""
+"- Armazenamento: para permitir anexar arquivos a notas, e para permitir a "
+"sincronização do sistema de arquivos "
 
 msgid "- Camera: to allow taking a picture and attaching it to a note."
-msgstr ""
+msgstr "- Câmera: para permitir tirar fotos e anexar a uma nota."
 
 msgid "- Location: to allow attaching geo-location information to a note."
 msgstr ""
+"- Localização: para permitir anexar informações de geo-localização a uma "
+"nota."
 
 msgid "Joplin website"
 msgstr "Site do Joplin"
@@ -1567,11 +1590,11 @@ msgstr "Descartar alterações"
 
 #, javascript-format
 msgid "No item with ID %s"
-msgstr ""
+msgstr "Nenhum item com ID %s"
 
 #, javascript-format
 msgid "The Joplin mobile app does not currently support this type of link: %s"
-msgstr ""
+msgstr "O app mobile do Joplin não suporta, atualmente, esse tipo de link: %s"
 
 #, javascript-format
 msgid "Unsupported image type: %s"
@@ -1584,7 +1607,7 @@ msgid "Attach any file"
 msgstr "Anexar qualquer arquivo"
 
 msgid "Share"
-msgstr ""
+msgstr "Compartilhar"
 
 msgid "Convert to note"
 msgstr "Converter para nota"

CliClient/locales/ru_RU.po

@@ -632,6 +632,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -756,12 +759,15 @@ msgstr "Проверить настройки синхронизации"
 msgid "Notes and settings are stored in: %s"
 msgstr "Заметки и настройки сохранены в: %s"
 
-msgid "Save"
-msgstr "Сохранить"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 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 "
@@ -901,6 +907,13 @@ msgstr "Установить пароль"
 msgid "Add or remove tags"
 msgstr "Добавить или удалить теги"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Копировать"
+
 msgid "Switch between note and to-do type"
 msgstr "Переключить тип между заметкой и задачей"
 
@@ -934,6 +947,9 @@ msgstr "Сохранить как..."
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Неподдерживаемая ссыка или сообщение: %s"
@@ -1212,16 +1228,6 @@ msgstr "Не удалось скопировать заметку в блокн
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Не удалось переместить заметку в блокнот «%s»"
 
-msgid "Text editor"
-msgstr "Текстовый редактор"
-
-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 ""
-"Редактор, в котором будут открываться заметки. Если не задан, будет "
-"произведена попытка автоматического определения редактора по умолчанию."
-
 msgid "Language"
 msgstr "Язык"
 
@@ -1306,6 +1312,18 @@ msgstr "%d час"
 msgid "%d hours"
 msgstr "%d часов"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Текстовый редактор"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Редактор, в котором будут открываться заметки. Если не задан, будет "
+"произведена попытка автоматического определения редактора по умолчанию."
+
 msgid "Show advanced options"
 msgstr "Показывать расширенные настройки"
 
@@ -1353,7 +1371,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/sl_SI.po

@@ -631,6 +631,9 @@ msgstr ""
 msgid "Italic"
 msgstr ""
 
+msgid "Insert Date Time"
+msgstr ""
+
 msgid "Edit in external editor"
 msgstr ""
 
@@ -755,12 +758,15 @@ msgstr "Preveri nastavitve sinhronizacije"
 msgid "Notes and settings are stored in: %s"
 msgstr "Zabeležke in nastavitve so shranjene v: %s"
 
-msgid "Save"
-msgstr "Shrani"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 msgstr ""
 
+msgid "Save"
+msgstr "Shrani"
+
 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 "
@@ -901,6 +907,13 @@ msgstr "Nastavi geslo"
 msgid "Add or remove tags"
 msgstr "Dodaj ali odstrani oznake"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopiraj"
+
 msgid "Switch between note and to-do type"
 msgstr "Menjaj med zabeležko in seznamom opravil"
 
@@ -938,6 +951,9 @@ msgstr "Shrani kot..."
 msgid "Copy path to clipboard"
 msgstr ""
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodprta povezava ali sporočilo: %s"
@@ -1216,16 +1232,6 @@ msgstr "Ni moč kopirati zabeležke v \"%s\" beležnico"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Ni moč premakniti zabeležke v \"%s\" beležnico"
 
-msgid "Text editor"
-msgstr "Urejevalnik besedila"
-
-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 ""
-"Urejevalnik, ki bo uporabljen za odpiranje zabeležk. Če noben ni izbran, bo "
-"avtomatsko zaznan privzeti urejevalnik."
-
 msgid "Language"
 msgstr "Jezik"
 
@@ -1310,6 +1316,18 @@ msgstr "Števil ur: %d"
 msgid "%d hours"
 msgstr "Število ur: %d"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "Urejevalnik besedila"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"Urejevalnik, ki bo uporabljen za odpiranje zabeležk. Če noben ni izbran, bo "
+"avtomatsko zaznan privzeti urejevalnik."
+
 msgid "Show advanced options"
 msgstr "Pokaži napredne možnosti"
 
@@ -1357,7 +1375,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/zh_CN.po

@@ -596,6 +596,9 @@ msgstr "粗体"
 msgid "Italic"
 msgstr "斜体"
 
+msgid "Insert Date Time"
+msgstr ""
+
 #, fuzzy
 msgid "Edit in external editor"
 msgstr "在外部编辑器中打开"
@@ -723,12 +726,15 @@ msgstr "检查同步配置"
 msgid "Notes and settings are stored in: %s"
 msgstr "笔记与设置文件储存目录为：%s"
 
-msgid "Save"
-msgstr "保存"
+msgid "Apply"
+msgstr ""
 
 msgid "Submit"
 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 "
@@ -860,6 +866,13 @@ msgstr "设置密码"
 msgid "Add or remove tags"
 msgstr "添加或删除标签"
 
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "复制"
+
 msgid "Switch between note and to-do type"
 msgstr "在笔记和待办事项类型之间切换"
 
@@ -892,6 +905,9 @@ msgstr "另存为…"
 msgid "Copy path to clipboard"
 msgstr "复制路径到剪切板"
 
+msgid "Copy Link Address"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "不支持的链接或信息：%s"
@@ -1161,14 +1177,6 @@ msgstr "无法复制笔记至 \"%s\" 笔记本"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "无法移动笔记至 \"%s\" 笔记本"
 
-msgid "Text editor"
-msgstr "文本编辑器"
-
-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 "此编辑器将会被用于打开笔记。若未提供将自动检测默认编辑器。"
-
 msgid "Language"
 msgstr "语言"
 
@@ -1251,6 +1259,16 @@ msgstr "%d小时"
 msgid "%d hours"
 msgstr "%d小时"
 
+#, fuzzy
+msgid "Text editor command"
+msgstr "文本编辑器"
+
+#, fuzzy
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr "此编辑器将会被用于打开笔记。若未提供将自动检测默认编辑器。"
+
 msgid "Show advanced options"
 msgstr "显示高级选项"
 
@@ -1296,7 +1314,8 @@ msgstr ""
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 
 msgid "Ignore TLS certificate errors"

CliClient/locales/zh_TW.po

@@ -16,15 +16,14 @@ msgstr ""
 "X-Generator: Poedit 2.0.8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#, fuzzy
 msgid "To delete a tag, untag the associated notes."
-msgstr "要刪除標籤，請取消關聯已標籤的記事。"
+msgstr "要刪除標籤，請取消關聯已被標籤的記事。"
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr "請先選擇要刪除的記事或記事本。"
 
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
-msgstr "Press Ctrl+D or type \"exit\" to exit the application"
+msgstr "按 Ctrl+D 或鍵入 \"exit\" 以退出應用程式"
 
 #, javascript-format
 msgid "More than one item match \"%s\". Please narrow down your query."
@@ -53,11 +52,11 @@ msgstr "正在取消同步...請稍等。"
 
 #, javascript-format
 msgid "No such command: %s"
-msgstr "沒有該指令: %s"
+msgstr "沒有該命令: %s"
 
 #, javascript-format
 msgid "The command \"%s\" is only available in GUI mode"
-msgstr ""
+msgstr "命令 \"%s\" 僅在 GUI 模式下可用"
 
 msgid "Cannot change encrypted item"
 msgstr "無法更改已加密項目"
@@ -95,9 +94,11 @@ msgid ""
 "value of [name]. If neither [name] nor [value] is provided, it will list the "
 "current configuration."
 msgstr ""
+"取得或設定一個設置值。如果沒有指明 [value]，則會顯示 [name] 的值。如果 "
+"[name] 和 [vallue] 兩者均沒有指明，則會列出當前設置。"
 
 msgid "Also displays unset and hidden config variables."
-msgstr ""
+msgstr "亦顯示未設置和隱藏的設置變數。"
 
 #, javascript-format
 msgid "%s = %s (%s)"
@@ -111,8 +112,8 @@ msgid ""
 "Duplicates the notes matching <note> to [notebook]. If no notebook is "
 "specified the note is duplicated in the current notebook."
 msgstr ""
-"將匹配 <note> 的記事複製到 [記事本]。如果未指定筆記本，則預設複製到當前記事本"
-"中。"
+"將匹配 <note> 的記事複製到 [notebook]。如果未指定筆記本，則預設複製到當前記事"
+"本中。"
 
 msgid "Marks a to-do as done."
 msgstr "標記待辦事項為完成。"
@@ -125,6 +126,8 @@ msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status` and `target-status`."
 msgstr ""
+"管理 E2EE 設置。命令是 `enable`，`disable`，`decrypt`，`status` 和 `target-"
+"status`。"
 
 msgid "Enter master password:"
 msgstr "輸入主密碼:"
@@ -148,17 +151,17 @@ msgstr "已停用"
 
 #, javascript-format
 msgid "Encryption is: %s"
-msgstr ""
+msgstr "加密: %s"
 
 msgid "Edit note."
 msgstr "編輯記事。"
 
 msgid ""
 "No text editor is defined. Please set it using `config editor <editor-path>`"
-msgstr "未設置文字編輯器。請用 `config editor <editor-path>` 去設置。"
+msgstr "未設置文字編輯器。請用 `config editor <editor-path>` 去設置"
 
 msgid "No active notebook."
-msgstr "無使用中的筆記本。"
+msgstr "無使用中的記事本。"
 
 #, javascript-format
 msgid "Note does not exist: \"%s\". Create it?"
@@ -202,45 +205,49 @@ msgstr "顯示使用資訊。"
 
 #, javascript-format
 msgid "For information on how to customise the shortcuts please visit %s"
-msgstr ""
+msgstr "有關如何自訂快捷鍵，請訪問 %s"
 
 msgid "Shortcuts are not available in CLI mode."
-msgstr ""
+msgstr "在 CLI 模式下無法使用快捷鍵。"
 
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
 "all` for the complete usage information."
 msgstr ""
+"輸入 `help [command]` 查看關於命令的更多資訊; 或者輸入 `help all` 獲取完整的"
+"使用說明。"
 
 msgid "The possible commands are:"
-msgstr ""
+msgstr "可能的命令是："
 
 msgid ""
 "In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
+"在任何一個命令中，可以通過標題或 ID 去引用記事或記事本，或使用快捷鍵 `$n` or "
+"`$b` 分別選定記事或記事本的。您亦可以用 `$ c` 來引用當前選擇的項目。"
 
 msgid "To move from one pane to another, press Tab or Shift+Tab."
-msgstr ""
+msgstr "要從一個窗格移動到另一個窗格，請按 Tab 或 Shift+Tab。"
 
 msgid ""
 "Use the arrows and page up/down to scroll the lists and text areas "
 "(including this console)."
-msgstr ""
+msgstr "使用方向鍵和上/下頁鍵去捲動清單和文本區域 (包括此主控台)。"
 
 msgid "To maximise/minimise the console, press \"tc\"."
-msgstr ""
+msgstr "要最大化/最小化主控台，請按 \"tc\"。"
 
 msgid "To enter command line mode, press \":\""
-msgstr ""
+msgstr "要進入命令行模式，請按 \":\""
 
 msgid "To exit command line mode, press ESCAPE"
-msgstr ""
+msgstr "要退出命令行模式，請按 ESC 鍵"
 
 msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
-msgstr ""
+msgstr "請輸入`help keymap` 查看有關鍵盤快捷鍵和設置選項"
 
 msgid "Imports data into Joplin."
 msgstr "匯入資料到 Joplin。"
@@ -289,7 +296,7 @@ msgid ""
 msgstr "顯示當前記事本中的記事。使用 \"ls/\" 顯示記事本的清單。"
 
 msgid "Displays only the first top <num> notes."
-msgstr "僅顯示頭 <num> 個記事。"
+msgstr "僅顯示頭 <num> 則記事。"
 
 msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
 msgstr "按 <field> 對項目進行排序 (例如: 標題、更新時間、建立時間等等)。"
@@ -302,14 +309,19 @@ 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 ""
+"僅顯示特定類型的項目。您可用 `n` 來顯示記事，`t` 來顯示待辦事項，或者 `nt` 一"
+"併顯示記事及待辦事項。又例如，用 `-tt` 僅顯示待辦事項，而 `-ttd` 則一併顯示記"
+"事及待辦事項。"
 
 msgid "Either \"text\" or \"json\""
-msgstr ""
+msgstr "\"text\" 或 \"json\" 二者之一"
 
 msgid ""
 "Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
 "TODO_CHECKED (for to-dos), TITLE"
 msgstr ""
+"使用長清單格式。格式為 ID, NOTE_COUNT (用於記事本), DATE, TODO_CHECKED (用於"
+"待辦事項), TITLE"
 
 msgid "Please select a notebook first."
 msgstr "請先選擇記事本。"
@@ -327,7 +339,7 @@ msgid "Creates a new to-do."
 msgstr "新增待辦事項。"
 
 msgid "Moves the notes matching <note> to [notebook]."
-msgstr "將匹配 <note> 的記事移動到 [記事本]。"
+msgstr "將匹配 <note> 的記事移動到 [notebook]。"
 
 msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr "將特定的 <item> (記事或記事本) 重新命名為 <name>。"
@@ -351,7 +363,7 @@ msgstr "刪除記事時不要求確認。"
 
 #, javascript-format
 msgid "%d notes match this pattern. Delete them?"
-msgstr "%d 個記事與此模式匹配。要刪除它們？"
+msgstr "%d 則記事與此模式匹配。要刪除它們？"
 
 msgid "Delete note?"
 msgstr "刪除記事？"
@@ -377,15 +389,15 @@ msgid "Synchronises with remote storage."
 msgstr "與遠端儲存設備同步。"
 
 msgid "Sync to provided target (defaults to sync.target config value)"
-msgstr ""
+msgstr "同步到已指明的目標 (預設是 sync.target 的設置值)"
 
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
-msgstr ""
+msgstr "身份驗證未完成 (未收到身份驗證的 token)。"
 
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
-msgstr "請按照以下步驟，設置 Joplin 與 Dropbox 同步所需的選項。"
+msgstr "請按照以下步驟，設置 Joplin 與 Dropbox 同步所需的選項:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr "步驟 1: 在瀏覽器中打開此網址以授權應用程式:"
@@ -406,6 +418,8 @@ msgid ""
 "taking place, you may delete the lock file at \"%s\" and resume the "
 "operation."
 msgstr ""
+"鎖定檔已被保留。如果您知道沒有正在同步，您可刪除 \"%s\" 上的鎖定檔並繼續操"
+"作。"
 
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
@@ -425,10 +439,13 @@ msgid ""
 "[tag] from [note], or to list the notes associated with [tag]. The command "
 "`tag list` can be used to list all the tags."
 msgstr ""
+"<tag-command> 可以是 \"add\" (新增)，\"remove\" (刪除) 或用 \"list\" 從 [記"
+"事] 中分配或移除 [標籤]，或列出與 [標籤] 關聯的記事。而命令 `tag list` 可以用"
+"來列出所有的標籤。"
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
-msgstr "無效的指令: \"%s\""
+msgstr "無效的命令: \"%s\""
 
 msgid ""
 "<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
@@ -436,6 +453,9 @@ msgid ""
 "target is a regular note it will be converted to a to-do). Use \"clear\" to "
 "convert the to-do back to a regular note."
 msgstr ""
+"<todo-command> 可以是 \"toggle\" (切換) 或 \"clear\" (清除)。使用 \"toggle\" "
+"在已完成和未完成的待辦事項之間互相切換 (如果目標是一般記事，則會轉換為待辦事"
+"項)。使用 \"clear\" 將待辦事項轉換為一般記事。"
 
 msgid "Marks a to-do as non-completed."
 msgstr "標記待辦事項為未完成。"
@@ -443,21 +463,21 @@ msgstr "標記待辦事項為未完成。"
 msgid ""
 "Switches to [notebook] - all further operations will happen within this "
 "notebook."
-msgstr ""
+msgstr "切換到 [notebook] - 所有進一步的操作將在此筆記本中發生。"
 
 msgid "Displays version information"
 msgstr "顯示版本資訊"
 
 #, javascript-format
 msgid "%s %s (%s)"
-msgstr ""
+msgstr "%s %s (%s)"
 
 msgid "Enum"
-msgstr ""
+msgstr "列舉 (Enum)"
 
 #, javascript-format
 msgid "Type: %s."
-msgstr ""
+msgstr "類型: %s。"
 
 #, javascript-format
 msgid "Possible values: %s."
@@ -468,20 +488,20 @@ msgid "Default: %s"
 msgstr "預設: %s"
 
 msgid "Possible keys/values:"
-msgstr ""
+msgstr "可能的鍵/值:"
 
 msgid "Type `joplin help` for usage information."
-msgstr ""
+msgstr "鍵入 `joplin help` 檢視使用說明。"
 
 msgid "Fatal error:"
-msgstr ""
+msgstr "嚴重錯誤:"
 
 msgid ""
 "The application has been authorised - you may now close this browser tab."
-msgstr ""
+msgstr "應用程式已取得權限 - 您現在可以關閉此瀏覽器分頁。"
 
 msgid "The application has been successfully authorised."
-msgstr ""
+msgstr "應用程式已成功取得權限。"
 
 msgid ""
 "Please open the following URL in your browser to authenticate the "
@@ -490,6 +510,9 @@ msgid ""
 "any files outside this directory nor to any other personal data. No data "
 "will be shared with any third party."
 msgstr ""
+"請在瀏覽器開啟以下 URL 去驗證應用程式。應用程式將在 \"Apps/Joplin\" 中建立一"
+"個目錄，並只會在該目錄中進行讀取和寫入。應用程式將無法訪問此目錄之外的任何檔"
+"案，同時也無法使用任何其他個人資料。我們不會與任何第三方廠商共用任何資料。"
 
 msgid "Search:"
 msgstr "搜尋:"
@@ -502,6 +525,11 @@ msgid ""
 "\n"
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
+"Joplin 歡迎您!\n"
+"\n"
+"鍵入: `:help shortcuts` 檢視鍵盤快速鍵清單，或只鍵入 `:help` 檢視使用說明。\n"
+"\n"
+"例如，您可鍵入: `mb` 去新增一本記事本; 鍵入 `mn` 去新增記事。"
 
 msgid ""
 "One or more items are currently encrypted and you may need to supply a "
@@ -509,14 +537,16 @@ msgid ""
 "supplied the password, the encrypted items are being decrypted in the "
 "background and will be available soon."
 msgstr ""
+"當前已加密一個或多個一個項目，您可能需要提供主密碼。請鍵入 \"e2ee decrypt\" "
+"去解碼。如果您已經提供了密碼，那加密的項目將會在後臺解密，請耐心等候。"
 
 #, javascript-format
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
+msgstr "匯出到 \"%s\" 為 \"%s\" 格式。請稍候..."
 
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
+msgstr "從 \"%s\" 匯入為 \"%s\" 格式。請稍候..."
 
 msgid "PDF File"
 msgstr "PDF 檔案"
@@ -562,13 +592,16 @@ msgid "Paste"
 msgstr "貼上"
 
 msgid "Bold"
-msgstr ""
+msgstr "粗體"
 
 msgid "Italic"
-msgstr ""
+msgstr "斜體"
+
+msgid "Insert Date Time"
+msgstr "插入日期時間"
 
 msgid "Edit in external editor"
-msgstr ""
+msgstr "使用外部編輯器編輯"
 
 msgid "Search in all the notes"
 msgstr "在所有記事中搜尋"
@@ -614,7 +647,7 @@ msgstr "關於 Joplin"
 
 #, javascript-format
 msgid "%s %s (%s, %s)"
-msgstr ""
+msgstr "%s %s (%s, %s)"
 
 #, javascript-format
 msgid "Open %s"
@@ -642,11 +675,11 @@ msgid "No"
 msgstr "否"
 
 msgid "The web clipper service is enabled and set to auto-start."
-msgstr ""
+msgstr "Web clipper 服務已啟用，並設置為自動啟動。"
 
 #, javascript-format
 msgid "Status: Started on port %d"
-msgstr ""
+msgstr "狀態: 已在 %d 端口上啟動"
 
 #, javascript-format
 msgid "Status: %s"
@@ -656,7 +689,7 @@ msgid "Disable Web Clipper Service"
 msgstr "停用 Web Clipper 服務"
 
 msgid "The web clipper service is not enabled."
-msgstr ""
+msgstr "Web clipper 服務已停用。"
 
 msgid "Enable Web Clipper Service"
 msgstr "啟用 Web Clipper 服務"
@@ -664,45 +697,51 @@ msgstr "啟用 Web Clipper 服務"
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
 "to Joplin."
-msgstr ""
+msgstr "Joplin Web Clipper 可以讓您從瀏覽器保存網頁和螢幕截圖到 Joplin。"
 
 msgid "In order to use the web clipper, you need to do the following:"
-msgstr ""
+msgstr "要使用 web clipper，您需要執行以下動作:"
 
 msgid "Step 1: Enable the clipper service"
-msgstr ""
+msgstr "步驟 1: 啟用 clipper 服務"
 
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
 "enabling it your firewall may ask you to give permission to Joplin to listen "
 "to a particular port."
 msgstr ""
+"此服務允許瀏覽器插件與 Joplin 溝通。當啟用它時，您的防火牆可能要求您授予 "
+"Joplin 偵聽特定端口的許可權。"
 
 msgid "Step 2: Install the extension"
-msgstr ""
+msgstr "步驟 2: 安裝插件"
 
 msgid "Download and install the relevant extension for your browser:"
-msgstr ""
+msgstr "下載並安裝瀏覽器插件:"
 
 msgid "Check synchronisation configuration"
 msgstr "檢測同步設置"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
-msgstr ""
+msgstr "所有記事和設置均儲存於: %s"
+
+msgid "Apply"
+msgstr "套用"
+
+msgid "Submit"
+msgstr "送出"
 
 msgid "Save"
 msgstr "儲存"
 
-#, fuzzy
-msgid "Submit"
-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 "
@@ -710,6 +749,9 @@ msgid ""
 "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 "停用加密"
@@ -721,13 +763,13 @@ msgid "Master Keys"
 msgstr "主密碼"
 
 msgid "Active"
-msgstr ""
+msgstr "使用中"
 
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgid "Source"
-msgstr ""
+msgstr "來源"
 
 msgid "Created"
 msgstr "已建立"
@@ -746,6 +788,8 @@ msgid ""
 "as \"active\"). Any of the keys might be used for decryption, depending on "
 "how the notes or notebooks were originally encrypted."
 msgstr ""
+"注意: 只有一個主密碼將用於加密 (標記為 \"使用中\" 的那個)。根據記事或記事本最"
+"初加密的方式，任何密碼都可能用於解密。"
 
 msgid "Missing Master Keys"
 msgstr "缺少主密碼"
@@ -755,18 +799,19 @@ msgid ""
 "however the application does not currently have access to them. It is likely "
 "they will eventually be downloaded via synchronisation."
 msgstr ""
+"某些項目使用這些 ID 的主密碼進行加密，但應用程式目前焦法訪問它們。這些許可權"
+"可能最終會通過同步下載。"
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
 "to enable it please check the documentation:"
-msgstr ""
-"有關端到端加密 (E2EE) 的詳細資訊以及該如何啟用它的建議，請參考線上文檔:"
+msgstr "有關端到端加密 (E2EE) 的詳細資訊以及該如何啟用它，請參考線上文檔:"
 
 msgid "Status"
 msgstr "狀態"
 
 msgid "Encryption is:"
-msgstr ""
+msgstr "加密:"
 
 msgid "Back"
 msgstr "返回"
@@ -774,13 +819,13 @@ msgstr "返回"
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
-msgstr ""
+msgstr "將建立新的記事本 \"%s\"，檔案 \"%s\" 將會匯入其中"
 
 msgid "Please create a notebook first."
 msgstr "請先新增記事本。"
 
 msgid "Please create a notebook first"
-msgstr "請先新增記事本。"
+msgstr "請先新增記事本"
 
 msgid "Notebook title:"
 msgstr "記事本標題:"
@@ -789,7 +834,7 @@ msgid "Add or remove tags:"
 msgstr "新增或移除標籤:"
 
 msgid "Separate each tag by a comma."
-msgstr "用逗號分隔每個標籤。"
+msgstr "您可用逗號分隔每個標籤。"
 
 msgid "Rename notebook:"
 msgstr "重新命名記事本:"
@@ -813,7 +858,7 @@ msgid "View them now"
 msgstr "立即檢視"
 
 msgid "Some items cannot be decrypted."
-msgstr ""
+msgstr "有些項目不能解密。"
 
 msgid "Set the password"
 msgstr "設置密碼"
@@ -821,8 +866,15 @@ msgstr "設置密碼"
 msgid "Add or remove tags"
 msgstr "新增或移除標籤"
 
+msgid "Duplicate"
+msgstr "新增複本"
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr "%s - 複本"
+
 msgid "Switch between note and to-do type"
-msgstr ""
+msgstr "切換到記事 / 待辦事項"
 
 msgid "Copy Markdown link"
 msgstr "複製 Markdown 連結"
@@ -834,18 +886,18 @@ msgid "Delete notes?"
 msgstr "刪除此記事？"
 
 msgid "No notes in here. Create one by clicking on \"New note\"."
-msgstr ""
+msgstr "當前沒有任何筆記。通過按一下 \"新增筆記\" 去建立。"
 
 msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
-msgstr ""
+msgstr "您當前沒有任何記事本。通過按一下 \"新增記事本\" 去建立。"
 
 msgid "Open..."
 msgstr "開啟..."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "This file could not be opened: %s"
-msgstr "無法儲存記事本: %s"
+msgstr "無法開啟檔案: %s"
 
 msgid "Save as..."
 msgstr "另存為..."
@@ -853,27 +905,30 @@ msgstr "另存為..."
 msgid "Copy path to clipboard"
 msgstr "複製路徑到剪貼板"
 
+msgid "Copy Link Address"
+msgstr "複製鏈接位址"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
-msgstr ""
+msgstr "不支援的鏈接或訊息: %s"
 
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
-msgstr ""
+msgstr "此筆記沒有內容。按一下 \"%s\" 切換到編輯模式並編輯筆記。"
 
 msgid "strong text"
-msgstr ""
+msgstr "重要文字 <strong>"
 
 msgid "emphasized text"
-msgstr ""
+msgstr "強調文字 <em>"
 
 msgid "List item"
-msgstr ""
+msgstr "清單項目"
 
 msgid "Insert Hyperlink"
-msgstr ""
+msgstr "插入超連結"
 
 msgid "Attach file"
 msgstr "附加檔案"
@@ -884,37 +939,36 @@ msgstr "標籤"
 msgid "Set alarm"
 msgstr "設置提醒"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "在: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "超連結"
 
 msgid "Code"
-msgstr ""
+msgstr "引言"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "編號清單"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "項目清單"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "核取方塊"
 
 msgid "Heading"
-msgstr ""
+msgstr "標題"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "水平線"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "按下停止外部編輯"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "正在取消中..."
+msgstr "觀察中..."
 
 msgid "to-do"
 msgstr "待辦事項"
@@ -966,15 +1020,15 @@ msgid "Notebooks"
 msgstr "記事本"
 
 msgid "Please select where the sync status should be exported to"
-msgstr ""
+msgstr "請選擇將同步狀態導出到的位置"
 
 #, javascript-format
 msgid "Usage: %s"
-msgstr ""
+msgstr "使用資訊: %s"
 
 #, javascript-format
 msgid "Unknown flag: %s"
-msgstr ""
+msgstr "未知的標誌: %s"
 
 msgid "Dropbox"
 msgstr "Dropbox"
@@ -996,16 +1050,16 @@ msgstr "WebDAV"
 
 #, javascript-format
 msgid "Unknown log level: %s"
-msgstr ""
+msgstr "未知的日誌級別: %s"
 
 #, javascript-format
 msgid "Unknown level ID: %s"
-msgstr ""
+msgstr "未知的級別 ID: %s"
 
 msgid ""
 "Cannot refresh token: authentication data is missing. Starting the "
 "synchronisation again may fix the problem."
-msgstr ""
+msgstr "無法刷新 token: 缺少身份驗證資料。再次啟動同步可能會解決此問題。"
 
 msgid ""
 "Could not synchronize with OneDrive.\n"
@@ -1015,49 +1069,54 @@ msgid ""
 "\n"
 "Please consider using a regular OneDrive account."
 msgstr ""
+"無法與 OneDrive 同步。\n"
+"\n"
+"此錯誤通常發生在 OneDrive for Business，不幸地，該操作無法被支援。\n"
+"\n"
+"請考慮使用一般的 OneDrive 帳戶。"
 
 #, javascript-format
 msgid "Cannot access %s"
-msgstr ""
+msgstr "無法訪問 %s"
 
 #, javascript-format
 msgid "Created local items: %d."
-msgstr ""
+msgstr "已建立的本地項目: %d 項"
 
 #, javascript-format
 msgid "Updated local items: %d."
-msgstr ""
+msgstr "已更新的本地項目: %d 項"
 
 #, javascript-format
 msgid "Created remote items: %d."
-msgstr ""
+msgstr "已建立的遠端項目: %d 項"
 
 #, javascript-format
 msgid "Updated remote items: %d."
-msgstr ""
+msgstr "已更新的遠端項目: %d 項"
 
 #, javascript-format
 msgid "Deleted local items: %d."
-msgstr ""
+msgstr "已刪除的本地項目: %d 項"
 
 #, javascript-format
 msgid "Deleted remote items: %d."
-msgstr ""
+msgstr "已刪除的遠端項目: %d 項"
 
 #, javascript-format
 msgid "Fetched items: %d/%d."
-msgstr ""
+msgstr "已擷取的本地項目: %d/%d 項"
 
 #, javascript-format
 msgid "State: %s."
-msgstr ""
+msgstr "狀態: %s。"
 
 msgid "Cancelling..."
 msgstr "正在取消中..."
 
 #, javascript-format
 msgid "Completed: %s"
-msgstr "已完成: %s"
+msgstr "已完成於: %s"
 
 #, javascript-format
 msgid "Last error: %s"
@@ -1071,7 +1130,7 @@ msgstr "進行中"
 
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
-msgstr ""
+msgstr "同步已在進行中。狀態: %s"
 
 msgid "Encrypted"
 msgstr "已加密"
@@ -1080,30 +1139,27 @@ msgid "Encrypted items cannot be modified"
 msgstr "無法修改已加密項目"
 
 msgid "Conflicts"
-msgstr ""
+msgstr "衝突"
 
 msgid "Cannot move notebook to this location"
-msgstr ""
+msgstr "無法移動記事本到此位置"
 
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
-msgstr ""
+msgstr "同名筆記本已經存在: \"%s\""
 
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
-msgstr ""
+msgstr "筆記本無法命名為 \"%s\"，這標題已被保留。"
 
-#, fuzzy
 msgid "title"
-msgstr "未命名"
+msgstr "標題"
 
-#, fuzzy
 msgid "updated date"
-msgstr "已更新: %d。"
+msgstr "更新日期"
 
-#, fuzzy
 msgid "created date"
-msgstr "已建立: %d。"
+msgstr "建立日期"
 
 msgid "Untitled"
 msgstr "未命名"
@@ -1119,14 +1175,6 @@ msgstr "無法複製此記事到 \"%s\" 記事本"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "無法移動此記事到 \"%s\" 記事本"
 
-msgid "Text editor"
-msgstr "文字編輯器"
-
-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 ""
-
 msgid "Language"
 msgstr "語言"
 
@@ -1164,10 +1212,10 @@ msgid "When creating a new to-do:"
 msgstr "當新增待辦事項時:"
 
 msgid "Focus title"
-msgstr "游標放置在標題"
+msgstr "游標置於標題"
 
 msgid "Focus body"
-msgstr "游標放置在內文"
+msgstr "游標置於內文"
 
 msgid "When creating a new note:"
 msgstr "當新增記事時:"
@@ -1179,7 +1227,7 @@ msgid "Note: Does not work in all desktop environments."
 msgstr "注意: 不是在全部桌面環境中都能發揮作用。"
 
 msgid "Global zoom percentage"
-msgstr "整體縮放比例"
+msgstr "整體縮放比例 (%)"
 
 msgid "Editor font family"
 msgstr "編輯器字型系列"
@@ -1188,8 +1236,8 @@ msgid ""
 "This must be *monospace* font or it will not work properly. If the font is "
 "incorrect or empty, it will default to a generic monospace font."
 msgstr ""
-"必須是 *等距 (monospace)* 字體，否則程式將無法正常工作。如果字體不正確或為"
-"空, 則預設為通用等距字體。"
+"必須是 *等距 (monospace)* 字型，否則程式將無法正常工作。如果字型不正確或沒有"
+"填寫，則預設為通用等距字型。"
 
 msgid "Automatically update the application"
 msgstr "自動更新應用程式"
@@ -1209,6 +1257,16 @@ msgstr "%d 小時"
 msgid "%d hours"
 msgstr "%d 小時"
 
+msgid "Text editor command"
+msgstr "文字編輯器命令"
+
+msgid ""
+"The editor command (may include arguments) that will be used to open a note. "
+"If none is provided it will try to auto-detect the default editor."
+msgstr ""
+"用於開啟筆記的編輯器命令 (可能包括參數)。如果沒有指明，程式將嘗試自動檢測預設"
+"的編輯器。"
+
 msgid "Show advanced options"
 msgstr "顯示進階選項"
 
@@ -1249,16 +1307,20 @@ msgid "WebDAV password"
 msgstr "WebDAV 密碼"
 
 msgid "Custom TLS certificates"
-msgstr ""
+msgstr "自訂 TLS 證書"
 
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
 "or path to individual cert files. For example: /my/cert_dir, /other/custom."
-"pem"
+"pem. Note that if you make changes to the TLS settings, you must save your "
+"changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
+"要載入證書，可用逗號分隔的目錄路徑清單，或指明特定證書的路徑。例如: /my/"
+"cert_dir, /other/custom.pem。請注意，如果修改了 TLS 的設置，您必須先儲存變"
+"更，然後再按一下 \"檢測同步設置\"。"
 
 msgid "Ignore TLS certificate errors"
-msgstr ""
+msgstr "忽略 TLS 證書錯誤"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1338,7 +1400,7 @@ msgstr "資料夾"
 
 #, javascript-format
 msgid "%s: %d notes"
-msgstr "%s:%d 個記事"
+msgstr "%s:%d 則記事"
 
 msgid "Coming alarms"
 msgstr "將會發生的提醒事項"
@@ -1389,29 +1451,31 @@ msgstr "取消同步"
 
 #, javascript-format
 msgid "Decrypting items: %d/%d"
-msgstr ""
+msgstr "正在解密項目: %d/%d 項"
 
 msgid "New tags:"
 msgstr "新增標籤:"
 
 msgid "Type new tags or select from list"
-msgstr ""
+msgstr "輸入新標籤，或在清單中選擇"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
 "them in your phone settings, in Apps > Joplin > Permissions"
 msgstr ""
+"應用程式需要以下權限才能正常運作。請在您的電話設定中啟用它們。(應用程式 > "
+"Joplin > 權限)"
 
 msgid ""
 "- Storage: to allow attaching files to notes and to enable filesystem "
 "synchronisation."
-msgstr ""
+msgstr "- 儲存: 允許將檔案附加到筆記並啟用檔案系統同步。"
 
 msgid "- Camera: to allow taking a picture and attaching it to a note."
-msgstr ""
+msgstr "- 相機: 允許拍照並附加相片到記事。"
 
 msgid "- Location: to allow attaching geo-location information to a note."
-msgstr ""
+msgstr "- 位置: 允許將地理位置資訊附加到筆記。"
 
 msgid "Joplin website"
 msgstr "Joplin 官方網站"
@@ -1447,13 +1511,13 @@ msgid "Show all"
 msgstr "顯示全部"
 
 msgid "Errors only"
-msgstr "僅出錯時"
+msgstr "僅顯示錯誤"
 
 msgid "This note has been modified:"
 msgstr "此記事已被修改:"
 
 msgid "Save changes"
-msgstr "保存變更"
+msgstr "儲存變更"
 
 msgid "Discard changes"
 msgstr "放棄變更"
@@ -1506,7 +1570,7 @@ msgstr "搜尋"
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
-msgstr "你可以點撃 (+) 鍵去新增記事或記事本。點撃側邊欄去檢視現有的記事本。"
+msgstr "您可以點撃 (+) 鍵去新增記事或記事本。點撃側邊欄去檢視現有的記事本。"
 
 msgid "You currently have no notebook. Create one by clicking on (+) button."
 msgstr "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本筆記。"

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.108",
+  "version": "1.0.114",
   "bin": {
     "joplin": "./main.js"
   },
@@ -38,8 +38,8 @@
     "html-entities": "^1.2.1",
     "html-minifier": "^3.5.15",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.3",
-    "joplin-turndown-plugin-gfm": "^1.0.2",
+    "joplin-turndown": "^4.0.8",
+    "joplin-turndown-plugin-gfm": "^1.0.7",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
@@ -58,10 +58,11 @@
     "server-destroy": "^1.0.1",
     "sharp": "^0.18.4",
     "sprintf-js": "^1.1.1",
-    "sqlite3": "^3.1.8",
+    "sqlite3": "^4.0.1",
     "string-padding": "^1.0.2",
     "string-to-stream": "^1.1.0",
     "strip-ansi": "^4.0.0",
+    "syswide-cas": "^5.2.0",
     "tar": "^4.4.0",
     "tcp-port-used": "^0.1.2",
     "tkwidgets": "^0.5.26",

CliClient/run_test.sh

@@ -28,6 +28,7 @@ npm test tests-build/HtmlToMd.js
 npm test tests-build/markdownUtils.js
 npm test tests-build/models_Folder.js
 npm test tests-build/models_Note.js
+npm test tests-build/models_Tag.js
 npm test tests-build/models_Setting.js
 npm test tests-build/services_InteropService.js
 npm test tests-build/services_ResourceService.js

CliClient/tests/html_to_md/text_with_escaped_html.html

@@ -0,0 +1,5 @@
+<p>Some text, not an image, so it should remain escaped:</p>
+<p>&lt;img src="http://test.com/image.png" /&gt;</p>
+<p>&lt;p class="testing"&gt;Paragraph example&lt;/p&gt;
+<p>But this is code so it can be unescaped:</p>
+<pre><code>&lt;img src="http://test.com/image.png" /&gt;</code></pre>

CliClient/tests/html_to_md/text_with_escaped_html.md

@@ -0,0 +1,9 @@
+Some text, not an image, so it should remain escaped:
+
+<img src="http://test.com/image.png" />
+
+<p class="testing">Paragraph example</p>
+
+But this is code so it can be unescaped:
+
+    <img src="http://test.com/image.png" />

CliClient/tests/models_Tag.js

@@ -0,0 +1,45 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const Tag = require('lib/models/Tag.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('models_Tag', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should add tags by title', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+
+		await Tag.setNoteTagsByTitles(note1.id, ['un', 'deux']);
+
+		const noteTags = await Tag.tagsByNoteId(note1.id);
+		expect(noteTags.length).toBe(2);
+	}));
+
+	it('should not allow renaming tag to existing tag names', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+
+		await Tag.setNoteTagsByTitles(note1.id, ['un', 'deux']);
+
+		const tagUn = await Tag.loadByTitle('un');
+		const hasThrown = await checkThrowAsync(async () => await Tag.save({ id: tagUn.id, title: 'deux' }, { userSideValidation: true }));
+
+		expect(hasThrown).toBe(true);
+	}));
+
+});

Clipper/joplin-webclipper/content_scripts/index.js

@@ -38,7 +38,7 @@
 			const node = childNodes[i];
 
 			let isVisible = node.nodeType === 1 ? window.getComputedStyle(node).display !== 'none' : true;
-			if (isVisible && ['input', 'textarea', 'script', 'style', 'select', 'option', 'button'].indexOf(node.nodeName.toLowerCase()) >= 0) isVisible = false;
+			if (isVisible && ['input', 'textarea', 'script', 'noscript', 'style', 'select', 'option', 'button'].indexOf(node.nodeName.toLowerCase()) >= 0) isVisible = false;
 
 			if (!isVisible) {
 				element.removeChild(node);
@@ -74,6 +74,17 @@
 	async function prepareCommandResponse(command) {
 		console.info('Got command: ' + command.name);
 
+		const clippedContentResponse = (title, html) => {
+			return {
+				name: 'clippedContent',
+				title: title,
+				html: html,
+				base_url: baseUrl(),
+				url: location.origin + location.pathname,
+				parent_id: command.parent_id,
+			};			
+		}
+
 		if (command.name === "simplifiedPageHtml") {
 
 			let article = null;
@@ -87,29 +98,20 @@
 				response.warning = 'Could not retrieve simplified version of page - full page has been saved instead.';
 				return response;
 			}
-
-			return {
-				name: 'clippedContent',
-				html: article.body,
-				title: article.title,
-				base_url: baseUrl(),
-				url: location.origin + location.pathname,
-				parent_id: command.parent_id,
-			};
+			return clippedContentResponse(article.title, article.body);
 
 		} else if (command.name === "completePageHtml") {
 
 			const cleanDocument = document.body.cloneNode(true);
 			cleanUpElement(cleanDocument);
+			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML);
 
-			return {
-				name: 'clippedContent',
-				html: cleanDocument.innerHTML,
-				title: pageTitle(),
-				base_url: baseUrl(),
-				url: location.origin + location.pathname,
-				parent_id: command.parent_id,
-			};
+		} else if (command.name === "selectedHtml") {
+
+		    const range = window.getSelection().getRangeAt(0);
+		    const container = document.createElement('div');
+		    container.appendChild(range.cloneContents());
+		    return clippedContentResponse(pageTitle(), container.innerHTML);
 
 		} else if (command.name === 'screenshot') {
 

Clipper/joplin-webclipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplin.cozic.net",
     "icons": {

Clipper/joplin-webclipper/popup/src/App.js

@@ -41,6 +41,13 @@ class AppComponent extends Component {
 			});
 		}
 
+		this.clipSelection_click = () => {
+			bridge().sendCommandToActiveTab({
+				name: 'selectedHtml',
+				parent_id: this.props.selectedFolderId,
+			});
+		}
+
 		this.clipScreenshot_click = async () => {
 			try {
 				const baseUrl = await bridge().clipperServerBaseUrl();
@@ -195,6 +202,7 @@ class AppComponent extends Component {
 					<ul>
 						<li><a className="Button" onClick={this.clipSimplified_click}>Clip simplified page</a></li>
 						<li><a className="Button" onClick={this.clipComplete_click}>Clip complete page</a></li>
+						<li><a className="Button" onClick={this.clipSelection_click}>Clip selection</a></li>
 						<li><a className="Button" onClick={this.clipScreenshot_click}>Clip screenshot</a></li>
 					</ul>
 				</div>

ElectronClient/app/ElectronAppWrapper.js

@@ -60,6 +60,14 @@ class ElectronAppWrapper {
 		// Fix: https://github.com/electron-userland/electron-builder/issues/2269
 		if (shim.isLinux()) windowOptions.icon = __dirname + '/build/icons/128x128.png';
 
+		require('electron-context-menu')({
+			shouldShowMenu: (event, params) => {
+				// params.inputFieldType === 'none' when right-clicking the text editor. This is a bit of a hack to detect it because in this
+				// case we don't want to use the built-in context menu but a custom one.
+				return params.isEditable && params.inputFieldType !== 'none';
+			},
+		});
+
 		this.win_ = new BrowserWindow(windowOptions)
 
 		this.win_.loadURL(url.format({

ElectronClient/app/InteropServiceHelper.js

@@ -11,7 +11,7 @@ class InteropServiceHelper {
 
 		if (module.target === 'file') {
 			path = bridge().showSaveDialog({
-				filters: [{ name: module.description, extensions: [module.fileExtension]}]
+				filters: [{ name: module.description, extensions: module.fileExtensions}]
 			});
 		} else {
 			path = bridge().showOpenDialog({

ElectronClient/app/app.js

@@ -183,7 +183,7 @@ class Application extends BaseApplication {
 		if (action.type == 'SETTING_UPDATE_ONE' && action.key == 'locale' || action.type == 'SETTING_UPDATE_ALL') {
 			setLocale(Setting.value('locale'));
 			// The bridge runs within the main process, with its own instance of locale.js
-			// so it needs to be set too here. 
+			// so it needs to be set too here.
 			bridge().setLocale(Setting.value('locale'));
 			this.refreshMenu();
 		}
@@ -285,7 +285,7 @@ class Application extends BaseApplication {
 
 							if (moduleSource === 'file') {
 								path = bridge().showOpenDialog({
-									filters: [{ name: module.description, extensions: [module.fileExtension]}]
+									filters: [{ name: module.description, extensions: module.fileExtensions}]
 								});
 							} else {
 								path = bridge().showOpenDialog({
@@ -362,7 +362,6 @@ class Application extends BaseApplication {
 					}
 				}, {
 					label: _('New notebook'),
-					accelerator: 'CommandOrControl+B',
 					screens: ['Main'],
 					click: () => {
 						this.dispatch({
@@ -442,6 +441,17 @@ class Application extends BaseApplication {
 							name: 'textItalic',
 						});
 					},
+				}, {
+					label: _('Insert Date Time'),
+					screens: ['Main'],
+					visible: false,
+					accelerator: 'CommandOrControl+Shift+T',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'insertDateTime',
+						});
+					},
 				}, {
 					type: 'separator',
 					screens: ['Main'],
@@ -748,6 +758,10 @@ class Application extends BaseApplication {
 			AlarmService.garbageCollect();
 		}, 1000 * 60 * 60);
 
+		if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
+			bridge().window().hide();
+		}
+
 		ResourceService.runInBackground();
 
 		if (Setting.value('env') === 'dev') {

ElectronClient/app/bridge.js

@@ -87,6 +87,7 @@ class Bridge {
 		const result = this.showMessageBox_(this.window(), {
 			type: 'question',
 			message: message,
+			cancelId: 1,
 			buttons: [_('OK'), _('Cancel')],
 		});
 		return result === 0;

ElectronClient/app/gui/ConfigScreen.jsx

@@ -63,6 +63,7 @@ class ConfigScreenComponent extends React.Component {
 			color: theme.colorFaded,
 			marginTop: 5,
 			fontStyle: 'italic',
+			maxWidth: '70em',
 		});
 
 		const updateSettingValue = (key, value) => {
@@ -148,6 +149,10 @@ class ConfigScreenComponent extends React.Component {
 		return output;
 	}
 
+	onApplyClick() {
+		shared.saveSettings(this);
+	}
+
 	onSaveClick() {
 		shared.saveSettings(this);
 		this.props.dispatch({ type: 'NAV_BACK' });
@@ -203,8 +208,9 @@ class ConfigScreenComponent extends React.Component {
 						{_('Notes and settings are stored in: %s', pathUtils.toSystemSlashes(Setting.value('profileDir'), process.platform))}
 					</div>
 					{ settingComps }
-					<button onClick={() => {this.onSaveClick()}} style={buttonStyle}>{_('Save')}</button>
+					<button onClick={() => {this.onSaveClick()}} style={buttonStyle}>{_('OK')}</button>
 					<button onClick={() => {this.onCancelClick()}} style={buttonStyle}>{_('Cancel')}</button>
+					<button onClick={() => {this.onApplyClick()}} style={buttonStyle}>{_('Apply')}</button>
 				</div>
 			</div>
 		);

ElectronClient/app/gui/Header.jsx

@@ -35,6 +35,7 @@ class HeaderComponent extends React.Component {
 		this.search_onClear = (event) => {
 			this.setState({ searchQuery: '' });
 			triggerOnQuery('');
+			if (this.searchElement_) this.searchElement_.focus();
 		}
 	}
 

ElectronClient/app/gui/ImportScreen.jsx

@@ -59,7 +59,7 @@ class ImportScreenComponent extends React.Component {
 
 	async doImport() {
 		const filePath = this.props.filePath;
-		const folderTitle = await Folder.findUniqueFolderTitle(filename(filePath));
+		const folderTitle = await Folder.findUniqueItemTitle(filename(filePath));
 		const messages = this.state.messages.slice();
 
 		this.addMessage('start', _('New notebook "%s" will be created and file "%s" will be imported into it', folderTitle, basename(filePath)));

ElectronClient/app/gui/NoteList.jsx

@@ -88,6 +88,15 @@ class NoteListComponent extends React.Component {
 				});
 			}}));
 
+			menu.append(new MenuItem({label: _('Duplicate'), click: async () => {
+				for (let i = 0; i < noteIds.length; i++) {
+					const note = await Note.load(noteIds[i]);
+					await Note.duplicate(noteIds[i], {
+						uniqueTitle: _('%s - Copy', note.title),
+					});
+				}
+			}}));
+
 			menu.append(new MenuItem({label: _('Switch between note and to-do type'), click: async () => {
 				for (let i = 0; i < noteIds.length; i++) {
 					const note = await Note.load(noteIds[i]);

ElectronClient/app/gui/NoteText.jsx

@@ -20,7 +20,6 @@ const MenuItem = bridge().MenuItem;
 const { shim } = require('lib/shim.js');
 const eventManager = require('../eventManager');
 const fs = require('fs-extra');
-const {clipboard} = require('electron')
 const md5 = require('md5');
 const mimeUtils = require('lib/mime-utils.js').mime;
 const ArrayUtils = require('lib/ArrayUtils');
@@ -28,6 +27,8 @@ const urlUtils = require('lib/urlUtils');
 const dialogs = require('./dialogs');
 const markdownUtils = require('lib/markdownUtils');
 const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
+const { toSystemSlashes, safeFilename } = require('lib/path-utils');
+const { clipboard } = require('electron');
 
 require('brace/mode/markdown');
 // https://ace.c9.io/build/kitchen-sink.html
@@ -86,13 +87,14 @@ class NoteTextComponent extends React.Component {
 		this.onNoteTypeToggle_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); }
 		this.onTodoToggle_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); }
 
-		this.onEditorPaste_ = async (event) => {
+		this.onEditorPaste_ = async (event = null) => {
 			const formats = clipboard.availableFormats();
 			for (let i = 0; i < formats.length; i++) {
 				const format = formats[i].toLowerCase();
 				const formatType = format.split('/')[0]
+
 				if (formatType === 'image') {
-					event.preventDefault();
+					if (event) event.preventDefault();
 
 					const image = clipboard.readImage();
 
@@ -113,6 +115,32 @@ class NoteTextComponent extends React.Component {
 			this.setState({ lastKeys: lastKeys });
 		}
 
+		this.onEditorContextMenu_ = (event) => {
+			const menu = new Menu();
+
+			const selectedText = this.selectedText();
+			const clipboardText = clipboard.readText();
+
+			menu.append(new MenuItem({label: _('Cut'), enabled: !!selectedText, click: async () => {
+				this.editorCutText();
+			}}));
+
+			menu.append(new MenuItem({label: _('Copy'), enabled: !!selectedText, click: async () => {
+				this.editorCopyText();
+			}}));
+
+			menu.append(new MenuItem({label: _('Paste'), enabled: true, click: async () => {
+				if (clipboardText) {
+					this.editorPasteText();
+				} else {
+					// To handle pasting images
+					this.onEditorPaste_();
+				}
+			}}));
+
+			menu.popup(bridge().window());
+		}
+
 		this.onDrop_ = async (event) => {
 			const files = event.dataTransfer.files;
 			if (!files || !files.length) return;
@@ -187,7 +215,7 @@ class NoteTextComponent extends React.Component {
 			}
 		}
 
-		return pos;		
+		return pos;
 	}
 
 	textOffsetToCursorPosition(offset, body) {
@@ -341,9 +369,8 @@ class NoteTextComponent extends React.Component {
 			this.editorSetScrollTop(1);
 			this.restoreScrollTop_ = 0;
 
-			// If a search is in progress we don't focus any field otherwise it will
-			// take the focus out of the search box.
-			if (note && this.props.notesParentType !== 'Search') {
+			// Only force focus on notes when creating a new note/todo
+			if (this.props.newNote) {
 				const focusSettingName = !!note.is_todo ? 'newTodoFocus' : 'newNoteFocus';
 
 				if (Setting.value(focusSettingName) === 'title') {
@@ -466,7 +493,7 @@ class NoteTextComponent extends React.Component {
 
 			const menu = new Menu()
 
-			if (itemType === "image" || itemType === "link") {
+			if (itemType === "image" || itemType === "resource") {
 				const resource = await Resource.load(arg0.resourceId);
 				const resourcePath = Resource.fullPath(resource);
 
@@ -484,10 +511,16 @@ class NoteTextComponent extends React.Component {
 				}}));
 
 				menu.append(new MenuItem({label: _('Copy path to clipboard'), click: async () => {
-					const { clipboard } = require('electron');
-					const { toSystemSlashes } = require('lib/path-utils.js');
 					clipboard.writeText(toSystemSlashes(resourcePath));
 				}}));
+			} else if (itemType === "text") {
+				menu.append(new MenuItem({label: _('Copy'), click: async () => {
+					clipboard.writeText(arg0.textToCopy);
+				}}));
+			} else if (itemType === "link") {
+				menu.append(new MenuItem({label: _('Copy Link Address'), click: async () => {
+					clipboard.writeText(arg0.textToCopy);
+				}}));
 			} else {
 				reg.logger().error('Unhandled item type: ' + itemType);
 				return;
@@ -586,6 +619,7 @@ class NoteTextComponent extends React.Component {
 			this.editor_.editor.renderer.off('afterRender', this.onAfterEditorRender_);
 			document.querySelector('#note-editor').removeEventListener('paste', this.onEditorPaste_, true);
 			document.querySelector('#note-editor').removeEventListener('keydown', this.onEditorKeyDown_);
+			document.querySelector('#note-editor').removeEventListener('contextmenu', this.onEditorContextMenu_);
 		}
 
 		this.editor_ = element;
@@ -597,8 +631,8 @@ class NoteTextComponent extends React.Component {
 			const letters = ['F', 'T', 'P', 'Q', 'L', ','];
 			for (let i = 0; i < letters.length; i++) {
 				const l = letters[i];
-				cancelledKeys.push('Ctrl+' + l); 
-				cancelledKeys.push('Command+' + l); 
+				cancelledKeys.push('Ctrl+' + l);
+				cancelledKeys.push('Command+' + l);
 			}
 
 			for (let i = 0; i < cancelledKeys.length; i++) {
@@ -614,6 +648,7 @@ class NoteTextComponent extends React.Component {
 
 			document.querySelector('#note-editor').addEventListener('paste', this.onEditorPaste_, true);
 			document.querySelector('#note-editor').addEventListener('keydown', this.onEditorKeyDown_);
+			document.querySelector('#note-editor').addEventListener('contextmenu', this.onEditorContextMenu_);
 
 			const lineLeftSpaces = function(line) {
 				let output = '';
@@ -639,7 +674,7 @@ class NoteTextComponent extends React.Component {
 
 				if (lineNoLeftSpaces.indexOf('- [ ] ') === 0 || lineNoLeftSpaces.indexOf('- [x] ') === 0 || lineNoLeftSpaces.indexOf('- [X] ') === 0) return leftSpaces + '- [ ] ';
 				if (lineNoLeftSpaces.indexOf('- ') === 0) return leftSpaces + '- ';
-				if (lineNoLeftSpaces.indexOf('* ') === 0) return leftSpaces + '* ';
+				if (lineNoLeftSpaces.indexOf('* ') === 0 && line.trim() !== '* * *') return leftSpaces + '* ';
 
 				const bulletNumber = markdownUtils.olLineNumber(lineNoLeftSpaces);
 				if (bulletNumber) return leftSpaces + (bulletNumber + 1) + '. ';
@@ -702,8 +737,16 @@ class NoteTextComponent extends React.Component {
 	updateHtml(body = null) {
 		const mdOptions = {
 			onResourceLoaded: () => {
-				this.updateHtml();
-				this.forceUpdate();
+				if (this.resourceLoadedTimeoutId_) {
+					clearTimeout(this.resourceLoadedTimeoutId_);
+					this.resourceLoadedTimeoutId_ = null;
+				}
+
+				this.resourceLoadedTimeoutId_ = setTimeout(() => {
+					this.resourceLoadedTimeoutId_ = null;
+					this.updateHtml();
+					this.forceUpdate();
+				}, 100);
 			},
 			postMessageSyntax: 'ipcRenderer.sendToHost',
 		};
@@ -727,13 +770,14 @@ class NoteTextComponent extends React.Component {
 	}
 
 	async doCommand(command) {
-		if (!command) return;
+		if (!command || !this.state.note) return;
 
 		let commandProcessed = true;
 
 		if (command.name === 'exportPdf' && this.webview_) {
 			const path = bridge().showSaveDialog({
-				filters: [{ name: _('PDF File'), extensions: ['pdf']}]
+				filters: [{ name: _('PDF File'), extensions: ['pdf']}],
+				defaultPath: safeFilename(this.state.note.title),
 			});
 
 			if (path) {
@@ -751,6 +795,8 @@ class NoteTextComponent extends React.Component {
 			this.commandTextBold();
 		} else if (command.name === 'textItalic') {
 			this.commandTextItalic();
+		} else if (command.name === 'insertDateTime' ) {
+			this.commandDateTime();
 		} else if (command.name === 'commandStartExternalEditing') {
 			this.commandStartExternalEditing();
 		} else {
@@ -828,15 +874,17 @@ class NoteTextComponent extends React.Component {
 	destroyExternalEditWatcher() {
 		if (!this.externalEditWatcher_) return;
 
-		console.info(this.externalEditWatcher_);
-
 		this.externalEditWatcher_.off('noteChange', this.externalEditWatcher_noteChange);
 		this.externalEditWatcher_.stopWatchingAll();
 		this.externalEditWatcher_ = null;
 	}
 
 	async commandStartExternalEditing() {
-		this.externalEditWatcher().openAndWatch(this.state.note);
+		try {
+			await this.externalEditWatcher().openAndWatch(this.state.note);
+		} catch (error) {
+			bridge().showErrorMessageBox(_('Error opening note in editor: %s', error.message));
+		}
 	}
 
 	async commandStopExternalEditing() {
@@ -873,6 +921,49 @@ class NoteTextComponent extends React.Component {
 		return lines[row];
 	}
 
+	selectedText() {
+		if (!this.state.note || !this.state.note.body) return '';
+
+		const selection = this.textOffsetSelection();
+		if (!selection || selection.start === selection.end) return '';
+
+		return this.state.note.body.substr(selection.start, selection.end - selection.start);
+	}
+
+	editorCopyText() {
+		clipboard.writeText(this.selectedText());
+	}
+
+	editorCutText() {
+		const selectedText = this.selectedText();
+		if (!selectedText) return;
+
+		clipboard.writeText(selectedText);
+
+		const s = this.textOffsetSelection();
+		if (!s || s.start === s.end) return '';
+
+		const s1 = this.state.note.body.substr(0, s.start);
+		const s2 = this.state.note.body.substr(s.end);
+
+		shared.noteComponent_change(this, 'body', s1 + s2);
+
+		this.updateEditorWithDelay((editor) => {
+			const range = this.selectionRange_;
+			range.setStart(range.start.row, range.start.column);
+			range.setEnd(range.start.row, range.start.column);
+			editor.getSession().getSelection().setSelectionRange(range, false);
+			editor.focus();
+		}, 10);
+	}
+
+	editorPasteText() {
+		const s = this.textOffsetSelection();
+		const s1 = this.state.note.body.substr(0, s.start);
+		const s2 = this.state.note.body.substr(s.end);
+		this.wrapSelectionWithStrings("", "", '', clipboard.readText());
+	}
+
 	selectionRangePreviousLine() {
 		if (!this.selectionRange_) return '';
 		const row = this.selectionRange_.start.row;
@@ -885,16 +976,20 @@ class NoteTextComponent extends React.Component {
 		return this.lineAtRow(row);
 	}
 
-	wrapSelectionWithStrings(string1, string2 = '', defaultText = '') {
+	textOffsetSelection() {
+		return this.selectionRange_ ? this.rangeToTextOffsets(this.selectionRange_, this.state.note.body) : null;
+	}
+
+	wrapSelectionWithStrings(string1, string2 = '', defaultText = '', replacementText = '') {
 		if (!this.rawEditor() || !this.state.note) return;
 
-		const selection = this.selectionRange_ ? this.rangeToTextOffsets(this.selectionRange_, this.state.note.body) : null;
+		const selection = this.textOffsetSelection();
 
 		let newBody = this.state.note.body;
 
 		if (selection && selection.start !== selection.end) {
 			const s1 = this.state.note.body.substr(0, selection.start);
-			const s2 = this.state.note.body.substr(selection.start, selection.end - selection.start);
+			const s2 = replacementText ? replacementText : this.state.note.body.substr(selection.start, selection.end - selection.start);
 			const s3 = this.state.note.body.substr(selection.end);
 			newBody = s1 + string1 + s2 + string2 + s3;
 
@@ -905,6 +1000,11 @@ class NoteTextComponent extends React.Component {
 				end: { row: r.end.row, column: r.end.column + string1.length},
 			};
 
+			if (replacementText) {
+				const diff = replacementText.length - (selection.end - selection.start);
+				newRange.end.column += diff;
+			}
+
 			this.updateEditorWithDelay((editor) => {
 				const range = this.selectionRange_;
 				range.setStart(newRange.start.row, newRange.start.column);
@@ -913,21 +1013,20 @@ class NoteTextComponent extends React.Component {
 				editor.focus();
 			});
 		} else {
+			let middleText = replacementText ? replacementText : defaultText;
 			const textOffset = this.currentTextOffset();
 			const s1 = this.state.note.body.substr(0, textOffset);
 			const s2 = this.state.note.body.substr(textOffset);
-			newBody = s1 + string1 + defaultText + string2 + s2;
+			newBody = s1 + string1 + middleText + string2 + s2;
 
 			const p = this.textOffsetToCursorPosition(textOffset + string1.length, newBody);
 			const newRange = {
 				start: { row: p.row, column: p.column },
-				end: { row: p.row, column: p.column + defaultText.length },
+				end: { row: p.row, column: p.column + middleText.length },
 			};
 
-			console.info('DDDDD', defaultText, newRange);
-
 			this.updateEditorWithDelay((editor) => {
-				if (defaultText && newRange) {
+				if (middleText && newRange) {
 					const range = this.selectionRange_;
 					range.setStart(newRange.start.row, newRange.start.column);
 					range.setEnd(newRange.end.row, newRange.end.column);
@@ -954,6 +1053,10 @@ class NoteTextComponent extends React.Component {
 		this.wrapSelectionWithStrings('*', '*', _('emphasized text'));
 	}
 
+	commandDateTime() {
+		this.wrapSelectionWithStrings(time.formatMsToLocal(new Date().getTime()));
+	}
+
 	commandTextCode() {
 		this.wrapSelectionWithStrings('`', '`');
 	}
@@ -1046,7 +1149,7 @@ class NoteTextComponent extends React.Component {
 			tooltip: _('Hyperlink'),
 			iconName: 'fa-link',
 			onClick: () => { return this.commandTextLink(); },
-		});		
+		});
 
 		toolbarItems.push({
 			tooltip: _('Code'),
@@ -1094,6 +1197,12 @@ class NoteTextComponent extends React.Component {
 			onClick: () => { return this.commandTextHorizontalRule(); },
 		});
 
+		toolbarItems.push({
+			tooltip: _('Insert Date Time'),
+			iconName: 'fa-calendar-plus-o',
+			onClick: () => { return this.commandDateTime(); },
+		});
+
 		toolbarItems.push({
 			type: 'separator',
 		});
@@ -1274,7 +1383,7 @@ class NoteTextComponent extends React.Component {
 
 		const viewer =  <webview
 			style={viewerStyle}
-			nodeintegration="1"
+			preload="gui/note-viewer/preload.js"
 			src="gui/note-viewer/index.html"
 			ref={(elem) => { this.webview_ref(elem); } }
 		/>
@@ -1325,7 +1434,7 @@ class NoteTextComponent extends React.Component {
 			editorProps={{$blockScrolling: true}}
 
 			// This is buggy (gets outside the container)
-			highlightActiveLine={false}			
+			highlightActiveLine={false}
 		/>
 
 		return (

ElectronClient/app/gui/SideBar.jsx

@@ -55,6 +55,21 @@ class SideBarComponent extends React.Component {
 			}
 		};
 
+		this.onTagDrop_ = async (event) => {
+			const tagId = event.currentTarget.getAttribute('tagid');
+			const dt = event.dataTransfer;
+			if (!dt) return;
+
+			if (dt.types.indexOf("text/x-jop-note-ids") >= 0) {
+				event.preventDefault();
+
+				const noteIds = JSON.parse(dt.getData("text/x-jop-note-ids"));
+				for (let i = 0; i < noteIds.length; i++) {
+					await Tag.addNote(tagId, noteIds[i]);
+				}
+			}
+		}
+
 		this.onFolderToggleClick_ = async (event) => {
 			const folderId = event.currentTarget.getAttribute('folderid');
 
@@ -238,14 +253,22 @@ class SideBarComponent extends React.Component {
 
 			const InteropService = require("lib/services/InteropService.js");
 
+			const exportMenu = new Menu();
+			const ioService = new InteropService();
+			const ioModules = ioService.modules();
+			for (let i = 0; i < ioModules.length; i++) {
+				const module = ioModules[i];
+				if (module.type !== 'exporter') continue;
+
+				exportMenu.append(new MenuItem({ label: module.fullLabel() , click: async () => {
+					await InteropServiceHelper.export(this.props.dispatch.bind(this), module, { sourceFolderIds: [itemId] });
+				}}));
+			}
+
 			menu.append(
 				new MenuItem({
 					label: _("Export"),
-					click: async () => {
-						const ioService = new InteropService();
-						const module = ioService.moduleByFormat_("exporter", "jex");
-						await InteropServiceHelper.export(this.props.dispatch.bind(this), module, { sourceFolderIds: [itemId] });
-					},
+					submenu: exportMenu,
 				})
 			);
 		}
@@ -346,8 +369,10 @@ class SideBarComponent extends React.Component {
 				data-id={tag.id}
 				data-type={BaseModel.TYPE_TAG}
 				onContextMenu={event => this.itemContextMenu(event)}
+				tagid={tag.id}
 				key={tag.id}
 				style={style}
+				onDrop={this.onTagDrop_}
 				onClick={() => {
 					this.tagItem_click(tag);
 				}}

ElectronClient/app/gui/note-viewer/index.html

@@ -34,7 +34,6 @@
 	<div id="content" ondragstart="return false;" ondrop="return false;"></div>
 
 	<script>
-	const { ipcRenderer } = require('electron');
 	const contentElement = document.getElementById('content');
 
 	// ----------------------------------------------------------------------
@@ -230,9 +229,23 @@
 
 		if (element && element.getAttribute('data-resource-id')) {
 			ipcRenderer.sendToHost('contextMenu', {
-				type: element.getAttribute('src') ? 'image' : 'link',
+				type: element.getAttribute('src') ? 'image' : 'resource',
 				resourceId: element.getAttribute('data-resource-id'),
 			});
+		} else {
+			const selectedText = window.getSelection().toString();
+
+			if (selectedText) {
+				ipcRenderer.sendToHost('contextMenu', {
+					type: 'text',
+					textToCopy: selectedText,
+				});
+			} else if (event.target.getAttribute('href')) {
+				ipcRenderer.sendToHost('contextMenu', {
+					type: 'link',
+					textToCopy: event.target.getAttribute('href'),
+				});
+			}
 		}
 	});
 

ElectronClient/app/gui/note-viewer/preload.js

@@ -0,0 +1,4 @@
+// Define here Electron objects that need to be accessed from the WebView
+// https://github.com/electron/electron/blob/master/docs/tutorial/security.md#2-disable-nodejs-integration-for-remote-content
+
+window.ipcRenderer = require('electron').ipcRenderer;

ElectronClient/app/locales/index.js

@@ -11,10 +11,14 @@ locales['gl_ES'] = require('./gl_ES.json');
 locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');
 locales['ja_JP'] = require('./ja_JP.json');
+locales['ko'] = require('./ko.json');
+locales['nb'] = require('./nb.json');
 locales['nl_BE'] = require('./nl_BE.json');
+locales['no'] = require('./no.json');
 locales['pt_BR'] = require('./pt_BR.json');
 locales['ru_RU'] = require('./ru_RU.json');
 locales['sl_SI'] = require('./sl_SI.json');
+locales['sv'] = require('./sv.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
 module.exports = { locales: locales };

ElectronClient/app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.102",
+  "version": "1.0.106",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -35,14 +35,14 @@
       "dev": true
     },
     "abab": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
-      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
+      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="
     },
     "acorn": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz",
-      "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw=="
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz",
+      "integrity": "sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw=="
     },
     "acorn-globals": {
       "version": "4.1.0",
@@ -1363,14 +1363,14 @@
       "dev": true
     },
     "cssom": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs="
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz",
+      "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="
     },
     "cssstyle": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz",
-      "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.1.1.tgz",
+      "integrity": "sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==",
       "requires": {
         "cssom": "0.3.x"
       }
@@ -1685,13 +1685,25 @@
       }
     },
     "data-urls": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.0.0.tgz",
-      "integrity": "sha512-ai40PPQR0Fn1lD2PPie79CibnlMN2AYiDhwFX/rZHVsxbs5kNJSjegqXIprhouGXlRdEnfybva7kqRGnB6mypA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.0.1.tgz",
+      "integrity": "sha512-0HdcMZzK6ubMUnsMmQmG0AcLQPvbvb47R0+7CCZQCYgcd8OUWG91CG7sM6GoXgjz+WLl4ArFzHtBMy/QqSF4eg==",
       "requires": {
-        "abab": "^1.0.4",
-        "whatwg-mimetype": "^2.0.0",
-        "whatwg-url": "^6.4.0"
+        "abab": "^2.0.0",
+        "whatwg-mimetype": "^2.1.0",
+        "whatwg-url": "^7.0.0"
+      },
+      "dependencies": {
+        "whatwg-url": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        }
       }
     },
     "debug": {
@@ -1780,6 +1792,11 @@
         "repeating": "^2.0.0"
       }
     },
+    "diff-match-patch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz",
+      "integrity": "sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="
+    },
     "dmg-builder": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.10.1.tgz",
@@ -2051,9 +2068,9 @@
       }
     },
     "electron-dl": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-1.10.0.tgz",
-      "integrity": "sha1-+UQWBkBW/G8qhq5JhhTJNSaJCvk=",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-1.12.0.tgz",
+      "integrity": "sha512-UMc2CL45Ybpvu66LDPYzwmDRmYK4Ivz+wdnTM0eXcNMztvQwhixAk2UPme1c7McqG8bAlKEkQpZn3epmQy4EWg==",
       "requires": {
         "ext-name": "^5.0.0",
         "pupa": "^1.0.0",
@@ -2265,9 +2282,9 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
-      "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
+      "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
       "requires": {
         "esprima": "^3.1.3",
         "estraverse": "^4.2.0",
@@ -3887,9 +3904,9 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "joplin-turndown": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.7.tgz",
-      "integrity": "sha512-dOUzNg0nt1Sgz5LO/6CvZmgGLk3q0BCelZ+CDTb/UOBn7reqUl7R0B4yAfiqDtO8p0/wzY/N87RzXeEawbPvFA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.8.tgz",
+      "integrity": "sha512-RPZJSZEplVPL3UiJNkaKsFAG8bCGofsKIiH24s8/4qcy1xYnEufvg++rHm7rxi/0VCtpSkRBlWHSs1/srJZvoA==",
       "requires": {
         "jsdom": "^11.9.0"
       }
@@ -3921,35 +3938,35 @@
       "optional": true
     },
     "jsdom": {
-      "version": "11.11.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.11.0.tgz",
-      "integrity": "sha512-ou1VyfjwsSuWkudGxb03FotDajxAto6USAlmMZjE2lc0jCznt7sBWkhfRBRaWwbnmDqdMSTKTLT5d9sBFkkM7A==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
       "requires": {
-        "abab": "^1.0.4",
-        "acorn": "^5.3.0",
+        "abab": "^2.0.0",
+        "acorn": "^5.5.3",
         "acorn-globals": "^4.1.0",
         "array-equal": "^1.0.0",
         "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": ">= 0.3.1 < 0.4.0",
+        "cssstyle": "^1.0.0",
         "data-urls": "^1.0.0",
-        "domexception": "^1.0.0",
-        "escodegen": "^1.9.0",
+        "domexception": "^1.0.1",
+        "escodegen": "^1.9.1",
         "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.2.0",
-        "nwsapi": "^2.0.0",
+        "left-pad": "^1.3.0",
+        "nwsapi": "^2.0.7",
         "parse5": "4.0.0",
         "pn": "^1.1.0",
-        "request": "^2.83.0",
+        "request": "^2.87.0",
         "request-promise-native": "^1.0.5",
         "sax": "^1.2.4",
         "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.3",
+        "tough-cookie": "^2.3.4",
         "w3c-hr-time": "^1.0.1",
         "webidl-conversions": "^4.0.2",
         "whatwg-encoding": "^1.0.3",
         "whatwg-mimetype": "^2.1.0",
         "whatwg-url": "^6.4.1",
-        "ws": "^4.0.0",
+        "ws": "^5.2.0",
         "xml-name-validator": "^3.0.0"
       }
     },
@@ -4005,11 +4022,18 @@
       "integrity": "sha1-FHshJTaQNcpLL30hDcU58Amz3po="
     },
     "katex": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.9.0.tgz",
-      "integrity": "sha512-lp3x90LT1tDZBW2tjLheJ98wmRMRjUHwk4QpaswT9bhqoQZ+XA4cPcjcQBxgOQNwaOSt6ZeL/a6GKQ1of3LFxQ==",
+      "version": "0.10.0-rc.1",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.10.0-rc.1.tgz",
+      "integrity": "sha512-JmnreLp0lWPA1z1krzO5drN1qBrkhqzMg5qv0l5y+Fr97sqgOuh37k9ky7VD1k/Ec+yvOe2BptiYSR9OoShkFg==",
       "requires": {
-        "match-at": "^0.1.1"
+        "commander": "^2.16.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+        }
       }
     },
     "kind-of": {
@@ -4345,9 +4369,9 @@
       "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
     },
     "mime-db": {
-      "version": "1.31.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz",
-      "integrity": "sha512-oB3w9lx50CMd6nfonoV5rBRUbJtjMifUHaFb5MfzjC8ksAIfVjT0BsX46SjjqBz7n9JGTrTX3paIeLSK+rS5fQ=="
+      "version": "1.34.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.34.0.tgz",
+      "integrity": "sha1-RS0Oz/XDA0am3B5kseruDTcZ/5o="
     },
     "mime-types": {
       "version": "2.1.18",
@@ -4557,9 +4581,9 @@
       "dev": true
     },
     "nwsapi": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.3.tgz",
-      "integrity": "sha512-zFJF9lOpg2+uicP0BQKOAfIOqeTp/p8PC669mewxgRkR1hGjne8BMUHk4wpRS9o5Z0icA5Nv04HmGkW31KfMKw=="
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.9.tgz",
+      "integrity": "sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ=="
     },
     "oauth-sign": {
       "version": "0.8.2",
@@ -5083,11 +5107,12 @@
       }
     },
     "react-ace": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-5.10.0.tgz",
-      "integrity": "sha512-aEK/XZCowP8IXq91e2DYqOtGhabk1bbjt+fyeW0UBcIkzDzP/RX/MeJKeyW7wsZcwElACVwyy9nnwXBTqgky3A==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-6.1.4.tgz",
+      "integrity": "sha512-a8/lAsy2bfi7Ho+3Kaj8hBPR+PEiCTG9xFG9LIjCJrv5WQFYFpeFTiPWA96M3t+LgIDFFltwfVTwD2pmdAVOxQ==",
       "requires": {
         "brace": "^0.11.0",
+        "diff-match-patch": "^1.0.0",
         "lodash.get": "^4.4.2",
         "lodash.isequal": "^4.1.1",
         "prop-types": "^15.5.8"
@@ -7129,11 +7154,21 @@
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
     "whatwg-encoding": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz",
-      "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.4.tgz",
+      "integrity": "sha512-vM9KWN6MP2mIHZ86ytcyIv7e8Cj3KTfO2nd2c8PFDqcI4bxFmQp83ibq4wadq7rL9l9sZV6o9B0LTt8ygGAAXg==",
       "requires": {
-        "iconv-lite": "0.4.19"
+        "iconv-lite": "0.4.23"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        }
       }
     },
     "whatwg-fetch": {
@@ -7245,12 +7280,11 @@
       }
     },
     "ws": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
-      "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
       "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0"
+        "async-limiter": "~1.0.0"
       }
     },
     "xdg-basedir": {

ElectronClient/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.102",
+  "version": "1.0.106",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {
@@ -91,10 +91,10 @@
     "highlight.js": "^9.12.0",
     "html-entities": "^1.2.1",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.7",
+    "joplin-turndown": "^4.0.8",
     "joplin-turndown-plugin-gfm": "^1.0.7",
     "jssha": "^2.3.1",
-    "katex": "^0.9.0",
+    "katex": "^0.10.0-rc.1",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.10",
     "mark.js": "^8.11.1",
@@ -109,7 +109,7 @@
     "promise": "^8.0.1",
     "query-string": "^5.1.1",
     "react": "^16.4.0",
-    "react-ace": "^5.10.0",
+    "react-ace": "^6.1.4",
     "react-datetime": "^2.14.0",
     "react-dom": "^16.4.0",
     "react-redux": "^5.0.7",

README.md

@@ -20,9 +20,9 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download | Alternative
 -----------------|--------|-------------------
-Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.101/Joplin-Setup-1.0.101.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.101/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.101/Joplin-1.0.101.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> | 
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.101/Joplin-1.0.101-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.105/Joplin-Setup-1.0.105.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.105/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.105/Joplin-1.0.105.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> | 
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.105/Joplin-1.0.105-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
 
 The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
 
@@ -30,7 +30,7 @@ The [portable application](https://en.wikipedia.org/wiki/Portable_application) a
 
 Operating System | Download | Alt. Download
 -----------------|----------|----------------
-Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.128/joplin-v1.0.128.apk)
+Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.131/joplin-v1.0.131.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplin.cozic.net/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -304,24 +304,28 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-![](https://joplin.cozic.net/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  66%
-![](https://joplin.cozic.net/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  95%
-![](https://joplin.cozic.net/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić (trbuhom@net.hr)  |  54%
-![](https://joplin.cozic.net/images/flags/country-4x3/cz.png)  |  Czech  |  [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po)  |  Lukas Helebrandt (lukas@aiya.cz)  |  84%
-![](https://joplin.cozic.net/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |  Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.  |  86%
-![](https://joplin.cozic.net/images/flags/country-4x3/de.png)  |  Deutsch  |  [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po)  |  Philipp Zumstein (zuphilip@gmail.com)  |  93%
+![](https://joplin.cozic.net/images/flags/country-4x3/.png)  |    |  [nb](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb.po)  |    |  89%
+![](https://joplin.cozic.net/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  65%
+![](https://joplin.cozic.net/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  93%
+![](https://joplin.cozic.net/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić (trbuhom@net.hr)  |  53%
+![](https://joplin.cozic.net/images/flags/country-4x3/cz.png)  |  Czech  |  [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po)  |  Lukas Helebrandt (lukas@aiya.cz)  |  82%
+![](https://joplin.cozic.net/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |  Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.  |  84%
+![](https://joplin.cozic.net/images/flags/country-4x3/de.png)  |  Deutsch  |  [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po)  |  Michael Sonntag (ms@editorei.de)  |  99%
 ![](https://joplin.cozic.net/images/flags/country-4x3/gb.png)  |  English  |  [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po)  |    |  100%
-![](https://joplin.cozic.net/images/flags/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)  |  93%
+![](https://joplin.cozic.net/images/flags/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)  |  100%
 ![](https://joplin.cozic.net/images/flags/country-4x3/fr.png)  |  Français  |  [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po)  |  Laurent Cozic  |  100%
-![](https://joplin.cozic.net/images/flags/es/galicia.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans (marcoslansgarza@gmail.com)  |  84%
-![](https://joplin.cozic.net/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  56%
-![](https://joplin.cozic.net/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  67%
-![](https://joplin.cozic.net/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos (rnbastos@gmail.com)  |  86%
-![](https://joplin.cozic.net/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  83%
-![](https://joplin.cozic.net/images/flags/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://joplin.cozic.net/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  98%
-![](https://joplin.cozic.net/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  72%
-![](https://joplin.cozic.net/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |    |  54%
+![](https://joplin.cozic.net/images/flags/es/galicia.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans (marcoslansgarza@gmail.com)  |  83%
+![](https://joplin.cozic.net/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  98%
+![](https://joplin.cozic.net/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  66%
+![](https://joplin.cozic.net/images/flags/country-4x3/.png)  |  Norwegian  |  [no](https://github.com/laurent22/joplin/blob/master/CliClient/locales/no.po)  |    |  89%
+![](https://joplin.cozic.net/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos (rnbastos@gmail.com)  |  100%
+![](https://joplin.cozic.net/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  82%
+![](https://joplin.cozic.net/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po)  |  Jonatan Nyberg (jonatan@autistici.org)  |  99%
+![](https://joplin.cozic.net/images/flags/country-4x3/ru.png)  |  Русский  |  [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po)  |  Artyom Karlov (artyom.karlov@gmail.com)  |  82%
+![](https://joplin.cozic.net/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  96%
+![](https://joplin.cozic.net/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  100%
+![](https://joplin.cozic.net/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |    |  53%
+![](https://joplin.cozic.net/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  100%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Known bugs

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 26
-		versionCode 2097306
-		versionName "1.0.128"
+		versionCode 2097309
+		versionName "1.0.131"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}
@@ -137,6 +137,7 @@ android {
 }
 
 dependencies {
+	compile project(':react-native-file-viewer')
 	compile project(':react-native-securerandom')
 	compile project(':react-native-push-notification')
 	compile project(':react-native-fs')
@@ -150,6 +151,8 @@ dependencies {
 	compile project(':react-native-fetch-blob')
 	compile project(':react-native-document-picker')
 	compile project(':react-native-image-resizer')
+	compile project(':react-native-share-extension')
+	compile "com.facebook.react:react-native:+"
 }
 
 // Run this once to be able to run the application with BUCK

ReactNativeClient/android/app/src/main/AndroidManifest.xml

@@ -63,5 +63,19 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+		<activity
+			android:noHistory="true"
+			android:name=".share.ShareActivity"
+			android:configChanges="orientation"
+			android:label="@string/app_name"
+			android:screenOrientation="portrait"
+			android:theme="@style/AppTheme" >
+			<intent-filter>
+				<action android:name="android.intent.action.SEND" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:mimeType="text/plain" />
+			</intent-filter>
+		</activity>
 	</application>
+
 </manifest>

ReactNativeClient/android/app/src/main/java/net/cozic/joplin/MainApplication.java

@@ -3,9 +3,11 @@ package net.cozic.joplin;
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.vinzscam.reactnativefileviewer.RNFileViewerPackage;
 import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
 import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
 import com.imagepicker.ImagePickerPackage;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -17,6 +19,8 @@ import com.rnfs.RNFSPackage;
 import fr.bamlab.rnimageresizer.ImageResizerPackage;
 import org.pgsqlite.SQLitePluginPackage;
 
+import com.alinz.parkerdan.shareextension.SharePackage;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -33,6 +37,7 @@ public class MainApplication extends Application implements ReactApplication {
 			return Arrays.<ReactPackage>asList(
 				new ImageResizerPackage(),
 				new MainReactPackage(),
+            new RNFileViewerPackage(),
             new RNSecureRandomPackage(),
             new ReactNativePushNotificationPackage(),
 				new ImagePickerPackage(),
@@ -40,7 +45,8 @@ public class MainApplication extends Application implements ReactApplication {
 				new RNFetchBlobPackage(),
 				new RNFSPackage(),
 				new SQLitePluginPackage(),
-				new VectorIconsPackage()
+				new VectorIconsPackage(),
+				new SharePackage()
 			);
 		}
 	};

ReactNativeClient/android/app/src/main/java/net/cozic/joplin/share/ShareActivity.java

@@ -0,0 +1,15 @@
+package net.cozic.joplin.share;
+
+
+// import ReactActivity
+import com.facebook.react.ReactActivity;
+
+
+public class ShareActivity extends ReactActivity {
+		@Override
+		protected String getMainComponentName() {
+			// this is the name AppRegistry will use to launch the Share View
+			return "Joplin";
+		}
+}
+

ReactNativeClient/android/app/src/main/java/net/cozic/joplin/share/ShareApplication.java

@@ -0,0 +1,38 @@
+package net.cozic.joplin.share;
+// import build config
+import net.cozic.joplin.BuildConfig;
+
+import com.alinz.parkerdan.shareextension.SharePackage;
+
+import android.app.Application;
+
+import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactPackage;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+public class ShareApplication extends Application implements ReactApplication {
+	private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+		@Override
+		public boolean getUseDeveloperSupport() {
+			return BuildConfig.DEBUG;
+		}
+
+		@Override
+		protected List<ReactPackage> getPackages() {
+			return Arrays.<ReactPackage>asList(
+				new MainReactPackage(),
+				new SharePackage()
+			);
+		}
+	};
+
+	@Override
+	public ReactNativeHost getReactNativeHost() {
+		return mReactNativeHost;
+	}
+}

ReactNativeClient/android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'Joplin'
+include ':react-native-file-viewer'
+project(':react-native-file-viewer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-file-viewer/android')
 include ':react-native-securerandom'
 project(':react-native-securerandom').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-securerandom/android')
 include ':react-native-push-notification'
@@ -23,4 +25,7 @@ include ':react-native-fetch-blob'
 project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fetch-blob/android')
 
 include ':react-native-document-picker'
-project(':react-native-document-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-document-picker/android')
+project(':react-native-document-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-document-picker/android')
+include ':app', ':react-native-share-extension'
+
+project(':react-native-share-extension').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share-extension/android')

ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj

@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -44,6 +43,7 @@
 		EC11356C90E9419799A2626F /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 51BCEC3BC28046C8BB19531F /* EvilIcons.ttf */; };
 		F3D0BB525E6C490294D73075 /* libRNSecureRandom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22647ACF9A4C45918C44C599 /* libRNSecureRandom.a */; };
 		FBF57CE2F0F448FA9A8985E2 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB8BCAEA9AA41CAAE460443 /* libsqlite3.0.tbd */; };
+		82C61D3DAE0A4666883001E9 /* libRNFileViewer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CCDC2774CD86466F897D88E2 /* libRNFileViewer.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -436,6 +436,8 @@
 		F5E37D05726A4A08B2EE323A /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = "<group>"; };
 		FD370E24D76E461D960DD85D /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; };
 		FF411B45E68B4A8CBCC35777 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
+		59F5448FAF7345F8B568BD00 /* RNFileViewer.xcodeproj */ = {isa = PBXFileReference; name = "RNFileViewer.xcodeproj"; path = "../node_modules/react-native-file-viewer/ios/RNFileViewer.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
+		CCDC2774CD86466F897D88E2 /* libRNFileViewer.a */ = {isa = PBXFileReference; name = "libRNFileViewer.a"; path = "libRNFileViewer.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -466,6 +468,7 @@
 				AE6BB3A2FDA34D01864A721A /* libRNVectorIcons.a in Frameworks */,
 				AF99EEC6C55042F7BFC87583 /* libRNImagePicker.a in Frameworks */,
 				F3D0BB525E6C490294D73075 /* libRNSecureRandom.a in Frameworks */,
+				82C61D3DAE0A4666883001E9 /* libRNFileViewer.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -729,6 +732,7 @@
 				711CBD21F0894B83A2D8E234 /* RNVectorIcons.xcodeproj */,
 				A4716DB8654B431D894F89E1 /* RNImagePicker.xcodeproj */,
 				252BD7B86BF7435B960DA901 /* RNSecureRandom.xcodeproj */,
+				59F5448FAF7345F8B568BD00 /* RNFileViewer.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -1346,12 +1350,14 @@
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)..\node_modules\neact-native-image-pickerios",
 					"$(SRCROOT)..\node_modules\neact-native-securerandomios",
+					"$(SRCROOT)\..\node_modules\react-native-file-viewer\ios",
 				);
 				INFOPLIST_FILE = Joplin/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/Joplin\"",
+					"\"$(SRCROOT)/Joplin\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1386,12 +1392,14 @@
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)..\node_modules\neact-native-image-pickerios",
 					"$(SRCROOT)..\node_modules\neact-native-securerandomios",
+					"$(SRCROOT)\..\node_modules\react-native-file-viewer\ios",
 				);
 				INFOPLIST_FILE = Joplin/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/Joplin\"",
+					"\"$(SRCROOT)/Joplin\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",

ReactNativeClient/lib/BaseApplication.js

@@ -50,10 +50,10 @@ class BaseApplication {
 		this.dbLogger_ = new Logger();
 		this.eventEmitter_ = new EventEmitter();
 
-		// Note: this is basically a cache of state.selectedFolderId. It should *only* 
+		// Note: this is basically a cache of state.selectedFolderId. It should *only*
 		// be derived from the state and not set directly since that would make the
 		// state and UI out of sync.
-		this.currentFolder_ = null; 
+		this.currentFolder_ = null;
 	}
 
 	logger() {
@@ -70,7 +70,7 @@ class BaseApplication {
 
 	async refreshCurrentFolder() {
 		let newFolder = null;
-		
+
 		if (this.currentFolder_) newFolder = await Folder.load(this.currentFolder_.id);
 		if (!newFolder) newFolder = await Folder.defaultFolder();
 
@@ -99,7 +99,7 @@ class BaseApplication {
 		while (argv.length) {
 			let arg = argv[0];
 			let nextArg = argv.length >= 2 ? argv[1] : null;
-			
+
 			if (arg == '--profile') {
 				if (!nextArg) throw new JoplinError(_('Usage: %s', '--profile <dir-path>'), 'flagError');
 				matched.profileDir = nextArg;
@@ -183,7 +183,7 @@ class BaseApplication {
 	async refreshNotes(state) {
 		let parentType = state.notesParentType;
 		let parentId = null;
-		
+
 		if (parentType === 'Folder') {
 			parentId = state.selectedFolderId;
 			parentType = BaseModel.TYPE_FOLDER;
@@ -388,7 +388,7 @@ class BaseApplication {
 		flags.splice(0, 0, 'node');
 
 		flags = await this.handleStartFlags_(flags, false);
-		
+
 		return flags.matched;
 	}
 
@@ -494,6 +494,9 @@ class BaseApplication {
 			setLocale(Setting.value('locale'));
 		}
 
+		time.setDateFormat(Setting.value('dateFormat'));
+		time.setTimeFormat(Setting.value('timeFormat'));
+
 		BaseService.logger_ = this.logger_;
 		EncryptionService.instance().setLogger(this.logger_);
 		BaseItem.encryptionService_ = EncryptionService.instance();
@@ -514,4 +517,4 @@ class BaseApplication {
 
 }
 
-module.exports = { BaseApplication };
+module.exports = { BaseApplication };

ReactNativeClient/lib/ClipperServer.js

@@ -94,6 +94,7 @@ class ClipperServer {
 		}
 
 		if (requestNote.source_url) output.source_url = requestNote.source_url;
+		if (requestNote.author) output.author = requestNote.author;
 
 		return output;
 	}

ReactNativeClient/lib/MdToHtml.js

@@ -115,7 +115,7 @@ class MdToHtml {
 		if (!resource.id) return ''; // Resource is being loaded
 
 		const mime = resource.mime ? resource.mime.toLowerCase() : '';
-		if (mime == 'image/png' || mime == 'image/jpg' || mime == 'image/jpeg' || mime == 'image/gif') {
+		if (Resource.isSupportedImageMimeType(mime)) {
 			let src = './' + Resource.filename(resource);
 			if (this.resourceBaseUrl_ !== null) src = this.resourceBaseUrl_ + src;
 			let output = '<img data-resource-id="' + resource.id + '" title="' + htmlentities(title) + '" src="' + src + '"/>';
@@ -216,7 +216,7 @@ class MdToHtml {
 
 			if (isInlineCode) {
 				openTag = null;
-			} else if (tag && t.type.indexOf('html_inline') >= 0) {
+			} else if (tag && (t.type.indexOf('html_inline') >= 0 || t.type.indexOf('html_block') >= 0)) {
 				openTag = null;
 			} else if (tag && t.type.indexOf('_open') >= 0) {
 				openTag = tag;
@@ -259,7 +259,7 @@ class MdToHtml {
 				}
 
 				if (!rendererPlugin) {
-					output.push('<code>');
+					output.push('<code class="inline-code">');
 				}
 			}
 
@@ -277,7 +277,7 @@ class MdToHtml {
 			if (t.type === 'image') {
 				if (tokenContent) attrs.push(['title', tokenContent]);
 				output.push(this.renderImage_(attrs, options));
-			} else if (t.type === 'html_inline') {
+			} else if (t.type === 'html_inline' || t.type === 'html_block') {
 				output.push(t.content);
 			} else if (t.type === 'softbreak') {
 				output.push('<br/>');
@@ -392,9 +392,43 @@ class MdToHtml {
 		const md = new MarkdownIt({
 			breaks: true,
 			linkify: true,
-			html: false, // For security, HTML tags are not supported - https://github.com/laurent22/joplin/issues/500
+			html: true,
 		});
 
+		// Add `file:` protocol in linkify to allow text in the format of "file://..." to translate into
+		// file-URL links in html view
+		md.linkify.add('file:', {
+
+		  validate: function (text, pos, self) {
+		    var tail = text.slice(pos);
+
+		    if (!self.re.file) {
+		      self.re.file =  new RegExp(
+			'^[\\/]{2,3}[\\S]+' // matches all local file URI on Win/Unix/MacOS systems including reserved characters in some OS (i.e. no OS specific sanity check)
+		      );
+		    }
+		    if (self.re.file.test(tail)) {
+		      return tail.match(self.re.file)[0].length;
+		    }
+		    return 0;
+		}
+			
+		});
+
+		// enable file link URLs in MarkdownIt. Keeps other URL restrictions of MarkdownIt untouched.
+		// Format [link name](file://...)		
+		md.validateLink = function (url) {
+
+			var BAD_PROTO_RE = /^(vbscript|javascript|data):/;
+			var GOOD_DATA_RE = /^data:image\/(gif|png|jpeg|webp);/;
+
+	    		// url should be normalized at this point, and existing entities are decoded
+			var str = url.trim().toLowerCase();
+
+			return BAD_PROTO_RE.test(str) ? (GOOD_DATA_RE.test(str) ? true : false) : true;
+
+		}
+
 		// This is currently used only so that the $expression$ and $$\nexpression\n$$ blocks are translated
 		// to math_inline and math_block blocks. These blocks are then processed directly with the Katex
 		// library.  It is better this way as then it is possible to conditionally load the CSS required by
@@ -438,9 +472,6 @@ class MdToHtml {
 			}
 		}
 
-		// Support <br> tag to allow newlines inside table cells
-		renderedBody = renderedBody.replace(/&lt;br&gt;/gi, '<br>');
-
 		// https://necolas.github.io/normalize.css/
 		const normalizeCss = `
 			html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}
@@ -495,7 +526,7 @@ class MdToHtml {
 				margin-right: 0.4em;
 				background-color:  ` + style.htmlColor + `;
 				/* Awesome Font file */
-				-webkit-mask: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 384 512'><path d='M369.9 97.9L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM332.1 128H256V51.9l76.1 76.1zM48 464V48h160v104c0 13.3 10.7 24 24 24h104v288H48z'/></svg>");
+				-webkit-mask: url("data:image/svg+xml;utf8,<svg viewBox='0 0 1536 1892' xmlns='http://www.w3.org/2000/svg'><path d='M288 128C129 128 0 257 0 416v960c0 159 129 288 288 288h960c159 0 288-129 288-288V416c0-159-129-288-288-288H288zm449.168 236.572l263.434.565 263.431.562.584 73.412.584 73.412-42.732 1.504c-23.708.835-47.002 2.774-52.322 4.36-14.497 4.318-23.722 12.902-29.563 27.51l-5.12 12.802-1.403 291.717c-1.425 295.661-1.626 302.586-9.936 343.043-15.2 74-69.604 150.014-142.197 198.685-58.287 39.08-121.487 60.47-208.155 70.45-22.999 2.648-122.228 2.636-141.976-.024l-.002.006c-69.785-9.377-108.469-20.202-154.848-43.332-85.682-42.73-151.778-116.991-177.537-199.469-10.247-32.81-11.407-40.853-11.375-78.754.026-31.257.76-39.15 5.024-54.043 8.94-31.228 20.912-51.733 43.56-74.62 27.312-27.6 55.812-40.022 95.524-41.633 37.997-1.542 63.274 5.024 87.23 22.66 15.263 11.235 30.828 33.238 39.537 55.884 5.52 14.355 5.949 18.31 7.549 69.569 1.675 53.648 3.05 63.99 11.674 87.785 11.777 32.499 31.771 55.017 61.46 69.22 26.835 12.838 47.272 16.785 80.56 15.56 21.646-.798 30.212-2.135 43.208-6.741 38.682-13.708 70.96-44.553 86.471-82.635 16.027-39.348 15.995-38.647 15.947-361.595-.042-283.26-.09-286.272-4.568-296.153-10.958-24.171-22.488-28.492-81.074-30.377l-42.969-1.38v-147.95z'/></svg>");
 			}
 			a.checkbox {
 				display: inline-block;
@@ -533,6 +564,12 @@ class MdToHtml {
 				width: auto;
 				max-width: 100%;
 			}
+			.inline-code {
+				border: 1px solid #CBCBCB;
+				background-color: #eff0f1;
+				padding-right: .2em;
+				padding-left: .2em;
+			}
 
 			@media print {
 				body {
@@ -558,6 +595,14 @@ class MdToHtml {
 					left: -0.02em;
 					color: ` + style.htmlColor + `;
 				}
+
+				pre {
+					white-space: pre-wrap;
+				}
+
+				.code, .inline-code {
+					border: 1px solid #CBCBCB;
+				}
 			}
 		`;
 
@@ -599,4 +644,4 @@ class MdToHtml {
 
 }
 
-module.exports = MdToHtml;
+module.exports = MdToHtml;

ReactNativeClient/lib/components/screens/note.js

@@ -34,6 +34,9 @@ const shared = require('lib/components/shared/note-screen-shared.js');
 const ImagePicker = require('react-native-image-picker');
 const AlarmService = require('lib/services/AlarmService.js');
 const { SelectDateTimeDialog } = require('lib/components/select-date-time-dialog.js');
+const ShareExtension = require('react-native-share-extension').default;
+
+import FileViewer from 'react-native-file-viewer';
 
 class NoteScreenComponent extends BaseScreenComponent {
 
@@ -55,6 +58,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 			alarmDialogShown: false,
 			heightBumpView:0,
 			noteTagDialogShown: false,
+			fromShare: false,
 		};
 
 		// iOS doesn't support multiline text fields properly so disable it
@@ -131,6 +135,9 @@ class NoteScreenComponent extends BaseScreenComponent {
 								noteId: item.id,
 							});
 						}, 5);
+					} else if (item.type_ === BaseModel.TYPE_RESOURCE) {
+						const resourcePath = Resource.fullPath(item);
+						await FileViewer.open(resourcePath);
 					} else {
 						throw new Error(_('The Joplin mobile app does not currently support this type of link: %s', BaseModel.modelTypeToName(item.type_)));
 					}
@@ -210,6 +217,10 @@ class NoteScreenComponent extends BaseScreenComponent {
 	componentWillUnmount() {
 		BackButtonService.removeHandler(this.backHandler);
 		NavService.removeHandler(this.navHandler);
+
+		if (this.state.fromShare) {
+			ShareExtension.close();
+		}
 	}
 
 	title_changeText(text) {
@@ -670,9 +681,10 @@ const NoteScreen = connect(
 			itemType: state.selectedItemType,
 			folders: state.folders,
 			theme: state.settings.theme,
+			sharedData: state.sharedData,
 			showAdvancedOptions: state.settings.showAdvancedOptions,
 		};
 	}
 )(NoteScreenComponent)
 
-module.exports = { NoteScreen };
+module.exports = { NoteScreen };

ReactNativeClient/lib/components/screens/notes.js

@@ -1,5 +1,5 @@
 const React = require('react'); const Component = React.Component;
-const { View, Button, Text } = require('react-native');
+const { AppState, View, Button, Text } = require('react-native');
 const { stateUtils } = require('lib/reducer.js');
 const { connect } = require('react-redux');
 const { reg } = require('lib/registry.js');
@@ -26,6 +26,13 @@ class NotesScreenComponent extends BaseScreenComponent {
 	constructor() {
 		super();
 
+		this.onAppStateChange_ = async () => {
+			// Force an update to the notes list when app state changes
+			let newProps = Object.assign({}, this.props);
+			newProps.notesSource = '';
+			await this.refreshNotes(newProps);
+		}
+
 		this.sortButton_press = async () => {
 			const buttons = [];
 			const sortNoteOptions = Setting.enumOptions('notes.sortOrder.field');
@@ -67,6 +74,11 @@ class NotesScreenComponent extends BaseScreenComponent {
 
 	async componentDidMount() {
 		await this.refreshNotes();
+		AppState.addEventListener('change', this.onAppStateChange_);
+	}
+
+	async componentWillUnmount() {
+		AppState.removeEventListener('change', this.onAppStateChange_);
 	}
 
 	async UNSAFE_componentWillReceiveProps(newProps) {
@@ -233,4 +245,4 @@ const NotesScreen = connect(
 	}
 )(NotesScreenComponent)
 
-module.exports = { NotesScreen };
+module.exports = { NotesScreen };

ReactNativeClient/lib/components/shared/note-screen-shared.js

@@ -174,8 +174,13 @@ shared.initState = async function(comp) {
 		mode: mode,
 		folder: folder,
 		isLoading: false,
+		fromShare: comp.props.sharedData ? true : false,
 	});
 
+	if (comp.props.sharedData) {
+		this.noteComponent_change(comp, 'body', comp.props.sharedData.value);
+	}
+
 	comp.lastLoadedNoteId_ = note ? note.id : null;
 }
 
@@ -190,4 +195,4 @@ shared.toggleIsTodo_onPress = function(comp) {
 	comp.setState(newState);
 }
 
-module.exports = shared;
+module.exports = shared;

ReactNativeClient/lib/import-enex.js

@@ -369,6 +369,7 @@ function importEnex(parentFolderId, filePath, importOptions = null) {
 				note.todo_completed = dateToTimestamp(noteAttributes['reminder-done-time'], true);
 				note.order = dateToTimestamp(noteAttributes['reminder-order'], true);
 				note.source = !!noteAttributes.source ? 'evernote.' + noteAttributes.source : 'evernote';
+				note.source_url = !!noteAttributes['source-url'] ? noteAttributes['source-url'] : '';
 
 				// if (noteAttributes['reminder-time']) {
 				// 	console.info('======================================================');

ReactNativeClient/lib/models/BaseItem.js

@@ -29,6 +29,19 @@ class BaseItem extends BaseModel {
 		throw new Error('Invalid class name: ' + className);
 	}
 
+	static async findUniqueItemTitle(title) {
+		let counter = 1;
+		let titleToTry = title;
+		while (true) {
+			const item = await this.loadByField('title', titleToTry);
+			if (!item) return titleToTry;
+			titleToTry = title + ' (' + counter + ')';
+			counter++;
+			if (counter >= 100) titleToTry = title + ' (' + ((new Date()).getTime()) + ')';
+			if (counter >= 1000) throw new Error('Cannot find unique title');
+		}
+	}
+
 	// Need to dynamically load the classes like this to avoid circular dependencies
 	static getClass(name) {
 		for (let i = 0; i < BaseItem.syncItemDefinitions_.length; i++) {

ReactNativeClient/lib/models/Folder.js

@@ -33,19 +33,6 @@ class Folder extends BaseItem {
 		}
 	}
 
-	static async findUniqueFolderTitle(title) {
-		let counter = 1;
-		let titleToTry = title;
-		while (true) {
-			const folder = await this.loadByField('title', titleToTry);
-			if (!folder) return titleToTry;
-			titleToTry = title + ' (' + counter + ')';
-			counter++;
-			if (counter >= 100) titleToTry = title + ' (' + ((new Date()).getTime()) + ')';
-			if (counter >= 1000) throw new Error('Cannot find unique title');
-		}
-	}
-
 	static noteIds(parentId) {
 		return this.db().selectAll('SELECT id FROM notes WHERE is_conflict = 0 AND parent_id = ?', [parentId]).then((rows) => {			
 			let output = [];

ReactNativeClient/lib/models/Note.js

@@ -420,6 +420,7 @@ class Note extends BaseItem {
 
 	static async duplicate(noteId, options = null) {
 		const changes = options && options.changes;
+		const uniqueTitle = options && options.uniqueTitle;
 
 		const originalNote = await Note.load(noteId);
 		if (!originalNote) throw new Error('Unknown note: ' + noteId);
@@ -432,6 +433,11 @@ class Note extends BaseItem {
 			newNote[n] = changes[n];
 		}
 
+		if (uniqueTitle) {
+			const title = await Note.findUniqueItemTitle(uniqueTitle);
+			newNote.title = title;
+		}
+
 		return this.save(newNote);
 	}
 

ReactNativeClient/lib/models/Resource.js

@@ -26,7 +26,7 @@ class Resource extends BaseItem {
 	}
 
 	static isSupportedImageMimeType(type) {
-		const imageMimeTypes = ["image/jpg", "image/jpeg", "image/png", "image/gif"];
+		const imageMimeTypes = ["image/jpg", "image/jpeg", "image/png", "image/gif", "image/svg+xml"];
 		return imageMimeTypes.indexOf(type.toLowerCase()) >= 0;
 	}
 
@@ -73,7 +73,12 @@ class Resource extends BaseItem {
 		}
 
 		try {
-			await this.encryptionService().decryptFile(encryptedPath, plainTextPath);
+			// const stat = await this.fsDriver().stat(encryptedPath);
+			await this.encryptionService().decryptFile(encryptedPath, plainTextPath, {
+				// onProgress: (progress) => {
+				// 	console.info('Decryption: ', progress.doneSize / stat.size);
+				// },
+			});
 		} catch (error) {
 			if (error.code === 'invalidIdentifier') {
 				// As the identifier is invalid it most likely means that this is not encrypted data
@@ -108,7 +113,12 @@ class Resource extends BaseItem {
 		if (resource.encryption_blob_encrypted) return { path: encryptedPath, resource: resource };
 
 		try {
-			await this.encryptionService().encryptFile(plainTextPath, encryptedPath);
+			// const stat = await this.fsDriver().stat(plainTextPath);
+			await this.encryptionService().encryptFile(plainTextPath, encryptedPath, {
+				// onProgress: (progress) => {
+				// 	console.info(progress.doneSize / stat.size);
+				// },
+			});
 		} catch (error) {
 			if (error.code === 'ENOENT') throw new JoplinError('File not found:' + error.toString(), 'fileNotFound');
 			throw error;

ReactNativeClient/lib/models/Setting.js

@@ -32,7 +32,6 @@ class Setting extends BaseModel {
 		this.metadata_ = {
 			'activeFolderId': { value: '', type: Setting.TYPE_STRING, public: false },
 			'firstStart': { value: true, type: Setting.TYPE_BOOL, public: false },
-			'editor': { value: '', type: Setting.TYPE_STRING, public: true, appTypes: ['cli'], label: () => _('Text editor'), description: () => _('The editor that will be used to open a note. If none is provided it will try to auto-detect the default editor.') },
 			'locale': { value: defaultLocale(), type: Setting.TYPE_STRING, isEnum: true, public: true, label: () => _('Language'), options: () => {
 				return ObjectUtils.sortByValue(supportedLocalesToLanguages());
 			}},
@@ -94,6 +93,8 @@ class Setting extends BaseModel {
 				return platform === 'linux' ? _('Note: Does not work in all desktop environments.') : null;
 			}},
 
+			'startMinimized': { value: false, type: Setting.TYPE_BOOL, public: true, appTypes: ['desktop'], label: () => _('Start application minimised in the tray icon') },
+
 			'collapsedFolderIds': { value: [], type: Setting.TYPE_ARRAY, public: false },
 			
 			'encryption.enabled': { value: false, type: Setting.TYPE_BOOL, public: false },
@@ -116,6 +117,7 @@ class Setting extends BaseModel {
 			}},
 			'noteVisiblePanes': { value: ['editor', 'viewer'], type: Setting.TYPE_ARRAY, public: false, appTypes: ['desktop'] },
 			'sidebarVisibility': { value: true, type: Setting.TYPE_BOOL, public: false, appTypes: ['desktop'] },
+			'editor': { value: '', type: Setting.TYPE_STRING, public: true, appTypes: ['cli', 'desktop'], label: () => _('Text editor command'), description: () => _('The editor command (may include arguments) that will be used to open a note. If none is provided it will try to auto-detect the default editor.') },
 			'showAdvancedOptions': { value: false, type: Setting.TYPE_BOOL, public: true, appTypes: ['mobile' ], label: () => _('Show advanced options') },
 			'sync.target': { value: SyncTargetRegistry.nameToId('dropbox'), type: Setting.TYPE_INT, isEnum: true, public: true, label: () => _('Synchronisation target'), description: (appType) => { return appType !== 'cli' ? null : _('The target to synchonise to. Each sync target may have additional parameters which are named as `sync.NUM.NAME` (all documented below).') }, options: () => {
 				return SyncTargetRegistry.idAndLabelPlainObject();
@@ -131,11 +133,11 @@ class Setting extends BaseModel {
 				return value ? rtrimSlashes(value) : '';
 			}, public: true, label: () => _('Directory to synchronise with (absolute path)'), description: (appType) => { return appType !== 'cli' ? null : _('The path to synchronise with when file system synchronisation is enabled. See `sync.target`.'); } },
 
-			'sync.5.path': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('nextcloud') }, public: true, label: () => _('Nextcloud WebDAV URL') },
+			'sync.5.path': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('nextcloud') }, public: true, label: () => _('Nextcloud WebDAV URL'), description: () => _('Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: %s', 'https://joplin.cozic.net/faq/') },
 			'sync.5.username': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('nextcloud') }, public: true, label: () => _('Nextcloud username') },
 			'sync.5.password': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('nextcloud') }, public: true, label: () => _('Nextcloud password'), secure: true },
 
-			'sync.6.path': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('webdav') }, public: true, label: () => _('WebDAV URL') },
+			'sync.6.path': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('webdav') }, public: true, label: () => _('WebDAV URL'), description: () => _('Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: %s', 'https://joplin.cozic.net/faq/') },
 			'sync.6.username': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('webdav') }, public: true, label: () => _('WebDAV username') },
 			'sync.6.password': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return settings['sync.target'] == SyncTargetRegistry.nameToId('webdav') }, public: true, label: () => _('WebDAV password'), secure: true },
 
@@ -150,7 +152,7 @@ class Setting extends BaseModel {
 			'sync.6.context': { value: '', type: Setting.TYPE_STRING, public: false },
 			'sync.7.context': { value: '', type: Setting.TYPE_STRING, public: false },
 
-			'net.customCertificates': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return [SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav')].indexOf(settings['sync.target']) >= 0 }, public: true, appTypes: ['desktop', 'cli'], label: () => _('Custom TLS certificates'), description: () => _('Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem') },
+			'net.customCertificates': { value: '', type: Setting.TYPE_STRING, show: (settings) => { return [SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav')].indexOf(settings['sync.target']) >= 0 }, public: true, appTypes: ['desktop', 'cli'], label: () => _('Custom TLS certificates'), description: () => _('Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on "Check synchronisation configuration".') },
 			'net.ignoreTlsErrors': { value: false, type: Setting.TYPE_BOOL, show: (settings) => { return [SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav')].indexOf(settings['sync.target']) >= 0 }, public: true, appTypes: ['desktop', 'cli'], label: () => _('Ignore TLS certificate errors') },
 		};
 

ReactNativeClient/lib/models/Tag.js

@@ -3,6 +3,7 @@ const BaseItem = require('lib/models/BaseItem.js');
 const NoteTag = require('lib/models/NoteTag.js');
 const Note = require('lib/models/Note.js');
 const { time } = require('lib/time-utils.js');
+const { _ } = require('lib/locale');
 
 class Tag extends BaseItem {
 
@@ -153,6 +154,9 @@ class Tag extends BaseItem {
 		if (options && options.userSideValidation) {
 			if ('title' in o) {
 				o.title = o.title.trim().toLowerCase();
+
+				const existingTag = await Tag.loadByTitle(o.title);
+				if (existingTag && existingTag.id !== o.id) throw new Error(_('The tag "%s" already exists. Please choose a different name.', o.title));
 			}
 		}
 

ReactNativeClient/lib/path-utils.js

@@ -40,9 +40,11 @@ function safeFileExtension(e) {
 	return e.replace(/[^a-zA-Z0-9]/g, '')
 }
 
-function safeFilename(e, maxLength = 32) {
+function safeFilename(e, maxLength = null, allowSpaces = false) {
+	if (maxLength === null) maxLength = 32;
 	if (!e || !e.replace) return '';
-	let output = e.replace(/[^a-zA-Z0-9\-_\(\)\.]/g, '_')
+	const regex = allowSpaces ? /[^a-zA-Z0-9\-_\(\)\. ]/g : /[^a-zA-Z0-9\-_\(\)\.]/g
+	let output = e.replace(regex, '_')
 	return output.substr(0, maxLength);
 }
 

ReactNativeClient/lib/reducer.js

@@ -23,6 +23,7 @@ const defaultState = {
 	syncReport: {},
 	searchQuery: '',
 	settings: {},
+	sharedData: null,
 	appState: 'starting',
 	hasDisabledSyncItems: false,
 	newNote: null,
@@ -570,4 +571,4 @@ const reducer = (state = defaultState, action) => {
 	return newState;
 }
 
-module.exports = { reducer, defaultState, stateUtils };
+module.exports = { reducer, defaultState, stateUtils };

ReactNativeClient/lib/services/EncryptionService.js

@@ -14,9 +14,20 @@ function hexPad(s, length) {
 class EncryptionService {
 
 	constructor() {
-		// Note: 1 MB is very slow with Node and probably even worse on mobile. 50 KB seems to work well
-		// and doesn't produce too much overhead in terms of headers.
-		this.chunkSize_ = 50000;
+		// Note: 1 MB is very slow with Node and probably even worse on mobile.
+		//
+		// On mobile the time it takes to decrypt increases exponentially for some reason, so it's important
+		// to have a relatively small size so as not to freeze the app. For example, on Android 7.1 simulator
+		// with 4.1 GB RAM, it takes this much to decrypt a block;
+		//
+		// 50KB => 1000 ms
+		// 25KB => 250ms
+		// 10KB => 200ms
+		// 5KB => 10ms
+		//
+		// So making the block 10 times smaller make it 100 times faster! So for now using 5KB. This can be
+		// changed easily since the chunk size is incorporated into the encrypted data.
+		this.chunkSize_ = 5000;
 		this.loadedMasterKeys_ = {};
 		this.activeMasterKeyId_ = null;
 		this.defaultEncryptionMethod_ = EncryptionService.METHOD_SJCL;
@@ -299,7 +310,9 @@ class EncryptionService {
 		throw new Error('Unknown decryption method: ' + method);
 	}
 
-	async encryptAbstract_(source, destination) {
+	async encryptAbstract_(source, destination, options = null) {
+		if (!options) options = {};
+
 		const method = this.defaultEncryptionMethod();
 		const masterKeyId = this.activeMasterKeyId();
 		const masterKeyPlainText = this.loadedMasterKey(masterKeyId);
@@ -311,17 +324,29 @@ class EncryptionService {
 
 		await destination.append(this.encodeHeader_(header));
 
+		let doneSize = 0;
+
 		while (true) {
 			const block = await source.read(this.chunkSize_);
 			if (!block) break;
 
+			doneSize += this.chunkSize_;
+			if (options.onProgress) options.onProgress({ doneSize: doneSize });
+
+			// Wait for a frame so that the app remains responsive in mobile.
+			// https://corbt.com/posts/2015/12/22/breaking-up-heavy-processing-in-react-native.html
+			await shim.waitForFrame();
+
 			const encrypted = await this.encrypt(method, masterKeyPlainText, block);
+
 			await destination.append(padLeft(encrypted.length.toString(16), 6, '0'));
 			await destination.append(encrypted);
 		}
 	}
 
-	async decryptAbstract_(source, destination) {
+	async decryptAbstract_(source, destination, options = null) {
+		if (!options) options = {};
+
 		const identifier = await source.read(5);
 		if (!this.isValidHeaderIdentifier(identifier)) throw new JoplinError('Invalid encryption identifier. Data is not actually encrypted? ID was: ' + identifier, 'invalidIdentifier');
 		const mdSizeHex = await source.read(6);
@@ -331,6 +356,8 @@ class EncryptionService {
 		const header = this.decodeHeader_(identifier + mdSizeHex + md);
 		const masterKeyPlainText = this.loadedMasterKey(header.masterKeyId);
 
+		let doneSize = 0;
+
 		while (true) {
 			const lengthHex = await source.read(6);
 			if (!lengthHex) break;
@@ -338,6 +365,11 @@ class EncryptionService {
 			const length = parseInt(lengthHex, 16);
 			if (!length) continue; // Weird but could be not completely invalid (block of size 0) so continue decrypting
 
+			doneSize += length;
+			if (options.onProgress) options.onProgress({ doneSize: doneSize });
+
+			await shim.waitForFrame();
+
 			const block = await source.read(length);
 
 			const plainText = await this.decrypt(header.encryptionMethod, masterKeyPlainText, block);
@@ -395,21 +427,21 @@ class EncryptionService {
 		};
 	}
 
-	async encryptString(plainText) {
+	async encryptString(plainText, options = null) {
 		const source = this.stringReader_(plainText);
 		const destination = this.stringWriter_();
-		await this.encryptAbstract_(source, destination);
+		await this.encryptAbstract_(source, destination, options);
 		return destination.result();
 	}
 
-	async decryptString(cipherText) {
+	async decryptString(cipherText, options = null) {
 		const source = this.stringReader_(cipherText);
 		const destination = this.stringWriter_();
-		await this.decryptAbstract_(source, destination);
+		await this.decryptAbstract_(source, destination, options);
 		return destination.data.join('');
 	}
 
-	async encryptFile(srcPath, destPath) {
+	async encryptFile(srcPath, destPath, options = null) {
 		let source = await this.fileReader_(srcPath, 'base64');
 		let destination = await this.fileWriter_(destPath, 'ascii');
 
@@ -422,7 +454,7 @@ class EncryptionService {
 
 		try {
 			await this.fsDriver().unlink(destPath);
-			await this.encryptAbstract_(source, destination);
+			await this.encryptAbstract_(source, destination, options);
 		} catch (error) {
 			cleanUp();
 			await this.fsDriver().unlink(destPath);
@@ -432,7 +464,7 @@ class EncryptionService {
 		await cleanUp();
 	}
 
-	async decryptFile(srcPath, destPath) {
+	async decryptFile(srcPath, destPath, options = null) {
 		let source = await this.fileReader_(srcPath, 'ascii');
 		let destination = await this.fileWriter_(destPath, 'base64');
 
@@ -445,7 +477,7 @@ class EncryptionService {
 
 		try {
 			await this.fsDriver().unlink(destPath);
-			await this.decryptAbstract_(source, destination);
+			await this.decryptAbstract_(source, destination, options);
 		} catch (error) {
 			cleanUp();
 			await this.fsDriver().unlink(destPath);

ReactNativeClient/lib/services/ExternalEditWatcher.js

@@ -4,6 +4,8 @@ const Setting = require('lib/models/Setting');
 const { shim } = require('lib/shim');
 const chokidar = require('chokidar');
 const EventEmitter = require('events');
+const { splitCommandString } = require('lib/string-utils');
+const spawn	= require('child_process').spawn;
 
 class ExternalEditWatcher {
 
@@ -115,6 +117,40 @@ class ExternalEditWatcher {
 		return false;
 	}
 
+	textEditorCommand() {
+		const editorCommand = Setting.value('editor');
+		if (!editorCommand) return null;
+
+		const s = splitCommandString(editorCommand);
+
+		const path = s.splice(0, 1);
+		if (!path.length) throw new Error('Invalid editor command: ' + editorCommand);
+
+		return {
+			path: path[0],
+			args: s,
+		};
+	}
+
+	async spawnCommand(path, args, options) {
+		return new Promise((resolve, reject) => {
+			const subProcess = spawn(path, args, options);
+
+			const iid = setInterval(() => {
+				if (subProcess && subProcess.pid) {
+					this.logger().debug('Started editor with PID ' + subProcess.pid);
+					clearInterval(iid);
+					resolve();
+				}
+			}, 100);
+
+			subProcess.on('error', (error) => {
+				clearInterval(iid);
+				reject(error);
+			});
+		});
+	}
+
 	async openAndWatch(note) {
 		if (!note || !note.id) {
 			this.logger().warn('ExternalEditWatcher: Cannot open note: ', note);
@@ -123,7 +159,14 @@ class ExternalEditWatcher {
 
 		const filePath = await this.writeNoteToFile_(note);
 		this.watch(filePath);
-		bridge().openExternal('file://' + filePath);
+
+		const cmd = this.textEditorCommand();
+		if (!cmd) {
+			bridge().openExternal('file://' + filePath);
+		} else {
+			cmd.args.push(filePath);
+			await this.spawnCommand(cmd.path, cmd.args, { detached: true });
+		}
 
 		this.dispatch({
 			type: 'NOTE_FILE_WATCHER_ADD',

ReactNativeClient/lib/services/InteropService.js

@@ -27,12 +27,12 @@ class InteropService {
 		let importModules = [
 			{
 				format: 'jex',
-				fileExtension: 'jex',
+				fileExtensions: ['jex'],
 				sources: ['file'],
 				description: _('Joplin Export File'),
 			}, {
 				format: 'md',
-				fileExtension: 'md',
+				fileExtensions: ['md', 'markdown'],
 				sources: ['file', 'directory'],
 				isNoteArchive: false, // Tells whether the file can contain multiple notes (eg. Enex or Jex format)
 				description: _('Markdown'),
@@ -42,7 +42,7 @@ class InteropService {
 				description: _('Joplin Export Directory'),
 			}, {
 				format: 'enex',
-				fileExtension: 'enex',
+				fileExtensions: ['enex'],
 				sources: ['file'],
 				description: _('Evernote Export File'),
 			},
@@ -51,13 +51,17 @@ class InteropService {
 		let exportModules = [
 			{
 				format: 'jex',
-				fileExtension: 'jex',
+				fileExtensions: ['jex'],
 				target: 'file',
 				description: _('Joplin Export File'),
 			}, {
 				format: 'raw',
 				target: 'directory',
 				description: _('Joplin Export Directory'),
+			}, {
+				format: 'md',
+				target: 'directory',
+				description: _('Markdown'),
 			},
 		];
 
@@ -108,7 +112,9 @@ class InteropService {
 		const module = this.moduleByFormat_(type, format);
 		if (!module) throw new Error(_('Cannot load "%s" module for format "%s"', type, format));
 		const ModuleClass = require(module.path);
-		return new ModuleClass();
+		const output = new ModuleClass();
+		output.setMetadata(module);
+		return output;
 	}
 
 	moduleByFileExtension_(type, ext) {
@@ -119,7 +125,7 @@ class InteropService {
 		for (let i = 0; i < modules.length; i++) {
 			const m = modules[i];
 			if (type !== m.type) continue;
-			if (m.fileExtension === ext) return m;
+			if (m.fileExtensions.indexOf(ext) >= 0) return m;
 		}
 
 		return null;

ReactNativeClient/lib/services/InteropService_Exporter_Base.js

@@ -5,6 +5,14 @@ class InteropService_Exporter_Base {
 	async processResource(resource, filePath) {}
 	async close() {}
 
+	setMetadata(md) {
+		this.metadata_ = md;
+	}
+
+	metadata() {
+		return this.metadata_;
+	}
+
 	async temporaryDirectory_(createIt) {
 		const md5 = require('md5');
 		const tempDir = require('os').tmpdir() + '/' + md5(Math.random() + Date.now());