Android release v1.0.133

Update Japanese Translations.

BUILD.md

@@ -9,8 +9,6 @@
 	echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile
 	source ~/.bash_profile
 
-If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp`
-
 ## Linux and Windows (WSL) dependencies
 
 - Install yarn - https://yarnpkg.com/lang/en/docs/install/
@@ -37,6 +35,10 @@ yarn dist
 
 If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
 
+If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp`.
+
+If you get the error `libtool: unrecognized option '-static'`, follow the instructions [in this post](https://stackoverflow.com/a/38552393/561309) to use the correct libtool version.
+
 That will create the executable file in the `dist` directory.
 
 From `/ElectronClient` you can also run `run.sh` to run the app for testing.

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/.gitignore

@@ -13,6 +13,7 @@ tests/fuzzing.*
 tests/fuzzing -*
 tests/logs/*
 tests/cli-integration/
+tests/tmp/
 *.mo
 *.*~
 tests/sync

CliClient/app/command-e2ee.js

@@ -47,34 +47,63 @@ class Command extends BaseCommand {
 		}
 
 		if (args.command === '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 {
+					if (args.path) {
+						const plainText = await EncryptionService.instance().decryptString(args.path);
+						this.stdout(plainText);
+						return;
+					} else {
+						if (process.stdin.isTTY) {
+							this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
+							await DecryptionWorker.instance().start();
+							this.stdout(_('Completed decryption.'));
+							return;
+						} else {
+							// var repl = require("repl");
+							// var r = repl.start("node> ");
 
-				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;
+							const text = await new Promise((accept, reject) => {
+								var buffer = '';
+								process.stdin.setEncoding('utf8');
+								process.stdin.on('data', function(chunk) {
+										buffer += chunk;
+										// process.stdout.write(chunk);
+								});
+								process.stdin.on('end', function() {
+									accept(buffer.trim());
+								});
+							});
+
+							if (text.length > 0) {
+								var cipherText = text;
+								try {
+									var item = await BaseItem.unserialize(text);
+									cipherText = item.encryption_cipher_text;
+								} catch (error) {
+									// we already got the pure cipher text
+								}
+								const plainText = await EncryptionService.instance().decryptString(cipherText);
+								this.stdout(plainText);
 							}
-							Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
-							await EncryptionService.instance().loadMasterKeysFromSettings();
-							continue;
+							return;
 						}
-
-						throw error;
 					}
-				}
+				} 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;
+					}
 
-				this.stdout(_('Completed decryption.'));
+					throw error;
+				}
 			}
 
 			return;
@@ -186,4 +215,4 @@ class Command extends BaseCommand {
 
 }
 
-module.exports = Command;
+module.exports = Command;

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/app/gui/FolderListWidget.js

@@ -32,8 +32,6 @@ class FolderListWidget extends ListWidget {
 				output.push(_('Search:'));
 				output.push(item.title);
 			}
-
-			// if (item && item.id) output.push(item.id.substr(0, 5));
 			
 			return output.join(' ');
 		};
@@ -85,7 +83,6 @@ class FolderListWidget extends ListWidget {
 	}
 
 	set notesParentType(v) {
-		//if (this.notesParentType_ === v) return;
 		this.notesParentType_ = v;
 		this.updateIndexFromSelectedItemId()
 		this.invalidate();
@@ -123,6 +120,14 @@ class FolderListWidget extends ListWidget {
 		this.updateIndexFromSelectedItemId()
 		this.invalidate();
 	}
+
+	folderHasChildren_(folders, folderId) {
+		for (let i = 0; i < folders.length; i++) {
+			let folder = folders[i];
+			if (folder.parent_id === folderId) return true;
+		}
+		return false;
+	}
 	
 	render() {
 		if (this.updateItems_) {
@@ -130,7 +135,18 @@ class FolderListWidget extends ListWidget {
 			const wasSelectedItemId = this.selectedJoplinItemId;
 			const previousParentType = this.notesParentType;
 
-			let newItems = this.folders.slice();
+			let newItems = [];
+			const orderFolders = (parentId) => {
+				for (let i = 0; i < this.folders.length; i++) {
+					const f = this.folders[i];
+					if (f.parent_id === parentId) {
+						newItems.push(f);
+						if (this.folderHasChildren_(this.folders, f.id)) orderFolders(f.id);
+					}
+				}
+			}
+
+			orderFolders('');
 
 			if (this.tags.length) {
 				if (newItems.length) newItems.push('-');

CliClient/locales/ca.po

@@ -463,10 +463,11 @@ msgstr "Està començant la sincronització..."
 msgid "Cancelling... Please wait."
 msgstr "S'està cancel·lant... Espereu."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command>pot ser «add», «remove» o «list» per a assignar o suprimir "
 "[tag] de la [nota], o per a llistar les notes associades amb [tag]. L'ordre "
@@ -947,6 +948,12 @@ msgstr ""
 "Ara mateix no hi ha cap bloc de notes. Creeu-ne un fent clic a «Bloc de "
 "notes nou»."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "Obre..."
 
@@ -1000,6 +1007,9 @@ msgstr "Estableix una alarma"
 msgid "In: %s"
 msgstr "A: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1205,10 +1215,6 @@ msgstr "Conflictes"
 msgid "Cannot move notebook to this location"
 msgstr "No es pot moure el bloc de notes a aquesta ubicació"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Ja existeix un bloc de notes amb aquest títol: «%s»"
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Els blocs de notes no poden tenir el nom «%s», és un títol reservat."
@@ -1287,6 +1293,9 @@ msgstr "Mostra la icona a la safata"
 msgid "Note: Does not work in all desktop environments."
 msgstr "Nota: no funciona en tots els entorns d'escriptori."
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Percentatge de zoom global"
 
@@ -1357,6 +1366,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "URL del Nextcloud WebDAV"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Nom d'usuari del Nextcloud"
 
@@ -1389,6 +1405,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "El valor de l'opció no és vàlid: «%s». Els valors possibles són: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Fitxer d'exportació del Joplin"
 
@@ -1652,3 +1672,6 @@ msgstr ""
 
 msgid "Welcome"
 msgstr "Benvingut"
+
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Ja existeix un bloc de notes amb aquest títol: «%s»"

CliClient/locales/cs_CZ.po

@@ -451,10 +451,11 @@ msgstr "Zahajuji synchronizaci..."
 msgid "Cancelling... Please wait."
 msgstr "Zastavuji, chvíli strpení."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> může být  \"add\", \"remove\" nebo \"list\" - přidat (add) či "
 "odebrat (remove) [tag] k [poznámce], nebo vypsat (list) seznam poznámek "
@@ -918,6 +919,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na \"Nový zápisník\"."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "Otevřít..."
 
@@ -969,6 +976,9 @@ msgstr "Nastavit alarm"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1176,10 +1186,6 @@ msgstr "Konflikty"
 msgid "Cannot move notebook to this location"
 msgstr "Poznámku nelze přesunout do zápisníku \"%s\""
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Zápisník s tímto názvem již existuje: \"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Zápisník se nemůže jmenovat \"%s\", tento název je rezervován."
@@ -1262,6 +1268,9 @@ msgstr "Zobrazovat ikonu v panelu"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Globální zoom"
 
@@ -1332,6 +1341,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Nextcloud uživatelské jméno"
 
@@ -1364,6 +1380,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Neplatná hodnota: \"%s\". Přípustné hodnoty jsou: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Soubor Joplin Export"
 
@@ -1621,5 +1641,8 @@ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+
 msgid "Welcome"
 msgstr "Vítejte"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Zápisník s tímto názvem již existuje: \"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "Hledané výrazy"

CliClient/locales/da_DK.po

@@ -455,10 +455,11 @@ msgstr "Starter synkronisering."
 msgid "Cancelling... Please wait."
 msgstr "Annullerer...  Vent venligst."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> (mærke-kommando) kan enten være \"add\" (tilføj), \"remove"
 "\" (slet) eller \"list\" (liste) for at tilføje eller fjerne mærke [tag] fra "
@@ -927,6 +928,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Der er ingen notesbog. Opret en ved at klikke på \"Ny Notesbog\"."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "Åben..."
 
@@ -978,6 +985,9 @@ msgstr "Indstil alarm"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1185,10 +1195,6 @@ msgstr "Konflikter"
 msgid "Cannot move notebook to this location"
 msgstr "Kan ikke flytte note til \"%s\" notesbog"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "En notesbog bruger allerede dette navn: \"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Notesbøger kan ikke få navnet \"%s\", da det er en beskyttet titel."
@@ -1271,6 +1277,9 @@ msgstr "Vis ikon på bundbjælke"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Global zoom procent"
 
@@ -1341,6 +1350,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Nextcloud brugernavn"
 
@@ -1373,6 +1389,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ulovlig værdi: \"%s\".  Mulige valg er: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Joplin eksport fil"
 
@@ -1630,6 +1650,9 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
 msgid "Welcome"
 msgstr "Velkommen"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "En notesbog bruger allerede dette navn: \"%s\""
+
 #~ msgid ""
 #~ "For more information about End-To-End Encryption (E2EE) and advices on "
 #~ "how to enable it please check the documentation"

CliClient/locales/de_DE.po

@@ -475,10 +475,11 @@ msgstr "Starte Synchronisation..."
 msgid "Cancelling... Please wait."
 msgstr "Abbrechen… Bitte warten."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> kann \"add\", \"remove\" or \"list\" sein, um ein [Schlagwort] "
 "zu [Notiz] zuzuweisen oder zu entfernen, oder um mit [Schlagwort] markierte "
@@ -961,6 +962,12 @@ msgstr ""
 "Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf "
 "\"Neues Notizbuch\" drückst."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "Öffne..."
 
@@ -1014,6 +1021,9 @@ msgstr "Alarm erstellen"
 msgid "In: %s"
 msgstr "In: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr "Weblink"
 
@@ -1220,10 +1230,6 @@ msgstr "Konflikte"
 msgid "Cannot move notebook to this location"
 msgstr "Kann Notizbuch nicht an diesen Ort verschieben"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Ein Notizbuch mit diesem Titel existiert bereits : \"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
@@ -1303,6 +1309,9 @@ msgstr "Zeige Tray Icon"
 msgid "Note: Does not work in all desktop environments."
 msgstr "Hinweis: Funktioniert nicht in allen Desktopumgebungen."
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Zoomstufe der Benutzeroberfläche"
 
@@ -1372,6 +1381,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Nextcloud Benutzername"
 
@@ -1409,6 +1425,10 @@ msgstr "Ignoriere TLS-Zertifikatfehler"
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ungültiger Optionswert: \"%s\". Mögliche Werte sind: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Joplin Export Datei"
 
@@ -1677,6 +1697,9 @@ msgstr ""
 msgid "Welcome"
 msgstr "Willkommen"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Ein Notizbuch mit diesem Titel existiert bereits : \"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "Suchen"
 

CliClient/locales/en_GB.po

@@ -414,7 +414,7 @@ msgstr ""
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 
 #, javascript-format
@@ -842,6 +842,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -893,6 +899,9 @@ msgstr ""
 msgid "In: %s"
 msgstr ""
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1089,10 +1098,6 @@ msgstr ""
 msgid "Cannot move notebook to this location"
 msgstr ""
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr ""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
@@ -1171,6 +1176,9 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1230,6 +1238,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr ""
 
@@ -1262,6 +1277,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr ""
 

CliClient/locales/es_ES.po

@@ -460,10 +460,11 @@ msgstr "Iniciando sincronización..."
 msgid "Cancelling... Please wait."
 msgstr "Cancelando... Por favor espere."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> puede ser \"add\", \"remove\" o \"list\" para asignar o "
 "eliminar [tag] de [note], o para listar las notas asociadas con [tag]. El "
@@ -629,16 +630,16 @@ msgid "Paste"
 msgstr "Pegar"
 
 msgid "Bold"
-msgstr ""
+msgstr "Negrita"
 
 msgid "Italic"
-msgstr ""
+msgstr "Cursiva"
 
 msgid "Insert Date Time"
-msgstr ""
+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"
@@ -711,11 +712,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"
@@ -770,7 +770,7 @@ msgid "Notes and settings are stored in: %s"
 msgstr "Las notas y los ajustes se guardan en: %s"
 
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 msgid "Submit"
 msgstr "Aceptar"
@@ -916,11 +916,11 @@ msgid "Add or remove tags"
 msgstr "Añadir o borrar etiquetas"
 
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplicado"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s - Copy"
-msgstr "Copiar"
+msgstr "%s - Copiar"
 
 msgid "Switch between note and to-do type"
 msgstr "Cambiar entre nota y lista de tareas"
@@ -941,12 +941,18 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "No hay ninguna libreta. Cree una pulsando en «Libreta nueva»."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 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..."
@@ -955,7 +961,7 @@ msgid "Copy path to clipboard"
 msgstr "Copiar la ruta en el portapapeles"
 
 msgid "Copy Link Address"
-msgstr ""
+msgstr "Copiar enlace"
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -970,16 +976,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"
@@ -990,37 +996,39 @@ msgstr "Etiquetas"
 msgid "Set alarm"
 msgstr "Establecer alarma"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "En: %s"
+
+msgid "Note properties"
+msgstr ""
 
 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"
@@ -1199,26 +1207,19 @@ msgstr "Conflictos"
 msgid "Cannot move notebook to this location"
 msgstr "No se puede mover la libreta a este lugar"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Ya existe una libreta con este nombre: «%s»"
-
 #, javascript-format
 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"
@@ -1285,6 +1286,9 @@ msgstr "Mostrar icono en la bandeja"
 msgid "Note: Does not work in all desktop environments."
 msgstr "Nota: No funciona en todos los entornos de escritorio."
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Establecer el porcentaje de aumento de la aplicación"
 
@@ -1317,17 +1321,16 @@ 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 ""
-"El editor que se usará para abrir una nota. Se intentará auto-detectar el "
-"editor predeterminado si no se proporciona ninguno."
+"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"
@@ -1356,6 +1359,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Servidor WebDAV de Nextcloud"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Usuario de Nextcloud"
 
@@ -1372,7 +1382,7 @@ 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, "
@@ -1380,14 +1390,23 @@ msgid ""
 "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."
 msgstr "Opción inválida: «%s». Los valores posibles son: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Archivo de exportación de Joplin"
 
@@ -1502,7 +1521,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"
 
@@ -1515,9 +1533,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:"
@@ -1653,6 +1671,9 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenido"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Ya existe una libreta con este nombre: «%s»"
+
 #~ msgid ""
 #~ "For more information about End-To-End Encryption (E2EE) and advices on "
 #~ "how to enable it please check the documentation"

CliClient/locales/eu.po

@@ -458,10 +458,11 @@ msgstr "Sinkronizazioa hasten..."
 msgid "Cancelling... Please wait."
 msgstr "Bertan behera uzten... itxaron, mesedez."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> izan daiteke \"add\", \"remove\" edo \"list\" [oharra]tik "
 "[etiketa] esleitu edo kentzeko, edo [etiketa]rekin elkartutako oharrak "
@@ -936,6 +937,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Momentuz ez dago koadernorik. Sortu bat \"Koaderno berria\" sakatuta."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -988,6 +995,9 @@ msgstr "Ezarri alarma"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1200,10 +1210,6 @@ msgstr "Gatazkak"
 msgid "Cannot move notebook to this location"
 msgstr "Ezin eraman daiteke oharra \"%s\" koadernora"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Dagoeneko bada koaderno bat izen horrekin: \"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
@@ -1291,6 +1297,9 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 #, fuzzy
 msgid "Global zoom percentage"
 msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
@@ -1359,6 +1368,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Nextcloud erabiltzaile-izena"
 
@@ -1394,6 +1410,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Balio aukera baliogabea: \"%s\". Litezkeen balioak: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 #, fuzzy
 msgid "Joplin Export File"
 msgstr "Evernotetik esportatutako fitxategiak"
@@ -1651,6 +1671,9 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
 msgid "Welcome"
 msgstr "Ongi etorri!"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Dagoeneko bada koaderno bat izen horrekin: \"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "Bilaketak"
 

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."
@@ -464,12 +464,12 @@ msgstr "Annulation... Veuillez attendre."
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> peut être \"add\", \"remove\" ou \"list\" pour assigner ou "
 "enlever l'étiquette [tag] de la [note], our pour lister les notes associées "
 "avec l'étiquette [tag]. La commande `tag list` peut être utilisée pour "
-"lister les étiquettes."
+"lister les étiquettes (utilisez l'option -l pour les options complètes)."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -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..."
@@ -661,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"
@@ -782,9 +782,9 @@ msgid ""
 "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. "
-"Souhaitez vous continuer ?"
+"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 ""
 "Enabling encryption means *all* your notes and attachments are going to be "
@@ -792,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 "
-"entrer votre mot de passe ci-dessous."
+"*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"
@@ -833,10 +833,10 @@ 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 "
-"à l'origine."
+"pour le déchiffrement, selon la façon dont les notes ou carnets étaient "
+"chiffrés à l'origine."
 
 msgid "Missing Master Keys"
 msgstr "Clefs maître manquantes"
@@ -846,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."
 
@@ -854,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"
@@ -910,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"
@@ -947,6 +947,12 @@ msgstr ""
 "Il n'y a pour l'instant aucun carnet. Créez-en un en cliquant sur \"Nouveau "
 "carnet\"."
 
+msgid "Location"
+msgstr "Lieu"
+
+msgid "URL"
+msgstr "URL"
+
 msgid "Open..."
 msgstr "Ouvrir..."
 
@@ -1000,6 +1006,9 @@ msgstr "Régler alarme"
 msgid "In: %s"
 msgstr "Dans : %s"
 
+msgid "Note properties"
+msgstr "Propriétés de la note"
+
 msgid "Hyperlink"
 msgstr "Lien"
 
@@ -1056,7 +1065,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"
@@ -1194,10 +1203,10 @@ 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"
@@ -1205,10 +1214,6 @@ msgstr "Conflits"
 msgid "Cannot move notebook to this location"
 msgstr "Impossible de déplacer le carnet à cet endroit"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Un carnet avec ce titre existe déjà : \"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Les carnets ne peuvent être nommés \"%s\" car c'est un nom réservé."
@@ -1287,6 +1292,9 @@ msgstr "Afficher l'icône dans la zone de notifications"
 msgid "Note: Does not work in all desktop environments."
 msgstr "Note : Ne fonctionne pas dans tous les environnements de bureau."
 
+msgid "Start application minimised in the tray icon"
+msgstr "Démarrer minimisé dans la zone de notification"
+
 msgid "Global zoom percentage"
 msgstr "Niveau de zoom"
 
@@ -1356,6 +1364,16 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud : URL WebDAV"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+"Attention : si vous changez cet emplacement, copiez-y tout le contenu avant "
+"de synchroniser, sinon tous les fichiers seront supprimés ! Consulter la FAQ "
+"pour plus de détails : %s"
+
 msgid "Nextcloud username"
 msgstr "Nextcloud : Nom utilisateur"
 
@@ -1393,6 +1411,10 @@ msgstr "Ignorer les erreurs de certificats TLS"
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Option invalide: \"%s\". Les valeurs possibles sont : %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr "L'étiquette \"%s\" existe déjà. Veuillez choisir un autre nom."
+
 msgid "Joplin Export File"
 msgstr "Fichier d'export Joplin"
 
@@ -1421,7 +1443,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."
@@ -1494,7 +1516,7 @@ msgid "Export Debug Report"
 msgstr "Exporter rapport de débogage"
 
 msgid "Encryption Config"
-msgstr "Config cryptage"
+msgstr "Config chiffrement"
 
 msgid "Configuration"
 msgstr "Configuration"
@@ -1523,7 +1545,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 :"
@@ -1659,12 +1681,15 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Un carnet avec ce titre existe déjà : \"%s\""
+
 #~ 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 "
-#~ "conseils pour l'activer, veuillez consulter la documentation"
+#~ "Pour plus d'informations sur le chiffrement de bout en bout, ainsi que "
+#~ "des conseils pour l'activer, veuillez consulter la documentation"
 
 #~ msgid "Searches"
 #~ msgstr "Recherches"

CliClient/locales/gl_ES.po

@@ -455,10 +455,11 @@ msgstr "Iniciando sincronización..."
 msgid "Cancelling... Please wait."
 msgstr "Cancelando... Agarde."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> pode ser «add», «remove» ou «list» para asignar ou eliminar "
 "[tag] da [note] ou para listar as notas asociadas con [tag]. A orde «list» "
@@ -924,6 +925,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Este no é un caderno. Cree un, premendo en «Novo caderno»."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "Abrir…"
 
@@ -977,6 +984,9 @@ msgstr "Estabelecer alarma"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1184,10 +1194,6 @@ msgstr "Conflitos"
 msgid "Cannot move notebook to this location"
 msgstr "Non é posíbel mover a nota ao caderno «%s»"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Xa existe un caderno con ese título: «%s»"
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Os cadernos non poden levar o nome «%s» porque é un título reservado."
@@ -1270,6 +1276,9 @@ msgstr "Mostrar a icona na bandexa"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Porcentaxe de ampliación"
 
@@ -1340,6 +1349,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "URL de Nextcloud WebDAV"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Usuario de Nextcloud"
 
@@ -1372,6 +1388,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Valor incorrecto de opción: «%s». Os valores posíbeis son: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Ficheiro de exportación do Joplin"
 
@@ -1628,3 +1648,6 @@ msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
 
 msgid "Welcome"
 msgstr "Benvido/a"
+
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Xa existe un caderno con ese título: «%s»"

CliClient/locales/hr_HR.po

@@ -462,7 +462,7 @@ msgstr "Prekidam... Pričekaj."
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<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 "
@@ -924,6 +924,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Ovdje nema bilježnica. Stvori novu pritiskom na \"Nova bilježnica\"."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -976,6 +982,9 @@ msgstr "Postavi upozorenje"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1184,10 +1193,6 @@ msgstr "Sukobi"
 msgid "Cannot move notebook to this location"
 msgstr "Ne mogu premjestiti bilješku u bilježnicu %s"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Bilježnica s ovim naslovom već postoji: \"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Naslov \"%s\" je rezerviran i ne može se koristiti."
@@ -1275,6 +1280,9 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1340,6 +1348,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr ""
 
@@ -1372,6 +1387,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Nevažeća vrijednost: \"%s\". Moguće vrijednosti su: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 #, fuzzy
 msgid "Joplin Export File"
 msgstr "Evernote izvozne datoteke"
@@ -1628,6 +1647,9 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobro došli"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Bilježnica s ovim naslovom već postoji: \"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "Pretraživanja"
 

CliClient/locales/joplin.pot

@@ -414,7 +414,7 @@ msgstr ""
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 
 #, javascript-format
@@ -842,6 +842,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -893,6 +899,9 @@ msgstr ""
 msgid "In: %s"
 msgstr ""
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1089,10 +1098,6 @@ msgstr ""
 msgid "Cannot move notebook to this location"
 msgstr ""
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr ""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
@@ -1171,6 +1176,9 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1230,6 +1238,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr ""
 
@@ -1262,6 +1277,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr ""
 

CliClient/locales/nl_BE.po

@@ -459,10 +459,11 @@ msgstr "Synchronisatie starten..."
 msgid "Cancelling... Please wait."
 msgstr "Annuleren.. Even geduld."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> kan \"add\", \"remove\" of \"list\" zijn om een [tag] toe te "
 "voegen aan een [note] of te verwijderen, of om alle notities geassocieerd "
@@ -940,6 +941,12 @@ msgstr ""
 "U heeft momenteel geen notitieboek. Maak een notitieboek door op \"Nieuw "
 "notitieboek\" te klikken."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -992,6 +999,9 @@ msgstr "Zet melding"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1202,10 +1212,6 @@ msgstr "Conflicten"
 msgid "Cannot move notebook to this location"
 msgstr "Kan notitie niet naar notitieboek \"%s\" verplaatsen."
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Er bestaat al een notitieboek met \"%s\" als titel"
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
@@ -1294,6 +1300,9 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1360,6 +1369,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr ""
 
@@ -1394,6 +1410,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ongeldige optie: \"%s\". Geldige waarden zijn: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 #, fuzzy
 msgid "Joplin Export File"
 msgstr "Exporteer Evernote bestanden"
@@ -1655,6 +1675,9 @@ msgstr ""
 msgid "Welcome"
 msgstr "Welkom"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Er bestaat al een notitieboek met \"%s\" als titel"
+
 #~ msgid "Searches"
 #~ msgstr "Zoekopdrachten"
 

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>."
@@ -459,10 +457,11 @@ msgstr "Iniciando sincronização..."
 msgid "Cancelling... Please wait."
 msgstr "Cancelando... Aguarde."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> pode ser \"add\", \"remove\" ou \"list\" para atribuir ou "
 "remover [tag] de [nota], ou para listar as notas associadas a [tag]. O "
@@ -627,16 +626,16 @@ msgid "Paste"
 msgstr "Colar"
 
 msgid "Bold"
-msgstr ""
+msgstr "Negrito"
 
 msgid "Italic"
-msgstr ""
+msgstr "Itálico"
 
 msgid "Insert Date Time"
-msgstr ""
+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"
@@ -645,7 +644,7 @@ msgid "View"
 msgstr "Visualizar"
 
 msgid "Toggle sidebar"
-msgstr ""
+msgstr "Alternar barra lateral"
 
 msgid "Toggle editor layout"
 msgstr "Alternar layout do editor"
@@ -657,7 +656,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"
@@ -711,46 +710,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"
@@ -760,7 +765,7 @@ msgid "Notes and settings are stored in: %s"
 msgstr "Notas e configurações estão armazenadas em: %s"
 
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 msgid "Submit"
 msgstr "Enviar"
@@ -879,9 +884,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:"
@@ -908,18 +912,17 @@ msgid "Add or remove tags"
 msgstr "Adicionar ou remover tags"
 
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplicar"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s - Copy"
-msgstr "Copiar"
+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"
@@ -934,21 +937,27 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Atualmente, não há cadernos. Crie um, clicando em \"Novo caderno\"."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 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 ""
+msgstr "Copiar endereço do link"
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -963,16 +972,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"
@@ -983,37 +992,39 @@ msgstr "Tags"
 msgid "Set alarm"
 msgstr "Definir alarme"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "Em: %s"
+
+msgid "Note properties"
+msgstr ""
 
 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"
@@ -1046,9 +1057,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?"
@@ -1192,30 +1202,22 @@ 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\""
-
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Já existe caderno com este título: \"%s\""
+msgstr "Não é possível mover a nota para este local"
 
 #, javascript-format
 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"
@@ -1252,9 +1254,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"
@@ -1281,6 +1282,9 @@ msgid "Show tray icon"
 msgstr "Exibir tray icon"
 
 msgid "Note: Does not work in all desktop environments."
+msgstr "Nota: não funciona em todos os ambientes de desktop"
+
+msgid "Start application minimised in the tray icon"
 msgstr ""
 
 msgid "Global zoom percentage"
@@ -1289,13 +1293,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"
@@ -1315,17 +1318,16 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d horas"
 
-#, fuzzy
 msgid "Text editor command"
-msgstr "Editor de texto"
+msgstr "Comando do 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 ""
-"O editor que será usado para abrir uma nota. Se nenhum for indicado, ele "
-"tentará detectar automaticamente o editor padrão."
+"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"
@@ -1353,6 +1355,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Usuário da Nextcloud"
 
@@ -1369,7 +1378,7 @@ 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, "
@@ -1377,14 +1386,23 @@ msgid ""
 "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."
 msgstr "Valor da opção inválida: \"%s\". Os valores possíveis são: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Arquivo de Exportação do Joplin"
 
@@ -1500,9 +1518,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"
@@ -1513,9 +1530,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:"
@@ -1527,17 +1544,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"
@@ -1586,11 +1610,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"
@@ -1603,7 +1627,7 @@ msgid "Attach any file"
 msgstr "Anexar qualquer arquivo"
 
 msgid "Share"
-msgstr ""
+msgstr "Compartilhar"
 
 msgid "Convert to note"
 msgstr "Converter para nota"
@@ -1642,6 +1666,9 @@ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
 msgid "Welcome"
 msgstr "Bem-vindo"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Já existe caderno com este título: \"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "Pesquisas"
 

CliClient/locales/ru_RU.po

@@ -459,10 +459,11 @@ msgstr "Начало синхронизации..."
 msgid "Cancelling... Please wait."
 msgstr "Отмена... Пожалуйста, ожидайте."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> может быть «add», «remove» или «list», чтобы назначить или "
 "убрать [tag] с [note], или чтобы вывести список заметок, ассоциированых с "
@@ -934,6 +935,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Сейчас здесь нет блокнотов. Создайте новый нажав «Новый блокнот»."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "Открыть..."
 
@@ -987,6 +994,9 @@ msgstr "Установить напоминание"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1194,10 +1204,6 @@ msgstr "Конфликты"
 msgid "Cannot move notebook to this location"
 msgstr "Не удалось переместить заметку в блокнот «%s»"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Блокнот с таким названием уже существует: «%s»"
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Блокнот не может быть назван «%s», это зарезервированное название."
@@ -1280,6 +1286,9 @@ msgstr "Показывать иконку в панели задач"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Глобальный масштаб в процентах"
 
@@ -1350,6 +1359,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Имя пользователя Nextcloud"
 
@@ -1382,6 +1398,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Неверное значение параметра: «%s». Доступные значения: %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Файл экспорта Joplin"
 
@@ -1640,6 +1660,9 @@ msgstr "У вас сейчас нет блокнота. Создайте его
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Блокнот с таким названием уже существует: «%s»"
+
 #~ msgid "Searches"
 #~ msgstr "Запросы"
 

CliClient/locales/sl_SI.po

@@ -458,10 +458,11 @@ msgstr "Sinhronizacija se začenja."
 msgid "Cancelling... Please wait."
 msgstr "V preklicu...Prosim počakajte."
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> je lahko \"dodaj\", \"odstrani\" ali \"naštej\", da dodeliš "
 "ali odstraniš [tag] from [note] ali našteje zabeležke povezane z oznako "
@@ -938,6 +939,12 @@ msgstr ""
 "Trenutno ni tukaj nobene beležnice. Ustvarite jo z klikom na \"Nova beležnica"
 "\"."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "Odpri..."
 
@@ -991,6 +998,9 @@ msgstr "Nastavi alarm"
 msgid "In: %s"
 msgstr "%s: %s"
 
+msgid "Note properties"
+msgstr ""
+
 msgid "Hyperlink"
 msgstr ""
 
@@ -1198,10 +1208,6 @@ msgstr "Konfikti"
 msgid "Cannot move notebook to this location"
 msgstr "Ni moč premakniti zabeležke v \"%s\" beležnico"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "Beležnica s tem naslovom že obstaja: \"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Beležnica ne more biti imenovana \"%s\", ker je to rezerviran naslov."
@@ -1284,6 +1290,9 @@ msgstr "Pokaži ikono v območju za obvestila(opravilna vrstica)"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Celokupen procent povečave"
 
@@ -1354,6 +1363,13 @@ msgstr ""
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Nextcloud uporabniško ime"
 
@@ -1386,6 +1402,10 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Neveljavna vrednost: \"%s\". Možne vrednosti so : %s."
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Joplin izvozna datoteka"
 
@@ -1643,5 +1663,8 @@ msgstr "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobrodošli"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Beležnica s tem naslovom že obstaja: \"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "Iskalni niz"

CliClient/locales/zh_CN.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 2.1.1\n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "移除相关笔记的标签后才可删除此标签。"
@@ -247,7 +247,7 @@ msgstr "按 ESC 键退出命令行模式"
 
 msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
-msgstr "输入 `help keymap` 来获取完整的键盘快捷键列表。"
+msgstr "输入 `help keymap` 来获取完整的键盘快捷键列表"
 
 msgid "Imports data into Joplin."
 msgstr "导入数据至 Jolin。"
@@ -434,10 +434,11 @@ msgstr "开始同步..."
 msgid "Cancelling... Please wait."
 msgstr "正在取消... 请稍后。"
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> 可以是 \"add\", \"remove\" 或者 \"list\" 从 [note] 中分配或删"
 "除 [tag]，或者列出与 [tag] 相关的笔记。`tag list` 命令将列出所有的标签。"
@@ -465,7 +466,7 @@ msgid ""
 msgstr "切换至 [notebook] - 所有进一步处理将在此笔记本中进行。"
 
 msgid "Displays version information"
-msgstr "显示版本信息。"
+msgstr "显示版本信息"
 
 #, javascript-format
 msgid "%s %s (%s)"
@@ -683,7 +684,7 @@ msgstr "状态：从端口 %d 开始"
 
 #, javascript-format
 msgid "Status: %s"
-msgstr "状态：\"%s\"。"
+msgstr "状态：%s"
 
 msgid "Disable Web Clipper Service"
 msgstr "禁用网页剪辑服务"
@@ -778,7 +779,7 @@ msgid "Updated"
 msgstr "更新日期"
 
 msgid "Password"
-msgstr "密码："
+msgstr "密码"
 
 msgid "Password OK"
 msgstr "密码可用"
@@ -840,7 +841,7 @@ msgid "Rename notebook:"
 msgstr "重命名笔记本："
 
 msgid "Rename tag:"
-msgstr "重命名标签"
+msgstr "重命名标签："
 
 msgid "Set alarm:"
 msgstr "设置提醒："
@@ -867,11 +868,11 @@ msgid "Add or remove tags"
 msgstr "添加或删除标签"
 
 msgid "Duplicate"
-msgstr ""
+msgstr "重复的"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s - Copy"
-msgstr "复制"
+msgstr "%s - 副本"
 
 msgid "Switch between note and to-do type"
 msgstr "在笔记和待办事项类型之间切换"
@@ -892,6 +893,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "此处没有任何笔记本。点击\"新笔记本\"创建。"
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
 msgid "Open..."
 msgstr "打开…"
 
@@ -925,7 +932,7 @@ msgid "emphasized text"
 msgstr "强调文本"
 
 msgid "List item"
-msgstr ""
+msgstr "项目列表"
 
 msgid "Insert Hyperlink"
 msgstr "插入超链接"
@@ -941,7 +948,10 @@ msgstr "设置提醒"
 
 #, javascript-format
 msgid "In: %s"
-msgstr "In: %s"
+msgstr "在: %s"
+
+msgid "Note properties"
+msgstr ""
 
 msgid "Hyperlink"
 msgstr "超链接"
@@ -965,11 +975,10 @@ msgid "Horizontal Rule"
 msgstr "水平线"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "点击以停止外部编辑"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "正在取消..."
+msgstr "正在监控变化..."
 
 msgid "to-do"
 msgstr "待办事项"
@@ -988,10 +997,10 @@ msgid "Clear"
 msgstr "清除"
 
 msgid "OneDrive Login"
-msgstr "登陆 OneDrive"
+msgstr "登录 OneDrive"
 
 msgid "Dropbox Login"
-msgstr "登陆 Dropbox"
+msgstr "登录 Dropbox"
 
 msgid "Options"
 msgstr "选项"
@@ -1055,7 +1064,7 @@ msgstr "未知日志级别：%s"
 
 #, javascript-format
 msgid "Unknown level ID: %s"
-msgstr "未知 level ID：%s"
+msgstr "未知的级别 ID：%s"
 
 msgid ""
 "Cannot refresh token: authentication data is missing. Starting the "
@@ -1132,13 +1141,13 @@ msgstr "正在进行"
 
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
-msgstr "同步正在进行中。状态：\"%s\""
+msgstr "同步正在进行中。状态：%s"
 
 msgid "Encrypted"
 msgstr "已加密"
 
 msgid "Encrypted items cannot be modified"
-msgstr "无法修改加密项目。"
+msgstr "无法修改已加密项目"
 
 msgid "Conflicts"
 msgstr "冲突文件"
@@ -1146,10 +1155,6 @@ msgstr "冲突文件"
 msgid "Cannot move notebook to this location"
 msgstr "无法移动笔记本到该位置"
 
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr "以此标题命名的笔记本已存在：\"%s\""
-
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "笔记本无法被命名为 \"%s\"，此标题为保留标题。"
@@ -1205,7 +1210,7 @@ msgid "Sort notes by"
 msgstr "排序笔记"
 
 msgid "Reverse sort order"
-msgstr "反转排序顺序。"
+msgstr "反转排序顺序"
 
 msgid "Save geo-location with notes"
 msgstr "保存笔记时同时保存地理定位信息"
@@ -1228,6 +1233,9 @@ msgstr "显示托盘图标"
 msgid "Note: Does not work in all desktop environments."
 msgstr "注意：在所有的桌面环境中都不能工作。"
 
+msgid "Start application minimised in the tray icon"
+msgstr "启动应用程序时在托盘中最小化"
+
 msgid "Global zoom percentage"
 msgstr "全局缩放比例"
 
@@ -1249,25 +1257,25 @@ msgstr "同步间隔"
 
 #, javascript-format
 msgid "%d minutes"
-msgstr "%d分"
+msgstr "%d 分钟"
 
 #, javascript-format
 msgid "%d hour"
-msgstr "%d小时"
+msgstr "%d 小时"
 
 #, javascript-format
 msgid "%d hours"
-msgstr "%d小时"
+msgstr "%d 小时"
 
-#, fuzzy
 msgid "Text editor command"
-msgstr "文本编辑器"
+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 "此编辑器将会被用于打开笔记。若未提供将自动检测默认编辑器。"
+msgstr ""
+"此文本编辑器命令（可能包括参数）将会被用于打开笔记。若未提供将尝试自动检测默"
+"认编辑器。"
 
 msgid "Show advanced options"
 msgstr "显示高级选项"
@@ -1291,7 +1299,16 @@ msgid ""
 msgstr "文件系统同步启用时的同步目录。见 `sync.target`。"
 
 msgid "Nextcloud WebDAV URL"
-msgstr "Nextcloud WebDAV URL"
+msgstr "Nextcloud WebDAV 链接"
+
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+"注意：如果您更改此位置，请确保在同步之前将所有内容复制到该位置，否则将删除所"
+"有文件！ 有关详细信息，请参阅常见问题解答（FAQ）：%s"
 
 msgid "Nextcloud username"
 msgstr "Nextcloud 用户名"
@@ -1300,7 +1317,7 @@ msgid "Nextcloud password"
 msgstr "Nextcloud 密码"
 
 msgid "WebDAV URL"
-msgstr "WebDAV URL"
+msgstr "WebDAV 链接"
 
 msgid "WebDAV username"
 msgstr "WebDAV 用户名"
@@ -1309,7 +1326,7 @@ 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, "
@@ -1317,22 +1334,29 @@ msgid ""
 "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."
 msgstr "无效设置数值：\"%s\"。可用值为：%s。"
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr "标签“%s”已经存在。请选择一个不一样的名字。"
+
 msgid "Joplin Export File"
-msgstr "Joplin 输出文件"
+msgstr "Joplin 导出文件"
 
 msgid "Markdown"
 msgstr "Markdown"
 
 msgid "Joplin Export Directory"
-msgstr "Joplin 输出文件目录"
+msgstr "Joplin 导出目录"
 
 msgid "Evernote Export File"
 msgstr "Evernote 导出文件"
@@ -1342,7 +1366,7 @@ msgstr "文件目录"
 
 #, javascript-format
 msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr "无法加载 \"%s\" 模块读取 \"%s\" 格式"
+msgstr "无法加载 \"%s\" 模块以读取 \"%s\" 格式"
 
 #, javascript-format
 msgid "Please specify import format for %s"
@@ -1361,7 +1385,7 @@ msgid "Please specify the notebook where the notes should be imported to."
 msgstr "请指定导入笔记的目标笔记本。"
 
 msgid "Items that cannot be synchronised"
-msgstr "项目无法被同步。"
+msgstr "无法同步项目"
 
 #, javascript-format
 msgid "%s (%s): %s"
@@ -1437,7 +1461,7 @@ msgid "Press to set the decryption password."
 msgstr "按键将设置解密密码。"
 
 msgid "Save alarm"
-msgstr "设置提醒"
+msgstr "保存提醒"
 
 msgid "Select date"
 msgstr "选择日期"
@@ -1462,8 +1486,8 @@ msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
 "them in your phone settings, in Apps > Joplin > Permissions"
 msgstr ""
-"为了正确地工作，应用需要以下权限。请在你的手机设置（应用 > Joplin > 权限）中"
-"启用它们。"
+"为了正常的使用，应用需要以下权限。请在你的手机设置（应用 > Joplin > 权限）中"
+"启用它们"
 
 msgid ""
 "- Storage: to allow attaching files to notes and to enable filesystem "
@@ -1480,7 +1504,7 @@ msgid "Joplin website"
 msgstr "Joplin 官网"
 
 msgid "Login with Dropbox"
-msgstr "通过 Dropbox 登陆"
+msgstr "通过 Dropbox 登录"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1561,7 +1585,7 @@ msgid "Delete notebook"
 msgstr "删除笔记本"
 
 msgid "Login with OneDrive"
-msgstr "通过 OneDrive 登陆"
+msgstr "通过 OneDrive 登录"
 
 msgid "Search"
 msgstr "搜索"
@@ -1577,5 +1601,8 @@ msgstr "您目前未有笔记本。点击(+)按钮创建。"
 msgid "Welcome"
 msgstr "欢迎"
 
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "以此标题命名的笔记本已存在：\"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "搜索历史"

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)"
@@ -420,15 +434,19 @@ msgstr "正在啟動同步..."
 msgid "Cancelling... Please wait."
 msgstr "正在取消中...請稍候。"
 
+#, fuzzy
 msgid ""
 "<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."
+"`tag list` can be used to list all the tags (use -l for long option)."
 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 +454,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 +464,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 +489,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 +511,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 +526,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 +538,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,16 +593,16 @@ msgid "Paste"
 msgstr "貼上"
 
 msgid "Bold"
-msgstr ""
+msgstr "粗體"
 
 msgid "Italic"
-msgstr ""
+msgstr "斜體"
 
 msgid "Insert Date Time"
-msgstr ""
+msgstr "插入日期時間"
 
 msgid "Edit in external editor"
-msgstr ""
+msgstr "使用外部編輯器編輯"
 
 msgid "Search in all the notes"
 msgstr "在所有記事中搜尋"
@@ -617,7 +648,7 @@ msgstr "關於 Joplin"
 
 #, javascript-format
 msgid "%s %s (%s, %s)"
-msgstr ""
+msgstr "%s %s (%s, %s)"
 
 #, javascript-format
 msgid "Open %s"
@@ -645,11 +676,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"
@@ -659,7 +690,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 服務"
@@ -667,39 +698,40 @@ 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 ""
+msgstr "套用"
 
-#, fuzzy
 msgid "Submit"
-msgstr "提交 / 送出"
+msgstr "送出"
 
 msgid "Save"
 msgstr "儲存"
@@ -709,6 +741,8 @@ msgid ""
 "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 "
@@ -716,6 +750,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 "停用加密"
@@ -727,13 +764,13 @@ msgid "Master Keys"
 msgstr "主密碼"
 
 msgid "Active"
-msgstr ""
+msgstr "使用中"
 
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgid "Source"
-msgstr ""
+msgstr "來源"
 
 msgid "Created"
 msgstr "已建立"
@@ -752,6 +789,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 "缺少主密碼"
@@ -761,18 +800,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 "返回"
@@ -780,13 +820,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 "記事本標題:"
@@ -795,7 +835,7 @@ msgid "Add or remove tags:"
 msgstr "新增或移除標籤:"
 
 msgid "Separate each tag by a comma."
-msgstr "用逗號分隔每個標籤。"
+msgstr "您可用逗號分隔每個標籤。"
 
 msgid "Rename notebook:"
 msgstr "重新命名記事本:"
@@ -819,7 +859,7 @@ msgid "View them now"
 msgstr "立即檢視"
 
 msgid "Some items cannot be decrypted."
-msgstr ""
+msgstr "有些項目不能解密。"
 
 msgid "Set the password"
 msgstr "設置密碼"
@@ -828,14 +868,14 @@ msgid "Add or remove tags"
 msgstr "新增或移除標籤"
 
 msgid "Duplicate"
-msgstr ""
+msgstr "新增複本"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s - Copy"
-msgstr "複製"
+msgstr "%s - 複本"
 
 msgid "Switch between note and to-do type"
-msgstr ""
+msgstr "切換到記事 / 待辦事項"
 
 msgid "Copy Markdown link"
 msgstr "複製 Markdown 連結"
@@ -847,18 +887,24 @@ 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 "您當前沒有任何記事本。通過按一下 \"新增記事本\" 去建立。"
+
+msgid "Location"
+msgstr ""
+
+msgid "URL"
 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 "另存為..."
@@ -867,29 +913,29 @@ msgid "Copy path to clipboard"
 msgstr "複製路徑到剪貼板"
 
 msgid "Copy Link Address"
-msgstr ""
+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 "附加檔案"
@@ -900,37 +946,39 @@ msgstr "標籤"
 msgid "Set alarm"
 msgstr "設置提醒"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "在: %s"
+
+msgid "Note properties"
+msgstr ""
 
 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 "待辦事項"
@@ -982,15 +1030,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"
@@ -1012,16 +1060,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"
@@ -1031,49 +1079,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"
@@ -1087,7 +1140,7 @@ msgstr "進行中"
 
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
-msgstr ""
+msgstr "同步已在進行中。狀態: %s"
 
 msgid "Encrypted"
 msgstr "已加密"
@@ -1096,30 +1149,23 @@ msgid "Encrypted items cannot be modified"
 msgstr "無法修改已加密項目"
 
 msgid "Conflicts"
-msgstr ""
+msgstr "衝突"
 
 msgid "Cannot move notebook to this location"
-msgstr ""
-
-#, javascript-format
-msgid "A notebook with this title already exists: \"%s\""
-msgstr ""
+msgstr "無法移動記事本到此位置"
 
 #, 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 "未命名"
@@ -1172,10 +1218,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 "當新增記事時:"
@@ -1186,8 +1232,11 @@ msgstr "顯示系統匣圖示"
 msgid "Note: Does not work in all desktop environments."
 msgstr "注意: 不是在全部桌面環境中都能發揮作用。"
 
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
-msgstr "整體縮放比例"
+msgstr "整體縮放比例 (%)"
 
 msgid "Editor font family"
 msgstr "編輯器字型系列"
@@ -1196,8 +1245,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 "自動更新應用程式"
@@ -1217,14 +1266,15 @@ msgstr "%d 小時"
 msgid "%d hours"
 msgstr "%d 小時"
 
-#, fuzzy
 msgid "Text editor command"
-msgstr "文字編輯器"
+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 "顯示進階選項"
@@ -1250,6 +1300,13 @@ msgstr "啟用檔案系統同步時要同步的路徑。請參閱 `sync.target`
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV 網址"
 
+#, javascript-format
+msgid ""
+"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"
+msgstr ""
+
 msgid "Nextcloud username"
 msgstr "Nextcloud 用戶名稱"
 
@@ -1266,7 +1323,7 @@ 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, "
@@ -1274,14 +1331,21 @@ msgid ""
 "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."
 msgstr "不正確選項值: \"%s\"。可能的值為: %s。"
 
+#, javascript-format
+msgid "The tag \"%s\" already exists. Please choose a different name."
+msgstr ""
+
 msgid "Joplin Export File"
 msgstr "Joplin 匯出檔"
 
@@ -1356,7 +1420,7 @@ msgstr "資料夾"
 
 #, javascript-format
 msgid "%s: %d notes"
-msgstr "%s:%d 個記事"
+msgstr "%s:%d 則記事"
 
 msgid "Coming alarms"
 msgstr "將會發生的提醒事項"
@@ -1407,29 +1471,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 官方網站"
@@ -1465,13 +1531,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 "放棄變更"
@@ -1524,10 +1590,13 @@ 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 "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本筆記。"
 
 msgid "Welcome"
 msgstr "歡迎"
+
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "同名筆記本已經存在: \"%s\""

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.112",
+  "version": "1.0.114",
   "bin": {
     "joplin": "./main.js"
   },
@@ -37,12 +37,14 @@
     "fs-extra": "^5.0.0",
     "html-entities": "^1.2.1",
     "html-minifier": "^3.5.15",
+    "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.8",
+    "joplin-turndown": "^4.0.9",
     "joplin-turndown-plugin-gfm": "^1.0.7",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
+    "markdown-it": "^8.4.2",
     "md5": "^2.2.1",
     "mime": "^2.0.3",
     "moment": "^2.18.1",
@@ -56,7 +58,7 @@
     "redux": "^3.7.2",
     "sax": "^1.2.2",
     "server-destroy": "^1.0.1",
-    "sharp": "^0.18.4",
+    "sharp": "^0.20.8",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^4.0.1",
     "string-padding": "^1.0.2",

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/HtmlToMd.js

@@ -36,7 +36,7 @@ describe('HtmlToMd', function() {
 			const htmlPath = basePath + '/' + htmlFilename;
 			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
 
-			// if (htmlFilename !== 'code_1.html') continue;
+			// if (htmlFilename !== 'anchor_with_url_with_spaces.html') continue;
 
 			const html = await shim.fsDriver().readFile(htmlPath);
 			const expectedMd = await shim.fsDriver().readFile(mdPath);

CliClient/tests/html_to_md/anchor_with_url_with_spaces.html

@@ -0,0 +1 @@
+<a href="http://example.com/That is not right"/>Testing</a>

CliClient/tests/html_to_md/anchor_with_url_with_spaces.md

@@ -0,0 +1 @@
+[Testing](http://example.com/That%20is%20not%20right)

CliClient/tests/html_to_md/picture_with_no_img.html

@@ -0,0 +1,29 @@
+Some pictures:
+
+<picture>
+<!--[if IE 9]><video style="display: none;"><![endif]-->
+<source media="(min-width: 768px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w">
+<source media="(min-width: 768px)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w">
+<source media="(min-width: 481px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w">
+<source media="(min-width: 481px)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w">
+<source media="(min-width: 321px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="450px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop&amp;dpr=1.5 675w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop&amp;dpr=1.5 675w">
+<source media="(min-width: 321px)" sizes="450px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop 450w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop 450w">
+<source media="(min-width: 0px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="320px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop&amp;dpr=1.5 480w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop&amp;dpr=1.5 480w">
+<source media="(min-width: 0px)" sizes="320px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop 320w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop 320w">
+<!--[if IE 9]></video><![endif]-->
+<img class=" lazyloaded" title="" alt="" id="img-id-0">
+</picture>
+
+<picture>
+<!--[if IE 9]><video style="display: none;"><![endif]-->
+<source media="(min-width: 768px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w">
+<source media="(min-width: 768px)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w">
+<source media="(min-width: 481px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop&amp;dpr=1.5 882w">
+<source media="(min-width: 481px)" sizes="588px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=588&amp;h=900&amp;fit=crop 588w">
+<source media="(min-width: 321px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="450px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop&amp;dpr=1.5 675w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop&amp;dpr=1.5 675w">
+<source media="(min-width: 321px)" sizes="450px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop 450w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=450&amp;h=688&amp;fit=crop 450w">
+<source media="(min-width: 0px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: px) and (min-resolution: 120dpi)" sizes="320px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop&amp;dpr=1.5 480w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop&amp;dpr=1.5 480w">
+<source media="(min-width: 0px)" sizes="320px" data-srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop 320w" srcset="https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&amp;w=320&amp;h=489&amp;fit=crop 320w">
+<!--[if IE 9]></video><![endif]-->
+<img class=" lazyloaded" title="" alt="" id="img-id-0" src="http://example.com/test.gif">
+</picture>

CliClient/tests/html_to_md/picture_with_no_img.md

@@ -0,0 +1 @@
+Some pictures: ![](https://static2.cbrimages.com/wp-content/uploads/2018/09/Die-01-cvrA.jpg?q=35&w=588&h=900&fit=crop&dpr=1.5) ![](http://example.com/test.gif)

CliClient/tests/markdownUtils.js

@@ -39,6 +39,7 @@ describe('markdownUtils', function() {
 			['![something](http://test.com/img.png)', ['http://test.com/img.png']],
 			['![something](http://test.com/img.png) ![something2](http://test.com/img2.png)', ['http://test.com/img.png', 'http://test.com/img2.png']],
 			['![something](http://test.com/img.png "Some description")', ['http://test.com/img.png']],
+			['![something](https://test.com/ohoh_(123).png)', ['https://test.com/ohoh_(123).png']],
 		];
 
 		for (let i = 0; i < testCases.length; i++) {

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);
+	}));
+
+});

CliClient/tests/services_rest_Api.js

@@ -0,0 +1,162 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const markdownUtils = require('lib/markdownUtils.js');
+const Api = require('lib/services/rest/Api');
+const Folder = require('lib/models/Folder');
+const Note = require('lib/models/Note');
+const Resource = require('lib/models/Resource');
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+let api = null;
+
+describe('services_rest_Api', function() {
+
+	beforeEach(async (done) => {
+		api = new Api();
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should ping', async (done) => {
+		const response = await api.route('GET', 'ping');
+		expect(response).toBe('JoplinClipperServer');
+		done();
+	});
+
+	it('should handle Not Found errors', async (done) => {
+		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'pong'));
+		expect(hasThrown).toBe(true);
+		done();
+	});
+
+	it('should get folders', async (done) => {
+		let f1 = await Folder.save({ title: "mon carnet" });
+		const response = await api.route('GET', 'folders');
+		expect(response.length).toBe(1);
+		expect(response[0].title).toBe('mon carnet');
+		done();
+	});
+
+	it('should get notes', async (done) => {
+		let response = null;
+		const f1 = await Folder.save({ title: "mon carnet" });
+		const f2 = await Folder.save({ title: "mon deuxième carnet" });
+		const n1 = await Note.save({ title: 'un', parent_id: f1.id });
+		const n2 = await Note.save({ title: 'deux', parent_id: f1.id });
+		const n3 = await Note.save({ title: 'trois', parent_id: f2.id });
+		
+		response = await api.route('GET', 'notes');
+		expect(response.length).toBe(3);
+
+		response = await api.route('GET', 'notes', { parent_id: f1.id });
+		expect(response.length).toBe(2);
+
+		response = await api.route('GET', 'notes', { parent_id: f2.id });
+		expect(response.length).toBe(1);
+		expect(response[0].id).toBe(n3.id);
+
+		response = await api.route('GET', 'notes/' + n1.id);
+		expect(response.id).toBe(n1.id);
+
+		response = await api.route('GET', 'notes/' + n3.id, { fields: 'id,title' });
+		expect(Object.getOwnPropertyNames(response).length).toBe(3);
+		expect(response.id).toBe(n3.id);
+		expect(response.title).toBe('trois');
+
+		done();
+	});
+
+	it('should create notes', async (done) => {
+		let response = null;
+		const f = await Folder.save({ title: "mon carnet" });
+		
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing',
+			parent_id: f.id,
+		}));
+		expect(response.title).toBe('testing');
+		expect(!!response.id).toBe(true);
+
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing',
+			parent_id: f.id,
+		}));
+		expect(response.title).toBe('testing');
+		expect(!!response.id).toBe(true);
+
+		done();
+	});
+
+	it('should create notes with images', async (done) => {
+		let response = null;
+		const f = await Folder.save({ title: "mon carnet" });
+		
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing image',
+			parent_id: f.id,
+			image_data_url: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANZJREFUeNoAyAA3/wFwtO3K6gUB/vz2+Prw9fj/+/r+/wBZKAAExOgF4/MC9ff+MRH6Ui4E+/0Bqc/zutj6AgT+/Pz7+vv7++nu82c4DlMqCvLs8goA/gL8/fz09fb59vXa6vzZ6vjT5fbn6voD/fwC8vX4UiT9Zi//APHyAP8ACgUBAPv5APz7BPj2+DIaC2o3E+3o6ywaC5fT6gD6/QD9/QEVf9kD+/dcLQgJA/7v8vqfwOf18wA1IAIEVycAyt//v9XvAPv7APz8LhoIAPz9Ri4OAgwARgx4W/6fVeEAAAAASUVORK5CYII="
+		}));
+
+		const resources = await Resource.all();
+		expect(resources.length).toBe(1);
+
+		const resource = resources[0];
+		expect(response.body.indexOf(resource.id) >= 0).toBe(true);
+
+		done();
+	});
+
+	it('should create notes from HTML', async (done) => {
+		let response = null;
+		const f = await Folder.save({ title: "mon carnet" });
+		
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing HTML',
+			parent_id: f.id,
+			body_html: '<b>Bold text</b>',
+		}));
+
+		expect(response.body).toBe('**Bold text**');
+
+		done();
+	});
+
+	it('should filter fields', async (done) => {
+		let f = api.fields_({ query: { fields: 'one,two' } }, []);
+		expect(f.length).toBe(2);
+		expect(f[0]).toBe('one');
+		expect(f[1]).toBe('two');
+
+		f = api.fields_({ query: { fields: 'one  ,, two  ' } }, []);
+		expect(f.length).toBe(2);
+		expect(f[0]).toBe('one');
+		expect(f[1]).toBe('two');
+
+		f = api.fields_({ query: { fields: '  ' } }, ['def']);
+		expect(f.length).toBe(1);
+		expect(f[0]).toBe('def');
+
+		done();
+	});
+
+	it('should handle tokens', async (done) => {
+		api = new Api('mytoken');
+
+		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'notes'));
+		expect(hasThrown).toBe(true);
+
+		const response = await api.route('GET', 'notes', { token: 'mytoken' })
+		expect(response.length).toBe(0);
+
+		done();
+	});
+
+});

CliClient/tests/test-utils.js

@@ -48,7 +48,9 @@ EncryptionService.fsDriver_ = fsDriver;
 FileApiDriverLocal.fsDriver_ = fsDriver;
 
 const logDir = __dirname + '/../tests/logs';
+const tempDir = __dirname + '/../tests/tmp';
 fs.mkdirpSync(logDir, 0o755);
+fs.mkdirpSync(tempDir, 0o755);
 
 SyncTargetRegistry.addClass(SyncTargetMemory);
 SyncTargetRegistry.addClass(SyncTargetFilesystem);
@@ -80,6 +82,7 @@ BaseItem.loadClass('MasterKey', MasterKey);
 
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
+Setting.setConstant('tempDir', tempDir);
 
 BaseService.logger_ = logger;
 

Clipper/joplin-webclipper/content_scripts/index.js

@@ -80,8 +80,9 @@
 				title: title,
 				html: html,
 				base_url: baseUrl(),
-				url: location.origin + location.pathname,
+				url: location.origin + location.pathname + location.search,
 				parent_id: command.parent_id,
+				tags: command.tags || '',
 			};			
 		}
 
@@ -214,6 +215,7 @@
 						crop_rect: selectionArea,
 						url: location.origin + location.pathname,
 						parent_id: command.parent_id,
+						tags: command.tags,
 					};
 
 					browser_.runtime.sendMessage({

Clipper/joplin-webclipper/popup/index.html

@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 
+<!-- NOTE: I think this is not used at all -->
+
 <html>
   <head>
     <meta charset="utf-8">

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

@@ -100,21 +100,34 @@
 	flex: 0;
 }
 
-.App .Folders {
+.App .Folders,
+.App .Tags {
 	display: flex;
 	flex-direction: row;
-	align-items: center;
+	align-items: top;
 	padding: 5px 0;
 }
 
-.App .Folders label {
+.App .Folders label,
+.App .Tags label {
 	flex: 0;
 	white-space: nowrap;
+	margin-right: .5em;
 }
 
 .App .Folders select {
 	flex: 1;
-	margin-left: 10px;
+}
+
+.App .Tags input {
+	display: inline-block;
+	flex: 1;
+	margin-bottom: .5em;
+}
+
+.App .ClearTagButton {
+	margin-left: .5em;
+	text-decoration: none;
 }
 
 .App .StatusBar {

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

@@ -14,6 +14,7 @@ class AppComponent extends Component {
 
 		this.state = ({
 			contentScriptLoaded: false,
+			selectedTags: [],
 		});
 
 		this.confirm_click = () => {
@@ -31,6 +32,7 @@ class AppComponent extends Component {
 			bridge().sendCommandToActiveTab({
 				name: 'simplifiedPageHtml',
 				parent_id: this.props.selectedFolderId,
+				tags: this.state.selectedTags.join(','),
 			});
 		}
 
@@ -38,6 +40,7 @@ class AppComponent extends Component {
 			bridge().sendCommandToActiveTab({
 				name: 'completePageHtml',
 				parent_id: this.props.selectedFolderId,
+				tags: this.state.selectedTags.join(','),
 			});
 		}
 
@@ -45,6 +48,7 @@ class AppComponent extends Component {
 			bridge().sendCommandToActiveTab({
 				name: 'selectedHtml',
 				parent_id: this.props.selectedFolderId,
+				tags: this.state.selectedTags.join(','),
 			});
 		}
 
@@ -56,6 +60,7 @@ class AppComponent extends Component {
 					name: 'screenshot',
 					api_base_url: baseUrl,
 					parent_id: this.props.selectedFolderId,
+					tags: this.state.selectedTags.join(','),
 				});
 
 				window.close();
@@ -74,6 +79,41 @@ class AppComponent extends Component {
 				id: event.target.value,
 			});
 		}
+
+		this.tagCompChanged = this.tagCompChanged.bind(this);
+		this.onAddTagClick = this.onAddTagClick.bind(this);
+		this.onClearTagButtonClick = this.onClearTagButtonClick.bind(this);
+	}
+
+	onAddTagClick(event) {
+		const newTags = this.state.selectedTags.slice();
+		newTags.push('');
+		this.setState({ selectedTags: newTags });
+		this.focusNewTagInput_ = true;
+	}
+
+	onClearTagButtonClick(event) {
+		const index = event.target.getAttribute('data-index');
+		const newTags = this.state.selectedTags.slice();
+		newTags.splice(index, 1);
+		this.setState({ selectedTags: newTags });
+	}
+
+	tagCompChanged(event) {
+		const index = Number(event.target.getAttribute('data-index'));
+		const value = event.target.value;
+
+		if (this.state.selectedTags.length <= index) {
+			const newTags = this.state.selectedTags.slice();
+			newTags.push(value);
+			this.setState({ selectedTags: newTags });
+		} else {
+			if (this.state.selectedTags[index] !== value) {
+				const newTags = this.state.selectedTags.slice();
+				newTags[index] = value;
+				this.setState({ selectedTags: newTags });				
+			}
+		}
 	}
 
 	async loadContentScripts() {
@@ -87,6 +127,39 @@ class AppComponent extends Component {
 		this.setState({
 			contentScriptLoaded: true,
 		});
+
+		let foundSelectedFolderId = false;
+
+		const searchSelectedFolder = (folders) => {
+			for (let i = 0; i < folders.length; i++) {
+				const folder = folders[i];
+				if (folder.id === this.props.selectedFolderId) foundSelectedFolderId = true;
+				if (folder.children) searchSelectedFolder(folder.children);
+			}
+		}
+
+		searchSelectedFolder(this.props.folders);
+
+		if (!foundSelectedFolderId) {
+			const newFolderId = this.props.folders.length ? this.props.folders[0].id : null;
+			this.props.dispatch({
+				type: 'SELECTED_FOLDER_SET',
+				id: newFolderId,
+			});
+		}
+	}
+
+	componentDidUpdate() {
+		if (this.focusNewTagInput_) {
+			this.focusNewTagInput_ = false;
+			let lastRef = null;
+			for (let i = 0; i < 100; i++) {
+				const ref = this.refs['tagSelector' + i];
+				if (!ref) break;
+				lastRef = ref;
+			}
+			if (lastRef) lastRef.focus();
+		}
 	}
 
 	render() {
@@ -119,24 +192,17 @@ class AppComponent extends Component {
 					<p className="Info">{ msg }</p>
 				</div>
 			);
-		} else {
-			if (hasContent) {
-				previewComponent = (
-					<div className="Preview">
-						<input className={"Title"} value={content.title} onChange={this.contentTitle_change}/>
-						<div className={"BodyWrapper"}>
-							<div className={"Body"} dangerouslySetInnerHTML={{__html: content.body_html}}></div>
-						</div>
-						<a className={"Confirm Button"} onClick={this.confirm_click}>Confirm</a>
+		} else if (hasContent) {
+			previewComponent = (
+				<div className="Preview">
+					<h2>Preview:</h2>
+					<input className={"Title"} value={content.title} onChange={this.contentTitle_change}/>
+					<div className={"BodyWrapper"}>
+						<div className={"Body"} dangerouslySetInnerHTML={{__html: content.body_html}}></div>
 					</div>
-				);
-			} else {
-				previewComponent = (
-					<div className="Preview">
-						<p className="Info">(No preview yet)</p>
-					</div>
-				);
-			}
+					<a className={"Confirm Button"} onClick={this.confirm_click}>Confirm</a>
+				</div>
+			);
 		}
 
 		const clipperStatusComp = () => {
@@ -166,8 +232,6 @@ class AppComponent extends Component {
 			return <div className="StatusBar"><img alt={foundState} className="Led" src={led}/><span className="ServerStatus">{ msg }{ helpLink }</span></div>
 		}
 
-		console.info(this.props.selectedFolderId);
-
 		const foldersComp = () => {
 			const optionComps = [];
 
@@ -196,6 +260,37 @@ class AppComponent extends Component {
 			);
 		}
 
+		const tagsComp = () => {
+			const comps = [];
+			for (let i = 0; i < this.state.selectedTags.length; i++) {
+				comps.push(<div>
+					<input
+						ref={'tagSelector' + i}
+						data-index={i}
+						key={i}
+						type="text"
+						list="tags"
+						value={this.state.selectedTags[i]}
+						onChange={this.tagCompChanged}
+						onInput={this.tagCompChanged}
+					/>
+					<a data-index={i} href="#" className="ClearTagButton" onClick={this.onClearTagButtonClick}>[x]</a>
+				</div>);
+			}
+			return (
+				<div>
+					{comps}
+					<a className="AddTagButton" href="#" onClick={this.onAddTagClick}>Add tag</a>
+				</div>
+			);
+		}
+
+		const tagDataListOptions = [];
+		for (let i = 0; i < this.props.tags.length; i++) {
+			const tag = this.props.tags[i];
+			tagDataListOptions.push(<option key={tag.id}>{tag.title}</option>);
+		}
+
 		return (
 			<div className="App">
 				<div className="Controls">			
@@ -207,8 +302,14 @@ class AppComponent extends Component {
 					</ul>
 				</div>
 				{ foldersComp() }
+				<div className="Tags">
+					<label>Tags:</label>
+					{tagsComp()}
+					<datalist id="tags">
+						{tagDataListOptions}
+					</datalist>
+				</div>
 				{ warningComponent }
-				<h2>Preview:</h2>
 				{ previewComponent }
 				{ clipperStatusComp() }
 			</div>
@@ -224,6 +325,7 @@ const mapStateToProps = (state) => {
 		contentUploadOperation: state.contentUploadOperation,
 		clipperServer: state.clipperServer,
 		folders: state.folders,
+		tags: state.tags,
 		selectedFolderId: state.selectedFolderId,
 	};
 };

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

@@ -2,7 +2,7 @@ const randomClipperPort = require('./randomClipperPort');
 
 class Bridge {
 
-	init(browser, browserSupportsPromises, dispatch) {
+	async init(browser, browserSupportsPromises, dispatch) {
 		console.info('Popup: Init bridge');
 
 		this.browser_ = browser;
@@ -28,6 +28,7 @@ class Bridge {
 					base_url: command.base_url,
 					source_url: command.url,
 					parent_id: command.parent_id,
+					tags: command.tags || '',
 				};
 
 				this.dispatch({ type: 'CLIPPED_CONTENT_SET', content: content });
@@ -36,7 +37,7 @@ class Bridge {
 
 		this.browser_.runtime.onMessage.addListener(this.browser_notify);
 
-		const backgroundPage = this.browser_.extension.getBackgroundPage();
+		const backgroundPage = await this.backgroundPage(this.browser_);
 
 		// Not sure why the getBackgroundPage() sometimes returns null, so
 		// in that case default to "prod" environment, which means the live
@@ -53,6 +54,17 @@ class Bridge {
 		this.findClipperServerPort();
 	}
 
+	async backgroundPage(browser) {
+		const bgp = browser.extension.getBackgroundPage();
+		if (bgp) return bgp;
+
+		return new Promise((resolve, reject) => {
+			browser.runtime.getBackgroundPage((bgp) => {
+				resolve(bgp);
+			})
+		});
+	}
+
 	env() {
 		return this.env_;
 	}
@@ -111,6 +123,11 @@ class Bridge {
 
 					const folders = await this.folderTree();
 					this.dispatch({ type: 'FOLDERS_SET', folders: folders });
+
+					const tags = await this.clipperApiExec('GET', 'tags');
+					this.dispatch({ type: 'TAGS_SET', tags: tags });
+
+					bridge().restoreState();
 					return;
 				}
 			} catch (error) {

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

@@ -16,6 +16,7 @@ const defaultState = {
 		port: null,
 	},
 	folders: [],
+	tags: [],
 	selectedFolderId: null,
 	env: 'prod',
 };
@@ -65,6 +66,11 @@ function reducer(state = defaultState, action) {
 			newState.selectedFolderId = action.folders[0].id;
 		}
 
+	} else if (action.type === 'TAGS_SET') {
+
+		newState = Object.assign({}, state);
+		newState.tags = action.tags;
+
 	} else if (action.type === 'SELECTED_FOLDER_SET') {
 
 		newState = Object.assign({}, state);
@@ -88,11 +94,18 @@ function reducer(state = defaultState, action) {
 	return newState;
 }
 
-const store = createStore(reducer, applyMiddleware(reduxMiddleware));
+async function main() {
+	const store = createStore(reducer, applyMiddleware(reduxMiddleware));
 
-bridge().init(window.browser ? window.browser : window.chrome, !!window.browser, store.dispatch);
-bridge().restoreState();
+	console.info('Popup: Init bridge and restore state...');
 
-console.info('Popup: Creating React app...');
+	await bridge().init(window.browser ? window.browser : window.chrome, !!window.browser, store.dispatch);
 
-ReactDOM.render(<Provider store={store}><App /></Provider>, document.getElementById('root'));
+	console.info('Popup: Creating React app...');
+
+	ReactDOM.render(<Provider store={store}><App /></Provider>, document.getElementById('root'));
+}
+
+main().catch((error) => {
+	console.error('Fatal error on initialisation:', error);
+});

ElectronClient/app/ElectronAppWrapper.js

@@ -62,7 +62,9 @@ class ElectronAppWrapper {
 
 		require('electron-context-menu')({
 			shouldShowMenu: (event, params) => {
-				return params.isEditable;
+				// 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';
 			},
 		});
 

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

@@ -166,8 +166,10 @@ class Application extends BaseApplication {
 
 				case 'NOTE_FILE_WATCHER_CLEAR':
 
-					newState = Object.assign({}, state);
-					newState.watchedNoteFiles = [];
+					if (state.watchedNoteFiles.length) {
+						newState = Object.assign({}, state);
+						newState.watchedNoteFiles = [];
+					}
 					break;
 
 			}
@@ -758,6 +760,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/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/MainScreen.jsx

@@ -5,6 +5,7 @@ const { SideBar } = require('./SideBar.min.js');
 const { NoteList } = require('./NoteList.min.js');
 const { NoteText } = require('./NoteText.min.js');
 const { PromptDialog } = require('./PromptDialog.min.js');
+const NotePropertiesDialog = require('./NotePropertiesDialog.min.js');
 const Setting = require('lib/models/Setting.js');
 const BaseModel = require('lib/BaseModel.js');
 const Tag = require('lib/models/Tag.js');
@@ -19,13 +20,24 @@ const eventManager = require('../eventManager');
 
 class MainScreenComponent extends React.Component {
 
+	constructor() {
+		super();
+
+		this.notePropertiesDialog_close = this.notePropertiesDialog_close.bind(this);
+	}
+
+	notePropertiesDialog_close() {
+		this.setState({ notePropertiesDialogOptions: {} });
+	}
+
 	componentWillMount() {
 		this.setState({
 			promptOptions: null,
 			modalLayer: {
 				visible: false,
 				message: '',
-			}
+			},
+			notePropertiesDialogOptions: {},
 		});
 	}
 
@@ -189,6 +201,13 @@ class MainScreenComponent extends React.Component {
 				});
 			}
 
+		} else if (command.name === 'commandNoteProperties') {
+			this.setState({
+				notePropertiesDialogOptions: {
+					noteId: command.noteId,
+					visible: true,
+				},
+			});
 		} else if (command.name === 'toggleVisiblePanes') {
 			this.toggleVisiblePanes();
 		} else if (command.name === 'toggleSidebar') {
@@ -412,10 +431,19 @@ class MainScreenComponent extends React.Component {
 
 		const modalLayerStyle = Object.assign({}, styles.modalLayer, { display: this.state.modalLayer.visible ? 'block' : 'none' });
 
+		const notePropertiesDialogOptions = this.state.notePropertiesDialogOptions;
+
 		return (
 			<div style={style}>
 				<div style={modalLayerStyle}>{this.state.modalLayer.message}</div>
 
+				<NotePropertiesDialog
+					theme={this.props.theme}
+					noteId={notePropertiesDialogOptions.noteId}
+					visible={!!notePropertiesDialogOptions.visible}
+					onClose={this.notePropertiesDialog_close}
+				/>
+
 				<PromptDialog
 					autocomplete={promptOptions && ('autocomplete' in promptOptions) ? promptOptions.autocomplete : null}
 					defaultValue={promptOptions && promptOptions.value ? promptOptions.value : ''}
@@ -427,6 +455,7 @@ class MainScreenComponent extends React.Component {
 					visible={!!this.state.promptOptions}
 					buttons={promptOptions && ('buttons' in promptOptions) ? promptOptions.buttons : null}
 					inputType={promptOptions && ('inputType' in promptOptions) ? promptOptions.inputType : null} />
+
 				<Header style={styles.header} showBackButton={false} items={headerItems} />
 				{messageComp}
 				<SideBar style={styles.sideBar} />

ElectronClient/app/gui/NotePropertiesDialog.jsx

@@ -0,0 +1,364 @@
+const React = require('react');
+const { connect } = require('react-redux');
+const { _ } = require('lib/locale.js');
+const moment = require('moment');
+const { themeStyle } = require('../theme.js');
+const { time } = require('lib/time-utils.js');
+const Datetime = require('react-datetime');
+const Note = require('lib/models/Note');
+const formatcoords = require('formatcoords');
+const { bridge } = require('electron').remote.require('./bridge');
+
+class NotePropertiesDialog extends React.Component {
+
+	constructor() {
+		super();
+
+		this.okButton_click = this.okButton_click.bind(this);
+		this.cancelButton_click = this.cancelButton_click.bind(this);
+
+		this.state = {
+			formNote: null,
+			editedKey: null,
+			editedValue: null,
+			visible: false,
+		};
+
+		this.keyToLabel_ = {
+			id: _('ID'),
+			user_created_time: _('Created'),
+			user_updated_time: _('Updated'),
+			location: _('Location'),
+			source_url: _('URL'),
+		};
+	}
+
+	componentWillReceiveProps(newProps) {
+		if ('visible' in newProps && newProps.visible !== this.state.visible) {
+			this.setState({ visible: newProps.visible });
+		}
+
+		if ('noteId' in newProps) {
+			this.loadNote(newProps.noteId);
+		}
+	}
+
+	async loadNote(noteId) {
+		if (!noteId) {
+			this.setState({ formNote: null });
+		} else {
+			const note = await Note.load(noteId);
+			const formNote = this.noteToFormNote(note);
+			this.setState({ formNote: formNote });
+		}
+	}
+
+	latLongFromLocation(location) {
+		const o = {};
+		const l = location.split(',');
+		if (l.length == 2) {
+			o.latitude = l[0].trim();
+			o.longitude = l[1].trim();
+		} else {
+			o.latitude = '';
+			o.longitude = '';
+		}
+		return o;
+	}
+
+	noteToFormNote(note) {
+		const formNote = {};
+
+		formNote.user_updated_time = time.formatMsToLocal(note.user_updated_time);
+		formNote.user_created_time = time.formatMsToLocal(note.user_created_time);
+		formNote.source_url = note.source_url;
+
+		formNote.location = '';
+		if (Number(note.latitude) || Number(note.longitude)) {
+			formNote.location = note.latitude + ', ' + note.longitude;
+		}
+
+		formNote.id = note.id;
+
+		return formNote;
+	}
+
+	formNoteToNote(formNote) {
+		const note = Object.assign({ id: formNote.id }, this.latLongFromLocation(formNote.location));
+		note.user_created_time = time.formatLocalToMs(formNote.user_created_time);
+		note.user_updated_time = time.formatLocalToMs(formNote.user_updated_time);
+		note.source_url = formNote.source_url;
+
+		return note;
+	}
+
+	styles(themeId) {
+		const styleKey = themeId;
+		if (styleKey === this.styleKey_) return this.styles_;
+
+		const theme = themeStyle(themeId);
+
+		this.styles_ = {};
+		this.styleKey_ = styleKey;
+
+		this.styles_.modalLayer = {
+			zIndex: 9999,
+			display: 'flex',
+			position: 'absolute',
+			top: 0,
+			left: 0,
+			width: '100%',
+			height: '100%',
+			backgroundColor: 'rgba(0,0,0,0.6)',
+    		alignItems: 'flex-start',
+    		justifyContent: 'center',
+		};
+
+		this.styles_.dialogBox = {
+			backgroundColor: 'white',
+			padding: 16,
+			boxShadow: '6px 6px 20px rgba(0,0,0,0.5)',
+			marginTop: 20,
+		}
+
+		this.styles_.controlBox = {
+			marginBottom: '1em',
+		};
+
+		this.styles_.button = {
+			minWidth: theme.buttonMinWidth,
+			minHeight: theme.buttonMinHeight,
+			marginLeft: 5,
+		};
+
+		this.styles_.editPropertyButton = {
+			color: theme.color,
+			textDecoration: 'none',
+		};
+
+		this.styles_.dialogTitle = Object.assign({}, theme.h1Style, { marginBottom: '1.2em' });
+
+		return this.styles_;
+	}
+
+	async closeDialog(applyChanges) {
+		if (applyChanges) {
+			await this.saveProperty();
+			const note = this.formNoteToNote(this.state.formNote);
+			note.updated_time = Date.now();
+			await Note.save(note, { autoTimestamp: false });
+		} else {
+			await this.cancelProperty();
+		}
+
+		this.setState({
+			visible: false,
+		});
+
+		if (this.props.onClose) {
+			this.props.onClose();
+		}
+	}
+
+	okButton_click() {
+		this.closeDialog(true);
+	}
+
+	cancelButton_click() {
+		this.closeDialog(false);
+	}
+
+	editPropertyButtonClick(key, initialValue) {
+		this.setState({
+			editedKey: key,
+			editedValue: initialValue,
+		});
+
+		setTimeout(() => {
+			if (this.refs.editField.openCalendar) {
+				this.refs.editField.openCalendar();
+			} else {
+				this.refs.editField.focus();
+			}
+		}, 100);
+	}
+
+	async saveProperty() {
+		if (!this.state.editedKey) return;
+
+		return new Promise((resolve, reject) => {
+			const newFormNote = Object.assign({}, this.state.formNote);
+
+			if (this.state.editedKey.indexOf('_time') >= 0) {
+				const dt = time.anythingToDateTime(this.state.editedValue, new Date());
+				newFormNote[this.state.editedKey] = time.formatMsToLocal(dt.getTime());
+			} else {
+				newFormNote[this.state.editedKey] = this.state.editedValue;
+			}
+
+			this.setState({
+				formNote: newFormNote,
+				editedKey: null,
+				editedValue: null
+			}, () => { resolve() });
+		});
+	}
+
+	async cancelProperty() {
+		return new Promise((resolve, reject) => {
+			this.setState({
+				editedKey: null,
+				editedValue: null
+			}, () => { resolve() });
+		});
+	}
+
+	createNoteField(key, value) {
+		const styles = this.styles(this.props.theme);
+		const theme = themeStyle(this.props.theme);
+		const labelComp = <label style={Object.assign({}, theme.textStyle, {marginRight: '1em', width: '6em', display:'inline-block', fontWeight: 'bold'})}>{this.formatLabel(key)}</label>;
+		let controlComp = null;
+		let editComp = null;
+		let editCompHandler = null;
+		let editCompIcon = null;
+
+		const onKeyDown = (event) => {
+			if (event.keyCode === 13) {
+				this.saveProperty();
+			} else if (event.keyCode === 27) {
+				this.cancelProperty();
+			}
+		}
+
+		if (this.state.editedKey === key) {
+			if (key.indexOf('_time') >= 0) {
+
+				controlComp = <Datetime
+					ref="editField"
+					defaultValue={value}
+					dateFormat={time.dateFormat()}
+					timeFormat={time.timeFormat()}
+					inputProps={{
+						onKeyDown: (event) => onKeyDown(event, key)
+					}}
+					onChange={(momentObject) => {this.setState({ editedValue: momentObject })}}
+				/>
+
+				editCompHandler = () => {this.saveProperty()};
+				editCompIcon = 'fa-save';
+			} else {
+
+				controlComp = <input
+					defaultValue={value}
+					type="text"
+					ref="editField"
+					onChange={(event) => {this.setState({ editedValue: event.target.value })}}
+					onKeyDown={(event) => onKeyDown(event)}
+					style={{display:'inline-block'}}
+				/>
+			}
+		} else {
+			let displayedValue = value;
+
+			if (key === 'location') {
+				try {
+					const dms = formatcoords(value);
+					displayedValue = dms.format('DDMMss', { decimalPlaces: 0 });
+				} catch (error) {
+					displayedValue = '';
+				}
+			}
+
+			if (['source_url', 'location'].indexOf(key) >= 0) {
+				let url = '';
+				if (key === 'source_url') url = value;
+				if (key === 'location') {
+					const ll = this.latLongFromLocation(value);
+					url = Note.geoLocationUrlFromLatLong(ll.latitude, ll.longitude);
+				}
+				controlComp = <a href="#" onClick={() => bridge().openExternal(url)} style={theme.urlStyle}>{displayedValue}</a>
+			} else {
+				controlComp = <div style={Object.assign({}, theme.textStyle, {display: 'inline-block'})}>{displayedValue}</div>
+			}
+
+			if (key !== 'id') {
+				editCompHandler = () => {this.editPropertyButtonClick(key, value)};
+				editCompIcon = 'fa-edit';
+			}
+		}
+
+		if (editCompHandler) {
+			editComp = (
+				<a href="#" onClick={editCompHandler} style={styles.editPropertyButton}>
+					<i className={'fa ' + editCompIcon} aria-hidden="true" style={{ marginLeft: '.5em'}}></i>
+				</a>
+			);
+		}
+
+		return (
+			<div key={key} style={this.styles_.controlBox} className="note-property-box">
+				{ labelComp }
+				{ controlComp }
+				{ editComp }
+			</div>
+		);
+	}
+
+	formatLabel(key) {
+		if (this.keyToLabel_[key]) return this.keyToLabel_[key];
+		return key;
+	}
+
+	formatValue(key, note) {
+		if (key === 'location') {
+			if (!Number(note.latitude) && !Number(note.longitude)) return null;
+			const dms = formatcoords(Number(note.latitude), Number(note.longitude))
+			return dms.format('DDMMss', { decimalPlaces: 0 });
+		}
+
+		if (['user_updated_time', 'user_created_time'].indexOf(key) >= 0) {
+			return time.formatMsToLocal(note[key]);
+		}
+
+		return note[key];
+	}
+
+	render() {
+		const style = this.props.style;
+		const theme = themeStyle(this.props.theme);
+		const styles = this.styles(this.props.theme);
+		const formNote = this.state.formNote;
+
+		const buttonComps = [];
+		buttonComps.push(<button key="ok" style={styles.button} onClick={this.okButton_click}>{_('Apply')}</button>);
+		buttonComps.push(<button key="cancel" style={styles.button} onClick={this.cancelButton_click}>{_('Cancel')}</button>);
+
+		const noteComps = [];
+
+		const modalLayerStyle = Object.assign({}, styles.modalLayer);
+		if (!this.state.visible) modalLayerStyle.display = 'none';
+
+		if (formNote) {
+			for (let key in formNote) {
+				if (!formNote.hasOwnProperty(key)) continue;
+				const comp = this.createNoteField(key, formNote[key]);
+				noteComps.push(comp);
+			}
+		}
+
+		return (
+			<div style={modalLayerStyle}>
+				<div style={styles.dialogBox}>
+					<div style={styles.dialogTitle}>Note properties</div>
+					<div>{noteComps}</div>
+					<div style={{ textAlign: 'right', marginTop: 10 }}>
+						{buttonComps}
+					</div>
+				</div>
+			</div>
+		);
+	}
+
+}
+
+module.exports = NotePropertiesDialog;

ElectronClient/app/gui/NoteText.jsx

@@ -87,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();
 
@@ -114,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;
@@ -342,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') {
@@ -467,8 +493,6 @@ class NoteTextComponent extends React.Component {
 
 			const menu = new Menu()
 
-			console.info(itemType);
-
 			if (itemType === "image" || itemType === "resource") {
 				const resource = await Resource.load(arg0.resourceId);
 				const resourcePath = Resource.fullPath(resource);
@@ -595,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;
@@ -623,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 = '';
@@ -722,7 +748,7 @@ class NoteTextComponent extends React.Component {
 					this.forceUpdate();
 				}, 100);
 			},
-			postMessageSyntax: 'ipcRenderer.sendToHost',
+			postMessageSyntax: 'ipcProxySendToHost',
 		};
 
 		const theme = themeStyle(this.props.theme);
@@ -895,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;
@@ -907,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;
 
@@ -927,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);
@@ -935,19 +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 },
 			};
 
 			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);
@@ -1066,6 +1145,25 @@ class NoteTextComponent extends React.Component {
 			type: 'separator',
 		});
 
+		toolbarItems.push({
+			tooltip: _('Note properties'),
+			iconName: 'fa-info-circle',
+			onClick: () => {
+				const n = this.state.note;
+				if (!n || !n.id) return;
+
+				this.props.dispatch({
+					type: 'WINDOW_COMMAND',
+					name: 'commandNoteProperties',
+					noteId: n.id,
+				});
+			},
+		});
+
+		toolbarItems.push({
+			type: 'separator',
+		});
+
 		toolbarItems.push({
 			tooltip: _('Hyperlink'),
 			iconName: 'fa-link',
@@ -1306,6 +1404,7 @@ class NoteTextComponent extends React.Component {
 			style={viewerStyle}
 			preload="gui/note-viewer/preload.js"
 			src="gui/note-viewer/index.html"
+			webpreferences="contextIsolation"
 			ref={(elem) => { this.webview_ref(elem); } }
 		/>
 

ElectronClient/app/gui/PromptDialog.jsx

@@ -102,7 +102,8 @@ class PromptDialog extends React.Component {
 			if (this.props.onClose) {
 				let outputAnswer = this.state.answer;
 				if (this.props.inputType === 'datetime') {
-					outputAnswer = anythingToDate(outputAnswer);
+					// outputAnswer = anythingToDate(outputAnswer);
+					outputAnswer = time.anythingToDateTime(outputAnswer);
 				}
 				this.props.onClose(accept ? outputAnswer : null, buttonType);
 			}
@@ -113,14 +114,14 @@ class PromptDialog extends React.Component {
 			this.setState({ answer: event.target.value });
 		}
 
-		const anythingToDate = (o) => {
-			if (o && o.toDate) return o.toDate();
-			if (!o) return null;
-			let m = moment(o, time.dateTimeFormat());
-			if (m.isValid()) return m.toDate();
-			m = moment(o, time.dateFormat());
-			return m.isValid() ? m.toDate() : null;
-		}
+		// const anythingToDate = (o) => {
+		// 	if (o && o.toDate) return o.toDate();
+		// 	if (!o) return null;
+		// 	let m = moment(o, time.dateTimeFormat());
+		// 	if (m.isValid()) return m.toDate();
+		// 	m = moment(o, time.dateFormat());
+		// 	return m.isValid() ? m.toDate() : null;
+		// }
 
 		const onDateTimeChange = (momentObject) => {
 			this.setState({ answer: momentObject });

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

@@ -36,6 +36,22 @@
 	<script>
 	const contentElement = document.getElementById('content');
 
+	const ipc = {};
+
+	window.addEventListener('message', (event) => {
+		// Here we only deal with messages that are sent from the main Electro process to the webview.
+		if (!event.data || event.data.target !== 'webview') return;
+
+		const callName = event.data.name;
+		const callData = event.data.data;
+
+		if (!ipc[callName]) {
+			console.warn('Missing IPC function:', event.data);
+		} else {
+			ipc[callName](callData);
+		}
+	});
+
 	// ----------------------------------------------------------------------
 	// Handle dynamically loading HLJS when a code element is present
 	// ----------------------------------------------------------------------
@@ -119,7 +135,9 @@
 		setPercentScroll(percentScroll_);
 	}
 
-	ipcRenderer.on('setHtml', (event, html) => {
+	ipc.setHtml = (event) => {
+		const html = event.html;
+
 		updateBodyHeight();
 
 		contentElement.innerHTML = html;
@@ -158,10 +176,12 @@
 				}
 			}, 1);
 		}
-	});
+	}
 
 	let ignoreNextScrollEvent = false;
-	ipcRenderer.on('setPercentScroll', (event, percent) => {
+	ipc.setPercentScroll = (event) => {
+		const percent = event.percent;
+
 		if (checkScrollIID_) {
 			clearInterval(checkScrollIID_);
 			checkScrollIID_ = null;
@@ -169,7 +189,7 @@
 
 		ignoreNextScrollEvent = true;
 		setPercentScroll(percent);
-	});
+	}
 
 	let mark_ = null;
 	function setMarkers(keywords) {
@@ -184,7 +204,9 @@
 	}
 
 	let markLoaded_ = false;
-	ipcRenderer.on('setMarkers', (event, keywords) => {
+	ipc.setMarkers = (event) => {
+		const keywords = event.keywords;
+
 		if (!keywords.length && !markLoaded_) return;
 
 		if (!markLoaded_) {
@@ -199,7 +221,7 @@
 		} else {
 			setMarkers(keywords);
 		}
-	});
+	}
 
 	function maxScrollTop() {
 		return Math.max(0, contentElement.scrollHeight - contentElement.clientHeight);
@@ -210,6 +232,10 @@
 		document.getElementById('body').style.height = window.innerHeight + 'px';
 	}
 
+	const ipcProxySendToHost = (methodName, arg) => {
+		window.postMessage({ target: 'main', name: methodName, args: [ arg ] }, '*');
+	}
+
 	contentElement.addEventListener('scroll', function(e) {
 		if (ignoreNextScrollEvent) {
 			ignoreNextScrollEvent = false;
@@ -218,7 +244,8 @@
 		const m = maxScrollTop();
 		const percent = m ? contentElement.scrollTop / m : 0;
 		setPercentScroll(percent);
-		ipcRenderer.sendToHost('percentScroll', percent);
+		
+		ipcProxySendToHost('percentScroll', percent);
 	});
 
 	document.addEventListener('contextmenu', function(event) {
@@ -228,7 +255,7 @@
 		if (element && !element.getAttribute('data-resource-id')) element = element.parentElement;
 
 		if (element && element.getAttribute('data-resource-id')) {
-			ipcRenderer.sendToHost('contextMenu', {
+			ipcProxySendToHost('contextMenu', {
 				type: element.getAttribute('src') ? 'image' : 'resource',
 				resourceId: element.getAttribute('data-resource-id'),
 			});
@@ -236,12 +263,12 @@
 			const selectedText = window.getSelection().toString();
 
 			if (selectedText) {
-				ipcRenderer.sendToHost('contextMenu', {
+				ipcProxySendToHost('contextMenu', {
 					type: 'text',
 					textToCopy: selectedText,
 				});
 			} else if (event.target.getAttribute('href')) {
-				ipcRenderer.sendToHost('contextMenu', {
+				ipcProxySendToHost('contextMenu', {
 					type: 'link',
 					textToCopy: event.target.getAttribute('href'),
 				});

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

@@ -1,4 +1,36 @@
-// 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
+// In order to give access to the webview to certain functions of the main process, we need
+// this bridge which listens from the main process and sends to the webview and the other
+// way around. This is necessary after having enabled the "contextIsolation" option, which
+// prevents the webview from accessing low-level methods in the main process.
 
-window.ipcRenderer = require('electron').ipcRenderer;
+const ipcRenderer = require('electron').ipcRenderer;
+
+ipcRenderer.on('setHtml', (event, html) => {
+	window.postMessage({ target: 'webview', name: 'setHtml', data: { html: html } }, '*');
+});
+
+ipcRenderer.on('setPercentScroll', (event, percent) => {
+	window.postMessage({ target: 'webview', name: 'setPercentScroll', data: { percent: percent } }, '*');
+});
+
+ipcRenderer.on('setMarkers', (event, keywords) => {
+	window.postMessage({ target: 'webview', name: 'setMarkers', data: { keywords: keywords } }, '*');
+});
+
+window.addEventListener('message', (event) => {
+	// Here we only deal with messages that are sent from the webview to the main Electron process
+	if (!event.data || event.data.target !== 'main') return;
+
+	const callName = event.data.name;
+	const args = event.data.args;
+
+	if (args.length === 0) {
+		ipcRenderer.sendToHost(callName);
+	} else if (args.length === 1) {
+		ipcRenderer.sendToHost(callName, args[0]);
+	} else if (args.length === 2) {
+		ipcRenderer.sendToHost(callName, args[1]);
+	} else {
+		throw new Error('Unsupported number of args');
+	}
+});

ElectronClient/app/locales/index.js

@@ -11,10 +11,15 @@ 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['nl_BE'] = require('./nl_BE.json');
+locales['nl_NL'] = require('./nl_NL.json');
+locales['no'] = require('./no.json');
 locales['pt_BR'] = require('./pt_BR.json');
+locales['ro'] = require('./ro.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.104",
+  "version": "1.0.109",
   "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.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
-      "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="
+      "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",
@@ -52,14 +52,6 @@
         "acorn": "^5.0.0"
       }
     },
-    "agent-base": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
-      "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
-      "requires": {
-        "es6-promisify": "^5.0.0"
-      }
-    },
     "ajv": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz",
@@ -1371,14 +1363,14 @@
       "dev": true
     },
     "cssom": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.3.tgz",
-      "integrity": "sha512-pjE/I/NSp3iyeoxXN5QaoJpgzYUMj2dJHx9OSufoTliJLDx+kuOQaMCJW8OwvrKJswhXUHnHN6eUmUSETN0msg=="
+      "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"
       }
@@ -1693,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": {
@@ -1788,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",
@@ -2266,14 +2275,6 @@
       "resolved": "https://registry.npmjs.org/es6-promise-pool/-/es6-promise-pool-2.5.0.tgz",
       "integrity": "sha1-FHxhKza0fxBQJ/nSv1SlmKmdnMs="
     },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "requires": {
-        "es6-promise": "^4.0.3"
-      }
-    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -2281,9 +2282,9 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz",
-      "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==",
+      "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",
@@ -2692,6 +2693,11 @@
         "mime-types": "^2.1.12"
       }
     },
+    "formatcoords": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/formatcoords/-/formatcoords-1.1.3.tgz",
+      "integrity": "sha1-dS8FarL+NMHUrooZBIzgw44W7QM="
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -3523,25 +3529,6 @@
         "sshpk": "^1.7.0"
       }
     },
-    "https-proxy-agent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
-      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
-      "requires": {
-        "agent-base": "^4.1.0",
-        "debug": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
     "iconv-lite": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
@@ -3956,35 +3943,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"
       }
     },
@@ -4040,11 +4027,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": {
@@ -4592,9 +4586,9 @@
       "dev": true
     },
     "nwsapi": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.4.tgz",
-      "integrity": "sha512-Zt6HRR6RcJkuj5/N9zeE7FN6YitRW//hK2wTOwX274IBphbY3Zf5+yn5mZ9v/SzAOTMjQNxZf9KkmPLWn0cV4g=="
+      "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",
@@ -5118,11 +5112,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"
@@ -7164,11 +7159,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": {
@@ -7280,12 +7285,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.104",
+  "version": "1.0.109",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {
@@ -87,15 +87,15 @@
     "es6-promise-pool": "^2.5.0",
     "follow-redirects": "^1.5.0",
     "form-data": "^2.3.2",
+    "formatcoords": "^1.1.3",
     "fs-extra": "^5.0.0",
     "highlight.js": "^9.12.0",
     "html-entities": "^1.2.1",
-    "https-proxy-agent": "^2.2.1",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.8",
+    "joplin-turndown": "^4.0.9",
     "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",
@@ -110,7 +110,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",

ElectronClient/app/style.css

@@ -77,4 +77,8 @@ table td, table th {
 
 .smalltalk {
 	font-family: sans-serif;
+}
+
+.note-property-box .rdt {
+	display: inline-block;
 }

ElectronClient/app/theme.js

@@ -1,7 +1,9 @@
 const Setting = require('lib/models/Setting.js');
 
+const zoomRatio = Setting.value('style.zoom') / 100;
+
 const globalStyle = {
-	fontSize: 12 * Setting.value('style.zoom') / 100,
+	fontSize: Math.round(12 * zoomRatio),
 	fontFamily: 'sans-serif',
 	margin: 15, // No text and no interactive component should be within this margin
 	itemMarginTop: 10,
@@ -46,7 +48,7 @@ globalStyle.htmlColor ='black'; // Note: CSS in WebView component only supports
 globalStyle.htmlBackgroundColor ='white';
 globalStyle.htmlDividerColor = 'rgb(150,150,150)';
 globalStyle.htmlLinkColor ='blue';
-globalStyle.htmlLineHeight ='20px';
+globalStyle.htmlLineHeight = Math.round(20 * zoomRatio) + 'px';
 
 globalStyle.marginRight = globalStyle.margin;
 globalStyle.marginLeft = globalStyle.margin;
@@ -76,11 +78,15 @@ globalStyle.textStyle2 = Object.assign({}, globalStyle.textStyle, {
 	color: globalStyle.color2,
 });
 
+globalStyle.urlStyle = Object.assign({}, globalStyle.textStyle, { color: "#155BDA", textDecoration: 'underline' });
+
 globalStyle.h1Style = Object.assign({}, globalStyle.textStyle);
 globalStyle.h1Style.fontSize *= 1.5;
+globalStyle.h1Style.fontWeight = 'bold';
 
 globalStyle.h2Style = Object.assign({}, globalStyle.textStyle);
 globalStyle.h2Style.fontSize *= 1.3;
+globalStyle.h2Style.fontWeight = 'bold';
 
 globalStyle.toolbarStyle = {
 	height: globalStyle.toolbarHeight,

README.md

@@ -1,6 +1,6 @@
 # Joplin
 
-[![Donate](https://joplin.cozic.net/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Donate with Bitcoin](https://joplin.cozic.net/images/badges/Donate-Bitcoin.svg)](https://joplin.cozic.net/donate/#bitcoin) [![Travis Build Status](https://travis-ci.org/laurent22/joplin.svg?branch=master)](https://travis-ci.org/laurent22/joplin) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/laurent22/joplin)
+[![Donate](https://joplin.cozic.net/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Become a patron](https://joplin.cozic.net/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Travis Build Status](https://travis-ci.org/laurent22/joplin.svg?branch=master)](https://travis-ci.org/laurent22/joplin) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/laurent22/joplin)
 
 Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in [Markdown format](#markdown).
 
@@ -20,17 +20,23 @@ 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.104/Joplin-Setup-1.0.104.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.104/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.104/Joplin-1.0.104.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.104/Joplin-1.0.104-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.107/Joplin-Setup-1.0.107.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.107/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.107/Joplin-1.0.107.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.107/Joplin-1.0.107-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.
 
+### Install and Update Ubuntu/Debian (Gnome Shell)
+
+``` sh
+wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/install_ubuntu.sh | bash
+```
+
 ## Mobile applications
 
 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.129/joplin-v1.0.129.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.133/joplin-v1.0.133.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
@@ -168,6 +174,7 @@ WebDAV-compatible services that are known to work with Joplin:
 
 - [Box.com](https://www.box.com/)
 - [DriveHQ](https://www.drivehq.com)
+- [Fastmail](https://www.fastmail.com/)
 - [HiDrive](https://www.strato.fr/stockage-en-ligne/) from Strato. [Setup help](https://github.com/laurent22/joplin/issues/309)
 - [Nginx WebDAV Module](https://nginx.org/en/docs/http/ngx_http_dav_module.html)
 - [OwnCloud](https://owncloud.org/)
@@ -267,7 +274,9 @@ The checkboxes can then be ticked in the mobile and desktop applications.
 
 ## HTML support
 
-Only the `<br>` tag is supported - it can be used to force a new line, which is convenient to insert new lines inside table cells. For security reasons, other HTML tags are not supported.
+It is generally recommended to enter the notes as Markdown as it makes the notes easier to edit. However for cases where certain features aren't supported (such as strikethrough or to highlight text), you can also use HTML code directly. For example this would be a valid note:
+
+	This is <s>strikethrough text</s> mixed with regular **Markdown**.
 
 # Donations
 
@@ -304,24 +313,29 @@ 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  |  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/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  64%
+![](https://joplin.cozic.net/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  91%
+![](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)  |  52%
+![](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)  |  81%
+![](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.  |  83%
+![](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)  |  98%
 ![](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)  |  92%
+![](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)  |  98%
 ![](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)  |  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)  |    |  55%
-![](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/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)  |  85%
-![](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/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)  |  71%
-![](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/es/galicia.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans (marcoslansgarza@gmail.com)  |  81%
+![](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)  |    |  97%
+![](https://joplin.cozic.net/images/flags/country-4x3/nl.png)  |  Nederlands  |  [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po)  |  Heimen Stoffels (vistausss@outlook.com)  |  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)  |    |  64%
+![](https://joplin.cozic.net/images/flags/country-4x3/no.png)  |  Norwegian  |  [no](https://github.com/laurent22/joplin/blob/master/CliClient/locales/no.po)  |    |  87%
+![](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)  |  98%
+![](https://joplin.cozic.net/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  64%
+![](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)  |    |  80%
+![](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)  |  97%
+![](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)  |  80%
+![](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)  |  98%
+![](https://joplin.cozic.net/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |  AWASHIRO Ikuya (ikunya@gmail.com)  |  99%
+![](https://joplin.cozic.net/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  98%
 <!-- 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 2097307
-		versionName "1.0.129"
+		versionCode 2097311
+		versionName "1.0.133"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}
@@ -137,7 +137,7 @@ android {
 }
 
 dependencies {
-    compile project(':react-native-file-viewer')
+	compile project(':react-native-file-viewer')
 	compile project(':react-native-securerandom')
 	compile project(':react-native-push-notification')
 	compile project(':react-native-fs')
@@ -151,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

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:installLocation="auto"
 	package="net.cozic.joplin"
 	android:versionCode="2"
 	android:versionName="0.8.0">
@@ -14,12 +15,12 @@
 	<!-- START react-native-push-notification -->
 	<!-- ==================================== -->
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
-    <permission
-        android:name="${applicationId}.permission.C2D_MESSAGE"
-        android:protectionLevel="signature" />
-    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+	<permission
+		android:name="${applicationId}.permission.C2D_MESSAGE"
+		android:protectionLevel="signature" />
+	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+	<uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 	<!-- ================================== -->
 	<!-- END react-native-push-notification -->
 	<!-- ================================== -->
@@ -39,13 +40,13 @@
 		<!-- START react-native-push-notification -->
 		<!-- ==================================== -->
 
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <service android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationRegistrationService"/>
+		<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
+		<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
+			<intent-filter>
+				<action android:name="android.intent.action.BOOT_COMPLETED" />
+			</intent-filter>
+		</receiver>
+		<service android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationRegistrationService"/>
 		<!-- ================================== -->
 		<!-- END react-native-push-notification -->
 		<!-- ================================== -->
@@ -63,5 +64,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

@@ -7,6 +7,7 @@ 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;
@@ -18,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;
 
@@ -42,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

@@ -25,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/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/BaseModel.js

@@ -287,7 +287,7 @@ class BaseModel {
 		}
 
 		// Remove fields that are not in the `fields` list, if provided.
-		// Note that things like update_time, user_update_time will still
+		// Note that things like update_time, user_updated_time will still
 		// be part of the final list of fields if autoTimestamp is on.
 		// id also will stay.
 		if (!options.isNew && options.fields) {
@@ -314,6 +314,10 @@ class BaseModel {
 		// The purpose of user_updated_time is to allow the user to manually set the time of a note (in which case
 		// options.autoTimestamp will be `false`). However note that if the item is later changed, this timestamp
 		// will be set again to the current time.
+		//
+		// The technique to modify user_updated_time while keeping updated_time current (so that sync can happen) is to
+		// manually set updated_time when saving and to set autoTimestamp to false, for example:
+		// Note.save({ id: "...", updated_time: Date.now(), user_updated_time: 1436342618000 }, { autoTimestamp: false })
 		if (options.autoTimestamp && this.hasField('user_updated_time')) {
 			o.user_updated_time = timeNow;
 		}

ReactNativeClient/lib/ClipperServer.js

@@ -1,18 +1,10 @@
 const { netUtils } = require('lib/net-utils');
 const urlParser = require("url");
-const Note = require('lib/models/Note');
-const Folder = require('lib/models/Folder');
-const Resource = require('lib/models/Resource');
 const Setting = require('lib/models/Setting');
-const { shim } = require('lib/shim');
-const md5 = require('md5');
-const { fileExtension, safeFileExtension, safeFilename, filename } = require('lib/path-utils');
-const HtmlToMd = require('lib/HtmlToMd');
 const { Logger } = require('lib/logger.js');
-const markdownUtils = require('lib/markdownUtils');
-const mimeUtils = require('lib/mime-utils.js').mime;
 const randomClipperPort = require('lib/randomClipperPort');
 const enableServerDestroy = require('server-destroy');
+const Api = require('lib/services/rest/Api');
 
 class ClipperServer {
 
@@ -21,6 +13,7 @@ class ClipperServer {
 		this.startState_ = 'idle';
 		this.server_ = null;
 		this.port_ = null;
+		this.api_ = new Api();
 	}
 
 	static instance() {
@@ -31,6 +24,7 @@ class ClipperServer {
 
 	setLogger(l) {
 		this.logger_ = l;
+		this.api_.setLogger(l);
 	}
 
 	logger() {
@@ -64,133 +58,6 @@ class ClipperServer {
 		});
 	}
 
-	htmlToMdParser() {
-		if (this.htmlToMdParser_) return this.htmlToMdParser_;
-		this.htmlToMdParser_ = new HtmlToMd();
-		return this.htmlToMdParser_;
-	}
-
-	async requestNoteToNote(requestNote) {
-		const output = {
-			title: requestNote.title ? requestNote.title : '',
-			body: requestNote.body ? requestNote.body : '',
-		};
-
-		if (requestNote.body_html) {
-			// Parsing will not work if the HTML is not wrapped in a top level tag, which is not guaranteed
-			// when getting the content from elsewhere. So here wrap it - it won't change anything to the final
-			// rendering but it makes sure everything will be parsed.
-			output.body = await this.htmlToMdParser().parse('<div>' + requestNote.body_html + '</div>', {
-				baseUrl: requestNote.base_url ? requestNote.base_url : '',
-			});
-		}
-
-		if (requestNote.parent_id) {
-			output.parent_id = requestNote.parent_id;
-		} else {
-			const folder = await Folder.defaultFolder();
-			if (!folder) throw new Error('Cannot find folder for note');
-			output.parent_id = folder.id;
-		}
-
-		if (requestNote.source_url) output.source_url = requestNote.source_url;
-		if (requestNote.author) output.author = requestNote.author;
-
-		return output;
-	}
-
-	// Note must have been saved first
-	async attachImageFromDataUrl_(note, imageDataUrl, cropRect) {
-		const tempDir = Setting.value('tempDir');
-		const mime = mimeUtils.fromDataUrl(imageDataUrl);
-		let ext = mimeUtils.toFileExtension(mime) || '';
-		if (ext) ext = '.' + ext;
-		const tempFilePath = tempDir + '/' + md5(Math.random() + '_' + Date.now()) + ext;
-		const imageConvOptions = {};
-		if (cropRect) imageConvOptions.cropRect = cropRect;
-		await shim.imageFromDataUrl(imageDataUrl, tempFilePath, imageConvOptions);
-		return await shim.attachFileToNote(note, tempFilePath);
-	}
-
-	async downloadImage_(url) {
-		const tempDir = Setting.value('tempDir');
-		const name = filename(url);
-		let fileExt = safeFileExtension(fileExtension(url).toLowerCase());
-		if (fileExt) fileExt = '.' + fileExt;
-		let imagePath = tempDir + '/' + safeFilename(name) + fileExt;
-		if (await shim.fsDriver().exists(imagePath)) imagePath = tempDir + '/' + safeFilename(name) + '_' + md5(Math.random() + '_' + Date.now()).substr(0,10) + fileExt;
-
-		try {
-			const result = await shim.fetchBlob(url, { path: imagePath });
-			return imagePath;
-		} catch (error) {
-			this.logger().warn('Cannot download image at ' + url, error);
-			return '';
-		}
-	}
-
-	async downloadImages_(urls) {
-		const PromisePool = require('es6-promise-pool')
-
-		const output = {};
-
-		let urlIndex = 0;
-		const promiseProducer = () => {
-			if (urlIndex >= urls.length) return null;
-
-			const url = urls[urlIndex++];
-
-			return new Promise(async (resolve, reject) => {
-				const imagePath = await this.downloadImage_(url);
-				if (imagePath) output[url] = { path: imagePath };
-				resolve();
-			});
-		}
-
-		const concurrency = 3
-		const pool = new PromisePool(promiseProducer, concurrency)
-		await pool.start()
-
-		return output;
-	}
-
-	async createResourcesFromPaths_(urls) {
-		for (let url in urls) {
-			if (!urls.hasOwnProperty(url)) continue;
-			const urlInfo = urls[url];
-			try {
-				const resource = await shim.createResourceFromPath(urlInfo.path);
-				urlInfo.resource = resource;
-			} catch (error) {
-				this.logger().warn('Cannot create resource for ' + url, error);
-			}
-		}
-		return urls;
-	}
-
-	async removeTempFiles_(urls) {
-		for (let url in urls) {
-			if (!urls.hasOwnProperty(url)) continue;
-			const urlInfo = urls[url];
-			try {
-				await shim.fsDriver().remove(urlInfo.path);
-			} catch (error) {
-				this.logger().warn('Cannot remove ' + urlInfo.path, error);
-			}
-		}
-	}
-
-	replaceImageUrlsByResources_(md, urls) {
-		let output = md.replace(/(!\[.*?\]\()([^\s\)]+)(.*?\))/g, (match, before, imageUrl, after) => {
-			const urlInfo = urls[imageUrl];
-			if (!urlInfo || !urlInfo.resource) return before + imageUrl + after;
-			const resourceUrl = Resource.internalUrl(urlInfo.resource);
-			return before + resourceUrl + after;
-		});
-
-		return output;
-	}
-
 	async findAvailablePort() {
 		const tcpPortUsed = require('tcp-port-used');
 
@@ -243,22 +110,33 @@ class ClipperServer {
 				response.end();
 			}
 
-			const requestId = Date.now();
-			this.logger().info('Request (' + requestId + '): ' + request.method + ' ' + request.url);
+			const writeResponse = (code, response) => {
+				if (typeof response === 'string') {
+					writeResponseText(code, response);
+				} else {
+					writeResponseJson(code, response);
+				}
+			}
+
+			this.logger().info('Request: ' + request.method + ' ' + request.url);
 
 			const url = urlParser.parse(request.url, true);
 
-			if (request.method === 'GET') {
-				if (url.pathname === '/ping') {
-					return writeResponseText(200, 'JoplinClipperServer');
+			const execRequest = async (request, body = '') => {
+				try {
+					const response = await this.api_.route(request.method, url.pathname, url.query, body);
+					writeResponse(200, response);
+				} catch (error) {
+					console.error(error);
+					writeResponse(error.httpCode ? error.httpCode : 500, error.message);
 				}
+			}
 
-				if (url.pathname === '/folders') {
-					const structure = await Folder.allAsTree({ fields: ['id', 'parent_id', 'title'] });
-					return writeResponseJson(200, structure);
-				}
-			} else if (request.method === 'POST') {
-				if (url.pathname === '/notes') {
+			if (request.method === 'OPTIONS') {
+				writeCorsHeaders(200);
+				response.end();
+			} else {
+				if (request.method === 'POST') {
 					let body = '';
 
 					request.on('data', (data) => {
@@ -266,44 +144,14 @@ class ClipperServer {
 					});
 
 					request.on('end', async () => {
-						try {
-							const requestNote = JSON.parse(body);
-							let note = await this.requestNoteToNote(requestNote);
-
-							const imageUrls = markdownUtils.extractImageUrls(note.body);
-							let result = await this.downloadImages_(imageUrls);
-							result = await this.createResourcesFromPaths_(result);
-							await this.removeTempFiles_(result);
-							note.body = this.replaceImageUrlsByResources_(note.body, result);
-
-							note = await Note.save(note);
-
-							if (requestNote.image_data_url) {
-								await this.attachImageFromDataUrl_(note, requestNote.image_data_url, requestNote.crop_rect);
-							}
-
-							this.logger().info('Request (' + requestId + '): Created note ' + note.id);
-							return writeResponseJson(200, note);
-						} catch (error) {
-							this.logger().error(error);
-							return writeResponseJson(400, { errorCode: 'exception', errorMessage: error.message });
-						}
+						execRequest(request, body);
 					});
 				} else {
-					return writeResponseJson(404, { errorCode: 'not_found' });
+					execRequest(request);
 				}
-			} else if (request.method === 'OPTIONS') {
-				writeCorsHeaders(200);
-				response.end();
-			} else {
-				return writeResponseJson(405, { errorCode: 'method_not_allowed' });
 			}
 		});
 
-		this.server_.on('close', () => {
-
-		});
-
 		enableServerDestroy(this.server_);
 
 		this.logger().info('Starting Clipper server on port ' + this.port_);

ReactNativeClient/lib/MdToHtml.js

@@ -73,31 +73,31 @@ class MdToHtml {
 		return attrs;
 	}
 
-	renderImage_(attrs, options) {
-		const loadResource = async (id) => {
-			// console.info('Loading resource: ' + id);
+	async loadResource(id, options) {
+		// console.info('Loading resource: ' + id);
 
-			// Initially set to to an empty object to make
-			// it clear that it is being loaded. Otherwise
-			// it sometimes results in multiple calls to
-			// loadResource() for the same resource.
-			this.loadedResources_[id] = {};
+		// Initially set to to an empty object to make
+		// it clear that it is being loaded. Otherwise
+		// it sometimes results in multiple calls to
+		// loadResource() for the same resource.
+		this.loadedResources_[id] = {};
 
-			const resource = await Resource.load(id);
-			//const resource = await this.modelCache_.load(Resource, id);
+		const resource = await Resource.load(id);
+		//const resource = await this.modelCache_.load(Resource, id);
 
-			if (!resource) {
-				// Can happen for example if an image is attached to a note, but the resource hasn't
-				// been downloaded from the sync target yet.
-				console.warn('Cannot load resource: ' + id);
-				return;
-			}
-
-			this.loadedResources_[id] = resource;
-
-			if (options.onResourceLoaded) options.onResourceLoaded();
+		if (!resource) {
+			// Can happen for example if an image is attached to a note, but the resource hasn't
+			// been downloaded from the sync target yet.
+			console.warn('Cannot load resource: ' + id);
+			return;
 		}
 
+		this.loadedResources_[id] = resource;
+
+		if (options.onResourceLoaded) options.onResourceLoaded();
+	}
+
+	renderImage_(attrs, options) {
 		const title = this.getAttr_(attrs, 'title');
 		const href = this.getAttr_(attrs, 'src');
 
@@ -108,7 +108,7 @@ class MdToHtml {
 		const resourceId = Resource.urlToId(href);
 		const resource = this.loadedResources_[resourceId];
 		if (!resource) {
-			loadResource(resourceId);
+			this.loadResource(resourceId, options);
 			return '';
 		}
 
@@ -125,6 +125,27 @@ class MdToHtml {
 		return '[Image: ' + htmlentities(resource.title) + ' (' + htmlentities(mime) + ')]';
 	}
 
+	renderImageHtml_(before, src, after, options) {
+		const resourceId = Resource.urlToId(src);
+		const resource = this.loadedResources_[resourceId];
+		if (!resource) {
+			this.loadResource(resourceId, options);
+			return '';
+		}
+
+		if (!resource.id) return ''; // Resource is being loaded
+
+		const mime = resource.mime ? resource.mime.toLowerCase() : '';
+		if (Resource.isSupportedImageMimeType(mime)) {
+			let newSrc = './' + Resource.filename(resource);
+			if (this.resourceBaseUrl_ !== null) newSrc = this.resourceBaseUrl_ + newSrc;
+			let output = '<img ' + before + ' data-resource-id="' + resource.id + '" src="' + newSrc + '" ' + after + '/>';
+			return output;
+		}
+
+		return '[Image: ' + htmlentities(resource.title) + ' (' + htmlentities(mime) + ')]';
+	}
+
 	renderOpenLink_(attrs, options) {
 		let href = this.getAttr_(attrs, 'href');
 		const text = this.getAttr_(attrs, 'text');
@@ -259,7 +280,7 @@ class MdToHtml {
 				}
 
 				if (!rendererPlugin) {
-					output.push('<code>');
+					output.push('<code class="inline-code">');
 				}
 			}
 
@@ -395,6 +416,40 @@ class MdToHtml {
 			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,8 +493,11 @@ class MdToHtml {
 			}
 		}
 
-		// Support <br> tag to allow newlines inside table cells
-		renderedBody = renderedBody.replace(/&lt;br&gt;/gi, '<br>');
+		renderedBody = renderedBody.replace(/<img(.*?)src=["'](.*?)["'](.*?)\/>/g, (v, before, src, after) => {
+			if (!Resource.isResourceUrl(src)) return '<img ' + before + ' src="' + src + '" ' + after + '/>';
+			return this.renderImageHtml_(before, src, after, options);
+		});
+
 
 		// https://necolas.github.io/normalize.css/
 		const normalizeCss = `
@@ -495,7 +553,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;
@@ -530,9 +588,24 @@ class MdToHtml {
 				border-bottom: 1px solid ` + style.htmlDividerColor + `;
 			}
 			img {
-				width: auto;
+				/* width: auto; */
 				max-width: 100%;
 			}
+			.inline-code {
+				border: 1px solid #CBCBCB;
+				background-color: #eff0f1;
+				padding-right: .2em;
+				padding-left: .2em;
+			}
+
+			/* 
+			This is to fix https://github.com/laurent22/joplin/issues/764
+			Without this, the tag attached to an equation float at an absoluate position of the page,
+			instead of a position relative to the container.
+			*/
+			.katex-display>.katex>.katex-html {
+				position: relative;
+			}
 
 			@media print {
 				body {
@@ -562,6 +635,10 @@ class MdToHtml {
 				pre {
 					white-space: pre-wrap;
 				}
+
+				.code, .inline-code {
+					border: 1px solid #CBCBCB;
+				}
 			}
 		`;
 
@@ -603,4 +680,4 @@ class MdToHtml {
 
 }
 
-module.exports = MdToHtml;
+module.exports = MdToHtml;