CLI v1.0.119

* add external editor example config to faq

* add external editor to feature list

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.
@@ -56,6 +58,8 @@ If node-gyp does not works (MSBUILD: error MSB3428: Could not load the Visual C+
 
 If `yarn dist` fails, it may need administrative rights.
 
+The [building\_win32\_tips on this page](./readme/building_win32_tips.md) might be helpful.
+
 # Building the Mobile application
 
 First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "Building Projects with Native Code" tab.

CONTRIBUTING.md

@@ -17,3 +17,12 @@ 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.
+
+Pull requests that automatically change many files tend to be rejected (for example changes that automatically update the code styling, or to add new lines to many files, or to automatically convert images to a different format) so if you have such a pull request in mind, please discuss it first in the forum.
+
+# 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/app.js

@@ -21,7 +21,6 @@ const { _, setLocale, defaultLocale, closestSupportedLocale } = require('lib/loc
 const os = require('os');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
-const EventEmitter = require('events');
 const Cache = require('lib/Cache');
 
 class Application extends BaseApplication {

CliClient/app/command-apidoc.js

@@ -0,0 +1,289 @@
+const { BaseCommand } = require('./base-command.js');
+const { _ } = require('lib/locale.js');
+const { cliUtils } = require('./cli-utils.js');
+const EncryptionService = require('lib/services/EncryptionService');
+const DecryptionWorker = require('lib/services/DecryptionWorker');
+const MasterKey = require('lib/models/MasterKey');
+const BaseItem = require('lib/models/BaseItem');
+const BaseModel = require('lib/BaseModel');
+const Setting = require('lib/models/Setting.js');
+const { toTitleCase } = require('lib/string-utils.js');
+const { reg } = require('lib/registry.js');
+const markdownUtils = require('lib/markdownUtils');
+const { Database } = require('lib/database.js');
+
+class Command extends BaseCommand {
+
+	usage() {
+		return 'apidoc';
+	}
+
+	description() {
+		return 'Build the API doc';
+	}
+
+	createPropertiesTable(tableFields) {
+  		const headers = [
+  			{ name: 'name', label: 'Name' },
+  			{ name: 'type', label: 'Type', filter: (value) => {
+  				return Database.enumName('fieldType', value);
+  			}},
+  			{ name: 'description', label: 'Description' },
+  		];
+		
+		return markdownUtils.createMarkdownTable(headers, tableFields); 
+	}
+
+	async action(args) {
+		const models = [
+			{
+				type: BaseModel.TYPE_NOTE,
+			},
+			{
+				type: BaseModel.TYPE_FOLDER,
+			},
+			{
+				type: BaseModel.TYPE_RESOURCE,
+			},
+			{
+				type: BaseModel.TYPE_TAG,
+			},
+		];
+
+		const lines = [];
+
+		lines.push('# Joplin API');
+		lines.push('');
+
+		lines.push('When the Web Clipper service is enabled, Joplin exposes a [REST API](https://en.wikipedia.org/wiki/Representational_state_transfer) which allows third-party applications to access Joplin\'s data and to create, modify or delete notes, notebooks, resources or tags.');
+		lines.push('');
+		lines.push('In order to use it, you\'ll first need to find on which port the service is running. To do so, open the Web Clipper Options in Joplin and if the service is running it should tell you on which port. Normally it runs on port **41184**. If you want to find it programmatically, you may follow this kind of algorithm:');
+		lines.push('');
+		lines.push('```javascript');
+		lines.push('let port = null;');
+		lines.push('for (let portToTest = 41184; portToTest <= 41194; portToTest++) {');
+		lines.push('    const result = pingPort(portToTest); // Call GET /ping');
+		lines.push('    if (result == \'JoplinClipperServer\') {');
+		lines.push('        port = portToTest; // Found the port');
+		lines.push('        break;');
+		lines.push('    }');
+		lines.push('}');
+		lines.push('```');
+		lines.push('');
+		
+		lines.push('# Authorisation')
+		lines.push('');
+		lines.push('To prevent unauthorised applications from accessing the API, the calls must be authentified. To do so, you must provide a token as a query parameter for each API call. You can get this token from the Joplin desktop application, on the Web Clipper Options screen.');
+		lines.push('');
+		lines.push('This would be an example of valid cURL call using a token:');
+		lines.push('');
+		lines.push('\tcurl http://localhost:41184/notes?token=ABCD123ABCD123ABCD123ABCD123ABCD123');
+		lines.push('');
+		lines.push('In the documentation below, the token will not be specified every time however you will need to include it.');
+		lines.push('');
+
+		lines.push('# Using the API');
+		lines.push('');
+		lines.push('All the calls, unless noted otherwise, receives and send **JSON data**. For example to create a new note:');
+		lines.push('');
+		lines.push('\tcurl --data \'{ "title": "My note", "body": "Some note in **Markdown**"}\' http://localhost:41184/notes');
+		lines.push('');
+		lines.push('In the documentation below, the calls may include special parameters such as :id or :note_id. You would replace this with the item ID or note ID.');
+		lines.push('');
+		lines.push('For example, for the endpoint `DELETE /tags/:id/notes/:note_id`, to remove the tag with ID "ABCD1234" from the note with ID "EFGH789", you would run for example:');
+		lines.push('');
+		lines.push('\tcurl -X DELETE http://localhost:41184/tags/ABCD1234/notes/EFGH789');
+		lines.push('');
+		lines.push('The four verbs supported by the API are the following ones:');
+		lines.push('');
+		lines.push('* **GET**: To retrieve items (notes, notebooks, etc.).');
+		lines.push('* **POST**: To create new items. In general most item properties are optional. If you omit any, a default value will be used.');
+		lines.push('* **PUT**: To update an item. Note in a REST API, traditionally PUT is used to completely replace an item, however in this API it will only replace the properties that are provided. For example if you PUT {"title": "my new title"}, only the "title" property will be changed. The other properties will be left untouched (they won\'t be cleared nor changed).');
+		lines.push('* **DELETE**: To delete items.');
+		lines.push('');
+
+		lines.push('# Filtering data');
+		lines.push('');
+		lines.push('You can change the fields that will be returned by the API using the `fields=` query parameter, which takes a list of comma separated fields. For example, to get the longitude and latitude of a note, use this:');
+		lines.push('');
+		lines.push('\tcurl http://localhost:41184/notes/ABCD123?fields=longitude,latitude');
+		lines.push('');
+		lines.push('To get the IDs only of all the tags:');
+		lines.push('');
+		lines.push('\tcurl http://localhost:41184/tags?fields=id');
+		lines.push('');
+
+		lines.push('# About the property types');
+		lines.push('');
+		lines.push('* Text is UTF-8.');
+		lines.push('* All date/time are Unix timestamps in milliseconds.');
+		lines.push('* Booleans are integer values 0 or 1.');
+		lines.push('');
+
+		lines.push('# Testing if the service is available');
+		lines.push('');
+		lines.push('Call **GET /ping** to check if the service is available. It should return "JoplinClipperServer" if it works.');
+		lines.push('');
+
+		for (let i = 0; i < models.length; i++) {
+			const model = models[i];
+			const ModelClass = BaseItem.getClassByItemType(model.type);
+			const tableName = ModelClass.tableName();
+			let tableFields = reg.db().tableFields(tableName, { includeDescription: true });
+			const singular = tableName.substr(0, tableName.length - 1);
+
+			if (model.type === BaseModel.TYPE_NOTE) {
+				tableFields = tableFields.slice();
+				tableFields.push({
+					name: 'body_html',
+					type: Database.enumId('fieldType', 'text'),
+					description: 'Note body, in HTML format',
+				});
+				tableFields.push({
+					name: 'base_url',
+					type: Database.enumId('fieldType', 'text'),
+					description: 'If `body_html` is provided and contains relative URLs, provide the `base_url` parameter too so that all the URLs can be converted to absolute ones. The base URL is basically where the HTML was fetched from, minus the query (everything after the \'?\'). For example if the original page was `https://stackoverflow.com/search?q=%5Bjava%5D+test`, the base URL is `https://stackoverflow.com/search`.',
+				});
+				tableFields.push({
+					name: 'image_data_url',
+					type: Database.enumId('fieldType', 'text'),
+					description: 'An image to attach to the note, in [Data URL](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs) format.',
+				});
+				tableFields.push({
+					name: 'crop_rect',
+					type: Database.enumId('fieldType', 'text'),
+					description: 'If an image is provided, you can also specify an optional rectangle that will be used to crop the image. In format `{ x: x, y: y, width: width, height: height }`',
+				});
+				tableFields.push({
+					name: 'tags',
+					type: Database.enumId('fieldType', 'text'),
+					description: 'Comma-separated list of tags. eg. `tag1,tag2`.',
+				});
+			}
+
+			lines.push('# ' + toTitleCase(tableName));
+			lines.push('');
+
+			if (model.type === BaseModel.TYPE_FOLDER) {
+				lines.push('This is actually a notebook. Internally notebooks are called "folders".');
+				lines.push('');
+			}
+
+			lines.push('## Properties');
+			lines.push('');
+			lines.push(this.createPropertiesTable(tableFields));
+			lines.push('');
+
+			lines.push('## GET /' + tableName);
+			lines.push('');
+			lines.push('Gets all ' + tableName);
+			lines.push('');
+
+			if (model.type === BaseModel.TYPE_FOLDER) {
+				lines.push('The folders are returned as a tree. The sub-notebooks of a notebook, if any, are under the `children` key.');
+				lines.push('');
+			}
+
+			lines.push('## GET /' + tableName + '/:id');
+			lines.push('');
+			lines.push('Gets ' + singular + ' with ID :id');
+			lines.push('');
+
+			if (model.type === BaseModel.TYPE_TAG) {
+				lines.push('## GET /tags/:id/notes');
+				lines.push('');
+				lines.push('Gets all the notes with this tag.');
+				lines.push('');
+			}
+
+			if (model.type === BaseModel.TYPE_NOTE) {
+				lines.push('## GET /notes/:id/tags');
+				lines.push('');
+				lines.push('Gets all the tags attached to this note.');
+				lines.push('');
+			}
+
+			if (model.type === BaseModel.TYPE_FOLDER) {
+				lines.push('## GET /folders/:id/notes');
+				lines.push('');
+				lines.push('Gets all the notes inside this folder.');
+				lines.push('');
+			}
+
+			if (model.type === BaseModel.TYPE_RESOURCE) {
+				lines.push('## GET /resources/:id/file');
+				lines.push('');
+				lines.push('Gets the actual file associated with this resource.');
+				lines.push('');
+			}
+
+			lines.push('## POST /' + tableName);
+			lines.push('');
+			lines.push('Creates a new ' + singular);
+			lines.push('');
+
+			if (model.type === BaseModel.TYPE_RESOURCE) {
+				lines.push('Creating a new resource is special because you also need to upload the file. Unlike other API calls, this one must have the "multipart/form-data" Content-Type. The file data must be passed to the "data" form field, and the other properties to the "props" form field. An example of a valid call with cURL would be:');
+				lines.push('');
+				lines.push('\tcurl -F \'data=@/path/to/file.jpg\' -F \'props={"title":"my resource title"}\' http://localhost:41184/resources');
+				lines.push('');
+				lines.push('The "data" field is required, while the "props" one is not. If not specified, default values will be used.');
+				lines.push('');
+			}
+
+			if (model.type === BaseModel.TYPE_TAG) {
+				lines.push('## POST /tags/:id/notes');
+				lines.push('');
+				lines.push('Post a note to this endpoint to add the tag to the note. The note data must at least contain an ID property (all other properties will be ignored).');
+				lines.push('');
+			}
+
+			if (model.type === BaseModel.TYPE_NOTE) {
+				lines.push('You can either specify the note body as Markdown by setting the `body` parameter, or in HTML by setting the `body_html`.');
+				lines.push('');
+				lines.push('Examples:');
+				lines.push('');
+				lines.push('* Create a note from some Markdown text');
+				lines.push('');
+				lines.push('      curl --data \'{ "title": "My note", "body": "Some note in **Markdown**"}\' http://127.0.0.1:41184/notes');
+				lines.push('');
+				lines.push('* Create a note from some HTML');
+				lines.push('');
+				lines.push('      curl --data \'{ "title": "My note", "body_html": "Some note in <b>HTML</b>"}\' http://127.0.0.1:41184/notes');
+				lines.push('');
+				lines.push('* Create a note and attach an image to it:');
+				lines.push('');
+				lines.push('      curl --data \'{ "title": "Image test", "body": "Here is Joplin icon:", "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="}\' http://127.0.0.1:41184/notes');
+				lines.push('');
+				lines.push('### Creating a note with a specific ID');
+				lines.push('');
+				lines.push('When a new note is created, it is automatically assigned a new unique ID so **normally you do not need to set the ID**. However, if for some reason you want to set it, you can supply it as the `id` property. It needs to be a 32 characters long hexadecimal string. **Make sure it is unique**, for example by generating it using whatever GUID function is available in your programming language.');
+				lines.push('');
+				lines.push('      curl --data \'{ "id": "00a87474082744c1a8515da6aa5792d2", "title": "My note with custom ID"}\' http://127.0.0.1:41184/notes');
+				lines.push('');
+			}
+
+			lines.push('## PUT /' + tableName + '/:id');
+			lines.push('');
+			lines.push('Sets the properties of the ' + singular + ' with ID :id');
+			lines.push('');
+
+			lines.push('## DELETE /' + tableName + '/:id');
+			lines.push('');
+			lines.push('Deletes the ' + singular + ' with ID :id');
+			lines.push('');
+
+			if (model.type === BaseModel.TYPE_TAG) {
+				lines.push('## DELETE /tags/:id/notes/:note_id');
+				lines.push('');
+				lines.push('Remove the tag from the note.');
+				lines.push('');
+			}
+		}
+
+		this.stdout(lines.join('\n'));
+	}
+
+}
+
+module.exports = Command;

CliClient/app/command-config.js

@@ -26,7 +26,7 @@ class Command extends BaseCommand {
 			const md = Setting.settingMetadata(name);
 			let value = Setting.value(name);
 			if (typeof value === 'object' || Array.isArray(value)) value = JSON.stringify(value);
-			if (md.secure) value = '********';
+			if (md.secure && value) value = '********';
 
 			if (Setting.isEnum(name)) {
 				return _('%s = %s (%s)', name, value, Setting.enumOptionsDoc(name));

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-sync.js

@@ -4,6 +4,7 @@ const { _ } = require('lib/locale.js');
 const { OneDriveApiNodeUtils } = require('./onedrive-api-node-utils.js');
 const Setting = require('lib/models/Setting.js');
 const BaseItem = require('lib/models/BaseItem.js');
+const ResourceFetcher = require('lib/services/ResourceFetcher');
 const { Synchronizer } = require('lib/synchronizer.js');
 const { reg } = require('lib/registry.js');
 const { cliUtils } = require('./cli-utils.js');
@@ -191,6 +192,15 @@ class Command extends BaseCommand {
 				}
 			}
 
+			// When using the tool in command line mode, the ResourceFetcher service is
+			// not going to be running in the background, so the resources need to be
+			// explicitely downloaded below.
+			if (!app().hasGui()) {
+				this.stdout(_('Downloading resources...'));
+				await ResourceFetcher.instance().fetchAll();
+				await ResourceFetcher.instance().waitForAllFinished();
+			}
+
 			await app().refreshCurrentFolder();
 		} catch (error) {
 			cleanUp();

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

@@ -460,13 +460,17 @@ msgstr "No es pot inicialitzar el sincronitzador."
 msgid "Starting synchronisation..."
 msgstr "Està començant la sincronització..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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 "
@@ -632,6 +636,10 @@ msgstr "Retalla"
 msgid "Paste"
 msgstr "Enganxa"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Seleccioneu una data"
+
 msgid "Bold"
 msgstr ""
 
@@ -647,6 +655,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Cerca a totes les notes"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Cerca a totes les notes"
+
 msgid "View"
 msgstr "Visualització"
 
@@ -715,6 +727,9 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 "El servei de desa-retalls de webs és actiu i configurat per a iniciar-se "
@@ -765,6 +780,21 @@ msgstr "Pas 2: Instal·leu l'extensió"
 msgid "Download and install the relevant extension for your browser:"
 msgstr "Baixeu i instal·leu l'extensió adient per al vostre navegador:"
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Mostra les opcions avançades"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Comprova la configuració de la sincronització"
 
@@ -929,6 +959,14 @@ msgstr "Copia"
 msgid "Switch between note and to-do type"
 msgstr "Alterna entre el tipus nota i tasques pendents"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Alterna entre el tipus nota i tasques pendents"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Alterna entre el tipus nota i tasques pendents"
+
 msgid "Copy Markdown link"
 msgstr "Copia l'enllaç Markdown"
 
@@ -947,6 +985,15 @@ 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 "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr "Obre..."
 
@@ -963,6 +1010,9 @@ msgstr "Copia el camí al porta-retalls"
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Missatge o enllaç no suportat: %s"
@@ -1077,6 +1127,14 @@ msgstr "Sincronitza"
 msgid "Notebooks"
 msgstr "Blocs de notes"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elements obtinguts: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Recursos: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccioneu on s'hauria d'exportar l'estat de la sincronització"
 
@@ -1121,6 +1179,9 @@ msgstr ""
 "No es pot actualitzar el testimoni: manquen les dades d'autenticació. Si "
 "comenceu altre cop la sincronització, potser es corregeixi el problema."
 
+msgid "Untitled"
+msgstr "Sense títol"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1168,10 +1229,6 @@ msgstr "Elements remots suprimits: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Elements obtinguts: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Estat: %s"
-
 msgid "Cancelling..."
 msgstr "S'està cancel·lant..."
 
@@ -1205,10 +1262,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."
@@ -1222,9 +1275,6 @@ msgstr "data d'actualització"
 msgid "created date"
 msgstr "data de creació"
 
-msgid "Untitled"
-msgstr "Sense títol"
-
 msgid "This note does not have geolocation information."
 msgstr "Aquesta nota no té informació de geolocalització."
 
@@ -1287,9 +1337,22 @@ 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 ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Percentatge de zoom global"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Tipus de lletra de l'editor"
+
 msgid "Editor font family"
 msgstr "Tipus de lletra de l'editor"
 
@@ -1357,6 +1420,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 +1459,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"
 
@@ -1401,6 +1475,10 @@ msgstr "Directori d'exportació del Joplin"
 msgid "Evernote Export File"
 msgstr "Fitxer d'exportació de l'Evernote"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Directori d'exportació del Joplin"
+
 msgid "Directory"
 msgstr "Directori"
 
@@ -1475,6 +1553,12 @@ msgstr "Alarmes programades"
 msgid "On %s: %s"
 msgstr "A les %s.%s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Ara mateix no hi ha cap nota. Creeu-ne una fent clic en el botó (+)."
 
@@ -1503,6 +1587,10 @@ msgstr "Voleu moure %d notes al bloc de notes «%s»?"
 msgid "Press to set the decryption password."
 msgstr "Premeu per a establir la contrasenya de desxifratge."
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Estableix una alarma"
+
 msgid "Save alarm"
 msgstr "Desa l'alarma"
 
@@ -1515,8 +1603,34 @@ msgstr "Confirmació"
 msgid "Cancel synchronisation"
 msgstr "Cancel·la la sincronització"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "S'està cancel·lant... Espereu."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Comprova la configuració de la sincronització"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "L'aplicació s'ha autoritzat correctament."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Elements obtinguts: %d/%d."
 
 msgid "New tags:"
@@ -1606,6 +1720,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipus d'imatge no admesa: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Adjunta una imatge"
+
 msgid "Attach photo"
 msgstr "Adjunta una imatge"
 
@@ -1630,6 +1748,9 @@ msgstr "Mostra les metadades"
 msgid "View on map"
 msgstr "Mostra-ho al mapa"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Suprimeix el bloc de notes"
 
@@ -1652,3 +1773,9 @@ msgstr ""
 
 msgid "Welcome"
 msgstr "Benvingut"
+
+#~ msgid "State: %s."
+#~ msgstr "Estat: %s"
+
+#~ 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

@@ -448,13 +448,17 @@ msgstr "Nelze zavézt synchronizátor."
 msgid "Starting synchronisation..."
 msgstr "Zahajuji synchronizaci..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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 "
@@ -614,6 +618,10 @@ msgstr "Vyjmout"
 msgid "Paste"
 msgstr "Vložit"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Vybrat datum"
+
 msgid "Bold"
 msgstr ""
 
@@ -629,6 +637,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Hledat ve všech poznámkách"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Hledat ve všech poznámkách"
+
 msgid "View"
 msgstr "Zobrazit"
 
@@ -697,6 +709,9 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -740,6 +755,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Ukázat pokročilé volby"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Zkontrolujte nastavení synchronizace"
 
@@ -901,6 +931,14 @@ msgstr "Kopírovat"
 msgid "Switch between note and to-do type"
 msgstr "Přepnout mezi poznámkou a to-do"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Přepnout mezi poznámkou a to-do"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Přepnout mezi poznámkou a to-do"
+
 #, fuzzy
 msgid "Copy Markdown link"
 msgstr "Markdown"
@@ -918,6 +956,15 @@ 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 "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr "Otevřít..."
 
@@ -934,6 +981,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodporovaný link či zpráva: %s"
@@ -1047,6 +1097,14 @@ msgstr "Synchronizovat"
 msgid "Notebooks"
 msgstr "Zápisníky"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Získané položky: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Zdroje: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Prosím vyberte, kam má být stav synchronizace exportován"
 
@@ -1091,6 +1149,9 @@ msgstr ""
 "Nelze obnovit token: chybí autentizační data. Restart synchronizace může "
 "tento problém vyřešit. "
 
+msgid "Untitled"
+msgstr "Bez názvu"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1138,10 +1199,6 @@ msgstr "Položky smazané na vzdáleném úložišti: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Získané položky: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Stav: %s."
-
 msgid "Cancelling..."
 msgstr "Zastavuji..."
 
@@ -1176,10 +1233,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."
@@ -1196,9 +1249,6 @@ msgstr "Upraveno: %d."
 msgid "created date"
 msgstr "Vytvořeno: %d."
 
-msgid "Untitled"
-msgstr "Bez názvu"
-
 msgid "This note does not have geolocation information."
 msgstr "Tato poznámka nemá informace o poloze."
 
@@ -1262,9 +1312,22 @@ msgstr "Zobrazovat ikonu v panelu"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Globální zoom"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Rodina písma v editoru"
+
 msgid "Editor font family"
 msgstr "Rodina písma v editoru"
 
@@ -1332,6 +1395,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 +1434,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"
 
@@ -1376,6 +1450,10 @@ msgstr "Složka pro export"
 msgid "Evernote Export File"
 msgstr "Soubor Evernote Exportu"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Složka pro export"
+
 msgid "Directory"
 msgstr "Adresář"
 
@@ -1450,6 +1528,12 @@ msgstr "Nadcházející alarmy"
 msgid "On %s: %s"
 msgstr "Na %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Nemáte žádné poznámky. Vytvořte jednu kliknutím na tlačítko (+)."
 
@@ -1478,6 +1562,10 @@ msgstr "Přesunout poznámky %d do zápisníku \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Stiskněte pro zadání hesla k dešifrování."
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Nastavit alarm"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Nastavit alarm"
@@ -1491,8 +1579,34 @@ msgstr "Potvrdit"
 msgid "Cancel synchronisation"
 msgstr "Zrušit synchronizaci"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Zastavuji, chvíli strpení."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Zkontrolujte nastavení synchronizace"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "Aplikace byla úspěšně autorizována."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Získané položky: %d/%d."
 
 msgid "New tags:"
@@ -1575,6 +1689,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodporovaný formát obrázku: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Přiložit obrázek"
+
 msgid "Attach photo"
 msgstr "Přiložit obrázek"
 
@@ -1599,6 +1717,9 @@ msgstr "Zobrazit metadata"
 msgid "View on map"
 msgstr "Zobrazit na map+"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Smazat zápisník"
 
@@ -1621,5 +1742,11 @@ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+
 msgid "Welcome"
 msgstr "Vítejte"
 
+#~ msgid "State: %s."
+#~ msgstr "Stav: %s."
+
+#~ 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

@@ -452,13 +452,17 @@ msgstr "Kan ikke initialisere synkroniseringen."
 msgid "Starting synchronisation..."
 msgstr "Starter synkronisering."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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 "
@@ -619,6 +623,10 @@ msgstr "Klip"
 msgid "Paste"
 msgstr "Indsæt"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Vælg dato"
+
 msgid "Bold"
 msgstr ""
 
@@ -634,6 +642,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Søg i alle noter"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Søg i alle noter"
+
 msgid "View"
 msgstr "Vis"
 
@@ -702,6 +714,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -745,6 +760,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Vis avancerede indstillinger"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Check synkroniserings Indstillinger"
 
@@ -910,6 +940,14 @@ msgstr "Kopier"
 msgid "Switch between note and to-do type"
 msgstr "Skift mellem note-  og opgave type"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Skift mellem note-  og opgave type"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Skift mellem note-  og opgave type"
+
 #, fuzzy
 msgid "Copy Markdown link"
 msgstr "Markdown"
@@ -927,6 +965,15 @@ 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 "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr "Åben..."
 
@@ -943,6 +990,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Ugyldigt- eller ulovligt link eller besked: %s"
@@ -1056,6 +1106,14 @@ msgstr "Synkroniser"
 msgid "Notebooks"
 msgstr "Notesbøger"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Hentede emner: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Ressourcer: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Vælg hvor sync status skal eksporteres til"
 
@@ -1100,6 +1158,9 @@ msgstr ""
 "Kan ikke opdatere token: Godkendelses data mangler. Prøv at starte "
 "synkronisering igen, det kan løse problemet."
 
+msgid "Untitled"
+msgstr "Samlet"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1147,10 +1208,6 @@ msgstr "Slettede fjern-emner: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Hentede emner: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Tilstand: %s."
-
 msgid "Cancelling..."
 msgstr "Annullerer..."
 
@@ -1185,10 +1242,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."
@@ -1205,9 +1258,6 @@ msgstr "Opdateret %d."
 msgid "created date"
 msgstr "Oprettet: %d."
 
-msgid "Untitled"
-msgstr "Samlet"
-
 msgid "This note does not have geolocation information."
 msgstr "Denne note har ingen geolokations oplysninger."
 
@@ -1271,9 +1321,22 @@ msgstr "Vis ikon på bundbjælke"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Global zoom procent"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Rediger skrifttype"
+
 msgid "Editor font family"
 msgstr "Rediger skrifttype"
 
@@ -1341,6 +1404,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 +1443,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"
 
@@ -1385,6 +1459,10 @@ msgstr "Joplin eksport mappe"
 msgid "Evernote Export File"
 msgstr "Evernote eksport fil"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Joplin eksport mappe"
+
 msgid "Directory"
 msgstr "Indeks"
 
@@ -1459,6 +1537,12 @@ msgstr "Kommende alarmer"
 msgid "On %s: %s"
 msgstr "På %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Der er ingen noter. Opret note ved at klikke på (+) knappen."
 
@@ -1487,6 +1571,10 @@ msgstr "Flyt %d noter til notesbogen \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Klik for at gemme dekrypterings kodeord."
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Indstil alarm"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Indstil alarm"
@@ -1500,8 +1588,34 @@ msgstr "Bekræft"
 msgid "Cancel synchronisation"
 msgstr "Afbryd synkronisering"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Annullerer...  Vent venligst."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Check synkroniserings Indstillinger"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "Denne app er succesfuldt godkendt."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Hentede emner: %d/%d."
 
 msgid "New tags:"
@@ -1584,6 +1698,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Ulovlig billedtype: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Vedhæft foto"
+
 msgid "Attach photo"
 msgstr "Vedhæft foto"
 
@@ -1608,6 +1726,9 @@ msgstr "Vis metadata"
 msgid "View on map"
 msgstr "Vis på kort"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Slet notesbog"
 
@@ -1630,6 +1751,12 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
 msgid "Welcome"
 msgstr "Velkommen"
 
+#~ msgid "State: %s."
+#~ msgstr "Tilstand: %s."
+
+#~ 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

@@ -13,13 +13,12 @@ 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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr ""
-"Um ein Schlagwort zu löschen, entferne es bei allen damit verbundenen "
-"Notizen."
+"Um ein Tag zu löschen, entferne es bei allen damit verbundenen Notizen."
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr ""
@@ -197,8 +196,8 @@ msgid ""
 "Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
-"Exportiert Joplin Dateien in den angegebenen Pfad. Standardmäßig wird die "
-"komplette Datenbank inklusive Notizbüchern, Notizen, Markierungen und "
+"Exportiert Joplin-Dateien in den angegebenen Pfad. Standardmäßig wird die "
+"komplette Datenbank inklusive Notizbüchern, Notizen, Schlagwörtern und "
 "Anhängen exportiert."
 
 #, javascript-format
@@ -306,7 +305,7 @@ msgstr "Anhänge: %d."
 
 #, javascript-format
 msgid "Tagged: %d."
-msgstr "Markiert: %d."
+msgstr "Verschlagwortet: %d."
 
 msgid "Importing notes..."
 msgstr "Importiere Notizen..."
@@ -472,18 +471,21 @@ msgstr "Kann Synchronisierer nicht initialisieren."
 msgid "Starting synchronisation..."
 msgstr "Starte Synchronisation..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 msgid "Cancelling... Please wait."
 msgstr "Abbrechen… Bitte warten."
 
 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 "
-"Notizen anzuzeigen. Mit dem Befehl `tag list` können alle Schlagwörter "
-"angezeigt werden."
+"<tag-command> kann „add“, „remove“ oder „list“ sein um [tag] zu [note] "
+"hinzuzufügen oder zu entfernen, oder um die Notizen aufzulisten die [tag] "
+"zugeordnet sind. Der Befehl `tag list` kann benutzt werden, um alle "
+"Schlagwörter anzuzeigen (nutze -l für die lange Option)."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -643,6 +645,9 @@ msgstr "Ausschneiden"
 msgid "Paste"
 msgstr "Einfügen"
 
+msgid "Select all"
+msgstr "Alle auswählen"
+
 msgid "Bold"
 msgstr "Fett"
 
@@ -658,6 +663,10 @@ msgstr "Im externen Editor bearbeiten"
 msgid "Search in all the notes"
 msgstr "Alle Notizen durchsuchen"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Alle Notizen durchsuchen"
+
 msgid "View"
 msgstr "Ansicht"
 
@@ -665,7 +674,7 @@ msgid "Toggle sidebar"
 msgstr "Seitenleiste ein/aus"
 
 msgid "Toggle editor layout"
-msgstr "Editor Layout umschalten"
+msgstr "Editor-Layout umschalten"
 
 msgid "Tools"
 msgstr "Werkzeuge"
@@ -674,7 +683,7 @@ msgid "Synchronisation status"
 msgstr "Status der Synchronisation"
 
 msgid "Web clipper options"
-msgstr "Web Clipper Optionen"
+msgstr "Web-Clipper Optionen"
 
 msgid "Encryption options"
 msgstr "Verschlüsselungsoptionen"
@@ -718,7 +727,7 @@ msgid "Current version is up-to-date."
 msgstr "Die aktuelle Version ist up-to-date."
 
 msgid "An update is available, do you want to download it now?"
-msgstr "Es ist ein Update verfügbar! Soll es jetzt heruntergeladen werden?"
+msgstr "Es ist ein Update verfügbar. Soll es jetzt heruntergeladen werden?"
 
 msgid "Yes"
 msgstr "Ja"
@@ -726,9 +735,12 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
+msgid "Token has been copied to the clipboard!"
+msgstr "Token wurde in die Zwischenablage kopiert."
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
-"Der Webclipperservice ist bereits aktiviert und auf Autostart eingestellt."
+"Der Web-Clipper-Service ist bereits aktiviert und auf Autostart eingestellt."
 
 #, javascript-format
 msgid "Status: Started on port %d"
@@ -739,26 +751,26 @@ msgid "Status: %s"
 msgstr "Status: %s"
 
 msgid "Disable Web Clipper Service"
-msgstr "Web Clipper Service deaktivieren"
+msgstr "Web-Clipper-Service deaktivieren"
 
 msgid "The web clipper service is not enabled."
-msgstr "Der Web Clipper Service ist nicht aktiviert."
+msgstr "Der Web-Clipper-Service ist nicht aktiviert."
 
 msgid "Enable Web Clipper Service"
-msgstr "Web Clipper Service aktivieren"
+msgstr "Web-Clipper-Service aktivieren"
 
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
 "to Joplin."
 msgstr ""
-"Joplin Web Clipper erlaubt im Browser das Speichern von Webseiten und "
+"Joplin Web-Clipper erlaubt im Browser das Speichern von Webseiten und "
 "Screenshots nach Joplin."
 
 msgid "In order to use the web clipper, you need to do the following:"
-msgstr "Um den Web Clipper zu benutzen, musst du folgendes machen:"
+msgstr "Um den Web-Clipper zu benutzen, musst du folgendes machen:"
 
 msgid "Step 1: Enable the clipper service"
-msgstr "Schritt 1: Clipper Service aktivieren"
+msgstr "Schritt 1: Clipper-Service aktivieren"
 
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -767,7 +779,7 @@ msgid ""
 msgstr ""
 "Dieser Service erlaubt es der Browser-Erweiterung mit Joplin zu "
 "kommunizieren. Beim Aktivieren kann deine Firewall dich nach der Erlaubnis "
-"bitten, dass Joplin auf einen bestimmten Port mithört."
+"bitten, dass Joplin auf einen bestimmten Port mithören darf."
 
 msgid "Step 2: Install the extension"
 msgstr "Schritt 2: Erweiterung installieren"
@@ -777,6 +789,22 @@ msgstr ""
 "Lade die entsprechende Erweiterung für deinen Browser herunter und "
 "installiere sie:"
 
+msgid "Advanced options"
+msgstr "Erweiterte Optionen"
+
+msgid "Authorisation token:"
+msgstr "Autorisierung-Token:"
+
+msgid "Copy token"
+msgstr "Token kopieren"
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+"Dieses Autorisierung-Token wird nur benötigt, um Drittanbieter-Anwendungen "
+"Zugriff auf Joplin zu gewähren."
+
 msgid "Check synchronisation configuration"
 msgstr "Überprüfen der Synchronisationseinstellungen"
 
@@ -855,13 +883,14 @@ msgstr ""
 "Notizbücher ursprünglich verschlüsselt wurden."
 
 msgid "Missing Master Keys"
-msgstr "Fehlender Master-Key"
+msgstr "Fehlender Hauptschlüssel"
 
 msgid ""
 "The master keys with these IDs are used to encrypt some of your items, "
 "however the application does not currently have access to them. It is likely "
 "they will eventually be downloaded via synchronisation."
-msgstr "Die Master-Keas dieser IDs werden für die Verschlüsselung einiger ..."
+msgstr ""
+"Die Hauptschlüssel dieser IDs werden für die Verschlüsselung einiger ..."
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
@@ -893,10 +922,10 @@ msgid "Please create a notebook first"
 msgstr "Bitte erstelle zuerst ein Notizbuch"
 
 msgid "Notebook title:"
-msgstr "Notizbuch Titel:"
+msgstr "Notizbuch-Titel:"
 
 msgid "Add or remove tags:"
-msgstr "Füge hinzu oder entferne Schlagwörter:"
+msgstr "Schlagwörter hinzufügen oder entfernen:"
 
 msgid "Separate each tag by a comma."
 msgstr "Trenne jedes Schlagwort mit einem Komma."
@@ -941,6 +970,12 @@ msgstr "%s kopieren"
 msgid "Switch between note and to-do type"
 msgstr "Zwischen Notiz und To-Do Typ wechseln"
 
+msgid "Switch to note type"
+msgstr "Zu Notiz-Typ wechseln"
+
+msgid "Switch to to-do type"
+msgstr "Zu To-Do-Typ wechseln"
+
 msgid "Copy Markdown link"
 msgstr "Markdown-Link kopieren"
 
@@ -952,8 +987,7 @@ msgstr "Notizen löschen?"
 
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr ""
-"Hier sind noch keine Notizen. Erstelle eine, indem du auf \"Neue Notiz\" "
-"drückst."
+"Keine Notizen vorhanden. Erstelle eine, indem du auf \"Neue Notiz\" drückst."
 
 msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
@@ -961,6 +995,16 @@ msgstr ""
 "Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf "
 "\"Neues Notizbuch\" drückst."
 
+# Please note: The term 'Location' is assumed to be the geographical location where the note has been created. For this the german word 'Standort' fits better than the previously used 'Ablageort'. The latter one is used for the folder where files are stored.
+msgid "Location"
+msgstr "Standort"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Note properties"
+msgstr "Notiz-Eigenschaften"
+
 msgid "Open..."
 msgstr "Öffne..."
 
@@ -969,7 +1013,7 @@ msgid "This file could not be opened: %s"
 msgstr "Dieses Notizbuch konnte nicht geöffnet werden: %s"
 
 msgid "Save as..."
-msgstr "Sichern unter..."
+msgstr "Speichern unter..."
 
 msgid "Copy path to clipboard"
 msgstr "Pfad in Zwischenablage kopieren"
@@ -977,6 +1021,9 @@ msgstr "Pfad in Zwischenablage kopieren"
 msgid "Copy Link Address"
 msgstr "Link-Adresse kopieren"
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nicht unterstützter Link oder Nachricht: %s"
@@ -1005,7 +1052,7 @@ msgid "Attach file"
 msgstr "Datei anhängen"
 
 msgid "Tags"
-msgstr "Markierungen"
+msgstr "Schlagwörter"
 
 msgid "Set alarm"
 msgstr "Alarm erstellen"
@@ -1038,9 +1085,8 @@ msgstr "Horizontale Linie"
 msgid "Click to stop external editing"
 msgstr "Klicken Sie hier, um die externe Bearbeitung anzuhalten"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "Ansehen…"
+msgstr "Zuschauend…"
 
 msgid "to-do"
 msgstr "To-Do"
@@ -1059,22 +1105,22 @@ msgid "Clear"
 msgstr "Leeren"
 
 msgid "OneDrive Login"
-msgstr "OneDrive Anmeldung"
+msgstr "OneDrive-Anmeldung"
 
 msgid "Dropbox Login"
-msgstr "Dropbox Anmeldung"
+msgstr "Dropbox-Anmeldung"
 
 msgid "Options"
 msgstr "Optionen"
 
 msgid "Synchronisation Status"
-msgstr "Synchronisations Status"
+msgstr "Synchronisations-Status"
 
 msgid "Encryption Options"
 msgstr "Verschlüsselungsoptionen"
 
 msgid "Clipper Options"
-msgstr "Clipper Einstellungen"
+msgstr "Clipper-Einstellungen"
 
 msgid "Remove this tag from all the notes?"
 msgstr "Dieses Schlagwort von allen Notizen entfernen?"
@@ -1091,9 +1137,17 @@ msgstr "Synchronisieren"
 msgid "Notebooks"
 msgstr "Notizbücher"
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Entschlüsselte Objekte: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Anhänge: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
-"Bitte wähle aus, wohin der Synchronisations Status exportiert werden soll"
+"Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll"
 
 #, javascript-format
 msgid "Usage: %s"
@@ -1123,11 +1177,11 @@ msgstr "WebDAV"
 
 #, javascript-format
 msgid "Unknown log level: %s"
-msgstr "Unbekanntes Log Level: %s"
+msgstr "Unbekanntes Log-Level: %s"
 
 #, javascript-format
 msgid "Unknown level ID: %s"
-msgstr "Unbekannte Level ID: %s"
+msgstr "Unbekannte Level-ID: %s"
 
 msgid ""
 "Cannot refresh token: authentication data is missing. Starting the "
@@ -1136,6 +1190,9 @@ msgstr ""
 "Kann Token nicht erneuern: Authentifikationsdaten nicht vorhanden. Ein "
 "Neustart der Synchronisation könnte das Problem beheben."
 
+msgid "Untitled"
+msgstr "Unbenannt"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1149,7 +1206,7 @@ msgstr ""
 "Dieser Fehler kommt oft vor, wenn OneDrive Business benutzt wird, das leider "
 "nicht unterstützt wird.\n"
 "\n"
-"Bitte benutze stattdessen einen normalen OneDrive Account."
+"Bitte benutze stattdessen einen normalen OneDrive-Account."
 
 #, javascript-format
 msgid "Cannot access %s"
@@ -1165,11 +1222,11 @@ msgstr "Lokale Objekte aktualisiert: %d."
 
 #, javascript-format
 msgid "Created remote items: %d."
-msgstr "Remote Objekte erstellt: %d."
+msgstr "Remote-Objekte erstellt: %d."
 
 #, javascript-format
 msgid "Updated remote items: %d."
-msgstr "Remote Objekte aktualisiert: %d."
+msgstr "Remote-Objekte aktualisiert: %d."
 
 #, javascript-format
 msgid "Deleted local items: %d."
@@ -1177,18 +1234,14 @@ msgstr "Lokale Objekte gelöscht: %d."
 
 #, javascript-format
 msgid "Deleted remote items: %d."
-msgstr "Remote Objekte gelöscht: %d."
+msgstr "Remote-Objekte gelöscht: %d."
 
 #, javascript-format
 msgid "Fetched items: %d/%d."
 msgstr "Geladene Objekte: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Status: %s."
-
 msgid "Cancelling..."
-msgstr "Abbrechen…"
+msgstr "Breche ab…"
 
 #, javascript-format
 msgid "Completed: %s"
@@ -1220,27 +1273,20 @@ 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 ""
-"Notizbuch kann nicht \"%s\" genannt werden. Dies ist ein reservierter Titel."
+"Notizbuch kann nicht \"%s\" genannt werden. Dieser Name ist reserviert.."
 
 msgid "title"
 msgstr "Titel"
 
 msgid "updated date"
-msgstr "Aktualsierungsdatum"
+msgstr "Aktualisierungsdatum"
 
 msgid "created date"
 msgstr "Erstelldatum"
 
-msgid "Untitled"
-msgstr "Unbenannt"
-
 msgid "This note does not have geolocation information."
 msgstr "Diese Notiz hat keine Standort-Informationen."
 
@@ -1274,7 +1320,7 @@ msgid "Uncompleted to-dos on top"
 msgstr "Zeige unvollständige To-Dos an oberster Stelle"
 
 msgid "Show completed to-dos"
-msgstr "Abgeschlossene ToDos anzeigen"
+msgstr "Abgeschlossene To-Dos anzeigen"
 
 msgid "Sort notes by"
 msgstr "Sortiere Notizen nach"
@@ -1298,14 +1344,27 @@ msgid "When creating a new note:"
 msgstr "Wenn eine neue Notiz erstellt wird:"
 
 msgid "Show tray icon"
-msgstr "Zeige Tray Icon"
+msgstr "Zeige Tray-Icon"
 
 msgid "Note: Does not work in all desktop environments."
 msgstr "Hinweis: Funktioniert nicht in allen Desktopumgebungen."
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr "Starte die Anwendung minimiert im Tray"
+
 msgid "Global zoom percentage"
 msgstr "Zoomstufe der Benutzeroberfläche"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Editor Schriftenfamilie"
+
 msgid "Editor font family"
 msgstr "Editor Schriftenfamilie"
 
@@ -1360,7 +1419,7 @@ msgstr ""
 "dokumentiert) bezeichnet werden."
 
 msgid "Directory to synchronise with (absolute path)"
-msgstr "Verzeichnis zum synchronisieren (absoluter Pfad)"
+msgstr "Verzeichnis mit dem synchronisiert werden soll (absoluter Pfad)"
 
 msgid ""
 "The path to synchronise with when file system synchronisation is enabled. "
@@ -1370,22 +1429,32 @@ msgstr ""
 "Synchronisation aktiviert ist. Siehe `sync.target`."
 
 msgid "Nextcloud WebDAV URL"
-msgstr "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 ""
+"Achtung: Stelle sicher, dass Du vor der Synchronisation alle Inhalte an den "
+"neuen Ablageort kopiert hast, sonst werden alle Dateien gelöscht! Lies auch "
+"die FAQs hierzu: %s"
 
 msgid "Nextcloud username"
-msgstr "Nextcloud Benutzername"
+msgstr "Nextcloud-Benutzername"
 
 msgid "Nextcloud password"
-msgstr "Nextcloud Passwort"
+msgstr "Nextcloud-Passwort"
 
 msgid "WebDAV URL"
-msgstr "WebDAV URL"
+msgstr "WebDAV-URL"
 
 msgid "WebDAV username"
-msgstr "WebDAV Benutzername"
+msgstr "WebDAV-Benutzername"
 
 msgid "WebDAV password"
-msgstr "WebDAV Passwort"
+msgstr "WebDAV-Passwort"
 
 msgid "Custom TLS certificates"
 msgstr "Benutzerdefinierte TLS-Zertifikate"
@@ -1397,9 +1466,9 @@ msgid ""
 "changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
 "Kommagetrennte Liste von Pfaden zu Verzeichnissen, aus denen die Zertifikate "
-"geladen werden, oder Pfad zu einzelnen Zertifikatsdateien. Zum Beispiel: / "
-"my / cert_dir, /other/custom.pem. Wenn Sie Änderungen an den TLS-"
-"Einstellungen vornehmen, müssen Sie Ihre Änderungen speichern, bevor Sie auf "
+"geladen werden, oder Pfad zu einzelnen Zertifikatsdateien. Zum Beispiel: /my/"
+"cert_dir, /other/custom.pem. Wenn Sie Änderungen an den TLS-Einstellungen "
+"vornehmen, müssen Sie Ihre Änderungen speichern, bevor Sie auf "
 "\"Synchronisierungskonfiguration prüfen\" klicken."
 
 msgid "Ignore TLS certificate errors"
@@ -1409,6 +1478,11 @@ 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 ""
+"Das Schlagwort \"%s\" existiert bereits. Bitte wähle einen anderen Namen."
+
 msgid "Joplin Export File"
 msgstr "Joplin Export Datei"
 
@@ -1421,6 +1495,10 @@ msgstr "Joplin Export Verzeichnis"
 msgid "Evernote Export File"
 msgstr "Evernote Export Datei"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Joplin Export Verzeichnis"
+
 msgid "Directory"
 msgstr "Verzeichnis"
 
@@ -1496,6 +1574,12 @@ msgstr "Anstehende Alarme"
 msgid "On %s: %s"
 msgstr "Auf %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Momentan existieren noch keine Notizen. Erstelle eine, indem du auf den (+) "
@@ -1526,6 +1610,9 @@ msgstr "%d Notizen in das Notizbuch \"%s\" verschieben?"
 msgid "Press to set the decryption password."
 msgstr "Tippe hier, um das Entschlüsselungspasswort festzulegen."
 
+msgid "Clear alarm"
+msgstr "Alarm löschen"
+
 msgid "Save alarm"
 msgstr "Alarm speichern"
 
@@ -1538,9 +1625,40 @@ msgstr "Bestätigen"
 msgid "Cancel synchronisation"
 msgstr "Synchronisation abbrechen"
 
+msgid "Checking... Please wait."
+msgstr "Überprüfe… Bitte warten."
+
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr ""
+"Erfolgreich. Die Synchronisation-Konfiguration scheint korrekt zu sein."
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+"Fehler. Bitte überprüfe, ob die URL, der Benutzername, das Passwort. usw. "
+"korrekt sind und das das Synchronisierungsziel erreichbar ist. Fehlermeldung:"
+
+msgid "The application has been authorised!"
+msgstr "Das Programm wurde erfolgreich autorisiert."
+
 #, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Entschlüsselte Objekte: %d/%d"
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+"Konnte Applikation nicht autorisieren:\n"
+"\n"
+"%s\n"
+"\n"
+"Bitte versuche es erneut."
+
+#, javascript-format
+msgid "Decrypted items: %s / %s"
+msgstr "Entschlüsselte Objekte: %s / %s"
 
 msgid "New tags:"
 msgstr "Neue Schlagwörter:"
@@ -1628,6 +1746,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nicht unterstütztes Fotoformat: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Foto anhängen"
+
 msgid "Attach photo"
 msgstr "Foto anhängen"
 
@@ -1652,6 +1774,9 @@ msgstr "Metadaten anzeigen"
 msgid "View on map"
 msgstr "Auf der Karte anzeigen"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Notizbuch löschen"
 
@@ -1671,12 +1796,18 @@ msgstr ""
 
 msgid "You currently have no notebook. Create one by clicking on (+) button."
 msgstr ""
-"Du hast noch kein Notizbuch. Erstelle eines, indem du auf den (+) Knopf "
-"drückst."
+"Du hast noch kein Notizbuch angelegt. Erstelle eines, indem du auf den (+) "
+"Knopf drückst."
 
 msgid "Welcome"
 msgstr "Willkommen"
 
+#~ msgid "State: %s."
+#~ msgstr "Status: %s."
+
+#~ 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

@@ -408,13 +408,16 @@ msgstr ""
 msgid "Starting synchronisation..."
 msgstr ""
 
+msgid "Downloading resources..."
+msgstr ""
+
 msgid "Cancelling... Please wait."
 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
@@ -552,6 +555,9 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
+msgid "Select all"
+msgstr ""
+
 msgid "Bold"
 msgstr ""
 
@@ -567,6 +573,9 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "Search in current note"
+msgstr ""
+
 msgid "View"
 msgstr ""
 
@@ -635,6 +644,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -678,6 +690,20 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+msgid "Advanced options"
+msgstr ""
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr ""
 
@@ -826,6 +852,12 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Switch to note type"
+msgstr ""
+
+msgid "Switch to to-do type"
+msgstr ""
+
 msgid "Copy Markdown link"
 msgstr ""
 
@@ -842,6 +874,15 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -858,6 +899,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -969,6 +1013,14 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1011,6 +1063,9 @@ msgid ""
 "synchronisation again may fix the problem."
 msgstr ""
 
+msgid "Untitled"
+msgstr ""
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1052,10 +1107,6 @@ msgstr ""
 msgid "Fetched items: %d/%d."
 msgstr ""
 
-#, javascript-format
-msgid "State: %s."
-msgstr ""
-
 msgid "Cancelling..."
 msgstr ""
 
@@ -1089,10 +1140,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 ""
@@ -1106,9 +1153,6 @@ msgstr ""
 msgid "created date"
 msgstr ""
 
-msgid "Untitled"
-msgstr ""
-
 msgid "This note does not have geolocation information."
 msgstr ""
 
@@ -1171,9 +1215,21 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
+msgid "Editor font size"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1230,6 +1286,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 +1325,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 ""
 
@@ -1274,6 +1341,9 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr ""
 
+msgid "Json Export Directory"
+msgstr ""
+
 msgid "Directory"
 msgstr ""
 
@@ -1343,6 +1413,12 @@ msgstr ""
 msgid "On %s: %s"
 msgstr ""
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 
@@ -1371,6 +1447,9 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""
 
+msgid "Clear alarm"
+msgstr ""
+
 msgid "Save alarm"
 msgstr ""
 
@@ -1383,8 +1462,31 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
+msgid "Checking... Please wait."
+msgstr ""
+
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr ""
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+msgid "The application has been authorised!"
+msgstr ""
+
 #, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
+#, javascript-format
+msgid "Decrypted items: %s / %s"
 msgstr ""
 
 msgid "New tags:"
@@ -1466,6 +1568,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr ""
 
+msgid "Take photo"
+msgstr ""
+
 msgid "Attach photo"
 msgstr ""
 
@@ -1490,6 +1595,9 @@ msgstr ""
 msgid "View on map"
 msgstr ""
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr ""
 

CliClient/locales/es_ES.po

@@ -457,13 +457,17 @@ msgstr "No se puede inicializar sincronizador."
 msgid "Starting synchronisation..."
 msgstr "Iniciando sincronización..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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 "
@@ -628,21 +632,29 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Pegar"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Seleccione fecha"
+
 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"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Buscar en todas las notas"
+
 msgid "View"
 msgstr "Ver"
 
@@ -711,11 +723,13 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#, fuzzy
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 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"
@@ -762,6 +776,21 @@ msgstr "Paso 2: Instalar la extensión"
 msgid "Download and install the relevant extension for your browser:"
 msgstr "Descargar e instalar para su navegador:"
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Mostrar opciones avanzadas"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Comprobar sincronización"
 
@@ -770,7 +799,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,15 +945,23 @@ 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"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Cambiar entre nota y lista de tareas"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Cambiar entre nota y lista de tareas"
+
 msgid "Copy Markdown link"
 msgstr "Copiar el enlace de Markdown"
 
@@ -941,12 +978,21 @@ 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 "Note properties"
+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,6 +1001,9 @@ msgid "Copy path to clipboard"
 msgstr "Copiar la ruta en el portapapeles"
 
 msgid "Copy Link Address"
+msgstr "Copiar enlace"
+
+msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
 #, javascript-format
@@ -970,16 +1019,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 +1039,36 @@ msgstr "Etiquetas"
 msgid "Set alarm"
 msgstr "Establecer alarma"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "En: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Hipervínculo"
 
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "Lista numerada"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "Lista con viñetas"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "Casilla"
 
 msgid "Heading"
-msgstr ""
+msgstr "Título"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "Regla horizontal"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "Pulsa para detener la edición externa"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "Cancelando..."
+msgstr "Mirando..."
 
 msgid "to-do"
 msgstr "lista de tareas"
@@ -1071,6 +1119,14 @@ msgstr "Sincronizar"
 msgid "Notebooks"
 msgstr "Libretas"
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Descifrando elementos: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Recursos: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccione a dónde se debería exportar el estado de sincronización"
 
@@ -1115,6 +1171,9 @@ msgstr ""
 "No se ha podido actualizar token: faltan datos de autenticación. Reiniciar "
 "la sincronización podría solucionar el problema."
 
+msgid "Untitled"
+msgstr "Sin título"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1162,10 +1221,6 @@ msgstr "Elementos remotos borrados: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Elementos obtenidos: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Estado: «%s»."
-
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
@@ -1199,29 +1254,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."
-
-msgid "Untitled"
-msgstr "Sin título"
+msgstr "fecha de creación"
 
 msgid "This note does not have geolocation information."
 msgstr "Esta nota no tiene informacion de geolocalización."
@@ -1285,9 +1330,22 @@ 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 ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Establecer el porcentaje de aumento de la aplicación"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Fuente del editor"
+
 msgid "Editor font family"
 msgstr "Fuente del editor"
 
@@ -1317,17 +1375,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 +1413,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 +1436,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 +1444,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"
 
@@ -1400,6 +1473,10 @@ msgstr "Directorio para exportar de Joplin"
 msgid "Evernote Export File"
 msgstr "Archivo exportado de Evernote"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Directorio para exportar de Joplin"
+
 msgid "Directory"
 msgstr "Directorio"
 
@@ -1474,6 +1551,12 @@ msgstr "Alarmas próximas"
 msgid "On %s: %s"
 msgstr "En %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "No hay notas. Cree una pulsando en el botón (+)."
 
@@ -1503,6 +1586,9 @@ msgid "Press to set the decryption password."
 msgstr "Presione para establecer la contraseña de descifrado."
 
 #, fuzzy
+msgid "Clear alarm"
+msgstr "Establecer alarma"
+
 msgid "Save alarm"
 msgstr "Establecer alarma"
 
@@ -1515,9 +1601,35 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Cancelando... Por favor espere."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Comprobar sincronización"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "La aplicacion ha sido autorizada éxitosamente."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Elementos obtenidos: %d/%d."
+msgid "Decrypted items: %s / %s"
+msgstr "Descifrando elementos: %d/%d."
 
 msgid "New tags:"
 msgstr "Nuevas etiquetas:"
@@ -1606,6 +1718,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagen no soportado: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Adjuntar foto"
+
 msgid "Attach photo"
 msgstr "Adjuntar foto"
 
@@ -1630,6 +1746,9 @@ msgstr "Mostrar metadatos"
 msgid "View on map"
 msgstr "Ver en un mapa"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Borrar libreta"
 
@@ -1653,6 +1772,12 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenido"
 
+#~ msgid "State: %s."
+#~ msgstr "Estado: «%s»."
+
+#~ 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

@@ -455,13 +455,17 @@ msgstr "Ezin has daiteke sinkronizazio prozesua."
 msgid "Starting synchronisation..."
 msgstr "Sinkronizazioa hasten..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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 "
@@ -627,6 +631,10 @@ msgstr "Moztu"
 msgid "Paste"
 msgstr "Itsatsi"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Data aukeratu"
+
 msgid "Bold"
 msgstr ""
 
@@ -642,6 +650,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Bilatu ohar guztietan"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Bilatu ohar guztietan"
+
 msgid "View"
 msgstr ""
 
@@ -712,6 +724,9 @@ msgstr ""
 msgid "No"
 msgstr "E"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -755,6 +770,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Erakutsi aukera aurreratuak"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Sinkronizazioa utzi"
@@ -920,6 +950,14 @@ msgstr "Kopiatu"
 msgid "Switch between note and to-do type"
 msgstr "Aldatu oharra eta zeregin eren artean."
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Aldatu oharra eta zeregin eren artean."
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Aldatu oharra eta zeregin eren artean."
+
 msgid "Copy Markdown link"
 msgstr ""
 
@@ -936,6 +974,15 @@ 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 "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -953,6 +1000,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Esteka edo mezu ez dago onartua: %s"
@@ -1069,6 +1119,14 @@ msgstr "Sinkronizatu"
 msgid "Notebooks"
 msgstr "Koadernoak"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Itemak eskuratuta: %d%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Baliabideak: %d."
+
 #, fuzzy
 msgid "Please select where the sync status should be exported to"
 msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
@@ -1116,6 +1174,9 @@ msgstr ""
 "Tokena ezin eguneratu daiteke: egiaztatze-datuak desagertuta daude. Agian, "
 "berriro sinkronizatzeak arazoa konpon lezake."
 
+msgid "Untitled"
+msgstr "Titulu gabekoa"
+
 #, fuzzy
 msgid ""
 "Could not synchronize with OneDrive.\n"
@@ -1162,10 +1223,6 @@ msgstr "Urruneko itemak ezabatuta: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Itemak eskuratuta: %d%d."
 
-#, fuzzy, javascript-format
-msgid "State: %s."
-msgstr "Egoera: \"%s\"."
-
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
@@ -1200,10 +1257,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 ""
@@ -1221,9 +1274,6 @@ msgstr "Eguneratuta: %d."
 msgid "created date"
 msgstr "Sortuta: %d."
 
-msgid "Untitled"
-msgstr "Titulu gabekoa"
-
 msgid "This note does not have geolocation information."
 msgstr "Ohar honek ez du geokokapen informaziorik."
 
@@ -1291,10 +1341,23 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 #, fuzzy
 msgid "Global zoom percentage"
 msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Oharra editatu."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1359,6 +1422,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 +1464,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"
@@ -1408,6 +1482,10 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr "Evernotetik esportatutako fitxategiak"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Evernotetik esportatutako fitxategiak"
+
 msgid "Directory"
 msgstr ""
 
@@ -1480,6 +1558,12 @@ msgstr "Hurrengo alarmak"
 msgid "On %s: %s"
 msgstr "On %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Ez dago oharrik. Sortu bat (+) botoian klik eginaz."
 
@@ -1508,6 +1592,10 @@ msgstr "Mugitu %d oharrak \"%s\" koadernora?"
 msgid "Press to set the decryption password."
 msgstr "Sakatu deszifratze pasahitza ezartzeko."
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Ezarri alarma"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Ezarri alarma"
@@ -1521,8 +1609,34 @@ msgstr "Baieztatu"
 msgid "Cancel synchronisation"
 msgstr "Sinkronizazioa utzi"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Bertan behera uzten... itxaron, mesedez."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Sinkronizazioa utzi"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "Aplikazioak baimena hartu du."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Itemak eskuratuta: %d%d."
 
 msgid "New tags:"
@@ -1605,6 +1719,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Irudi formatua ez onartua: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Argazkia erantsi"
+
 msgid "Attach photo"
 msgstr "Argazkia erantsi"
 
@@ -1629,6 +1747,9 @@ msgstr "Erakutsi metadatuak"
 msgid "View on map"
 msgstr "Ikusi mapan"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Ezabatu koadernoa"
 
@@ -1651,6 +1772,13 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
 msgid "Welcome"
 msgstr "Ongi etorri!"
 
+#, fuzzy
+#~ msgid "State: %s."
+#~ msgstr "Egoera: \"%s\"."
+
+#~ 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."
@@ -458,18 +458,21 @@ msgstr "Impossible d'initialiser la synchronisation."
 msgid "Starting synchronisation..."
 msgstr "Commencement de la synchronisation..."
 
+msgid "Downloading resources..."
+msgstr "Téléchargement des ressources..."
+
 msgid "Cancelling... Please wait."
 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 +574,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..."
@@ -627,6 +630,9 @@ msgstr "Couper"
 msgid "Paste"
 msgstr "Coller"
 
+msgid "Select all"
+msgstr "Sélectionner tout"
+
 msgid "Bold"
 msgstr "Gras"
 
@@ -642,6 +648,9 @@ msgstr "Ouvrir dans un éditeur externe"
 msgid "Search in all the notes"
 msgstr "Chercher dans toutes les notes"
 
+msgid "Search in current note"
+msgstr "Chercher dans la note en cours"
+
 msgid "View"
 msgstr "Affichage"
 
@@ -661,7 +670,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"
@@ -711,6 +720,9 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
+msgid "Token has been copied to the clipboard!"
+msgstr "Le code d'authentification a été copié dans le presse-papiers !"
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "Le service du Web Clipper est activé et démarrera automatiquement."
 
@@ -761,6 +773,22 @@ msgstr ""
 "Téléchargez et installez le module complémentaire correspondant à votre "
 "navigateur :"
 
+msgid "Advanced options"
+msgstr "Options avancées"
+
+msgid "Authorisation token:"
+msgstr "Code d'authentification :"
+
+msgid "Copy token"
+msgstr "Copier le code"
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+"Ce code d'authentification est nécessaire uniquement pour permettre aux "
+"logiciels tiers d'accéder aux données de Joplin."
+
 msgid "Check synchronisation configuration"
 msgstr "Vérifier config synchronisation"
 
@@ -782,9 +810,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 +820,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 +861,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 +874,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 +882,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 +938,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"
@@ -928,6 +956,12 @@ msgstr "%s - Copie"
 msgid "Switch between note and to-do type"
 msgstr "Alterner entre note et tâche"
 
+msgid "Switch to note type"
+msgstr "Convertir en note"
+
+msgid "Switch to to-do type"
+msgstr "Convertir en tâche"
+
 msgid "Copy Markdown link"
 msgstr "Copier lien Markdown"
 
@@ -947,6 +981,15 @@ 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 "Note properties"
+msgstr "Propriétés de la note"
+
 msgid "Open..."
 msgstr "Ouvrir..."
 
@@ -963,6 +1006,9 @@ msgstr "Copier le chemin"
 msgid "Copy Link Address"
 msgstr "Copier l'adresse du lien"
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr "Cette pièce jointe n'est pas téléchargée ou pas encore déchiffrée"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Lien ou message non géré : %s"
@@ -1056,7 +1102,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"
@@ -1076,6 +1122,14 @@ msgstr "Synchroniser"
 msgid "Notebooks"
 msgstr "Carnets"
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Déchiffrement des objets : %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Tél. ressources : %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Veuillez sélectionner un répertoire ou exporter l'état de la synchronisation"
@@ -1121,6 +1175,9 @@ msgstr ""
 "Impossible de rafraîchir la connexion à OneDrive. Démarrez la "
 "synchronisation à nouveau pour corriger le problème."
 
+msgid "Untitled"
+msgstr "Sans titre"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1168,10 +1225,6 @@ msgstr "Objets distants supprimés : %d."
 msgid "Fetched items: %d/%d."
 msgstr "Téléchargés : %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "État : %s."
-
 msgid "Cancelling..."
 msgstr "Annulation..."
 
@@ -1194,10 +1247,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 +1258,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é."
@@ -1222,9 +1271,6 @@ msgstr "date de modification"
 msgid "created date"
 msgstr "date de création"
 
-msgid "Untitled"
-msgstr "Sans titre"
-
 msgid "This note does not have geolocation information."
 msgstr "Cette note n'a pas d'information d'emplacement."
 
@@ -1287,9 +1333,24 @@ 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 ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+"Cela permettra à Joplin de s'exécuter en arrière-plan. Il est recommandé "
+"d'activer ce réglage pour que vos notes soient constamment synchronisées, "
+"donc réduire le nombre de conflits."
+
+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"
 
+msgid "Editor font size"
+msgstr "Taille police éditeur"
+
 msgid "Editor font family"
 msgstr "Police de l'éditeur"
 
@@ -1356,6 +1417,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 +1464,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"
 
@@ -1405,6 +1480,9 @@ msgstr "Dossier d'export Joplin"
 msgid "Evernote Export File"
 msgstr "Fichiers d'export Evernote"
 
+msgid "Json Export Directory"
+msgstr "Dossier d'export JSON"
+
 msgid "Directory"
 msgstr "Dossier"
 
@@ -1421,7 +1499,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."
@@ -1479,6 +1557,12 @@ msgstr "Alarmes à venir"
 msgid "On %s: %s"
 msgstr "Le %s  : %s"
 
+msgid "Permission to use camera"
+msgstr "Permission d'utiliser l'appareil photo"
+
+msgid "Your permission to use your camera is required."
+msgstr "Votre permission est requise pour utiliser l'appareil photo"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Ce carnet ne contient aucune note. Créez-en une en appuyant sur le bouton "
@@ -1494,7 +1578,7 @@ msgid "Export Debug Report"
 msgstr "Exporter rapport de débogage"
 
 msgid "Encryption Config"
-msgstr "Config cryptage"
+msgstr "Config chiffrement"
 
 msgid "Configuration"
 msgstr "Configuration"
@@ -1509,6 +1593,9 @@ msgstr "Déplacer %d notes vers carnet \"%s\" ?"
 msgid "Press to set the decryption password."
 msgstr "Définir mot de passe de synchronisation."
 
+msgid "Clear alarm"
+msgstr "Enlever l'alarme"
+
 msgid "Save alarm"
 msgstr "Enregistrer alarme"
 
@@ -1521,9 +1608,39 @@ msgstr "Confirmer"
 msgid "Cancel synchronisation"
 msgstr "Annuler synchronisation"
 
+msgid "Checking... Please wait."
+msgstr "Vérification... Veuillez attendre."
+
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "La configuration de la synchronisation semble correcte."
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+"Erreur. Veuillez vérifier que l'URL, le nom, le mot de passe, etc. sont "
+"corrects et que la destination est accessible. L'erreur reportée est :"
+
+msgid "The application has been authorised!"
+msgstr "Le logiciel a été autorisé !"
+
 #, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Décryptage des objets : %d/%d"
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+"Impossible d'autoriser le logiciel :\n"
+"\n"
+"%s\n"
+"\n"
+"Veuillez réessayer."
+
+#, javascript-format
+msgid "Decrypted items: %s / %s"
+msgstr "Déchiffrement : %s / %s"
 
 msgid "New tags:"
 msgstr "Nouvelles étiquettes :"
@@ -1611,6 +1728,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Type d'image non géré : %s"
 
+msgid "Take photo"
+msgstr "Prendre une photo"
+
 msgid "Attach photo"
 msgstr "Attacher une photo"
 
@@ -1635,6 +1755,9 @@ msgstr "Voir métadonnées"
 msgid "View on map"
 msgstr "Voir sur carte"
 
+msgid "Go to source URL"
+msgstr "Aller à l'URL source"
+
 msgid "Delete notebook"
 msgstr "Supprimer le carnet"
 
@@ -1659,12 +1782,18 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
+#~ msgid "State: %s."
+#~ msgstr "État : %s."
+
+#~ 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

@@ -452,13 +452,17 @@ msgstr "Non é posíbel iniciar o sincronizador."
 msgid "Starting synchronisation..."
 msgstr "Iniciando sincronización..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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» "
@@ -619,6 +623,10 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Pegar"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Seleccionar data"
+
 msgid "Bold"
 msgstr ""
 
@@ -634,6 +642,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Buscar en todas as notas"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Buscar en todas as notas"
+
 msgid "View"
 msgstr "Vista"
 
@@ -702,6 +714,9 @@ msgstr "Si"
 msgid "No"
 msgstr "Non"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -745,6 +760,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Mostrar opcións avanzadas"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Comprobar a configuración da sincronización"
 
@@ -907,6 +937,14 @@ msgstr "Copiar"
 msgid "Switch between note and to-do type"
 msgstr "Cambiar entre notas e tarefas"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Cambiar entre notas e tarefas"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Cambiar entre notas e tarefas"
+
 #, fuzzy
 msgid "Copy Markdown link"
 msgstr "Markdown"
@@ -924,6 +962,15 @@ 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 "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr "Abrir…"
 
@@ -940,6 +987,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Ligazón ou mensaxe incompatíbeis: %s"
@@ -1055,6 +1105,14 @@ msgstr "Sincronizar"
 msgid "Notebooks"
 msgstr "Cadernos"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementos obtidos: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Recursos: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccione onde exportar o estado da sincronización"
 
@@ -1099,6 +1157,9 @@ msgstr ""
 "Non é posíbel actualizar o «token»: faltan datos da autenticación. Iniciar a "
 "sincronización de novo pode arranxar o problema."
 
+msgid "Untitled"
+msgstr "Sen título"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1146,10 +1207,6 @@ msgstr "Elementos remotos borrados: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Elementos obtidos: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Estado: %s."
-
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
@@ -1184,10 +1241,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."
@@ -1204,9 +1257,6 @@ msgstr "Actualizado: %d."
 msgid "created date"
 msgstr "Creado: %d."
 
-msgid "Untitled"
-msgstr "Sen título"
-
 msgid "This note does not have geolocation information."
 msgstr "Esta nota non ten información de xeolocalización."
 
@@ -1270,9 +1320,22 @@ msgstr "Mostrar a icona na bandexa"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Porcentaxe de ampliación"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Familia de tipos de letra do editor"
+
 msgid "Editor font family"
 msgstr "Familia de tipos de letra do editor"
 
@@ -1340,6 +1403,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 +1442,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"
 
@@ -1384,6 +1458,10 @@ msgstr "Cartafol de exportación do Joplin"
 msgid "Evernote Export File"
 msgstr "Ficheiro de exportación de Evernote"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Cartafol de exportación do Joplin"
+
 msgid "Directory"
 msgstr "Cartafol"
 
@@ -1458,6 +1536,12 @@ msgstr "Alarmas próximas"
 msgid "On %s: %s"
 msgstr "En %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Non ten notas actualmente. Cree unha premendo no botón (+)."
 
@@ -1486,6 +1570,10 @@ msgstr "Mover %d notas para o caderno \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Prema para estabelecer o contrasinal de descifrado."
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Estabelecer alarma"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Estabelecer alarma"
@@ -1499,8 +1587,34 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Cancelando... Agarde."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Comprobar a configuración da sincronización"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "O aplicativo foi autorizado correctamente."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Elementos obtidos: %d/%d."
 
 msgid "New tags:"
@@ -1583,6 +1697,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imaxe incompatíbel: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Anexar foto"
+
 msgid "Attach photo"
 msgstr "Anexar foto"
 
@@ -1607,6 +1725,9 @@ msgstr "Mostrar metadatos"
 msgid "View on map"
 msgstr "Ver no mapa"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Eliminar caderno"
 
@@ -1628,3 +1749,9 @@ msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
 
 msgid "Welcome"
 msgstr "Benvido/a"
+
+#~ msgid "State: %s."
+#~ msgstr "Estado: %s."
+
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Xa existe un caderno con ese título: «%s»"

CliClient/locales/hr_HR.po

@@ -455,6 +455,9 @@ msgstr "Ne mogu započeti sinkronizaciju."
 msgid "Starting synchronisation..."
 msgstr "Započinjem sinkronizaciju..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 msgid "Cancelling... Please wait."
 msgstr "Prekidam... Pričekaj."
 
@@ -462,7 +465,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 "
@@ -625,6 +628,10 @@ msgstr "Izreži"
 msgid "Paste"
 msgstr "Zalijepi"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Odaberi datum"
+
 msgid "Bold"
 msgstr ""
 
@@ -640,6 +647,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Pretraži u svim bilješkama"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Pretraži u svim bilješkama"
+
 msgid "View"
 msgstr ""
 
@@ -711,6 +722,9 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -754,6 +768,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Prikaži napredne opcije"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Prekini sinkronizaciju"
@@ -908,6 +937,14 @@ msgstr "Kopiraj"
 msgid "Switch between note and to-do type"
 msgstr "Zamijeni bilješku i zadatak"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Zamijeni bilješku i zadatak"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Zamijeni bilješku i zadatak"
+
 msgid "Copy Markdown link"
 msgstr ""
 
@@ -924,6 +961,15 @@ 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 "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -941,6 +987,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana poveznica ili poruka: %s"
@@ -1056,6 +1105,14 @@ msgstr "Sinkroniziraj"
 msgid "Notebooks"
 msgstr "Bilježnice"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Stvorene lokalne stavke: %d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Resursi: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
 
@@ -1098,6 +1155,9 @@ msgid ""
 "synchronisation again may fix the problem."
 msgstr "Nedostaju podaci za ovjeru. Pokušaj ponovo započeti sinkronizaciju."
 
+msgid "Untitled"
+msgstr "Nenaslovljen"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1145,10 +1205,6 @@ msgstr "Obrisane udaljene stavke: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Stvorene lokalne stavke: %d."
 
-#, fuzzy, javascript-format
-msgid "State: %s."
-msgstr "Stanje: \"%s\"."
-
 msgid "Cancelling..."
 msgstr "Prekidam..."
 
@@ -1184,10 +1240,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."
@@ -1204,9 +1256,6 @@ msgstr "Ažurirano: %d."
 msgid "created date"
 msgstr "Stvoreno: %d."
 
-msgid "Untitled"
-msgstr "Nenaslovljen"
-
 msgid "This note does not have geolocation information."
 msgstr "Ova bilješka nema geolokacijske informacije."
 
@@ -1275,9 +1324,22 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Uredi bilješku."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1340,6 +1402,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 +1441,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"
@@ -1386,6 +1459,10 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr "Evernote izvozne datoteke"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Evernote izvozne datoteke"
+
 msgid "Directory"
 msgstr ""
 
@@ -1456,6 +1533,12 @@ msgstr "Nadolazeća upozorenja"
 msgid "On %s: %s"
 msgstr "On %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Trenutno nema bilješki. Stvori novu klikom na (+) gumb."
 
@@ -1484,6 +1567,10 @@ msgstr "Premjesti %d bilješke u bilježnicu \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr ""
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Postavi upozorenje"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Postavi upozorenje"
@@ -1497,8 +1584,34 @@ msgstr "Potvrdi"
 msgid "Cancel synchronisation"
 msgstr "Prekini sinkronizaciju"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Prekidam... Pričekaj."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Prekini sinkronizaciju"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "Aplikacija je uspješno autorizirana."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Stvorene lokalne stavke: %d."
 
 msgid "New tags:"
@@ -1582,6 +1695,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodržana vrsta slike: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Priloži sliku"
+
 msgid "Attach photo"
 msgstr "Priloži sliku"
 
@@ -1606,6 +1723,9 @@ msgstr "Prikaži metapodatke"
 msgid "View on map"
 msgstr "Vidi na karti"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Obriši bilježnicu"
 
@@ -1628,6 +1748,13 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobro došli"
 
+#, fuzzy
+#~ msgid "State: %s."
+#~ msgstr "Stanje: \"%s\"."
+
+#~ 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

@@ -408,13 +408,16 @@ msgstr ""
 msgid "Starting synchronisation..."
 msgstr ""
 
+msgid "Downloading resources..."
+msgstr ""
+
 msgid "Cancelling... Please wait."
 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
@@ -552,6 +555,9 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
+msgid "Select all"
+msgstr ""
+
 msgid "Bold"
 msgstr ""
 
@@ -567,6 +573,9 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "Search in current note"
+msgstr ""
+
 msgid "View"
 msgstr ""
 
@@ -635,6 +644,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -678,6 +690,20 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+msgid "Advanced options"
+msgstr ""
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr ""
 
@@ -826,6 +852,12 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Switch to note type"
+msgstr ""
+
+msgid "Switch to to-do type"
+msgstr ""
+
 msgid "Copy Markdown link"
 msgstr ""
 
@@ -842,6 +874,15 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -858,6 +899,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -969,6 +1013,14 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1011,6 +1063,9 @@ msgid ""
 "synchronisation again may fix the problem."
 msgstr ""
 
+msgid "Untitled"
+msgstr ""
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1052,10 +1107,6 @@ msgstr ""
 msgid "Fetched items: %d/%d."
 msgstr ""
 
-#, javascript-format
-msgid "State: %s."
-msgstr ""
-
 msgid "Cancelling..."
 msgstr ""
 
@@ -1089,10 +1140,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 ""
@@ -1106,9 +1153,6 @@ msgstr ""
 msgid "created date"
 msgstr ""
 
-msgid "Untitled"
-msgstr ""
-
 msgid "This note does not have geolocation information."
 msgstr ""
 
@@ -1171,9 +1215,21 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
+msgid "Editor font size"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1230,6 +1286,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 +1325,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 ""
 
@@ -1274,6 +1341,9 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr ""
 
+msgid "Json Export Directory"
+msgstr ""
+
 msgid "Directory"
 msgstr ""
 
@@ -1343,6 +1413,12 @@ msgstr ""
 msgid "On %s: %s"
 msgstr ""
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 
@@ -1371,6 +1447,9 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""
 
+msgid "Clear alarm"
+msgstr ""
+
 msgid "Save alarm"
 msgstr ""
 
@@ -1383,8 +1462,31 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
+msgid "Checking... Please wait."
+msgstr ""
+
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr ""
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+msgid "The application has been authorised!"
+msgstr ""
+
 #, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
+#, javascript-format
+msgid "Decrypted items: %s / %s"
 msgstr ""
 
 msgid "New tags:"
@@ -1466,6 +1568,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr ""
 
+msgid "Take photo"
+msgstr ""
+
 msgid "Attach photo"
 msgstr ""
 
@@ -1490,6 +1595,9 @@ msgstr ""
 msgid "View on map"
 msgstr ""
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr ""
 

CliClient/locales/nl_BE.po

@@ -456,13 +456,17 @@ msgstr "Kan de synchronisatie niet starten."
 msgid "Starting synchronisation..."
 msgstr "Synchronisatie starten..."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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 "
@@ -629,6 +633,10 @@ msgstr "Knip"
 msgid "Paste"
 msgstr "Plak"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Selecteer datum"
+
 msgid "Bold"
 msgstr ""
 
@@ -644,6 +652,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Zoek in alle notities"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Zoek in alle notities"
+
 msgid "View"
 msgstr ""
 
@@ -714,6 +726,9 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -757,6 +772,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Toon geavanceerde opties"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Annuleer synchronisatie"
@@ -922,6 +952,14 @@ msgstr "Kopieer"
 msgid "Switch between note and to-do type"
 msgstr "Wissel tussen notitie en to-do type"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Wissel tussen notitie en to-do type"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Wissel tussen notitie en to-do type"
+
 msgid "Copy Markdown link"
 msgstr ""
 
@@ -940,6 +978,15 @@ msgstr ""
 "U heeft momenteel geen notitieboek. Maak een notitieboek door op \"Nieuw "
 "notitieboek\" te klikken."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -957,6 +1004,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Link of bericht \"%s\" wordt niet ondersteund"
@@ -1072,6 +1122,14 @@ msgstr "Synchroniseer"
 msgid "Notebooks"
 msgstr "Notitieboeken"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Opgehaalde items: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Middelen: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
 
@@ -1117,6 +1175,9 @@ msgstr ""
 "Kan token niet vernieuwen: authenticatiedata ontbreekt. Herstarten van de "
 "synchronisatie kan het probleem eventueel oplossen. "
 
+msgid "Untitled"
+msgstr "Untitled"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1164,10 +1225,6 @@ msgstr "Verwijderde remote items: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Opgehaalde items: %d/%d."
 
-#, fuzzy, javascript-format
-msgid "State: %s."
-msgstr "Status: \"%s\""
-
 msgid "Cancelling..."
 msgstr "Annuleren..."
 
@@ -1202,10 +1259,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 ""
@@ -1224,9 +1277,6 @@ msgstr "Bijgewerkt: %d."
 msgid "created date"
 msgstr "Aangemaakt: %d."
 
-msgid "Untitled"
-msgstr "Untitled"
-
 msgid "This note does not have geolocation information."
 msgstr "Deze notitie bevat geen geo-locatie informatie."
 
@@ -1294,9 +1344,22 @@ msgstr ""
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Bewerk notitie."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1360,6 +1423,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 +1464,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"
@@ -1408,6 +1482,10 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr "Exporteer Evernote bestanden"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Exporteer Evernote bestanden"
+
 msgid "Directory"
 msgstr ""
 
@@ -1481,6 +1559,12 @@ msgstr "Meldingen"
 msgid "On %s: %s"
 msgstr "Op %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Er zijn momenteel geen notities. Maak een notitie door op (+) te klikken."
@@ -1510,6 +1594,10 @@ msgstr "Verplaats %d notities naar notitieboek \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Klik om het decryptie wachtwoord in te stellen"
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Zet melding"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Zet melding"
@@ -1523,8 +1611,34 @@ msgstr "Bevestig"
 msgid "Cancel synchronisation"
 msgstr "Annuleer synchronisatie"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Annuleren.. Even geduld."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Annuleer synchronisatie"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "De applicatie is succesvol geauthenticeerd."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Opgehaalde items: %d/%d."
 
 msgid "New tags:"
@@ -1607,6 +1721,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Afbeeldingstype %s wordt niet ondersteund"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Voeg foto toe"
+
 msgid "Attach photo"
 msgstr "Voeg foto toe"
 
@@ -1631,6 +1749,9 @@ msgstr "Toon metadata"
 msgid "View on map"
 msgstr "Toon op de kaart"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Verwijder notitieboek"
 
@@ -1655,6 +1776,13 @@ msgstr ""
 msgid "Welcome"
 msgstr "Welkom"
 
+#, fuzzy
+#~ msgid "State: %s."
+#~ msgstr "Status: \"%s\""
+
+#~ 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

@@ -1,7 +1,8 @@
-# SOME DESCRIPTIVE TITLE.
+# pt_BR locale strings - Joplin.
 # Copyright (C) YEAR Laurent Cozic
 # This file is distributed under the same license as the Joplin-CLI package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Updated by Renato Xavier da Silveira Rosa <renatoxsr@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
@@ -13,7 +14,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.7\n"
+"X-Generator: Poedit 2.2\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -147,7 +148,7 @@ msgid "Completed decryption."
 msgstr "Decriptação completada."
 
 msgid "Enabled"
-msgstr "Desabilitado"
+msgstr "Habilitado"
 
 msgid "Disabled"
 msgstr "Desabilitado"
@@ -246,9 +247,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 +363,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>."
@@ -456,17 +455,21 @@ msgstr "Não é possível inicializar o sincronizador."
 msgid "Starting synchronisation..."
 msgstr "Iniciando sincronização..."
 
+msgid "Downloading resources..."
+msgstr "Baixando os recursos..."
+
 msgid "Cancelling... Please wait."
 msgstr "Cancelando... Aguarde."
 
 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 "
-"comando `taglist` pode ser usado para listar todas as tags."
+"comando `tag list` pode ser usado para listar todas as tags (use -l para "
+"opção longa)."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -626,26 +629,33 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Colar"
 
+msgid "Select all"
+msgstr "Selecionar tudo"
+
 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"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Pesquisar em todas as notas"
+
 msgid "View"
 msgstr "Visualizar"
 
 msgid "Toggle sidebar"
-msgstr ""
+msgstr "Alternar barra lateral"
 
 msgid "Toggle editor layout"
 msgstr "Alternar layout do editor"
@@ -657,7 +667,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"
@@ -709,48 +719,73 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
+msgid "Token has been copied to the clipboard!"
+msgstr "Token foi copiado para a \\u00e1rea de transfer\\u00eancia!"
+
 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 "Baixe e instale a extensão relevante para seu browser:"
+
+msgid "Advanced options"
+msgstr "Mostrar opções avançadas"
+
+msgid "Authorisation token:"
+msgstr "Token de autoriza\\u00e7\\u00e3o:"
+
+msgid "Copy token"
+msgstr "Copira token"
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
 msgstr ""
+"Esse token de autoriza\\u00e7\\u00e3o só é necess\\u00e1rio para permitir "
+"que aplicativos de terceiros acessem o Joplin."
 
 msgid "Check synchronisation configuration"
 msgstr "Verificar a configuração da sincronização"
@@ -760,7 +795,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 +914,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 +942,23 @@ 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 "Switch to note type"
+msgstr "Alternar para o tipo Nota"
+
+msgid "Switch to to-do type"
+msgstr "Alternar para o tipo Tarefa"
+
 msgid "Copy Markdown link"
-msgstr "Markdown"
+msgstr "Copiar link de Markdown"
 
 msgid "Delete"
 msgstr "Excluir"
@@ -934,21 +973,33 @@ 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 "Localização"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Note properties"
+msgstr "Propriedades da nota"
+
 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"
+
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr "O anexo ainda não foi baixado ou decriptado."
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -963,16 +1014,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 +1034,36 @@ msgstr "Tags"
 msgid "Set alarm"
 msgstr "Definir alarme"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "Em: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Hiperlink"
 
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "Lista numerada"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "Lista com bullets"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "Checkbox"
 
 msgid "Heading"
-msgstr ""
+msgstr "Cabeçalho"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "Régua horizontal"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "Clique para encerrar edição externa"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "Cancelando..."
+msgstr "Observando alterações..."
 
 msgid "to-do"
 msgstr "tarefa"
@@ -1046,9 +1096,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?"
@@ -1065,6 +1114,14 @@ msgstr "Sincronizar"
 msgid "Notebooks"
 msgstr "Cadernos"
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Decriptando itens: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Buscando recursos: %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Favor selecionar o local para onde o status de sincronia deveria ser "
@@ -1111,6 +1168,9 @@ msgstr ""
 "Não é possível atualizar token: faltam dados de autenticação. Iniciar a "
 "sincronização novamente pode corrigir o problema."
 
+msgid "Untitled"
+msgstr "Sem título"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1158,10 +1218,6 @@ msgstr "Itens remotos excluídos: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Itens pesquisados: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Estado: \"%s\"."
-
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
@@ -1192,33 +1248,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."
-
-msgid "Untitled"
-msgstr "Sem título"
+msgstr "data de criação"
 
 msgid "This note does not have geolocation information."
 msgstr "Esta nota não possui informações de geolocalização."
@@ -1252,15 +1297,14 @@ 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"
 
 msgid "Reverse sort order"
-msgstr "Inverter ordem de classificação."
+msgstr "Inverter ordem de classificação"
 
 msgid "Save geo-location with notes"
 msgstr "Salvar  geolocalização com notas"
@@ -1281,21 +1325,36 @@ 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 ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
 msgstr ""
+"Isso irá permitir que o Joplin continue sendo executado em segundo plano. É "
+"recomendado que você habilita essa configuração para que suas notas "
+"sejamconstantemente sincronizadas, de modo a reduzir as chances de conflitos."
+
+msgid "Start application minimised in the tray icon"
+msgstr "Iniciar aplicativo minimizado na barra de tarefas"
 
 msgid "Global zoom percentage"
 msgstr "Porcentagem global do zoom"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Família de fontes do editor"
+
 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 +1374,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 +1411,16 @@ 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 ""
+"Atenção: Se você modificar esse local, tenha certeza de copiar todo o seu "
+"conteúdo para lá antes de sincronizar, do contrário todos os seus arquivos "
+"serão removidos! Veja o FAQ para mais detalhes: %s"
+
 msgid "Nextcloud username"
 msgstr "Usuário da Nextcloud"
 
@@ -1369,7 +1437,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 +1445,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 "A tag \"%s\" já existe. Escolha um nome diferente."
+
 msgid "Joplin Export File"
 msgstr "Arquivo de Exportação do Joplin"
 
@@ -1397,8 +1474,11 @@ msgstr "Diretório de Exportação do Joplin"
 msgid "Evernote Export File"
 msgstr "Arquivo de Exportação do Evernote"
 
+msgid "Json Export Directory"
+msgstr "Diretório de Exportação JSON"
+
 msgid "Directory"
-msgstr "DIretório"
+msgstr "Diretório"
 
 #, javascript-format
 msgid "Cannot load \"%s\" module for format \"%s\""
@@ -1472,6 +1552,12 @@ msgstr "Próximos alarmes"
 msgid "On %s: %s"
 msgstr "Em %s: %s"
 
+msgid "Permission to use camera"
+msgstr "Permissão para utilizar sua c\\u00e2mera"
+
+msgid "Your permission to use your camera is required."
+msgstr "É necessária a sua permissão para utilizar sua c\\u00e2mera."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Atualmente, não há notas. Crie uma, clicando no botão (+)."
 
@@ -1500,9 +1586,11 @@ 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 "Clear alarm"
+msgstr "Limpar alarme"
+
 msgid "Save alarm"
-msgstr "Definir alarme"
+msgstr "Salvar alarme"
 
 msgid "Select date"
 msgstr "Selecionar data"
@@ -1513,9 +1601,40 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronização"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Itens pesquisados: %d/%d."
+msgid "Checking... Please wait."
+msgstr "Verificando... Por favor aguarde."
+
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Sucesso! A configuração da sincronização parece estar correta."
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+"Erro. Verifique se a URL, nome de usuário, senha, etc., estão corretos e "
+"tenha certeza que o destino da sincronização está acessível. O erro "
+"reportado foi:"
+
+msgid "The application has been authorised!"
+msgstr "O aplicativo foi autorizado!"
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+"Não foi possível autorizar o aplicativo:\n"
+"\n"
+"%s\n"
+"\n"
+"Por favor tente novamente."
+
+#, javascript-format
+msgid "Decrypted items: %s / %s"
+msgstr "Itens decriptados: %s / %s"
 
 msgid "New tags:"
 msgstr "Novas tags:"
@@ -1527,17 +1646,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,16 +1712,20 @@ 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"
 msgstr "Tipo de imagem não suportada: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Anexar foto"
+
 msgid "Attach photo"
 msgstr "Anexar foto"
 
@@ -1603,7 +1733,7 @@ msgid "Attach any file"
 msgstr "Anexar qualquer arquivo"
 
 msgid "Share"
-msgstr ""
+msgstr "Compartilhar"
 
 msgid "Convert to note"
 msgstr "Converter para nota"
@@ -1620,6 +1750,9 @@ msgstr "Exibir metadados"
 msgid "View on map"
 msgstr "Ver no mapa"
 
+msgid "Go to source URL"
+msgstr "Ir para a URL de origem"
+
 msgid "Delete notebook"
 msgstr "Excluir caderno"
 
@@ -1642,6 +1775,12 @@ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
 msgid "Welcome"
 msgstr "Bem-vindo"
 
+#~ msgid "State: %s."
+#~ msgstr "Estado: \"%s\"."
+
+#~ 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

@@ -456,13 +456,17 @@ msgstr "Не удалось инициировать синхронизацию.
 msgid "Starting synchronisation..."
 msgstr "Начало синхронизации..."
 
+msgid "Downloading resources..."
+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], или чтобы вывести список заметок, ассоциированых с "
@@ -626,6 +630,10 @@ msgstr "Вырезать"
 msgid "Paste"
 msgstr "Вставить"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Выбрать дату"
+
 msgid "Bold"
 msgstr ""
 
@@ -641,6 +649,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Поиск во всех заметках"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Поиск во всех заметках"
+
 msgid "View"
 msgstr "Вид"
 
@@ -709,6 +721,9 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -752,6 +767,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Показывать расширенные настройки"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Проверить настройки синхронизации"
 
@@ -917,6 +947,14 @@ msgstr "Копировать"
 msgid "Switch between note and to-do type"
 msgstr "Переключить тип между заметкой и задачей"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Переключить тип между заметкой и задачей"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Переключить тип между заметкой и задачей"
+
 #, fuzzy
 msgid "Copy Markdown link"
 msgstr "Markdown"
@@ -934,6 +972,15 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Сейчас здесь нет блокнотов. Создайте новый нажав «Новый блокнот»."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr "Открыть..."
 
@@ -950,6 +997,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Неподдерживаемая ссыка или сообщение: %s"
@@ -1065,6 +1115,14 @@ msgstr "Синхронизировать"
 msgid "Notebooks"
 msgstr "Блокноты"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Получено элементов: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Ресурсов: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Выберите, куда должен быть экспортирован статус синхронизации"
 
@@ -1109,6 +1167,9 @@ msgstr ""
 "Не удалось обновить токен: отсутствуют данные аутентификации. Повторный "
 "запуск синхронизации может решить проблему."
 
+msgid "Untitled"
+msgstr "Без имени"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1156,10 +1217,6 @@ msgstr "Удалено удалённых элементов: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Получено элементов: %d/%d."
 
-#, fuzzy, javascript-format
-msgid "State: %s."
-msgstr "Статус: «%s»."
-
 msgid "Cancelling..."
 msgstr "Отмена..."
 
@@ -1194,10 +1251,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», это зарезервированное название."
@@ -1214,9 +1267,6 @@ msgstr "Обновлено: %d."
 msgid "created date"
 msgstr "Создано: %d."
 
-msgid "Untitled"
-msgstr "Без имени"
-
 msgid "This note does not have geolocation information."
 msgstr "Эта заметка не содержит информации о геолокации."
 
@@ -1280,9 +1330,22 @@ msgstr "Показывать иконку в панели задач"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Глобальный масштаб в процентах"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Семейство шрифтов редактора"
+
 msgid "Editor font family"
 msgstr "Семейство шрифтов редактора"
 
@@ -1350,6 +1413,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 +1452,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"
 
@@ -1394,6 +1468,10 @@ msgstr "Папка экспорта Joplin"
 msgid "Evernote Export File"
 msgstr "Файл экспорта Evernote"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Папка экспорта Joplin"
+
 msgid "Directory"
 msgstr "Директория"
 
@@ -1469,6 +1547,12 @@ msgstr "Грядущие напоминания"
 msgid "On %s: %s"
 msgstr "В %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Сейчас здесь нет заметок. Создаёте новую, нажав кнопку (+)."
 
@@ -1497,6 +1581,10 @@ msgstr "Переместить %d заметок в блокнот «%s»?"
 msgid "Press to set the decryption password."
 msgstr "Нажмите, чтобы установить пароль для расшифровки."
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Установить напоминание"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Установить напоминание"
@@ -1510,8 +1598,34 @@ msgstr "Подтвердить"
 msgid "Cancel synchronisation"
 msgstr "Отменить синхронизацию"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "Отмена... Пожалуйста, ожидайте."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Проверить настройки синхронизации"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "Приложение успешно авторизовано."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Получено элементов: %d/%d."
 
 msgid "New tags:"
@@ -1594,6 +1708,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Неподдерживаемый формат изображения: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Прикрепить фото"
+
 msgid "Attach photo"
 msgstr "Прикрепить фото"
 
@@ -1618,6 +1736,9 @@ msgstr "Показать метаданные"
 msgid "View on map"
 msgstr "Посмотреть на карте"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Удалить блокнот"
 
@@ -1640,6 +1761,13 @@ msgstr "У вас сейчас нет блокнота. Создайте его
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
+#, fuzzy
+#~ msgid "State: %s."
+#~ msgstr "Статус: «%s»."
+
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Блокнот с таким названием уже существует: «%s»"
+
 #~ msgid "Searches"
 #~ msgstr "Запросы"
 

CliClient/locales/sl_SI.po

@@ -455,13 +455,17 @@ msgstr "Ni moč zagnati sinhronizatorja."
 msgid "Starting synchronisation..."
 msgstr "Sinhronizacija se začenja."
 
+msgid "Downloading resources..."
+msgstr ""
+
 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 "
@@ -625,6 +629,10 @@ msgstr "Izreži"
 msgid "Paste"
 msgstr "Prilepi"
 
+#, fuzzy
+msgid "Select all"
+msgstr "Izberi datum"
+
 msgid "Bold"
 msgstr ""
 
@@ -640,6 +648,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Išči znotraj vseh zabeležk"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Išči znotraj vseh zabeležk"
+
 msgid "View"
 msgstr "Pogled"
 
@@ -708,6 +720,9 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
+msgid "Token has been copied to the clipboard!"
+msgstr ""
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 
@@ -751,6 +766,21 @@ msgstr ""
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "Pokaži napredne možnosti"
+
+msgid "Authorisation token:"
+msgstr ""
+
+msgid "Copy token"
+msgstr ""
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Preveri nastavitve sinhronizacije"
 
@@ -917,6 +947,14 @@ msgstr "Kopiraj"
 msgid "Switch between note and to-do type"
 msgstr "Menjaj med zabeležko in seznamom opravil"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "Menjaj med zabeležko in seznamom opravil"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "Menjaj med zabeležko in seznamom opravil"
+
 #, fuzzy
 msgid "Copy Markdown link"
 msgstr "Sistem označevanja"
@@ -938,6 +976,15 @@ msgstr ""
 "Trenutno ni tukaj nobene beležnice. Ustvarite jo z klikom na \"Nova beležnica"
 "\"."
 
+msgid "Location"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Note properties"
+msgstr ""
+
 msgid "Open..."
 msgstr "Odpri..."
 
@@ -954,6 +1001,9 @@ msgstr ""
 msgid "Copy Link Address"
 msgstr ""
 
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodprta povezava ali sporočilo: %s"
@@ -1069,6 +1119,14 @@ msgstr "Sinhroniziraj"
 msgid "Notebooks"
 msgstr "Beležnice"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Preneseni predmeti: %d/%d."
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "Viri: %d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Prosim izberite, kam želite izvoziti sinhronizacijski status"
 
@@ -1113,6 +1171,9 @@ msgstr ""
 "Ne gre osvežiti tokena: manjkajo podatki o avtentikaciji. Ponovno zaženite "
 "sinhronizacijo, da morda popravite težavo."
 
+msgid "Untitled"
+msgstr "Neimenovano"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1160,10 +1221,6 @@ msgstr "Izbrisani oddaljeni predmeti: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Preneseni predmeti: %d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "Stanje: %s."
-
 msgid "Cancelling..."
 msgstr "V preklicu..."
 
@@ -1198,10 +1255,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."
@@ -1218,9 +1271,6 @@ msgstr "Posodobljeno: %d."
 msgid "created date"
 msgstr "Ustvarjeno: %d."
 
-msgid "Untitled"
-msgstr "Neimenovano"
-
 msgid "This note does not have geolocation information."
 msgstr "Ta zabeležke nima geografske lokacije."
 
@@ -1284,9 +1334,22 @@ msgstr "Pokaži ikono v območju za obvestila(opravilna vrstica)"
 msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+
+msgid "Start application minimised in the tray icon"
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr "Celokupen procent povečave"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Družina urejevalnika besedilnega stila"
+
 msgid "Editor font family"
 msgstr "Družina urejevalnika besedilnega stila"
 
@@ -1354,6 +1417,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 +1456,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"
 
@@ -1398,6 +1472,10 @@ msgstr "Joplin izvozno mesto"
 msgid "Evernote Export File"
 msgstr "Evernote izvozna datoteka"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Joplin izvozno mesto"
+
 msgid "Directory"
 msgstr "Mesto datoteke"
 
@@ -1472,6 +1550,12 @@ msgstr "Prihajajoči alarmi"
 msgid "On %s: %s"
 msgstr "Vključeno %s: %s"
 
+msgid "Permission to use camera"
+msgstr ""
+
+msgid "Your permission to use your camera is required."
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Trenutno ni zabeležk. Ustvarite jo s klikom na (+) gumb."
 
@@ -1500,6 +1584,10 @@ msgstr "Premakni %d zabeležk v beležnico \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Klikni za nastavitev dekripcijskega gesla."
 
+#, fuzzy
+msgid "Clear alarm"
+msgstr "Nastavi alarm"
+
 #, fuzzy
 msgid "Save alarm"
 msgstr "Nastavi alarm"
@@ -1513,8 +1601,34 @@ msgstr "Potrdi"
 msgid "Cancel synchronisation"
 msgstr "Prekliči sinhronizacijo"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "V preklicu...Prosim počakajte."
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "Preveri nastavitve sinhronizacije"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "Aplikacija je bila uspešno avtorizirana."
+
+#, javascript-format
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+
 #, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid "Decrypted items: %s / %s"
 msgstr "Preneseni predmeti: %d/%d."
 
 msgid "New tags:"
@@ -1597,6 +1711,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodprt tip slike: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Pripni fotografijo"
+
 msgid "Attach photo"
 msgstr "Pripni fotografijo"
 
@@ -1621,6 +1739,9 @@ msgstr "Prikaži meta podatke"
 msgid "View on map"
 msgstr "Prikaži na zemljevidu"
 
+msgid "Go to source URL"
+msgstr ""
+
 msgid "Delete notebook"
 msgstr "Izbriši beležnico"
 
@@ -1643,5 +1764,11 @@ msgstr "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobrodošli"
 
+#~ msgid "State: %s."
+#~ msgstr "Stanje: %s."
+
+#~ 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。"
@@ -431,13 +431,17 @@ msgstr "无法初始化同步。"
 msgid "Starting synchronisation..."
 msgstr "开始同步..."
 
+msgid "Downloading resources..."
+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 +469,7 @@ msgid ""
 msgstr "切换至 [notebook] - 所有进一步处理将在此笔记本中进行。"
 
 msgid "Displays version information"
-msgstr "显示版本信息。"
+msgstr "显示版本信息"
 
 #, javascript-format
 msgid "%s %s (%s)"
@@ -590,6 +594,10 @@ msgstr "剪切"
 msgid "Paste"
 msgstr "粘贴"
 
+#, fuzzy
+msgid "Select all"
+msgstr "选择日期"
+
 msgid "Bold"
 msgstr "粗体"
 
@@ -597,7 +605,7 @@ msgid "Italic"
 msgstr "斜体"
 
 msgid "Insert Date Time"
-msgstr ""
+msgstr "插入时间"
 
 #, fuzzy
 msgid "Edit in external editor"
@@ -606,6 +614,10 @@ msgstr "在外部编辑器中打开"
 msgid "Search in all the notes"
 msgstr "在所有笔记内搜索"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "在所有笔记内搜索"
+
 msgid "View"
 msgstr "显示"
 
@@ -674,6 +686,9 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
+msgid "Token has been copied to the clipboard!"
+msgstr "Token 已被复制到粘贴板"
+
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "网页剪辑服务已启用并设置为自动启动。"
 
@@ -683,7 +698,7 @@ msgstr "状态：从端口 %d 开始"
 
 #, javascript-format
 msgid "Status: %s"
-msgstr "状态：\"%s\"。"
+msgstr "状态：%s"
 
 msgid "Disable Web Clipper Service"
 msgstr "禁用网页剪辑服务"
@@ -719,6 +734,21 @@ msgstr "步骤二：安装扩展"
 msgid "Download and install the relevant extension for your browser:"
 msgstr "为您的浏览器下载并安装相关的扩展："
 
+#, fuzzy
+msgid "Advanced options"
+msgstr "显示高级选项"
+
+msgid "Authorisation token:"
+msgstr "授权码："
+
+msgid "Copy token"
+msgstr "拷贝 token"
+
+msgid ""
+"This authorisation token is only needed to allow third-party applications to "
+"access Joplin."
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "检查同步配置"
 
@@ -727,7 +757,7 @@ msgid "Notes and settings are stored in: %s"
 msgstr "笔记与设置文件储存目录为：%s"
 
 msgid "Apply"
-msgstr ""
+msgstr "应用"
 
 msgid "Submit"
 msgstr "提交"
@@ -778,7 +808,7 @@ msgid "Updated"
 msgstr "更新日期"
 
 msgid "Password"
-msgstr "密码："
+msgstr "密码"
 
 msgid "Password OK"
 msgstr "密码可用"
@@ -840,7 +870,7 @@ msgid "Rename notebook:"
 msgstr "重命名笔记本："
 
 msgid "Rename tag:"
-msgstr "重命名标签"
+msgstr "重命名标签："
 
 msgid "Set alarm:"
 msgstr "设置提醒："
@@ -867,15 +897,23 @@ 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 "在笔记和待办事项类型之间切换"
 
+#, fuzzy
+msgid "Switch to note type"
+msgstr "在笔记和待办事项类型之间切换"
+
+#, fuzzy
+msgid "Switch to to-do type"
+msgstr "在笔记和待办事项类型之间切换"
+
 msgid "Copy Markdown link"
 msgstr "复制 Markdown 链接"
 
@@ -892,6 +930,15 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "此处没有任何笔记本。点击\"新笔记本\"创建。"
 
+msgid "Location"
+msgstr "位置"
+
+msgid "URL"
+msgstr ""
+
+msgid "Note properties"
+msgstr "笔记属性"
+
 msgid "Open..."
 msgstr "打开…"
 
@@ -906,7 +953,10 @@ msgid "Copy path to clipboard"
 msgstr "复制路径到剪切板"
 
 msgid "Copy Link Address"
-msgstr ""
+msgstr "拷贝链接地址"
+
+msgid "This attachment is not downloaded or not decrypted yet."
+msgstr "该附件没有下载或者没有解密"
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -925,7 +975,7 @@ msgid "emphasized text"
 msgstr "强调文本"
 
 msgid "List item"
-msgstr ""
+msgstr "项目列表"
 
 msgid "Insert Hyperlink"
 msgstr "插入超链接"
@@ -941,7 +991,7 @@ msgstr "设置提醒"
 
 #, javascript-format
 msgid "In: %s"
-msgstr "In: %s"
+msgstr "在: %s"
 
 msgid "Hyperlink"
 msgstr "超链接"
@@ -965,11 +1015,10 @@ msgid "Horizontal Rule"
 msgstr "水平线"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "点击以停止外部编辑"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "正在取消..."
+msgstr "正在监控变化..."
 
 msgid "to-do"
 msgstr "待办事项"
@@ -988,10 +1037,10 @@ msgid "Clear"
 msgstr "清除"
 
 msgid "OneDrive Login"
-msgstr "登陆 OneDrive"
+msgstr "登录 OneDrive"
 
 msgid "Dropbox Login"
-msgstr "登陆 Dropbox"
+msgstr "登录 Dropbox"
 
 msgid "Options"
 msgstr "选项"
@@ -1020,6 +1069,14 @@ msgstr "同步"
 msgid "Notebooks"
 msgstr "笔记本"
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "解密项目：%d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d"
+msgstr "资源：%d。"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "请选择同步状态的导出位置"
 
@@ -1055,13 +1112,16 @@ 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 "
 "synchronisation again may fix the problem."
 msgstr "无法刷新令牌：缺失认证数据。重新开始同步可能会修复此错误。"
 
+msgid "Untitled"
+msgstr "无标题"
+
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1109,10 +1169,6 @@ msgstr "已删除远程项目: %d。"
 msgid "Fetched items: %d/%d."
 msgstr "已提取项目：%d/%d."
 
-#, javascript-format
-msgid "State: %s."
-msgstr "状态：%s。"
-
 msgid "Cancelling..."
 msgstr "正在取消..."
 
@@ -1132,13 +1188,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 +1202,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\"，此标题为保留标题。"
@@ -1163,9 +1215,6 @@ msgstr "更新日期"
 msgid "created date"
 msgstr "创建日期"
 
-msgid "Untitled"
-msgstr "无标题"
-
 msgid "This note does not have geolocation information."
 msgstr "此笔记不包含地理定位信息。"
 
@@ -1205,7 +1254,7 @@ msgid "Sort notes by"
 msgstr "排序笔记"
 
 msgid "Reverse sort order"
-msgstr "反转排序顺序。"
+msgstr "反转排序顺序"
 
 msgid "Save geo-location with notes"
 msgstr "保存笔记时同时保存地理定位信息"
@@ -1228,9 +1277,24 @@ msgstr "显示托盘图标"
 msgid "Note: Does not work in all desktop environments."
 msgstr "注意：在所有的桌面环境中都不能工作。"
 
+msgid ""
+"This will allow Joplin to run in the background. It is recommended to enable "
+"this setting so that your notes are constantly being synchronised, thus "
+"reducing the number of conflicts."
+msgstr ""
+"该选项允许 Joplin 在后台运行，如果你的笔记时常发生变化，推荐启用该设置来减少"
+"可能的冲突"
+
+msgid "Start application minimised in the tray icon"
+msgstr "启动应用程序时在托盘中最小化"
+
 msgid "Global zoom percentage"
 msgstr "全局缩放比例"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "编辑器字体"
+
 msgid "Editor font family"
 msgstr "编辑器字体"
 
@@ -1249,25 +1313,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 +1355,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 +1373,7 @@ msgid "Nextcloud password"
 msgstr "Nextcloud 密码"
 
 msgid "WebDAV URL"
-msgstr "WebDAV URL"
+msgstr "WebDAV 链接"
 
 msgid "WebDAV username"
 msgstr "WebDAV 用户名"
@@ -1309,7 +1382,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,32 +1390,43 @@ 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 导出文件"
 
+#, fuzzy
+msgid "Json Export Directory"
+msgstr "Joplin 导出目录"
+
 msgid "Directory"
 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 +1445,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"
@@ -1408,6 +1492,12 @@ msgstr "临近提醒"
 msgid "On %s: %s"
 msgstr "%s：%s"
 
+msgid "Permission to use camera"
+msgstr "使用摄像头的权限"
+
+msgid "Your permission to use your camera is required."
+msgstr "使用摄像头的权限是必须的"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "当前没有任何笔记。点击(+)按钮创建。"
 
@@ -1436,9 +1526,13 @@ msgstr "移动%d条笔记至笔记本\"%s\"？"
 msgid "Press to set the decryption password."
 msgstr "按键将设置解密密码。"
 
-msgid "Save alarm"
+#, fuzzy
+msgid "Clear alarm"
 msgstr "设置提醒"
 
+msgid "Save alarm"
+msgstr "保存提醒"
+
 msgid "Select date"
 msgstr "选择日期"
 
@@ -1448,8 +1542,41 @@ msgstr "确认"
 msgid "Cancel synchronisation"
 msgstr "取消同步"
 
+#, fuzzy
+msgid "Checking... Please wait."
+msgstr "正在取消... 请稍后。"
+
+#, fuzzy
+msgid "Success! Synchronisation configuration appears to be correct."
+msgstr "检查同步配置"
+
+msgid ""
+"Error. Please check that URL, username, password, etc. are correct and that "
+"the sync target is accessible. The reported error was:"
+msgstr ""
+"发生错误。请检查 URL，用户名，密码等等是否正确并且确保同步目的地可被访问。报"
+"告的错误如下："
+
+#, fuzzy
+msgid "The application has been authorised!"
+msgstr "此程序已被成功授权。"
+
 #, javascript-format
-msgid "Decrypting items: %d/%d"
+msgid ""
+"Could not authorise application:\n"
+"\n"
+"%s\n"
+"\n"
+"Please try again."
+msgstr ""
+"无法授权应用：\n"
+"\n"
+"%s\n"
+"\n"
+"请重新尝试"
+
+#, fuzzy, javascript-format
+msgid "Decrypted items: %s / %s"
 msgstr "解密项目：%d/%d"
 
 msgid "New tags:"
@@ -1462,8 +1589,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 +1607,7 @@ msgid "Joplin website"
 msgstr "Joplin 官网"
 
 msgid "Login with Dropbox"
-msgstr "通过 Dropbox 登陆"
+msgstr "通过 Dropbox 登录"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1533,6 +1660,10 @@ msgstr "Joplin 手机应用目前不支持这种类型的链接：%s"
 msgid "Unsupported image type: %s"
 msgstr "不支持的图片格式：%s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "附加照片"
+
 msgid "Attach photo"
 msgstr "附加照片"
 
@@ -1557,11 +1688,14 @@ msgstr "显示元数据"
 msgid "View on map"
 msgstr "查看地图"
 
+msgid "Go to source URL"
+msgstr "定位到源 URL"
+
 msgid "Delete notebook"
 msgstr "删除笔记本"
 
 msgid "Login with OneDrive"
-msgstr "通过 OneDrive 登陆"
+msgstr "通过 OneDrive 登录"
 
 msgid "Search"
 msgstr "搜索"
@@ -1577,5 +1711,11 @@ msgstr "您目前未有笔记本。点击(+)按钮创建。"
 msgid "Welcome"
 msgstr "欢迎"
 
+#~ msgid "State: %s."
+#~ msgstr "状态：%s。"
+
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "以此标题命名的笔记本已存在：\"%s\""
+
 #~ msgid "Searches"
 #~ msgstr "搜索历史"

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.110",
+  "version": "1.0.119",
   "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

@@ -22,14 +22,18 @@ trap finish EXIT
 
 cd "$ROOT_DIR"
 npm test tests-build/ArrayUtils.js
-npm test tests-build/encryption.js
 npm test tests-build/EnexToMd.js
 npm test tests-build/HtmlToMd.js
 npm test tests-build/markdownUtils.js
+npm test tests-build/models_BaseItem.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/pathUtils.js
 npm test tests-build/services_InteropService.js
 npm test tests-build/services_ResourceService.js
-npm test tests-build/synchronizer.js
-npm test tests-build/urlUtils.js
+npm test tests-build/urlUtils.js
+npm test tests-build/encryption.js
+npm test tests-build/services_rest_Api.js
+npm test tests-build/synchronizer.js

CliClient/tests/EnexToMd.js

@@ -1,5 +1,6 @@
 require('app-module-path').addPath(__dirname);
 
+const os = require('os');
 const { time } = require('lib/time-utils.js');
 const { filename } = require('lib/path-utils.js');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
@@ -37,9 +38,14 @@ describe('EnexToMd', function() {
 			// if (htmlFilename !== 'text2.html') continue;
 
 			const html = await shim.fsDriver().readFile(htmlPath);
-			const expectedMd = await shim.fsDriver().readFile(mdPath);
+			let expectedMd = await shim.fsDriver().readFile(mdPath);
 
-			const actualMd = await enexXmlToMd('<div>' + html + '</div>', []);
+			let actualMd = await enexXmlToMd('<div>' + html + '</div>', []);
+			
+			if (os.EOL === '\r\n') {
+				expectedMd = expectedMd.replace(/\r\n/g, '\n')
+				actualMd = actualMd.replace(/\r\n/g, '\n')
+			}
 
 			if (actualMd !== expectedMd) {
 				console.info('');

CliClient/tests/HtmlToMd.js

@@ -1,5 +1,6 @@
 require('app-module-path').addPath(__dirname);
 
+const os = require('os');
 const { time } = require('lib/time-utils.js');
 const { filename } = require('lib/path-utils.js');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
@@ -36,12 +37,17 @@ 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);
+			let expectedMd = await shim.fsDriver().readFile(mdPath);
 
-			const actualMd = await htmlToMd.parse('<div>' + html + '</div>', []);
+			let actualMd = await htmlToMd.parse('<div>' + html + '</div>', []);
+
+			if (os.EOL === '\r\n') {
+				expectedMd = expectedMd.replace(/\r\n/g, '\n')
+				actualMd = actualMd.replace(/\r\n/g, '\n')
+			}
 
 			if (actualMd !== expectedMd) {
 				console.info('');

CliClient/tests/enex_to_md/list4.html

@@ -0,0 +1,5 @@
+<ul>
+	<li><div>This note has an unordered list</div></li>
+	<li><div>List item</div></li>
+	<li><div>List item</div></li>
+</ul>

CliClient/tests/enex_to_md/list4.md

@@ -0,0 +1,3 @@
+- This note has an unordered list
+- List item
+- List item

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_BaseItem.js

@@ -0,0 +1,51 @@
+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 BaseItem = require('lib/models/BaseItem.js');
+const Resource = require('lib/models/Resource.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);
+});
+
+async function allItems() {
+	let folders = await Folder.all();
+	let notes = await Note.all();
+	return folders.concat(notes);
+}
+
+describe('models_BaseItem', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	// it('should be able to exclude keys when syncing', asyncTest(async () => {
+	// 	let folder1 = await Folder.save({ title: "folder1" });
+	// 	let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+	// 	await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+	// 	let resource1 = (await Resource.all())[0];
+	// 	console.info(await Resource.serializeForSync(resource1));
+	// }));
+
+	// This is to handle the case where a property is removed from a BaseItem table - in that case files in
+	// the sync target will still have the old property but we don't need it locally.
+	it('should ignore properties that are present in sync file but not in database when serialising', asyncTest(async () => {
+		let folder = await Folder.save({ title: "folder1" });
+		
+		let serialized = await Folder.serialize(folder);
+		serialized += "\nignore_me: true"
+
+		let unserialized = await Folder.unserialize(serialized);
+
+		expect('ignore_me' in unserialized).toBe(false);
+	}));
+
+});

CliClient/tests/models_Note.js

@@ -5,6 +5,7 @@ const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const BaseModel = require('lib/BaseModel.js');
+const ArrayUtils = require('lib/ArrayUtils.js');
 const { shim } = require('lib/shim');
 
 process.on('unhandledRejection', (reason, p) => {
@@ -34,6 +35,56 @@ describe('models_Note', function() {
 		expect(items.length).toBe(2);
 		expect(items[0].type_).toBe(BaseModel.TYPE_NOTE);
 		expect(items[1].type_).toBe(BaseModel.TYPE_RESOURCE);
+
+		const resource2 = await shim.createResourceFromPath(__dirname + '/../tests/support/photo.jpg');
+		const resource3 = await shim.createResourceFromPath(__dirname + '/../tests/support/photo.jpg');
+		note2.body += '<img alt="bla" src=":/' + resource2.id + '"/>';
+		note2.body += '<img src=\':/' + resource3.id + '\' />';
+		items = await Note.linkedItems(note2.body);
+		expect(items.length).toBe(4);
+	}));
+
+	it('should find linked items', asyncTest(async () => {
+		const testCases = [
+			['[](:/06894e83b8f84d3d8cbe0f1587f9e226)', ['06894e83b8f84d3d8cbe0f1587f9e226']],
+			['[](:/06894e83b8f84d3d8cbe0f1587f9e226) [](:/06894e83b8f84d3d8cbe0f1587f9e226)', ['06894e83b8f84d3d8cbe0f1587f9e226']],
+			['[](:/06894e83b8f84d3d8cbe0f1587f9e226) [](:/06894e83b8f84d3d8cbe0f1587f9e227)', ['06894e83b8f84d3d8cbe0f1587f9e226', '06894e83b8f84d3d8cbe0f1587f9e227']],
+			['[](:/06894e83b8f84d3d8cbe0f1587f9e226 "some title")', ['06894e83b8f84d3d8cbe0f1587f9e226']],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const t = testCases[i];
+
+			const input = t[0];
+			const expected = t[1];
+			const actual = Note.linkedItemIds(input);
+			const contentEquals = ArrayUtils.contentEquals(actual, expected);
+
+			// console.info(contentEquals, input, expected, actual);
+
+			expect(contentEquals).toBe(true);
+		}
+	}));
+
+	it('should change the type of notes', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		note1 = await Note.load(note1.id);
+
+		let changedNote = Note.changeNoteType(note1, 'todo');
+		expect(changedNote === note1).toBe(false);
+		expect(!!changedNote.is_todo).toBe(true);
+		await Note.save(changedNote);
+
+		note1 = await Note.load(note1.id);
+		changedNote = Note.changeNoteType(note1, 'todo');
+		expect(changedNote === note1).toBe(true);
+		expect(!!changedNote.is_todo).toBe(true);
+
+		note1 = await Note.load(note1.id);
+		changedNote = Note.changeNoteType(note1, 'note');
+		expect(changedNote === note1).toBe(false);
+		expect(!!changedNote.is_todo).toBe(false);
 	}));
 
 });

CliClient/tests/models_Resource.js

@@ -0,0 +1,59 @@
+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 Resource = require('lib/models/Resource.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_Resource', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should have a "done" fetch_status when created locally', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+		let ls = await Resource.localState(resource1);
+		expect(ls.fetch_status).toBe(Resource.FETCH_STATUS_DONE);
+	}));
+
+	it('should have a default local state', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+		let ls = await Resource.localState(resource1);
+		expect(!ls.id).toBe(true);
+		expect(ls.resource_id).toBe(resource1.id);
+		expect(ls.fetch_status).toBe(Resource.FETCH_STATUS_DONE);
+	}));
+
+	it('should save and delete local state', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+		await Resource.setLocalState(resource1, { fetch_status: Resource.FETCH_STATUS_IDLE });
+
+		let ls = await Resource.localState(resource1);
+		expect(!!ls.id).toBe(true);
+		expect(ls.fetch_status).toBe(Resource.FETCH_STATUS_IDLE);
+
+		await Resource.delete(resource1.id);
+		ls = await Resource.localState(resource1);
+		expect(!ls.id).toBe(true);
+	}));
+
+});

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

@@ -0,0 +1,39 @@
+require('app-module-path').addPath(__dirname);
+
+const { friendlySafeFilename } = require('lib/path-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('pathUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should create friendly safe filename', async (done) => {
+		const testCases = [
+			['生活', '生活'],
+			['not/good', 'not_good'],
+			['really/not/good', 'really_not_good'],
+			['con', '___'],
+			['no space at the end ', 'no space at the end'],
+			['nor dots...', 'nor dots'],
+			['  no space before either', 'no space before either'],
+			['thatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylong', 'thatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylong'],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const t = testCases[i];
+			expect(friendlySafeFilename(t[0])).toBe(t[1]);
+		}
+
+		expect(!!friendlySafeFilename('')).toBe(true);
+		expect(!!friendlySafeFilename('...')).toBe(true);
+
+		done();
+	});
+
+});

CliClient/tests/services_InteropService.js

@@ -310,4 +310,51 @@ describe('services_InteropService', function() {
 		expect(note2_2.body.indexOf(note1_2.id) >= 0).toBe(true);
 	}));
 
+	it('should export into json format', asyncTest(async () => {
+		const service = new InteropService();
+		let folder1 = await Folder.save({ title: 'folder1' });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		note1 = await Note.load(note1.id);
+		const filePath = exportDir();
+
+		await service.export({ path: filePath, format: 'json' });
+
+		// verify that the json files exist and can be parsed
+		const items = [folder1, note1];
+		for (let i = 0; i < items.length; i++) {
+			const jsonFile = filePath + '/' + items[i].id + '.json'; 
+			let json = await fs.readFile(jsonFile, 'utf-8');
+			let obj = JSON.parse(json);
+			expect(obj.id).toBe(items[i].id);
+			expect(obj.type_).toBe(items[i].type_);
+			expect(obj.title).toBe(items[i].title);
+			expect(obj.body).toBe(items[i].body);
+		}
+	}));
+
+	it('should export MD with unicode filenames', asyncTest(async () => {
+		const service = new InteropService();
+		let folder1 = await Folder.save({ title: 'folder1' });
+		let folder2 = await Folder.save({ title: 'ジョプリン' });
+		let note1 = await Note.save({ title: '生活', parent_id: folder1.id });
+		let note2 = await Note.save({ title: '生活', parent_id: folder1.id });
+		let note2b = await Note.save({ title: '生活', parent_id: folder1.id });
+		let note3 = await Note.save({ title: '', parent_id: folder1.id });
+		let note4 = await Note.save({ title: '', parent_id: folder1.id });
+		let note5 = await Note.save({ title: 'salut, ça roule ?', parent_id: folder1.id });
+		let note6 = await Note.save({ title: 'ジョプリン', parent_id: folder2.id });
+
+		const outDir = exportDir();
+
+		await service.export({ path: outDir, format: 'md' });
+
+		expect(await shim.fsDriver().exists(outDir + '/folder1/生活.md')).toBe(true);
+		expect(await shim.fsDriver().exists(outDir + '/folder1/生活 (1).md')).toBe(true);
+		expect(await shim.fsDriver().exists(outDir + '/folder1/生活 (2).md')).toBe(true);
+		expect(await shim.fsDriver().exists(outDir + '/folder1/Untitled.md')).toBe(true);
+		expect(await shim.fsDriver().exists(outDir + '/folder1/Untitled (1).md')).toBe(true);
+		expect(await shim.fsDriver().exists(outDir + '/folder1/salut, ça roule _.md')).toBe(true);
+		expect(await shim.fsDriver().exists(outDir + '/ジョプリン/ジョプリン.md')).toBe(true);
+	}));
+
 });

CliClient/tests/services_ResourceService.js

@@ -8,6 +8,7 @@ const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
 const NoteTag = require('lib/models/NoteTag.js');
 const Resource = require('lib/models/Resource.js');
+const ItemChange = require('lib/models/ItemChange.js');
 const NoteResource = require('lib/models/NoteResource.js');
 const ResourceService = require('lib/services/ResourceService.js');
 const fs = require('fs-extra');
@@ -79,7 +80,6 @@ describe('services_ResourceService', function() {
 		let note2 = await Note.save({ title: 'ma deuxième note', parent_id: folder1.id });
 		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
 		let resource1 = (await Resource.all())[0];
-		const resourcePath = Resource.fullPath(resource1);
 
 		await service.indexNoteResources();
 
@@ -106,4 +106,44 @@ describe('services_ResourceService', function() {
 		expect((await Resource.all()).length).toBe(1);
 	}));
 
+	it('should not delete resource if it is used in an IMG tag', asyncTest(async () => {
+		const service = new ResourceService();
+
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+
+		await service.indexNoteResources();
+
+		await Note.save({ id: note1.id, body: 'This is HTML: <img src=":/' + resource1.id + '"/>' });
+		
+		await service.indexNoteResources();
+		
+		await service.deleteOrphanResources(0);
+
+		expect(!!(await Resource.load(resource1.id))).toBe(true);
+	}));
+
+	it('should not process twice the same change', asyncTest(async () => {
+		const service = new ResourceService();
+
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+
+		await service.indexNoteResources();
+
+		const before = (await NoteResource.all())[0];
+
+		await time.sleep(0.1);
+
+		await service.indexNoteResources();
+
+		const after = (await NoteResource.all())[0];
+
+		expect(before.last_seen_time).toBe(after.last_seen_time);
+	}));
+
 });

CliClient/tests/services_SearchEngine.js

@@ -0,0 +1,188 @@
+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 SearchEngine = require('lib/services/SearchEngine');
+const Note = require('lib/models/Note');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+let engine = null;
+
+describe('services_SearchEngine', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+
+		engine = new SearchEngine();
+		engine.setDb(db());
+		
+		done();
+	});
+
+	it('should keep the content and FTS table in sync', async (done) => {
+		let rows, n1, n2, n3;
+
+		n1 = await Note.save({ title: "a" });
+		n2 = await Note.save({ title: "b" });
+		rows = await engine.search('a');
+		expect(rows.length).toBe(1);
+		expect(rows[0].title).toBe('a');
+
+		await Note.delete(n1.id);
+		rows = await engine.search('a');
+		expect(rows.length).toBe(0);
+		rows = await engine.search('b');
+		expect(rows[0].title).toBe('b');
+
+		await Note.save({ id: n2.id, title: 'c' });
+		rows = await engine.search('b');
+		expect(rows.length).toBe(0);
+		rows = await engine.search('c');
+		expect(rows[0].title).toBe('c');
+
+		await Note.save({ id: n2.id, encryption_applied: 1 });
+		rows = await engine.search('c');
+		expect(rows.length).toBe(0);
+
+		await Note.save({ id: n2.id, encryption_applied: 0 });
+		rows = await engine.search('c');
+		expect(rows.length).toBe(1);
+
+		done();
+	});
+
+	it('should order search results by relevance (1)', async (done) => {
+		const n1 = await Note.save({ title: "abcd efgh" }); // 3
+		const n2 = await Note.save({ title: "abcd aaaaa abcd abcd" }); // 1
+		const n3 = await Note.save({ title: "abcd aaaaa bbbb eeee abcd" }); // 2
+
+		const rows = await engine.search('abcd');
+
+		expect(rows[0].id).toBe(n2.id);
+		expect(rows[1].id).toBe(n3.id);
+		expect(rows[2].id).toBe(n1.id);
+
+		done();
+	});
+
+	it('should order search results by relevance (2)', async (done) => {
+		// 1
+		const n1 = await Note.save({ title: "abcd efgh", body: "XX abcd XX efgh" });
+		// 4
+		const n2 = await Note.save({ title: "abcd aaaaa bbbb eeee efgh" });
+		// 3
+		const n3 = await Note.save({ title: "abcd aaaaa efgh" });
+		// 2
+		const n4 = await Note.save({ title: "blablablabla blabla bla abcd X efgh" });
+		// 5
+		const n5 = await Note.save({ title: "occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh" });
+
+		const rows = await engine.search('abcd efgh');
+
+		expect(rows[0].id).toBe(n1.id);
+		expect(rows[1].id).toBe(n4.id);
+		expect(rows[2].id).toBe(n3.id);
+		expect(rows[3].id).toBe(n2.id);
+		expect(rows[4].id).toBe(n5.id);
+
+		done();
+	});
+
+	it('should supports various query types', async (done) => {
+		let rows;
+
+		const n1 = await Note.save({ title: "abcd efgh ijkl", body: "aaaa bbbb" });
+		const n2 = await Note.save({ title: "iiii efgh bbbb", body: "aaaa bbbb" });
+
+		rows = await engine.search('abcd ijkl');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('"abcd ijkl"');
+		expect(rows.length).toBe(0);
+
+		rows = await engine.search('"abcd efgh"');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('title:abcd');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('title:efgh');
+		expect(rows.length).toBe(2);
+
+		rows = await engine.search('body:abcd');
+		expect(rows.length).toBe(0);
+
+		rows = await engine.search('body:bbbb');
+		expect(rows.length).toBe(2);
+
+		rows = await engine.search('body:bbbb iiii');
+		expect(rows.length).toBe(1);
+
+		done();
+	});
+
+	it('should parse normal query strings', async (done) => {
+		let rows;
+
+		const testCases = [
+			['abcd efgh', { _: ['abcd', 'efgh'] }],
+			['abcd   efgh', { _: ['abcd', 'efgh'] }],
+			['title:abcd efgh', { _: ['efgh'], title: ['abcd'] }],
+			['title:abcd', { title: ['abcd'] }],
+			['"abcd efgh"', { _: ['abcd efgh'] }],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const t = testCases[i];
+			const input = t[0];
+			const expected = t[1];
+			const actual = engine.parseQuery(input);
+
+			expect(JSON.stringify(actual.terms._)).toBe(JSON.stringify(expected._));
+			expect(JSON.stringify(actual.terms.title)).toBe(JSON.stringify(expected.title));
+			expect(JSON.stringify(actual.terms.body)).toBe(JSON.stringify(expected.body));
+		}
+
+		done();
+	});
+
+	it('should parse query strings with wildcards', async (done) => {
+		let rows;
+
+		const testCases = [
+			['do*', ['do', 'dog', 'domino'], [] ],
+			// "*" is a wildcard only when used at the end (to searhc for documents with the specified prefix)
+			// If it's at the beginning, it's ignored, if it's in the middle, it's treated as a litteral "*".
+			['*an*', ['an', 'anneau'], ['piano', 'plan'] ],
+			['no*no', ['no*no'], ['nonono'] ],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const t = testCases[i];
+			const input = t[0];
+			const shouldMatch = t[1];
+			const shouldNotMatch = t[2];
+			const regex = new RegExp(engine.parseQuery(input).terms._[0].value, 'gmi');
+
+			for (let j = 0; j < shouldMatch.length; j++) {
+				const r = shouldMatch[j].match(regex);
+				expect(!!r).toBe(true, '"' + input + '" should match "' + shouldMatch[j] + '"');
+			}
+
+		// 	for (let j = 0; j < shouldNotMatch.length; j++) {
+		// 		const r = shouldNotMatch[j].match(regex);
+		// 		// console.info(input, shouldNotMatch)
+		// 		expect(!!r).toBe(false, '"' + input + '" should not match "' + shouldNotMatch[j] + '"');
+		// 	}
+		}
+
+		expect(engine.parseQuery('*').termCount).toBe(0);
+
+		done();
+	});
+
+});

CliClient/tests/services_rest_Api.js

@@ -0,0 +1,289 @@
+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 Tag = require('lib/models/Tag');
+const Resource = require('lib/models/Resource');
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+
+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 update folders', async (done) => {
+		let f1 = await Folder.save({ title: "mon carnet" });
+		const response = await api.route('PUT', 'folders/' + f1.id, null, JSON.stringify({
+			title: 'modifié',
+		}));
+
+		let f1b = await Folder.load(f1.id);
+		expect(f1b.title).toBe('modifié');
+
+		done();
+	});
+
+	it('should delete folders', async (done) => {
+		let f1 = await Folder.save({ title: "mon carnet" });
+		await api.route('DELETE', 'folders/' + f1.id);
+
+		let f1b = await Folder.load(f1.id);
+		expect(!f1b).toBe(true);
+		
+		done();
+	});
+
+	it('should create folders', async (done) => {
+		const response = await api.route('POST', 'folders', null, JSON.stringify({
+			title: 'from api',
+		}));
+
+		expect(!!response.id).toBe(true);
+
+		let f = await Folder.all();
+		expect(f.length).toBe(1);
+		expect(f[0].title).toBe('from api');
+		
+		done();
+	});
+
+	it('should get one folder', async (done) => {
+		let f1 = await Folder.save({ title: "mon carnet" });
+		const response = await api.route('GET', 'folders/' + f1.id);
+		expect(response.id).toBe(f1.id);
+
+		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'folders/doesntexist'));
+		expect(hasThrown).toBe(true);
+
+		done();
+	});
+
+	it('should get the folder notes', async (done) => {
+		let f1 = await Folder.save({ title: "mon carnet" });
+		const response2 = await api.route('GET', 'folders/' + f1.id + '/notes');
+		expect(response2.length).toBe(0);
+
+		const n1 = await Note.save({ title: 'un', parent_id: f1.id });
+		const n2 = await Note.save({ title: 'deux', parent_id: f1.id });
+		const response = await api.route('GET', 'folders/' + f1.id + '/notes');
+		expect(response.length).toBe(2);
+
+		done();
+	});
+
+	it('should fail on invalid paths', async (done) => {
+		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'schtroumpf'));
+		expect(hasThrown).toBe(true);
+
+		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/' + 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 supplied ID', async (done) => {
+		let response = null;
+		const f = await Folder.save({ title: "mon carnet" });
+		
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			id: '12345678123456781234567812345678',
+			title: 'testing',
+			parent_id: f.id,
+		}));
+		expect(response.id).toBe('12345678123456781234567812345678');
+
+		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');
+
+		let 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);
+
+		hasThrown = await checkThrowAsync(async () => await api.route('POST', 'notes', null, JSON.stringify({title:'testing'})));
+		expect(hasThrown).toBe(true);
+
+		done();
+	});
+
+	it('should add tags to notes', async (done) => {
+		const tag = await Tag.save({ title: "mon étiquette" });
+		const note = await Note.save({ title: "ma note" });
+
+		const response = await api.route('POST', 'tags/' + tag.id + '/notes', null, JSON.stringify({
+			id: note.id,
+		}));
+
+		const noteIds = await Tag.noteIds(tag.id);	
+		expect(noteIds[0]).toBe(note.id);
+
+		done();
+	});
+
+	it('should remove tags from notes', async (done) => {
+		const tag = await Tag.save({ title: "mon étiquette" });
+		const note = await Note.save({ title: "ma note" });
+		await Tag.addNote(tag.id, note.id);
+
+		const response = await api.route('DELETE', 'tags/' + tag.id + '/notes/' + note.id);
+
+		const noteIds = await Tag.noteIds(tag.id);	
+		expect(noteIds.length).toBe(0);
+
+		done();
+	});
+
+	it('should list all tag notes', async (done) => {
+		const tag = await Tag.save({ title: "mon étiquette" });
+		const tag2 = await Tag.save({ title: "mon étiquette 2" });
+		const note1 = await Note.save({ title: "ma note un" });
+		const note2 = await Note.save({ title: "ma note deux" });
+		await Tag.addNote(tag.id, note1.id);
+		await Tag.addNote(tag.id, note2.id);
+
+		const response = await api.route('GET', 'tags/' + tag.id + '/notes');
+		expect(response.length).toBe(2);
+		expect('id' in response[0]).toBe(true);
+		expect('title' in response[0]).toBe(true);
+
+		const response2 = await api.route('GET', 'notes/' + note1.id + '/tags');
+		expect(response2.length).toBe(1);
+		await Tag.addNote(tag2.id, note1.id);
+		const response3 = await api.route('GET', 'notes/' + note1.id + '/tags');
+		expect(response3.length).toBe(2);
+
+		done();
+	});
+
+});

CliClient/tests/synchronizer.js

@@ -7,6 +7,7 @@ const fs = require('fs-extra');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Resource = require('lib/models/Resource.js');
+const ResourceFetcher = require('lib/services/ResourceFetcher');
 const Tag = require('lib/models/Tag.js');
 const { Database } = require('lib/database.js');
 const Setting = require('lib/models/Setting.js');
@@ -872,12 +873,49 @@ describe('Synchronizer', function() {
 		let allResources = await Resource.all();
 		expect(allResources.length).toBe(1);
 		let resource1_2 = allResources[0];
-		let resourcePath1_2 = Resource.fullPath(resource1_2);
-
+		let ls = await Resource.localState(resource1_2);
 		expect(resource1_2.id).toBe(resource1.id);
+		expect(ls.fetch_status).toBe(Resource.FETCH_STATUS_IDLE);
+
+		const fetcher = new ResourceFetcher(() => { return synchronizer().api() });
+		fetcher.queueDownload(resource1_2.id);
+		await fetcher.waitForAllFinished();
+
+		resource1_2 = await Resource.load(resource1.id);
+		ls = await Resource.localState(resource1_2);
+		expect(ls.fetch_status).toBe(Resource.FETCH_STATUS_DONE);
+
+		let resourcePath1_2 = Resource.fullPath(resource1_2);
 		expect(fileContentEqual(resourcePath1, resourcePath1_2)).toBe(true);
 	}));
 
+	it('should handle resource download errors', asyncTest(async () => {
+		while (insideBeforeEach) await time.msleep(500);
+
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+		let resourcePath1 = Resource.fullPath(resource1);
+		await synchronizer().start();
+
+		await switchClient(2);
+
+		await synchronizer().start();
+
+		const fetcher = new ResourceFetcher(() => { return {
+			// Simulate a failed download
+			get: () => { return new Promise((resolve, reject) => { reject(new Error('did not work')) }); }
+		} });
+		fetcher.queueDownload(resource1.id);
+		await fetcher.waitForAllFinished();
+
+		resource1 = await Resource.load(resource1.id);
+		let ls = await Resource.localState(resource1);
+		expect(ls.fetch_status).toBe(Resource.FETCH_STATUS_ERROR);
+		expect(ls.fetch_error).toBe('did not work');
+	}));
+
 	it('should delete resources', asyncTest(async () => {
 		while (insideBeforeEach) await time.msleep(500);
 
@@ -926,6 +964,10 @@ describe('Synchronizer', function() {
 		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
 		await encryptionService().loadMasterKeysFromSettings();
 
+		const fetcher = new ResourceFetcher(() => { return synchronizer().api() });
+		fetcher.queueDownload(resource1.id);
+		await fetcher.waitForAllFinished();
+		
 		let resource1_2 = (await Resource.all())[0];
 		resource1_2 = await Resource.decrypt(resource1_2);
 		let resourcePath1_2 = Resource.fullPath(resource1_2);

CliClient/tests/test-utils.js

@@ -4,6 +4,7 @@ const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
+const ItemChange = require('lib/models/ItemChange.js');
 const Resource = require('lib/models/Resource.js');
 const Tag = require('lib/models/Tag.js');
 const NoteTag = require('lib/models/NoteTag.js');
@@ -48,7 +49,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 +83,7 @@ BaseItem.loadClass('MasterKey', MasterKey);
 
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
+Setting.setConstant('tempDir', tempDir);
 
 BaseService.logger_ = logger;
 
@@ -119,6 +123,8 @@ async function switchClient(id) {
 async function clearDatabase(id = null) {
 	if (id === null) id = currentClient_;
 
+	await ItemChange.waitForAllSaved();
+
 	let queries = [
 		'DELETE FROM notes',
 		'DELETE FROM folders',

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 || '',
 			};			
 		}
 
@@ -137,6 +138,7 @@
 			messageComp.style.maxWidth = messageCompWidth + 'px'
 			messageComp.style.border = '1px solid black'
 			messageComp.style.background = 'white'
+			messageComp.style.color = 'black';
 			messageComp.style.top = '10px'
 			messageComp.style.textAlign = 'center';
 			messageComp.style.padding = '10px'
@@ -214,6 +216,7 @@
 						crop_rect: selectionArea,
 						url: location.origin + location.pathname,
 						parent_id: command.parent_id,
+						tags: command.tags,
 					};
 
 					browser_.runtime.sendMessage({

Clipper/joplin-webclipper/manifest.json

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

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,10 +14,14 @@ class AppComponent extends Component {
 
 		this.state = ({
 			contentScriptLoaded: false,
+			selectedTags: [],
 		});
 
 		this.confirm_click = () => {
-			bridge().sendContentToJoplin(this.props.clippedContent);
+			const content = Object.assign({}, this.props.clippedContent);
+			content.tags = this.state.selectedTags.join(',');
+			content.parent_id = this.props.selectedFolderId;
+			bridge().sendContentToJoplin(content);
 		}
 
 		this.contentTitle_change = (event) => {
@@ -30,21 +34,18 @@ class AppComponent extends Component {
 		this.clipSimplified_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'simplifiedPageHtml',
-				parent_id: this.props.selectedFolderId,
 			});
 		}
 
 		this.clipComplete_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'completePageHtml',
-				parent_id: this.props.selectedFolderId,
 			});
 		}
 
 		this.clipSelection_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'selectedHtml',
-				parent_id: this.props.selectedFolderId,
 			});
 		}
 
@@ -56,6 +57,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 +76,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 +124,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 +189,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 +229,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 +257,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 +299,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 +322,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);
+});

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

@@ -1,20 +1,20 @@
 function randomClipperPort(state, env) {
-  const startPorts = {
-    prod: 41184,
-    dev: 27583,
-  };
+	const startPorts = {
+		prod: 41184,
+		dev: 27583,
+	};
 
-  const startPort = env === 'prod' ? startPorts.prod : startPorts.dev;
+	const startPort = env === 'prod' ? startPorts.prod : startPorts.dev;
 
-  if (!state) {
-    state = { offset: 0 };
-  } else {
-    state.offset++;
-  }
+	if (!state) {
+		state = { offset: 0 };
+	} else {
+		state.offset++;
+	}
 
-  state.port = startPort + state.offset;
+	state.port = startPort + state.offset;
 
-  return state;
+	return state;
 }
 
 module.exports = randomClipperPort;

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

@@ -23,8 +23,9 @@ const DecryptionWorker = require('lib/services/DecryptionWorker');
 const InteropService = require('lib/services/InteropService');
 const InteropServiceHelper = require('./InteropServiceHelper.js');
 const ResourceService = require('lib/services/ResourceService');
+const SearchEngine = require('lib/services/SearchEngine');
 const ClipperServer = require('lib/ClipperServer');
-
+const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
 const { bridge } = require('electron').remote.require('./bridge');
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
@@ -49,7 +50,6 @@ class Application extends BaseApplication {
 	constructor() {
 		super();
 		this.lastMenuScreen_ = null;
-		this.powerSaveBlockerId_ = null;
 	}
 
 	hasGui() {
@@ -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;
 
 			}
@@ -219,17 +221,6 @@ class Application extends BaseApplication {
 			Setting.setValue('sidebarVisibility', newState.sidebarVisibility);
 		}
 
-		if (action.type === 'SYNC_STARTED') {
-			if (!this.powerSaveBlockerId_) this.powerSaveBlockerId_ = bridge().powerSaveBlockerStart('prevent-app-suspension');
-		}
-
-		if (action.type === 'SYNC_COMPLETED') {
-			if (this.powerSaveBlockerId_) {
-				bridge().powerSaveBlockerStop(this.powerSaveBlockerId_);
-				this.powerSaveBlockerId_ = null;
-			}
-		}
-
 		return result;
 	}
 
@@ -418,6 +409,10 @@ class Application extends BaseApplication {
 					label: _('Paste'),
 					role: 'paste',
 					accelerator: 'CommandOrControl+V',
+				}, {
+					label: _('Select all'),
+					role: 'selectall',
+					accelerator: 'CommandOrControl+A',
 				}, {
 					type: 'separator',
 					screens: ['Main'],
@@ -465,14 +460,27 @@ class Application extends BaseApplication {
 							name: 'commandStartExternalEditing',
 						});
 					},
+				}, {
+					type: 'separator',
+					screens: ['Main'],
 				}, {
 					label: _('Search in all the notes'),
 					screens: ['Main'],
+					accelerator: 'F6',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'focus_search',
+						});
+					},
+				}, {
+					label: _('Search in current note'),
+					screens: ['Main'],
 					accelerator: 'CommandOrControl+F',
 					click: () => {
 						this.dispatch({
 							type: 'WINDOW_COMMAND',
-							name: 'focus_search',
+							name: 'showLocalSearch',
 						});
 					},
 				}],
@@ -682,6 +690,23 @@ class Application extends BaseApplication {
 		document.head.appendChild(styleTag);
 	}
 
+	async loadCustomCss(filePath) {
+		let cssString = '';
+		if (await fs.pathExists(filePath)) {
+			try {
+				cssString = await fs.readFile(filePath, 'utf-8');
+
+			} catch (error) {
+				let msg = error.message ? error.message : '';
+				msg = 'Could not load custom css from ' + filePath + '\n' + msg;
+				error.message = msg;
+				throw error;
+			}
+		}
+
+		return cssString;
+	}
+
 	async start(argv) {
 		const electronIsDev = require('electron-is-dev');
 
@@ -735,7 +760,12 @@ class Application extends BaseApplication {
 			ids: Setting.value('collapsedFolderIds'),
 		});
 
-		if (shim.isLinux()) bridge().setAllowPowerSaveBlockerToggle(true);
+		const cssString = await this.loadCustomCss(Setting.value('profileDir') + '/userstyle.css');
+
+		this.store().dispatch({
+			type: 'LOAD_CUSTOM_CSS',
+			css: cssString
+		});
 
 		// Note: Auto-update currently doesn't work in Linux: it downloads the update
 		// but then doesn't install it on exit.
@@ -758,8 +788,15 @@ class Application extends BaseApplication {
 			AlarmService.garbageCollect();
 		}, 1000 * 60 * 60);
 
+		if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
+			bridge().window().hide();
+		}
+
 		ResourceService.runInBackground();
 
+		SearchEngine.instance().setDb(reg.db());
+		SearchEngine.instance().setLogger(reg.logger());
+
 		if (Setting.value('env') === 'dev') {
 			AlarmService.updateAllNotifications();
 		} else {
@@ -782,6 +819,9 @@ class Application extends BaseApplication {
 		if (Setting.value('clipperServer.autoStart')) {
 			ClipperServer.instance().start();
 		}
+
+		ExternalEditWatcher.instance().setLogger(reg.logger());
+		ExternalEditWatcher.instance().dispatch = this.store().dispatch;
 	}
 
 }

ElectronClient/app/bridge.js

@@ -1,7 +1,6 @@
 const { _, setLocale } = require('lib/locale.js');
 const { dirname } = require('lib/path-utils.js');
 const { Logger } = require('lib/logger.js');
-const { powerSaveBlocker } = require('electron');
 
 class Bridge {
 
@@ -9,7 +8,6 @@ class Bridge {
 		this.electronWrapper_ = electronWrapper;
 		this.autoUpdateLogger_ = null;
 		this.lastSelectedPath_ = null;
-		this.allowPowerSaveBlockerToggle_ = false;
 	}
 
 	electronApp() {
@@ -24,10 +22,6 @@ class Bridge {
 		return this.electronWrapper_.window();
 	}
 
-	setAllowPowerSaveBlockerToggle(v) {
-		this.allowPowerSaveBlockerToggle_ = v;
-	}
-
 	windowContentSize() {
 		if (!this.window()) return { width: 0, height: 0 };
 		const s = this.window().getContentSize();
@@ -126,19 +120,7 @@ class Bridge {
 		const { checkForUpdates } = require('./checkForUpdates.js');
 		checkForUpdates(inBackground, window, logFilePath);
 	}
-
-	powerSaveBlockerStart(type) {
-		if (!this.allowPowerSaveBlockerToggle_) return null;
-		console.info('Enable powerSaveBlockerStart: ' + type);
-		return powerSaveBlocker.start(type);
-	}
-
-	powerSaveBlockerStop(id) {
-		if (!this.allowPowerSaveBlockerToggle_) return null;
-		console.info('Disable powerSaveBlocker: ' + id);
-		return powerSaveBlocker.stop(id);
-	}
-
+	
 }
 
 let bridge_ = null;

ElectronClient/app/gui/ConfigScreen.jsx

@@ -53,10 +53,13 @@ class ConfigScreenComponent extends React.Component {
 		const labelStyle = Object.assign({}, theme.textStyle, {
 			display: 'inline-block',
 			marginRight: 10,
+			color: theme.color,
 		});
 
 		const controlStyle = {
 			display: 'inline-block',
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
 		};
 
 		const descriptionStyle = Object.assign({}, theme.textStyle, {
@@ -120,7 +123,10 @@ class ConfigScreenComponent extends React.Component {
 				updateSettingValue(key, event.target.value);
 			}
 
-			const inputStyle = Object.assign({}, controlStyle, { width: '50%', minWidth: '20em' });
+			const inputStyle = Object.assign({}, controlStyle, {
+				width: '50%',
+				minWidth: '20em',
+				border: '1px solid' });
 			const inputType = md.secure === true ? 'password' : 'text';
 
 			return (
@@ -164,21 +170,19 @@ class ConfigScreenComponent extends React.Component {
 
 	render() {
 		const theme = themeStyle(this.props.theme);
-		const style = Object.assign({}, this.props.style, { overflow: 'auto' });
+		const style = Object.assign({
+			backgroundColor: theme.backgroundColor
+		}, this.props.style, { overflow: 'auto' });
 		const settings = this.state.settings;
 
-		const headerStyle = {
-			width: style.width,
-		};
+		const headerStyle = Object.assign({}, theme.headerStyle, { width: style.width });
 
-		const containerStyle = {
-			padding: 10,
-		};
+		const containerStyle = Object.assign({}, theme.containerStyle, { padding: 10 });
 
-		const buttonStyle = {
+		const buttonStyle = Object.assign({}, theme.buttonStyle, {
 			display: this.state.changedSettingKeys.length ? 'inline-block' : 'none',
 			marginRight: 10,
-		}
+		});
 
 		const settingComps = shared.settingsToComponents(this, 'desktop', settings);
 
@@ -195,7 +199,7 @@ class ConfigScreenComponent extends React.Component {
 
 			settingComps.push(
 				<div key="check_sync_config_button" style={this.rowStyle_}>
-					<button disabled={this.state.checkSyncConfigResult === 'checking'} onClick={this.checkSyncConfig_}>{_('Check synchronisation configuration')}</button>
+					<button style={buttonStyle} disabled={this.state.checkSyncConfigResult === 'checking'} onClick={this.checkSyncConfig_}>{_('Check synchronisation configuration')}</button>
 					{ statusComp }
 				</div>);
 		}
@@ -228,4 +232,4 @@ const mapStateToProps = (state) => {
 
 const ConfigScreen = connect(mapStateToProps)(ConfigScreenComponent);
 
-module.exports = { ConfigScreen };
+module.exports = { ConfigScreen };

ElectronClient/app/gui/DropboxLoginScreen.jsx

@@ -28,16 +28,18 @@ class DropboxLoginScreenComponent extends React.Component {
 		const style = this.props.style;
 		const theme = themeStyle(this.props.theme);
 
-		const headerStyle = {
-			width: style.width,
-		};
+		const headerStyle = Object.assign({}, theme.headerStyle, { width: style.width });
+		const containerStyle = Object.assign({}, theme.containerStyle, {
+			padding: theme.margin,
+			height: style.height - theme.headerHeight - theme.margin * 2,
+		});
 
 		const inputStyle = Object.assign({}, theme.inputStyle, { width: 500 });
 
 		return (
 			<div>
 				<Header style={headerStyle} />
-				<div style={{padding: theme.margin}}>
+				<div style={containerStyle}>
 					<p style={theme.textStyle}>{_('To allow Joplin to synchronise with Dropbox, please follow the steps below:')}</p>
 					<p style={theme.textStyle}>{_('Step 1: Open this URL in your browser to authorise the application:')}</p>
 					<a style={theme.textStyle} href="#" onClick={this.shared_.loginUrl_click}>{this.state.loginUrl}</a>
@@ -59,4 +61,4 @@ const mapStateToProps = (state) => {
 
 const DropboxLoginScreen = connect(mapStateToProps)(DropboxLoginScreenComponent);
 
-module.exports = { DropboxLoginScreen };
+module.exports = { DropboxLoginScreen };

ElectronClient/app/gui/EncryptionConfigScreen.jsx

@@ -50,6 +50,13 @@ class EncryptionConfigScreenComponent extends React.Component {
 	renderMasterKey(mk) {
 		const theme = themeStyle(this.props.theme);
 
+		const passwordStyle = {
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
+			border: '1px solid',
+			borderColor: theme.dividerColor,
+		}
+
 		const onSaveClick = () => {
 			return shared.onSavePasswordClick(this, mk);
 		}
@@ -69,7 +76,7 @@ class EncryptionConfigScreenComponent extends React.Component {
 				<td style={theme.textStyle}>{mk.source_application}</td>
 				<td style={theme.textStyle}>{time.formatMsToLocal(mk.created_time)}</td>
 				<td style={theme.textStyle}>{time.formatMsToLocal(mk.updated_time)}</td>
-				<td style={theme.textStyle}><input type="password" value={password} onChange={(event) => onPasswordChange(event)}/> <button onClick={() => onSaveClick()}>{_('Save')}</button></td>
+				<td style={theme.textStyle}><input type="password" style={passwordStyle} value={password} onChange={(event) => onPasswordChange(event)}/> <button style={theme.buttonStyle} onClick={() => onSaveClick()}>{_('Save')}</button></td>
 				<td style={theme.textStyle}>{passwordOk}</td>
 			</tr>
 		);
@@ -81,15 +88,13 @@ class EncryptionConfigScreenComponent extends React.Component {
 		const masterKeys = this.state.masterKeys;
 		const containerPadding = 10;
 
-		const headerStyle = {
-			width: style.width,
-		};
+		const headerStyle = Object.assign({}, theme.headerStyle, { width: style.width });
 
-		const containerStyle = {
+		const containerStyle = Object.assign({}, theme.containerStyle, {
 			padding: containerPadding,
 			overflow: 'auto',
 			height: style.height - theme.headerHeight - containerPadding * 2,
-		};
+		});
 
 		const mkComps = [];
 		let nonExistingMasterKeyIds = this.props.notLoadedMasterKeys.slice();
@@ -126,7 +131,7 @@ class EncryptionConfigScreenComponent extends React.Component {
 		}
 
 		const decryptedItemsInfo = <p style={theme.textStyle}>{shared.decryptedStatText(this)}</p>;
-		const toggleButton = <button onClick={() => { onToggleButtonClick() }}>{this.props.encryptionEnabled ? _('Disable encryption') : _('Enable encryption')}</button>
+		const toggleButton = <button style={theme.buttonStyle} onClick={() => { onToggleButtonClick() }}>{this.props.encryptionEnabled ? _('Disable encryption') : _('Enable encryption')}</button>
 
 		let masterKeySection = null;
 
@@ -213,4 +218,4 @@ const mapStateToProps = (state) => {
 
 const EncryptionConfigScreen = connect(mapStateToProps)(EncryptionConfigScreenComponent);
 
-module.exports = { EncryptionConfigScreen };
+module.exports = { EncryptionConfigScreen };

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();
 		}
 	}
 
@@ -107,6 +108,9 @@ class HeaderComponent extends React.Component {
 			color: style.color,
 			fontSize: style.fontSize,
 			fontFamily: style.fontFamily,
+			backgroundColor: style.searchColor,
+			border: '1px solid',
+			borderColor: style.dividerColor,
 		};
 
 		const searchButton = {
@@ -170,6 +174,8 @@ class HeaderComponent extends React.Component {
 			paddingLeft: theme.headerButtonHPadding,
 			paddingRight: theme.headerButtonHPadding,
 			color: theme.color,
+			searchColor: theme.backgroundColor,
+			dividerColor: theme.dividerColor,
 			textDecoration: 'none',
 			fontFamily: theme.fontFamily,
 			fontSize: theme.fontSize,
@@ -211,4 +217,4 @@ const mapStateToProps = (state) => {
 
 const Header = connect(mapStateToProps)(HeaderComponent);
 
-module.exports = { Header };
+module.exports = { Header };

ElectronClient/app/gui/IconButton.jsx

@@ -35,4 +35,4 @@ class IconButton extends React.Component {
 
 }
 
-module.exports = { IconButton };
+module.exports = { IconButton };

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: {},
 		});
 	}
 
@@ -108,7 +120,7 @@ class MainScreenComponent extends React.Component {
 			});
 		} else if (command.name === 'setTags') {
 			const tags = await Tag.tagsByNoteId(command.noteId);
-			const tagTitles = tags.map((a) => { return a.title });
+			const tagTitles = tags.map((a) => { return a.title }).sort();
 
 			this.setState({
 				promptOptions: {
@@ -146,7 +158,7 @@ class MainScreenComponent extends React.Component {
 				},
 			});
 		} else if (command.name === 'renameTag') {
-			const tag = await Tag.load(command.id);			
+			const tag = await Tag.load(command.id);
 			if(!tag) return;
 
 			this.setState({
@@ -161,12 +173,12 @@ class MainScreenComponent extends React.Component {
 							} catch (error) {
 								bridge().showErrorMessageBox(error.message);
 							}
-						}						
+						}
 						this.setState({promptOptions: null });
 					}
 				}
 			})
-		
+
 		} else if (command.name === 'search') {
 
 			if (!this.searchId_) this.searchId_ = uuid.create();
@@ -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') {
@@ -317,14 +336,17 @@ class MainScreenComponent extends React.Component {
 	}
 
 	render() {
-		const style = this.props.style;
+		const theme = themeStyle(this.props.theme);
+		const style = Object.assign({
+				color: theme.color,
+				backgroundColor: theme.backgroundColor,
+			}, this.props.style);
 		const promptOptions = this.state.promptOptions;
 		const folders = this.props.folders;
 		const notes = this.props.notes;
 		const messageBoxVisible = this.props.hasDisabledSyncItems || this.props.showMissingMasterKeyMessage;
 		const sidebarVisibility = this.props.sidebarVisibility;
 		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible, sidebarVisibility);
-		const theme = themeStyle(this.props.theme);
 		const selectedFolderId = this.props.selectedFolderId;
 		const onConflictFolder = this.props.selectedFolderId === Folder.conflictFolderId();
 
@@ -412,10 +434,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 +458,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/NoteList.jsx

@@ -13,9 +13,16 @@ const InteropService = require('lib/services/InteropService');
 const InteropServiceHelper = require('../InteropServiceHelper.js');
 const Search = require('lib/models/Search');
 const Mark = require('mark.js/dist/mark.min.js');
+const SearchEngine = require('lib/services/SearchEngine');
 
 class NoteListComponent extends React.Component {
 
+	constructor() {
+		super();
+
+		this.itemRenderer = this.itemRenderer.bind(this);
+	}
+
 	style() {
 		const theme = themeStyle(this.props.theme);
 
@@ -97,13 +104,33 @@ class NoteListComponent extends React.Component {
 				}
 			}}));
 
-			menu.append(new MenuItem({label: _('Switch between note and to-do type'), click: async () => {
-				for (let i = 0; i < noteIds.length; i++) {
-					const note = await Note.load(noteIds[i]);
-					await Note.save(Note.toggleIsTodo(note), { userSideValidation: true });
-					eventManager.emit('noteTypeToggle', { noteId: note.id });
+			if (noteIds.length <= 1) {
+				menu.append(new MenuItem({label: _('Switch between note and to-do type'), click: async () => {
+					for (let i = 0; i < noteIds.length; i++) {
+						const note = await Note.load(noteIds[i]);
+						await Note.save(Note.toggleIsTodo(note), { userSideValidation: true });
+						eventManager.emit('noteTypeToggle', { noteId: note.id });
+					}
+				}}));
+			} else {
+				const switchNoteType = async (noteIds, type) => {
+					for (let i = 0; i < noteIds.length; i++) {
+						const note = await Note.load(noteIds[i]);
+						const newNote = Note.changeNoteType(note, type);
+						if (newNote === note) continue;
+						await Note.save(newNote, { userSideValidation: true });
+						eventManager.emit('noteTypeToggle', { noteId: note.id });
+					}
 				}
-			}}));
+
+				menu.append(new MenuItem({label: _('Switch to note type'), click: async () => {
+					await switchNoteType(noteIds, 'note');
+				}}));
+
+				menu.append(new MenuItem({label: _('Switch to to-do type'), click: async () => {
+					await switchNoteType(noteIds, 'todo');
+				}}));
+			}
 
 			menu.append(new MenuItem({label: _('Copy Markdown link'), click: async () => {
 				const { clipboard } = require('electron');
@@ -149,7 +176,10 @@ class NoteListComponent extends React.Component {
 		menu.popup(bridge().window());
 	}
 
-	itemRenderer(item, theme, width) {
+	itemRenderer(item) {
+		const theme = themeStyle(this.props.theme);
+		const width = this.props.style.width;
+
 		const onTitleClick = async (event, item) => {
 			if (event.ctrlKey) {
 				event.preventDefault();
@@ -205,8 +235,11 @@ class NoteListComponent extends React.Component {
 
 		let highlightedWords = [];
 		if (this.props.notesParentType === 'Search') {
-			const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
-			highlightedWords = search ? Search.keywords(search.query_pattern) : [];
+			const query = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
+			if (query) {
+				const parsedQuery = SearchEngine.instance().parseQuery(query.query_pattern);
+				highlightedWords = SearchEngine.instance().allParsedQueryTerms(parsedQuery);
+			}
 		}
 
 		let style = Object.assign({ width: width }, this.style().listItem);
@@ -237,7 +270,18 @@ class NoteListComponent extends React.Component {
 				exclude: ['img'],
 				acrossElements: true,
 			});
-			mark.mark(highlightedWords);
+
+			mark.unmark();
+
+			for (let i = 0; i < highlightedWords.length; i++) {
+				const w = highlightedWords[i];
+
+				if (w.type === 'regex') {
+					mark.markRegExp(new RegExp(w.value, 'gmi'), { acrossElements: true });
+				} else {
+					mark.mark([w]);
+				}
+			}
 
 			// Note: in this case it is safe to use dangerouslySetInnerHTML because titleElement
 			// is a span tag that we created and that contains data that's been inserted as plain text
@@ -249,6 +293,14 @@ class NoteListComponent extends React.Component {
 			titleComp = <span>{displayTitle}</span>
 		}
 
+		const watchedIconStyle = {
+			paddingRight: 4,
+			color: theme.color,
+		};
+		const watchedIcon = this.props.watchedNoteFiles.indexOf(item.id) < 0 ? null : (
+			<i style={watchedIconStyle} className={"fa fa-external-link"}></i>
+		);
+
 		// Need to include "todo_completed" in key so that checkbox is updated when
 		// item is changed via sync.		
 		return <div key={item.id + '_' + item.todo_completed} style={style}>
@@ -263,6 +315,7 @@ class NoteListComponent extends React.Component {
 				onDragStart={(event) => onDragStart(event) }
 				data-id={item.id}
 			>
+			{watchedIcon}
 			{titleComp}
 			</a>
 		</div>
@@ -293,7 +346,7 @@ class NoteListComponent extends React.Component {
 				style={style}
 				className={"note-list"}
 				items={notes}
-				itemRenderer={ (item) => { return this.itemRenderer(item, theme, style.width) } }
+				itemRenderer={this.itemRenderer}
 			></ItemList>
 		);
 	}
@@ -309,6 +362,7 @@ const mapStateToProps = (state) => {
 		notesParentType: state.notesParentType,
 		searches: state.searches,
 		selectedSearchId: state.selectedSearchId,
+		watchedNoteFiles: state.watchedNoteFiles,
 	};
 };
 

ElectronClient/app/gui/NotePropertiesDialog.jsx

@@ -0,0 +1,381 @@
+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: theme.backgroundColor,
+			padding: 16,
+			boxShadow: '6px 6px 20px rgba(0,0,0,0.5)',
+			marginTop: 20,
+		}
+
+		this.styles_.controlBox = {
+			marginBottom: '1em',
+			color: 'black', //This will apply for the calendar
+		};
+
+		this.styles_.button = {
+			minWidth: theme.buttonMinWidth,
+			minHeight: theme.buttonMinHeight,
+			marginLeft: 5,
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
+			border: '1px solid',
+			borderColor: theme.dividerColor,
+		};
+
+		this.styles_.editPropertyButton = {
+			color: theme.color,
+			textDecoration: 'none',
+			backgroundColor: theme.backgroundColor,
+			border: '1px solid',
+			borderColor: theme.dividerColor,
+		};
+		
+		this.styles_.input = {
+			display:'inline-block',
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
+			border: '1px solid',
+			borderColor: theme.dividerColor,
+		};
+
+		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),
+						style: styles.input
+					}}
+					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={styles.input}
+				/>
+			}
+		} 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/NoteSearchBar.jsx

@@ -0,0 +1,122 @@
+const React = require('react');
+const { connect } = require('react-redux');
+const { themeStyle } = require('../theme.js');
+const { _ } = require('lib/locale.js');
+
+class NoteSearchBarComponent extends React.Component {
+
+	constructor() {
+		super();
+
+		this.state = {
+			query: '',
+		};
+
+		this.searchInput_change = this.searchInput_change.bind(this);
+		this.previousButton_click = this.previousButton_click.bind(this);
+		this.nextButton_click = this.nextButton_click.bind(this);
+		this.closeButton_click = this.closeButton_click.bind(this);
+	}
+
+	style() {
+		const theme = themeStyle(this.props.theme);
+
+		let style = {
+			root: Object.assign({}, theme.textStyle, {
+				backgroundColor: theme.backgroundColor,
+				color: theme.colorFaded,
+			}),
+		};
+
+		return style;
+	}
+
+	componentDidMount() {
+		this.refs.searchInput.focus();
+	}
+
+	buttonIconComponent(iconName, clickHandler) {
+		const theme = themeStyle(this.props.theme);
+
+		const searchButton = {
+			paddingLeft: 4,
+			paddingRight: 4,
+			paddingTop: 2,
+			paddingBottom: 2,
+			textDecoration: 'none',
+			marginRight: 5,
+		};
+
+		const iconStyle = {
+			display: 'flex',
+			fontSize: Math.round(theme.fontSize) * 1.2,
+			color: theme.color,
+		};
+
+		const icon = <i style={iconStyle} className={"fa " + iconName}></i>
+
+		return (
+			<a
+				href="#"
+				style={searchButton}
+				onClick={clickHandler}
+			>{icon}</a>
+		);
+	}
+
+	searchInput_change(event) {
+		const query = event.currentTarget.value;
+		this.setState({ query: query });
+		this.triggerOnChange(query);
+	}
+
+	previousButton_click(event) {
+		if (this.props.onPrevious) this.props.onPrevious();
+	}
+
+	nextButton_click(event) {
+		if (this.props.onNext) this.props.onNext();
+	}
+
+	closeButton_click(event) {
+		if (this.props.onClose) this.props.onClose();
+	}
+
+	triggerOnChange(query) {
+		if (this.props.onChange) this.props.onChange(query);
+	}
+
+	focus() {
+		this.refs.searchInput.focus();
+	}
+
+	render() {
+		const theme = themeStyle(this.props.theme);
+
+		const closeButton = this.buttonIconComponent('fa-times', this.closeButton_click);
+		const previousButton = this.buttonIconComponent('fa-chevron-up', this.previousButton_click);
+		const nextButton = this.buttonIconComponent('fa-chevron-down', this.nextButton_click);
+
+		return (
+			<div style={this.props.style}>
+				<div style={{display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
+					{ closeButton }
+					<input placeholder={_('Search...')} value={this.state.query} onChange={this.searchInput_change} ref="searchInput" type="text" style={{width: 200, marginRight: 5}}></input>
+					{ nextButton }
+					{ previousButton }
+				</div>
+			</div>
+		);
+	}
+
+}
+
+const mapStateToProps = (state) => {
+	return {
+		theme: state.settings.theme,
+	};
+};
+
+const NoteSearchBar = connect(mapStateToProps, null, null, { withRef: true })(NoteSearchBarComponent);
+
+module.exports = NoteSearchBar;

ElectronClient/app/gui/NoteText.jsx

@@ -6,7 +6,9 @@ const Search = require('lib/models/Search.js');
 const { time } = require('lib/time-utils.js');
 const Setting = require('lib/models/Setting.js');
 const { IconButton } = require('./IconButton.min.js');
+const { urlDecode, escapeHtml } = require('lib/string-utils');
 const Toolbar = require('./Toolbar.min.js');
+const TagList = require('./TagList.min.js');
 const { connect } = require('react-redux');
 const { _ } = require('lib/locale.js');
 const { reg } = require('lib/registry.js');
@@ -23,23 +25,36 @@ const fs = require('fs-extra');
 const md5 = require('md5');
 const mimeUtils = require('lib/mime-utils.js').mime;
 const ArrayUtils = require('lib/ArrayUtils');
+const ObjectUtils = require('lib/ObjectUtils');
 const urlUtils = require('lib/urlUtils');
 const dialogs = require('./dialogs');
+const NoteSearchBar = require('./NoteSearchBar.min.js');
 const markdownUtils = require('lib/markdownUtils');
 const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
+const ResourceFetcher = require('lib/services/ResourceFetcher');
 const { toSystemSlashes, safeFilename } = require('lib/path-utils');
 const { clipboard } = require('electron');
+const SearchEngine = require('lib/services/SearchEngine');
 
 require('brace/mode/markdown');
 // https://ace.c9.io/build/kitchen-sink.html
 // https://highlightjs.org/static/demo/
 require('brace/theme/chrome');
+require('brace/theme/twilight');
+
+const NOTE_TAG_BAR_FEATURE_ENABLED = false;
 
 class NoteTextComponent extends React.Component {
 
 	constructor() {
 		super();
 
+		this.localSearchDefaultState = {
+			query: '',
+			selectedIndex: 0,
+			resultCount: 0,
+		};
+
 		this.state = {
 			note: null,
 			noteMetadata: '',
@@ -51,6 +66,7 @@ class NoteTextComponent extends React.Component {
 			scrollHeight: null,
 			editorScrollTop: 0,
 			newNote: null,
+			noteTags: [],
 
 			// If the current note was just created, and the title has never been
 			// changed by the user, this variable contains that note ID. Used
@@ -58,6 +74,8 @@ class NoteTextComponent extends React.Component {
 			newAndNoTitleChangeNoteId: null,
 			bodyHtml: '',
 			lastKeys: [],
+			showLocalSearch: false,
+			localSearch: Object.assign({}, this.localSearchDefaultState), 
 		};
 
 		this.lastLoadedNoteId_ = null;
@@ -67,8 +85,10 @@ class NoteTextComponent extends React.Component {
 		this.scheduleSaveTimeout_ = null;
 		this.restoreScrollTop_ = null;
 		this.lastSetHtml_ = '';
-		this.lastSetMarkers_ = [];
+		this.lastSetMarkers_ = '';
+		this.lastSetMarkersOptions_ = {};
 		this.selectionRange_ = null;
+		this.noteSearchBar_ = React.createRef();
 
 		// Complicated but reliable method to get editor content height
 		// https://github.com/ajaxorg/ace/issues/2046
@@ -87,13 +107,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,8 +135,47 @@ 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;
+			const dt = event.dataTransfer;
+
+			if (dt.types.indexOf("text/x-jop-note-ids") >= 0) {
+				const noteIds = JSON.parse(dt.getData("text/x-jop-note-ids"));
+				const linkText = [];
+				for (let i = 0; i < noteIds.length; i++) {
+					const note = await Note.load(noteIds[i]);
+					linkText.push(Note.markdownTag(note));
+				}
+
+				this.wrapSelectionWithStrings("", "", '', linkText.join('\n'));
+			}
+
+			const files = dt.files;
 			if (!files || !files.length) return;
 
 			const filesToAttach = [];
@@ -130,6 +190,10 @@ class NoteTextComponent extends React.Component {
 		}
 
 		const updateSelectionRange = () => {
+			if (!this.rawEditor()) {
+				this.selectionRange_ = null;
+				return;
+			}
 
 			const ranges = this.rawEditor().getSelection().getAllRanges();
 			if (!ranges || !ranges.length || !this.state.note) {
@@ -153,11 +217,51 @@ class NoteTextComponent extends React.Component {
 				this.reloadNote(this.props);
 			}
 		}
+
+		this.resourceFetcher_downloadComplete = async (resource) => {
+			if (!this.state.note || !this.state.note.body) return;
+			const resourceIds = await Note.linkedResourceIds(this.state.note.body);
+			if (resourceIds.indexOf(resource.id) >= 0) {
+				this.mdToHtml().clearCache();
+				this.lastSetHtml_ = '';
+				this.updateHtml(this.state.note.body);
+			}
+		}
+
+		this.noteSearchBar_change = (query) => {
+			this.setState({ localSearch: {
+				query: query,
+				selectedIndex: 0,
+			}});
+		}
+
+		const noteSearchBarNextPrevious = (inc) => {
+			const ls = Object.assign({}, this.state.localSearch);
+			ls.selectedIndex += inc;
+			if (ls.selectedIndex < 0) ls.selectedIndex = ls.resultCount - 1;
+			if (ls.selectedIndex >= ls.resultCount) ls.selectedIndex = 0;
+
+			this.setState({ localSearch: ls });
+		}
+
+		this.noteSearchBar_next = () => {
+			noteSearchBarNextPrevious(+1);
+		}
+
+		this.noteSearchBar_previous = () => {
+			noteSearchBarNextPrevious(-1);
+		}
+
+		this.noteSearchBar_close = () => {
+			this.setState({
+				showLocalSearch: false,
+			});
+		}
 	}
 
 	// Note:
 	// - What's called "cursor position" is expressed as { row: x, column: y } and is how Ace Editor get/set the cursor position
-	// - A "range" defines a selection with a start and end cusor position, expressed as { start: <CursorPos>, end: <CursorPos> } 
+	// - A "range" defines a selection with a start and end cusor position, expressed as { start: <CursorPos>, end: <CursorPos> }
 	// - A "text offset" below is the absolute position of the cursor in the string, as would be used in the indexOf() function.
 	// The functions below are used to convert between the different types.
 	rangeToTextOffsets(range, body) {
@@ -205,7 +309,7 @@ class NoteTextComponent extends React.Component {
 			}
 
 			row++;
-			currentOffset += line.length + 1;	
+			currentOffset += line.length + 1;
 		}
 	}
 
@@ -219,11 +323,12 @@ class NoteTextComponent extends React.Component {
 
 	async componentWillMount() {
 		let note = null;
-
+		let noteTags = [];
 		if (this.props.newNote) {
 			note = Object.assign({}, this.props.newNote);
 		} else if (this.props.noteId) {
 			note = await Note.load(this.props.noteId);
+			noteTags = this.props.noteTags || [];
 		}
 
 		const folder = note ? Folder.byId(this.props.folders, note.parent_id) : null;
@@ -233,6 +338,7 @@ class NoteTextComponent extends React.Component {
 			note: note,
 			folder: folder,
 			isLoading: false,
+			noteTags: noteTags
 		});
 
 		this.lastLoadedNoteId_ = note ? note.id : null;
@@ -242,6 +348,9 @@ class NoteTextComponent extends React.Component {
 		eventManager.on('alarmChange', this.onAlarmChange_);
 		eventManager.on('noteTypeToggle', this.onNoteTypeToggle_);
 		eventManager.on('todoToggle', this.onTodoToggle_);
+
+		ResourceFetcher.instance().on('downloadComplete', this.resourceFetcher_downloadComplete);
+		ExternalEditWatcher.instance().on('noteChange', this.externalEditWatcher_noteChange);
 	}
 
 	componentWillUnmount() {
@@ -254,7 +363,8 @@ class NoteTextComponent extends React.Component {
 		eventManager.removeListener('noteTypeToggle', this.onNoteTypeToggle_);
 		eventManager.removeListener('todoToggle', this.onTodoToggle_);
 
-		this.destroyExternalEditWatcher();
+		ResourceFetcher.instance().off('downloadComplete', this.resourceFetcher_downloadComplete);
+		ExternalEditWatcher.instance().off('noteChange', this.externalEditWatcher_noteChange);
 	}
 
 	async saveIfNeeded(saveIfNewNote = false) {
@@ -267,7 +377,7 @@ class NoteTextComponent extends React.Component {
 		}
 		await shared.saveNoteButton_press(this);
 
-		this.externalEditWatcherUpdateNoteFile(this.state.note);
+		ExternalEditWatcher.instance().updateNoteFile(this.state.note);
 	}
 
 	async saveOneProperty(name, value) {
@@ -301,14 +411,15 @@ class NoteTextComponent extends React.Component {
 		let note = null;
 		let loadingNewNote = true;
 		let parentFolder = null;
+		let noteTags = [];
 
 		if (props.newNote) {
 			note = Object.assign({}, props.newNote);
 			this.lastLoadedNoteId_ = null;
-			this.externalEditWatcherStopWatchingAll();
 		} else {
 			noteId = props.noteId;
 			loadingNewNote = stateNoteId !== noteId;
+			noteTags = await Tag.tagsByNoteId(noteId);
 			this.lastLoadedNoteId_ = noteId;
 			note = noteId ? await Note.load(noteId) : null;
 			if (noteId !== this.lastLoadedNoteId_) return; // Race condition - current note was changed while this one was loading
@@ -331,8 +442,6 @@ class NoteTextComponent extends React.Component {
 
 		// Scroll back to top when loading new note
 		if (loadingNewNote) {
-			this.externalEditWatcherStopWatchingAll();
-
 			this.editorMaxScrollTop_ = 0;
 
 			// HACK: To go around a bug in Ace editor, we first set the scroll position to 1
@@ -342,9 +451,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') {
@@ -376,8 +484,7 @@ class NoteTextComponent extends React.Component {
 			}
 		}
 
-		if (note)
-		{
+		if (note) {
 			parentFolder = Folder.byId(props.folders, note.parent_id);
 		}
 
@@ -387,6 +494,7 @@ class NoteTextComponent extends React.Component {
 			webviewReady: webviewReady,
 			folder: parentFolder,
 			lastKeys: [],
+			noteTags: noteTags
 		};
 
 		if (!note) {
@@ -395,11 +503,33 @@ class NoteTextComponent extends React.Component {
 			newState.newAndNoTitleChangeNoteId = null;
 		}
 
+		if (!note || loadingNewNote) {
+			newState.showLocalSearch = false;
+			newState.localSearch = Object.assign({}, this.localSearchDefaultState);
+		}
+
 		this.lastSetHtml_ = '';
-		this.lastSetMarkers_ = [];
+		this.lastSetMarkers_ = '';
+		this.lastSetMarkersOptions_ = {};
 
 		this.setState(newState);
 
+		// https://github.com/laurent22/joplin/pull/893#discussion_r228025210
+		// @Abijeet: Had to add this check. If not, was going into an infinite loop where state was getting updated repeatedly.
+		// Since I'm updating the state, the componentWillReceiveProps was getting triggered again, where nextProps.newNote was still true, causing reloadNote to trigger again and again.
+		// Notes from Laurent: The selected note tags are part of the global Redux state because they need to be updated whenever tags are changed or deleted
+		// anywhere in the app. Thus it's not possible simple to load the tags here (as we won't have a way to know if they're updated afterwards).
+		// Perhaps a better way would be to move that code in the middleware, check for TAGS_DELETE, TAGS_UPDATE, etc. actions and update the
+		// selected note tags accordingly.
+		if (NOTE_TAG_BAR_FEATURE_ENABLED) {
+			if (!this.props.newNote) {
+				this.props.dispatch({
+					type: "SET_NOTE_TAGS",
+					items: noteTags,
+				});
+			}
+		}
+
 		this.updateHtml(newState.note ? newState.note.body : '');
 	}
 
@@ -408,6 +538,10 @@ class NoteTextComponent extends React.Component {
 			await this.reloadNote(nextProps);
 		} else if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) {
 			await this.reloadNote(nextProps);
+		} else if ('noteTags' in nextProps && this.areNoteTagsModified(nextProps.noteTags, this.state.noteTags)) {
+			this.setState({
+				noteTags: nextProps.noteTags
+			});
 		}
 
 		if ('syncStarted' in nextProps && !nextProps.syncStarted && !this.isModified()) {
@@ -423,6 +557,26 @@ class NoteTextComponent extends React.Component {
 		return shared.isModified(this);
 	}
 
+	areNoteTagsModified(newTags, oldTags) {
+		if (!NOTE_TAG_BAR_FEATURE_ENABLED) return false;
+
+		if (!oldTags) return true;
+
+		if (newTags.length !== oldTags.length) return true;
+
+		for (let i = 0; i < newTags.length; ++i) {
+			let currNewTag = newTags[i];
+			for (let j = 0; j < oldTags.length; ++j) {
+				let currOldTag = oldTags[j];
+				if (currOldTag.id === currNewTag.id && currOldTag.updated_time !== currNewTag.updated_time) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	refreshNoteMetadata(force = null) {
 		return shared.refreshNoteMetadata(this, force);
 	}
@@ -459,6 +613,10 @@ class NoteTextComponent extends React.Component {
 
 			const newBody = this.mdToHtml_.handleCheckboxClick(msg, this.state.note.body);
 			this.saveOneProperty('body', newBody);
+		} else if (msg === 'setMarkerCount') {
+			const ls = Object.assign({}, this.state.localSearch);
+			ls.resultCount = arg0;
+			this.setState({ localSearch: ls });
 		} else if (msg === 'percentScroll') {
 			this.ignoreNextEditorScroll_ = true;
 			this.setEditorPercentScroll(arg0);
@@ -467,8 +625,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);
@@ -510,25 +666,31 @@ class NoteTextComponent extends React.Component {
 			if (!item) throw new Error('No item with ID ' + itemId);
 
 			if (item.type_ === BaseModel.TYPE_RESOURCE) {
+				const localState = await Resource.localState(item);
+				if (localState.fetch_status !== Resource.FETCH_STATUS_DONE || !!item.encryption_blob_encrypted) {
+					bridge().showErrorMessageBox(_('This attachment is not downloaded or not decrypted yet.'));
+					return;
+				}
 				const filePath = Resource.fullPath(item);
 				bridge().openItem(filePath);
 			} else if (item.type_ === BaseModel.TYPE_NOTE) {
 				this.props.dispatch({
-					type: "FOLDER_SELECT",
-					id: item.parent_id,
+					type: "FOLDER_AND_NOTE_SELECT",
+					folderId: item.parent_id,
+					noteId: item.id,
 				});
-
-				setTimeout(() => {
-					this.props.dispatch({
-						type: 'NOTE_SELECT',
-						id: item.id,
-					});
-				}, 10);
 			} else {
 				throw new Error('Unsupported item type: ' + item.type_);
 			}
 		} else if (urlUtils.urlProtocol(msg)) {
-			require('electron').shell.openExternal(msg);
+			if (msg.indexOf('file://') === 0) {
+				// When using the file:// protocol, openExternal doesn't work (does nothing) with URL-encoded paths
+				require('electron').shell.openExternal(urlDecode(msg));
+			} else {
+				require('electron').shell.openExternal(msg);
+			}
+		} else if (msg.indexOf('#') === 0) {
+			// This is an internal anchor, which is handled by the WebView so skip this case
 		} else {
 			bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
 		}
@@ -595,6 +757,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 +786,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,13 +886,14 @@ class NoteTextComponent extends React.Component {
 					this.forceUpdate();
 				}, 100);
 			},
-			postMessageSyntax: 'ipcRenderer.sendToHost',
+			postMessageSyntax: 'ipcProxySendToHost',
 		};
 
 		const theme = themeStyle(this.props.theme);
 
 		let bodyToRender = body;
 		if (bodyToRender === null) bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+		bodyToRender = '<style>' + this.props.customCss + '</style>\n' + bodyToRender;
 		let bodyHtml = '';
 
 		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
@@ -746,43 +911,48 @@ class NoteTextComponent extends React.Component {
 	async doCommand(command) {
 		if (!command || !this.state.note) return;
 
-		let commandProcessed = true;
+		let fn = null;
 
 		if (command.name === 'exportPdf' && this.webview_) {
-			const path = bridge().showSaveDialog({
-				filters: [{ name: _('PDF File'), extensions: ['pdf']}],
-				defaultPath: safeFilename(this.state.note.title),
-			});
-
-			if (path) {
-				this.webview_.printToPDF({}, (error, data) => {
-					if (error) {
-						bridge().showErrorMessageBox(error.message);
-					} else {
-						shim.fsDriver().writeFile(path, data, 'buffer');
-					}
-				});
-			}
+			fn = this.commandSavePdf;
 		} else if (command.name === 'print' && this.webview_) {
-			this.webview_.print();
+			fn = this.commandPrint;
 		} else if (command.name === 'textBold') {
-			this.commandTextBold();
+			fn = this.commandTextBold;
 		} else if (command.name === 'textItalic') {
-			this.commandTextItalic();
+			fn = this.commandTextItalic;
 		} else if (command.name === 'insertDateTime' ) {
-			this.commandDateTime();
+			fn = this.commandDateTime;
 		} else if (command.name === 'commandStartExternalEditing') {
-			this.commandStartExternalEditing();
-		} else {
-			commandProcessed = false;
+			fn = this.commandStartExternalEditing;
+		} else if (command.name === 'showLocalSearch') {
+			fn = this.commandShowLocalSearch;
 		}
 
-		if (commandProcessed) {
-			this.props.dispatch({
-				type: 'WINDOW_COMMAND',
-				name: null,
-			});
+		if (!fn) return;
+
+		this.props.dispatch({
+			type: 'WINDOW_COMMAND',
+			name: null,
+		});
+
+		requestAnimationFrame(() => {
+			fn = fn.bind(this);
+			fn();
+		});
+	}
+
+	commandShowLocalSearch() {
+		if (this.state.showLocalSearch) {
+			this.noteSearchBar_.current.wrappedInstance.focus();
+		} else {
+			this.setState({ showLocalSearch: true });
 		}
+
+		this.props.dispatch({
+			type: 'NOTE_VISIBLE_PANES_SET',
+			panes: ['editor', 'viewer'],
+		});
 	}
 
 	async commandAttachFile(filePaths = null) {
@@ -827,42 +997,66 @@ class NoteTextComponent extends React.Component {
 		});
 	}
 
-	externalEditWatcher() {
-		if (!this.externalEditWatcher_) {
-			this.externalEditWatcher_ = new ExternalEditWatcher((action) => { return this.props.dispatch(action) });
-			this.externalEditWatcher_.setLogger(reg.logger());
-			this.externalEditWatcher_.on('noteChange', this.externalEditWatcher_noteChange);
+	printTo_(target, options) {
+		const previousBody = this.state.note.body;
+		const tempBody = "# " + this.state.note.title + "\n\n" + previousBody;
+
+		const previousTheme = Setting.value('theme');
+		Setting.setValue('theme', Setting.THEME_LIGHT);
+		this.lastSetHtml_ = '';
+		this.updateHtml(tempBody);
+		this.forceUpdate();
+
+		const restoreSettings = () => {
+			Setting.setValue('theme', previousTheme);
+			this.lastSetHtml_ = '';
+			this.updateHtml(previousBody);
+			this.forceUpdate();
 		}
 
-		return this.externalEditWatcher_;
+		setTimeout(() => {
+			if (target === 'pdf') {
+				this.webview_.printToPDF({}, (error, data) => {
+					restoreSettings();
+
+					if (error) {
+						bridge().showErrorMessageBox(error.message);
+					} else {
+						shim.fsDriver().writeFile(options.path, data, 'buffer');
+					}
+				});
+			} else if (target === 'printer') {
+				this.webview_.print();
+				restoreSettings();
+			}
+		}, 100);		
 	}
 
-	externalEditWatcherUpdateNoteFile(note) {
-		if (this.externalEditWatcher_) this.externalEditWatcher().updateNoteFile(note);
+	commandSavePdf() {
+		const path = bridge().showSaveDialog({
+			filters: [{ name: _('PDF File'), extensions: ['pdf']}],
+			defaultPath: safeFilename(this.state.note.title),
+		});
+
+		if (path) {
+			this.printTo_('pdf', { path: path });
+		}
 	}
 
-	externalEditWatcherStopWatchingAll() {
-		if (this.externalEditWatcher_) this.externalEditWatcher().stopWatchingAll();
-	}
-
-	destroyExternalEditWatcher() {
-		if (!this.externalEditWatcher_) return;
-
-		this.externalEditWatcher_.off('noteChange', this.externalEditWatcher_noteChange);
-		this.externalEditWatcher_.stopWatchingAll();
-		this.externalEditWatcher_ = null;
+	commandPrint() {
+		this.printTo_('printer');
 	}
 
 	async commandStartExternalEditing() {
 		try {
-			await this.externalEditWatcher().openAndWatch(this.state.note);
+			await ExternalEditWatcher.instance().openAndWatch(this.state.note);
 		} catch (error) {
 			bridge().showErrorMessageBox(_('Error opening note in editor: %s', error.message));
 		}
 	}
 
 	async commandStopExternalEditing() {
-		this.externalEditWatcherStopWatchingAll();
+		ExternalEditWatcher.instance().stopWatching(this.state.note.id);
 	}
 
 	async commandSetTags() {
@@ -895,6 +1089,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 +1144,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 +1168,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 +1181,23 @@ 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 },
 			};
 
+			// BUG!! If replacementText contains newline characters, the logic
+			// to select the new text will not work.
+
 			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 +1316,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',
@@ -1213,14 +1482,32 @@ class NoteTextComponent extends React.Component {
 			paddingLeft: 8,
 			paddingRight: 8,
 			marginRight: rootStyle.paddingLeft,
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
+			border: '1px solid',
+			borderColor: theme.dividerColor,
 		};
 
 		const toolbarStyle = {
-			marginBottom: 10,
 		};
 
-		const bottomRowHeight = rootStyle.height - titleBarStyle.height - titleBarStyle.marginBottom - titleBarStyle.marginTop - theme.toolbarHeight - toolbarStyle.marginBottom;
+		const tagStyle = {
+			marginBottom: 10,
+			height: 30
+		};
 
+		const searchBarHeight = this.state.showLocalSearch ? 35 : 0;
+
+		let bottomRowHeight = 0;
+		if (NOTE_TAG_BAR_FEATURE_ENABLED) {
+			bottomRowHeight = rootStyle.height - titleBarStyle.height - titleBarStyle.marginBottom - titleBarStyle.marginTop - theme.toolbarHeight - tagStyle.height - tagStyle.marginBottom;
+		} else {
+			toolbarStyle.marginBottom = 10;
+			bottomRowHeight = rootStyle.height - titleBarStyle.height - titleBarStyle.marginBottom - titleBarStyle.marginTop - theme.toolbarHeight - toolbarStyle.marginBottom;
+		}
+
+		bottomRowHeight -= searchBarHeight;
+		
 		const viewerStyle = {
 			width: Math.floor(innerWidth / 2),
 			height: bottomRowHeight,
@@ -1240,7 +1527,10 @@ class NoteTextComponent extends React.Component {
 			verticalAlign: 'top',
 			paddingTop: paddingTop + 'px',
 			lineHeight: theme.textAreaLineHeight + 'px',
-			fontSize: theme.fontSize + 'px',
+			fontSize: theme.editorFontSize + 'px',
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
+			editorTheme: theme.editorTheme,
 		};
 
 		if (visiblePanes.indexOf('viewer') < 0) {
@@ -1252,7 +1542,11 @@ class NoteTextComponent extends React.Component {
 		}
 
 		if (visiblePanes.indexOf('editor') < 0) {
-			editorStyle.display = 'none';
+			// Note: Ideally we'd set the display to "none" to take the editor out
+			// of the DOM but if we do that, certain things won't work, in particular
+			// things related to scroll, which are based on the editor. See
+			// editorScrollTop_, restoreScrollTop_, etc.
+			editorStyle.width = 0;
 			viewerStyle.width = innerWidth;
 		}
 
@@ -1267,16 +1561,30 @@ class NoteTextComponent extends React.Component {
 
 			const htmlHasChanged = this.lastSetHtml_ !== html;
 			 if (htmlHasChanged) {
-				this.webview_.send('setHtml', html);
+				let options = {codeTheme: theme.codeThemeCss};
+				this.webview_.send('setHtml', html, options);
 				this.lastSetHtml_ = html;
 			}
 
-			const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
-			const keywords = search ? Search.keywords(search.query_pattern) : [];
+			let keywords = [];
+			const markerOptions = {};
 
-			if (htmlHasChanged || !ArrayUtils.contentEquals(this.lastSetMarkers_, keywords)) {
-				this.lastSetMarkers_ = [];
-				this.webview_.send('setMarkers', keywords);
+			if (this.state.showLocalSearch) {
+				keywords = [this.state.localSearch.query];
+				markerOptions.selectedIndex = this.state.localSearch.selectedIndex;
+			} else {
+				const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
+				if (search) {
+					const parsedQuery = SearchEngine.instance().parseQuery(search.query_pattern);
+					keywords = SearchEngine.instance().allParsedQueryTerms(parsedQuery);
+				}
+			}
+
+			const keywordHash = JSON.stringify(keywords);
+			if (htmlHasChanged || keywordHash !== this.lastSetMarkers_ || !ObjectUtils.fieldsEqual(this.lastSetMarkersOptions_, markerOptions)) {
+				this.lastSetMarkers_ = keywordHash;
+				this.lastSetMarkersOptions_ = Object.assign({}, markerOptions);
+				this.webview_.send('setMarkers', keywords, markerOptions);
 			}
 		}
 
@@ -1296,6 +1604,11 @@ class NoteTextComponent extends React.Component {
 			placeholder={ this.props.newNote ? _('Creating new %s...', isTodo ? _('to-do') : _('note')) : '' }
 		/>
 
+		const tagList = !NOTE_TAG_BAR_FEATURE_ENABLED ? null : <TagList
+			style={tagStyle}
+			items={this.state.noteTags}
+		/>;
+
 		const titleBarMenuButton = <IconButton style={{
 			display: 'flex',
 		}} iconName="fa-caret-down" theme={this.props.theme} onClick={() => { this.itemContextMenu() }} />
@@ -1306,6 +1619,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); } }
 		/>
 
@@ -1334,7 +1648,7 @@ class NoteTextComponent extends React.Component {
 		const editor =  <AceEditor
 			value={body}
 			mode="markdown"
-			theme="chrome"
+			theme={editorRootStyle.editorTheme}
 			style={editorRootStyle}
 			width={editorStyle.width + 'px'}
 			height={editorStyle.height + 'px'}
@@ -1358,6 +1672,17 @@ class NoteTextComponent extends React.Component {
 			highlightActiveLine={false}
 		/>
 
+		const noteSearchBarComp = !this.state.showLocalSearch ? null : (
+			<NoteSearchBar
+				ref={this.noteSearchBar_}
+				style={{display: 'flex', height:searchBarHeight,width:innerWidth, borderTop: '1px solid ' + theme.dividerColor}}
+				onChange={this.noteSearchBar_change}
+				onNext={this.noteSearchBar_next}
+				onPrevious={this.noteSearchBar_previous}
+				onClose={this.noteSearchBar_close}
+			/>
+		);
+
 		return (
 			<div style={rootStyle} onDrop={this.onDrop_}>
 				<div style={titleBarStyle}>
@@ -1366,8 +1691,11 @@ class NoteTextComponent extends React.Component {
 					{ false ? titleBarMenuButton : null }
 				</div>
 				{ toolbar }
+				{ tagList }
 				{ editor }
 				{ viewer }
+				<div style={{clear:'both'}}/>
+				{ noteSearchBarComp }
 			</div>
 		);
 	}
@@ -1377,6 +1705,7 @@ class NoteTextComponent extends React.Component {
 const mapStateToProps = (state) => {
 	return {
 		noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null,
+		noteTags: state.selectedNoteTags,
 		folderId: state.selectedFolderId,
 		itemType: state.selectedItemType,
 		folders: state.folders,
@@ -1389,9 +1718,10 @@ const mapStateToProps = (state) => {
 		searches: state.searches,
 		selectedSearchId: state.selectedSearchId,
 		watchedNoteFiles: state.watchedNoteFiles,
+		customCss: state.customCss,
 	};
 };
 
 const NoteText = connect(mapStateToProps)(NoteTextComponent);
 
-module.exports = { NoteText };
+module.exports = { NoteText };

ElectronClient/app/gui/OneDriveLoginScreen.jsx

@@ -73,14 +73,14 @@ class OneDriveLoginScreenComponent extends React.Component {
 		const style = this.props.style;
 		const theme = themeStyle(this.props.theme);
 
-		const headerStyle = {
-			width: style.width,
-		};
+		const headerStyle = Object.assign({}, theme.headerStyle, { width: style.width });
 
 		const webviewStyle = {
 			width: this.props.style.width,
 			height: this.props.style.height - theme.headerHeight,
 			overflow: 'hidden',
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
 		};
 
 		const headerButtons = [
@@ -109,4 +109,4 @@ const mapStateToProps = (state) => {
 
 const OneDriveLoginScreen = connect(mapStateToProps)(OneDriveLoginScreenComponent);
 
-module.exports = { OneDriveLoginScreen };
+module.exports = { OneDriveLoginScreen };

ElectronClient/app/gui/PromptDialog.jsx

@@ -59,7 +59,7 @@ class PromptDialog extends React.Component {
 		};
 
 		this.styles_.promptDialog = {
-			backgroundColor: 'white',
+			backgroundColor: theme.backgroundColor,
 			padding: 16,
 			display: 'inline-block',
 			boxShadow: '6px 6px 20px rgba(0,0,0,0.5)',
@@ -69,6 +69,10 @@ class PromptDialog extends React.Component {
 			minWidth: theme.buttonMinWidth,
 			minHeight: theme.buttonMinHeight,
 			marginLeft: 5,
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
+			border: '1px solid',
+			borderColor: theme.dividerColor,
 		};
 
 		this.styles_.label = {
@@ -82,6 +86,10 @@ class PromptDialog extends React.Component {
 		this.styles_.input = {
 			width: 0.5 * width,
 			maxWidth: 400,
+			color: theme.color,
+			backgroundColor: theme.backgroundColor,
+			border: '1px solid',
+			borderColor: theme.dividerColor,
 		};
 
 		this.styles_.desc = Object.assign({}, theme.textStyle, {
@@ -102,7 +110,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 +122,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 });
@@ -141,6 +150,7 @@ class PromptDialog extends React.Component {
 		if (this.props.inputType === 'datetime') {
 			inputComp = <Datetime
 				value={this.state.answer}
+				inputProps={{style: styles.input}}
 				dateFormat={time.dateFormat()}
 				timeFormat={time.timeFormat()}
 				onChange={(momentObject) => onDateTimeChange(momentObject)}
@@ -165,7 +175,7 @@ class PromptDialog extends React.Component {
 			<div style={styles.modalLayer}>
 				<div style={styles.promptDialog}>
 					<label style={styles.label}>{this.props.label ? this.props.label : ''}</label>
-					<div style={{display: 'inline-block'}}>
+					<div style={{display: 'inline-block', color: 'black', backgroundColor: theme.backgroundColor}}>
 						{inputComp}
 						{descComp}
 					</div>
@@ -179,4 +189,4 @@ class PromptDialog extends React.Component {
 
 }
 
-module.exports = { PromptDialog };
+module.exports = { PromptDialog };

ElectronClient/app/gui/SideBar.jsx

@@ -12,6 +12,7 @@ const { bridge } = require("electron").remote.require("./bridge");
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
 const InteropServiceHelper = require("../InteropServiceHelper.js");
+const { shim } = require('lib/shim');
 
 class SideBarComponent extends React.Component {
 
@@ -55,6 +56,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');
 
@@ -163,6 +179,35 @@ class SideBarComponent extends React.Component {
 		return style;
 	}
 
+	clearForceUpdateDuringSync() {
+		if (this.forceUpdateDuringSyncIID_) {
+			clearInterval(this.forceUpdateDuringSyncIID_);
+			this.forceUpdateDuringSyncIID_ = null;
+		}
+	}
+
+	componentDidUpdate(prevProps) {
+		if (shim.isLinux()) {
+			// For some reason, the UI seems to sleep in some Linux distro during
+			// sync. Cannot find the reason for it and cannot replicate, so here
+			// as a test force the update at regular intervals. 
+			// https://github.com/laurent22/joplin/issues/312#issuecomment-429472193
+			if (!prevProps.syncStarted && this.props.syncStarted) {
+				this.clearForceUpdateDuringSync();
+
+				this.forceUpdateDuringSyncIID_ = setInterval(() => {
+					this.forceUpdate();
+				}, 2000);
+			}
+
+			if (prevProps.syncStarted && !this.props.syncStarted) this.clearForceUpdateDuringSync();
+		}	
+	}
+
+	componentWillUnmount() {
+		this.clearForceUpdateDuringSync();
+	}
+
 	itemContextMenu(event) {
 		const itemId = event.target.getAttribute("data-id");
 		if (itemId === Folder.conflictFolderId()) return;
@@ -238,14 +283,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 +399,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);
 				}}
@@ -445,7 +500,19 @@ class SideBarComponent extends React.Component {
 			);
 		}
 
+		let decryptionReportText = '';
+		if (this.props.decryptionWorker && this.props.decryptionWorker.state !== 'idle' && this.props.decryptionWorker.itemCount) {
+			decryptionReportText = _('Decrypting items: %d/%d', this.props.decryptionWorker.itemIndex + 1, this.props.decryptionWorker.itemCount);
+		}
+
+		let resourceFetcherText = '';
+		if (this.props.resourceFetcher && this.props.resourceFetcher.toFetchCount) {
+			resourceFetcherText = _('Fetching resources: %d', this.props.resourceFetcher.toFetchCount);
+		}
+
 		let lines = Synchronizer.reportToLines(this.props.syncReport);
+		if (resourceFetcherText) lines.push(resourceFetcherText);
+		if (decryptionReportText) lines.push(decryptionReportText);
 		const syncReportText = [];
 		for (let i = 0; i < lines.length; i++) {
 			syncReportText.push(
@@ -485,6 +552,8 @@ const mapStateToProps = state => {
 		locale: state.settings.locale,
 		theme: state.settings.theme,
 		collapsedFolderIds: state.collapsedFolderIds,
+		decryptionWorker: state.decryptionWorker,
+		resourceFetcher: state.resourceFetcher,
 	};
 };
 

ElectronClient/app/gui/StatusScreen.jsx

@@ -47,17 +47,14 @@ class StatusScreenComponent extends React.Component {
 		const theme = themeStyle(this.props.theme);
 		const style = this.props.style;
 
-		const headerStyle = {
-			width: style.width,
-		};
+		const headerStyle = Object.assign({}, theme.headerStyle, { width: style.width });
 
 		const containerPadding = 10;
 
-		const containerStyle = {
+		const containerStyle = Object.assign({}, theme.containerStyle, {
 			padding: containerPadding,
-			overflowY: 'auto',
 			height: style.height - theme.headerHeight - containerPadding * 2,
-		};
+		});
 
 		function renderSectionTitleHtml(key, title) {
 			return <h2 key={'section_' + key} style={theme.h2Style}>{title}</h2>
@@ -134,4 +131,4 @@ const mapStateToProps = (state) => {
 
 const StatusScreen = connect(mapStateToProps)(StatusScreenComponent);
 
-module.exports = { StatusScreen };
+module.exports = { StatusScreen };

ElectronClient/app/gui/TagItem.jsx

@@ -0,0 +1,21 @@
+const React = require('react');
+const { connect } = require('react-redux');
+const { themeStyle } = require('../theme.js');
+
+class TagItemComponent extends React.Component {
+	render() {
+		const theme = themeStyle(this.props.theme);
+		const style = Object.assign({}, theme.tagStyle);
+		const title = this.props.title;
+
+		return <span style={style}>{title}</span>;
+	}
+}
+
+const mapStateToProps = (state) => {
+	return { theme: state.settings.theme };
+};
+
+const TagItem = connect(mapStateToProps)(TagItemComponent);
+
+module.exports = TagItem;

ElectronClient/app/gui/TagList.jsx

@@ -0,0 +1,50 @@
+const React = require('react');
+const { connect } = require('react-redux');
+const { themeStyle } = require('../theme.js');
+const TagItem = require('./TagItem.min.js');
+
+class TagListComponent extends React.Component {
+	render() {
+		const style = Object.assign({}, this.props.style);
+		const theme = themeStyle(this.props.theme);
+		const tags = this.props.items;
+
+		style.display = 'flex';
+		style.flexDirection  = 'row';
+		style.borderBottom = '1px solid ' + theme.dividerColor;
+		style.boxSizing = 'border-box';
+		style.fontSize = theme.fontSize;
+
+		const tagItems = [];
+		if (tags || tags.length > 0) {
+			// Sort by id for now, but probably needs to be changed in the future.
+			tags.sort((a, b) => { return a.title < b.title ? -1 : +1; });
+
+			for (let i = 0; i < tags.length; i++) {
+				const props = {
+					title: tags[i].title,
+					key: tags[i].id
+				};
+				tagItems.push(<TagItem {...props} />);
+			}
+		}
+
+		if (tagItems.length === 0) {
+			style.visibility = 'hidden';
+		}
+
+		return (
+			<div className="tag-list" style={style}>
+				{ tagItems }
+			</div>
+		)
+	}
+}
+
+const mapStateToProps = (state) => {
+	return { theme: state.settings.theme };
+};
+
+const TagList = connect(mapStateToProps)(TagListComponent);
+
+module.exports = TagList;

ElectronClient/app/gui/dialogs.js

@@ -30,4 +30,4 @@ class Dialogs {
 
 const dialogs = new Dialogs();
 
-module.exports = dialogs;
+module.exports = dialogs;

ElectronClient/app/gui/note-viewer/highlight/styles/atom-one-dark-reasonable.css

@@ -0,0 +1,77 @@
+/*
+
+Atom One Dark With support for ReasonML by Gidi Morris, based off work by Daniel Gamage
+
+Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
+
+*/
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  line-height: 1.3em;
+  color: #abb2bf;
+  background: #282c34;
+  border-radius: 5px;
+}
+.hljs-keyword, .hljs-operator {
+  color: #F92672;
+}
+.hljs-pattern-match {
+  color: #F92672;
+}
+.hljs-pattern-match .hljs-constructor {
+  color: #61aeee;
+}
+.hljs-function {
+  color: #61aeee;
+}
+.hljs-function .hljs-params {
+  color: #A6E22E;
+}
+.hljs-function .hljs-params .hljs-typing {
+  color: #FD971F;
+}
+.hljs-module-access .hljs-module {
+  color: #7e57c2;
+}
+.hljs-constructor {
+  color: #e2b93d;
+}
+.hljs-constructor .hljs-string {
+  color: #9CCC65;
+}
+.hljs-comment, .hljs-quote {
+  color: #b18eb1;
+  font-style: italic;
+}
+.hljs-doctag, .hljs-formula {
+  color: #c678dd;
+}
+.hljs-section, .hljs-name, .hljs-selector-tag, .hljs-deletion, .hljs-subst {
+  color: #e06c75;
+}
+.hljs-literal {
+  color: #56b6c2;
+}
+.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta-string {
+  color: #98c379;
+}
+.hljs-built_in, .hljs-class .hljs-title {
+  color: #e6c07b;
+}
+.hljs-attr, .hljs-variable, .hljs-template-variable, .hljs-type, .hljs-selector-class, .hljs-selector-attr, .hljs-selector-pseudo, .hljs-number {
+  color: #d19a66;
+}
+.hljs-symbol, .hljs-bullet, .hljs-link, .hljs-meta, .hljs-selector-id, .hljs-title {
+  color: #61aeee;
+}
+.hljs-emphasis {
+  font-style: italic;
+}
+.hljs-strong {
+  font-weight: bold;
+}
+.hljs-link {
+  text-decoration: underline;
+}

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

@@ -16,6 +16,11 @@
 		}
 
 		mark {
+			background: #F3B717;
+			color: black;
+		}
+
+		.mark-selected {
 			background: #CF3F00;
 			color: white;
 		}
@@ -36,6 +41,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
 	// ----------------------------------------------------------------------
@@ -43,7 +64,7 @@
 	let hljsScriptAdded = false;
 	let hljsLoaded = false;
 
-	function loadHljs(callback) {
+	function loadHljs(options) {
 		hljsScriptAdded = true;
 
 		const script = document.createElement('script');
@@ -58,16 +79,16 @@
 		link.rel = 'stylesheet';
 		// https://ace.c9.io/build/kitchen-sink.html
 		// https://highlightjs.org/static/demo/
-		link.href = 'highlight/styles/atom-one-light.css';
+		link.href = 'highlight/styles/' + options.codeTheme;
 		document.getElementById('hlScriptContainer').appendChild(link);
 	}
 
-	function loadAndApplyHljs() {
+	function loadAndApplyHljs(options) {
 		var codeElements = document.getElementsByClassName('code');
 		if (!codeElements.length) return;
 
 		if (!hljsScriptAdded) {
-			this.loadHljs();
+			this.loadHljs(options);
 			return;
 		}
 
@@ -119,12 +140,16 @@
 		setPercentScroll(percentScroll_);
 	}
 
-	ipcRenderer.on('setHtml', (event, html) => {
+	ipc.setHtml = (event) => {
+		const html = event.html;
+
+		markJsHackMarkerInserted_ = false;
+
 		updateBodyHeight();
 
 		contentElement.innerHTML = html;
 
-		loadAndApplyHljs();
+		loadAndApplyHljs(event.options);
 
 		// Remove the bullet from "ul" for checkbox lists and extra padding
 		// const checkboxes = document.getElementsByClassName('checkbox');
@@ -158,10 +183,12 @@
 				}
 			}, 1);
 		}
-	});
+	}
 
 	let ignoreNextScrollEvent = false;
-	ipcRenderer.on('setPercentScroll', (event, percent) => {
+	ipc.setPercentScroll = (event) => {
+		const percent = event.percent;
+
 		if (checkScrollIID_) {
 			clearInterval(checkScrollIID_);
 			checkScrollIID_ = null;
@@ -169,10 +196,36 @@
 
 		ignoreNextScrollEvent = true;
 		setPercentScroll(percent);
-	});
+	}
+
+	// HACK for Mark.js bug - https://github.com/julmot/mark.js/issues/127
+	let markJsHackMarkerInserted_ = false;
+	function addMarkJsSpaceHack(document) {
+		if (markJsHackMarkerInserted_) return;
+		
+		const prepareElementsForMarkJs = (elements, type) => {
+			// const markJsHackMarker_ = '&#8203; &#8203;'
+			const markJsHackMarker_ = ' ';
+			for (let i = 0; i < elements.length; i++) {
+				if (!type) {
+					elements[i].innerHTML = elements[i].innerHTML + markJsHackMarker_;
+				} else if (type === 'insertBefore') {
+					elements[i].insertAdjacentHTML('beforeBegin', markJsHackMarker_);
+				}
+			}
+		}
+
+		prepareElementsForMarkJs(document.getElementsByTagName('p'));
+		prepareElementsForMarkJs(document.getElementsByTagName('div'));
+		prepareElementsForMarkJs(document.getElementsByTagName('br'), 'insertBefore');
+		markJsHackMarkerInserted_ = true;
+	}
 
 	let mark_ = null;
-	function setMarkers(keywords) {
+	let markSelectedElement_ = null;
+	function setMarkers(keywords, options = null) {
+		if (!options) options = {};
+
 		if (!mark_) {
 			mark_ = new Mark(document.getElementById('content'), {
 				exclude: ['img'],
@@ -180,26 +233,68 @@
 			});
 		}
 
-		mark_.mark(keywords);
+		addMarkJsSpaceHack(document);
+
+		mark_.unmark()
+
+		if (markSelectedElement_) markSelectedElement_.classList.remove('mark-selected');
+
+		let selectedElement = null;
+		let elementIndex = 0;
+
+		const onEachElement = (element) => {
+			if (!('selectedIndex' in options)) return;
+
+			if (('selectedIndex' in options) && elementIndex === options.selectedIndex) {
+				markSelectedElement_ = element;
+				element.classList.add('mark-selected');
+				selectedElement = element;
+			}
+			
+			elementIndex++;
+		}
+
+		for (let i = 0; i < keywords.length; i++) {
+			const keyword = keywords[i];
+
+			if (keyword.type === 'regex') {
+				mark_.markRegExp(new RegExp(keyword.value, 'gmi'), {
+					each: onEachElement,
+					acrossElements: true,
+				});
+			} else {
+				mark_.mark([keyword], {
+					each: onEachElement,
+					accuracy: 'exactly', 
+				});
+			}
+		}
+
+		ipcProxySendToHost('setMarkerCount', elementIndex);
+
+		if (selectedElement) selectedElement.scrollIntoView();
 	}
 
 	let markLoaded_ = false;
-	ipcRenderer.on('setMarkers', (event, keywords) => {
+	ipc.setMarkers = (event) => {
+		const keywords = event.keywords;
+		const options = event.options;
+
 		if (!keywords.length && !markLoaded_) return;
 
 		if (!markLoaded_) {
 			const script = document.createElement('script');
 			script.onload = function() {
-				setMarkers(keywords);
+				setMarkers(keywords, options);
 			};
 
 			script.src = '../../node_modules/mark.js/dist/mark.min.js';
 			document.getElementById('markScriptContainer').appendChild(script);
 			markLoaded_ = true;
 		} else {
-			setMarkers(keywords);
+			setMarkers(keywords, options);
 		}
-	});
+	}
 
 	function maxScrollTop() {
 		return Math.max(0, contentElement.scrollHeight - contentElement.clientHeight);
@@ -210,6 +305,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 +317,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 +328,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 +336,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'),
 				});
@@ -249,6 +349,35 @@
 		}
 	});
 
+	function handleInternalLink(event, anchorNode) {
+		const href = anchorNode.getAttribute('href');
+		if (href.indexOf('#') === 0) {
+			event.preventDefault();
+			location.hash = href;
+			return true;
+		}
+		return false;
+	}
+
+	document.addEventListener('click', function(event) {
+		const t = event.target;
+
+		// Prevent URLs added via <a> tags from being opened within the application itself
+		// otherwise it would open the whole website within the WebView.
+		if (t && t.nodeName === 'A' && !t.hasAttribute('data-from-md')) {
+			if (handleInternalLink(event, t)) return;
+
+			event.preventDefault();
+			ipcProxySendToHost(t.getAttribute('href'));
+			return;
+		}
+
+		// If this is an internal link, jump to the anchor directly
+		if (t && t.nodeName === 'A' && t.hasAttribute('data-from-md')) {
+			if (handleInternalLink(event, t)) return;
+		}
+	});
+
 	// Disable drag and drop otherwise it's possible to drop a URL
 	// on it and it will open in the view as a website.
 	document.addEventListener('drop', function(e) {
@@ -271,4 +400,4 @@
 	</script>
 
 </body>
-</html>
+</html>

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, options) => {
+	window.postMessage({ target: 'webview', name: 'setHtml', data: { html: html, options: options } }, '*');
+});
+
+ipcRenderer.on('setPercentScroll', (event, percent) => {
+	window.postMessage({ target: 'webview', name: 'setPercentScroll', data: { percent: percent } }, '*');
+});
+
+ipcRenderer.on('setMarkers', (event, keywords, options) => {
+	window.postMessage({ target: 'webview', name: 'setMarkers', data: { keywords: keywords, options: options } }, '*');
+});
+
+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');
+	}
+});