CLI v1.0.112

.gitignore

@@ -39,7 +39,5 @@ node_modules
 Tools/github_oauth_token.txt
 _releases
 ReactNativeClient/lib/csstojs/
-ReactNativeClient/lib/rnInjectedJs/
 ElectronClient/app/gui/note-viewer/fonts/
-ElectronClient/app/gui/note-viewer/lib.js
 Tools/commit_hook.txt

BUILD.md

@@ -9,6 +9,8 @@
 	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/
@@ -35,10 +37,6 @@ 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.
@@ -58,8 +56,6 @@ 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

@@ -1,7 +1,3 @@
-**IMPORTANT:** At the moment pull requests for new features are no longer being accepted. More info there: https://github.com/laurent22/joplin/issues/1112
-
-* * *
-
 # User support
 
 For general discussion about Joplin, user support, software development questions, and to discuss new features, please go to the [Joplin Forum](https://discourse.joplin.cozic.net/). It is possible to login with your GitHub account.
@@ -16,19 +12,8 @@ If possible, **please provide a screenshot**. A screenshot showing the problem i
 
 Again, please check that it has not already been requested. If it has, simply **up-vote the issue** - the ones with the most up-votes are likely to be implemented. "+1" comments are not tracked.
 
-# Creating a pull request
+# Adding new features
 
-- 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. That scope, due to limited resources, might be narrower than you think. As a rule of thumb **if your change is likely to involve more than 50 lines of code, you should discuss it in the forum**, just so that you don't waste your time implementing something that might not be accepted.
-
-- Bug fixes have a very high chance of being accepted.
-
-- A pull request that is relevant to the current roadmap has a very high chance of being accepted.
+If you want to add a new feature, consider asking about it before implementing it or checking existing discussions to make sure it is within the scope of the project. Of course you are free to create the pull request directly but it is not guaranteed it is going to be accepted.
 
 Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
-
-# Coding style
-
-There are only two rules, but not following them means the pull request will not be accepted (it can be accepted once the issues are fixed):
-
-- **Please use tabs, NOT spaces.**
-- **Please do not add or remove optional characters, such as spaces or colons.** Please setup your editor so that it only changes what you are working on and is not making automated changes elsewhere. The reason for this is that small white space changes make diff hard to read and can cause needless conflicts.

CliClient/.gitignore

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

CliClient/app/app.js

@@ -21,8 +21,8 @@ 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');
-const WelcomeUtils = require('lib/WelcomeUtils');
 
 class Application extends BaseApplication {
 
@@ -377,8 +377,6 @@ class Application extends BaseApplication {
 			return this.stdout(object);
 		});
 
-		await WelcomeUtils.install(this.dispatch.bind(this));
-
 		// If we have some arguments left at this point, it's a command
 		// so execute it.
 		if (argv.length) {
@@ -396,12 +394,6 @@ class Application extends BaseApplication {
 				}
 				process.exit(1);
 			}
-
-			await Setting.saveAll();
-
-			// Need to call exit() explicitely, otherwise Node wait for any timeout to complete
-			// https://stackoverflow.com/questions/18050095
-			process.exit(0);
 		} else { // Otherwise open the GUI
 			this.initRedux();
 

CliClient/app/build-doc.js

@@ -102,7 +102,7 @@ function getFooter() {
 
 	output.push('WEBSITE');
 	output.push('');
-	output.push(INDENT + 'https://joplinapp.org');
+	output.push(INDENT + 'https://joplin.cozic.net');
 
 	output.push('');
 

CliClient/app/command-apidoc.js

@@ -1,299 +0,0 @@
-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('# Error handling');
-		lines.push('');
-		lines.push('In case of an error, an HTTP status code >= 400 will be returned along with a JSON object that provides more info about the error. The JSON object is in the format `{ "error": "description of error" }`.');
-		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('');
-
-		lines.push('# Searching');
-		lines.push('');
-		lines.push('Call **GET /search?query=YOUR_QUERY** to search for notes. This end-point supports the `field` parameter which is recommended to use so that you only get the data that you need. The query syntax is as described in the main documentation: https://joplinapp.org/#searching');
-		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) value = '********';
+			if (md.secure) value = '********';
 
 			if (Setting.isEnum(name)) {
 				return _('%s = %s (%s)', name, value, Setting.enumOptionsDoc(name));

CliClient/app/command-e2ee.js

@@ -6,10 +6,6 @@ const DecryptionWorker = require('lib/services/DecryptionWorker');
 const MasterKey = require('lib/models/MasterKey');
 const BaseItem = require('lib/models/BaseItem');
 const Setting = require('lib/models/Setting.js');
-const { shim } = require('lib/shim');
-const pathUtils = require('lib/path-utils.js');
-const imageType = require('image-type');
-const readChunk = require('read-chunk');
 
 class Command extends BaseCommand {
 
@@ -18,7 +14,7 @@ class Command extends BaseCommand {
 	}
 
 	description() {
-		return _('Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status`, `decrypt-file` and `target-status`.');
+		return _('Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status` and `target-status`.');
 	}
 
 	options() {
@@ -26,7 +22,6 @@ class Command extends BaseCommand {
 			// This is here mostly for testing - shouldn't be used
 			['-p, --password <password>', 'Use this password as master password (For security reasons, it is not recommended to use this option).'],
 			['-v, --verbose', 'More verbose output for the `target-status` command'],
-			['-o, --output <directory>', 'Output directory'],
 		];
 	}
 
@@ -35,18 +30,6 @@ class Command extends BaseCommand {
 
 		const options = args.options;
 
-		const askForMasterKey = async (error) => {
-			const masterKeyId = error.masterKeyId;
-			const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
-			if (!password) {
-				this.stdout(_('Operation cancelled'));
-				return false;
-			}
-			Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
-			await EncryptionService.instance().loadMasterKeysFromSettings();
-			return true;
-		}
-
 		if (args.command === 'enable') {
 			const password = options.password ? options.password.toString() : await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
 			if (!password) {
@@ -76,8 +59,14 @@ class Command extends BaseCommand {
 						break;
 					} catch (error) {
 						if (error.code === 'masterKeyNotLoaded') {
-							const ok = await askForMasterKey(error);
-							if (!ok) return;
+							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;
 						}
 
@@ -96,36 +85,6 @@ class Command extends BaseCommand {
 			return;
 		}
 
-		if (args.command === 'decrypt-file') {
-			while (true) {
-				try {
-					const outputDir = options.output ? options.output : require('os').tmpdir();
-					let outFile = outputDir + '/' + pathUtils.filename(args.path) + '.' + Date.now() + '.bin'; 
-					await EncryptionService.instance().decryptFile(args.path, outFile);
-					const buffer = await readChunk(outFile, 0, 64);
-					const detectedType = imageType(buffer);
-
-					if (detectedType) {
-						const newOutFile = outFile + '.' + detectedType.ext;
-						await shim.fsDriver().move(outFile, newOutFile);
-						outFile = newOutFile;
-					}
-
-					this.stdout(outFile);
-					break;
-				} catch (error) {
-					if (error.code === 'masterKeyNotLoaded') {
-						const ok = await askForMasterKey(error);
-						if (!ok) return;
-						continue;
-					}
-
-					throw error;
-				}
-			}
-			return;
-		}
-
 		if (args.command === 'target-status') {
 			const fs = require('fs-extra');
 			const pathUtils = require('lib/path-utils.js');

CliClient/app/command-help.js

@@ -37,7 +37,7 @@ class Command extends BaseCommand {
 		const stdoutWidth = app().commandStdoutMaxWidth();
 
 		if (args.command === 'shortcuts' || args.command === 'keymap') {
-			this.stdout(_('For information on how to customise the shortcuts please visit %s', 'https://joplinapp.org/terminal/#shortcuts'));
+			this.stdout(_('For information on how to customise the shortcuts please visit %s', 'https://joplin.cozic.net/terminal/#shortcuts'));
 			this.stdout('');
 
 			if (app().gui().isDummy()) {

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.formatMsToLocal(item.user_updated_time));
+					row.push(time.unixMsToLocalDateTime(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-search.js

@@ -49,6 +49,35 @@ class Command extends BaseCommand {
 			type: 'SEARCH_SELECT',
 			id: searchId,
 		});
+
+		// let fields = Note.previewFields();
+		// fields.push('body');
+		// const notes = await Note.previews(folder ? folder.id : null, {
+		// 	fields: fields,
+		// 	anywherePattern: '*' + pattern + '*',
+		// });
+
+		// const fragmentLength = 50;
+
+		// let parents = {};
+
+		// for (let i = 0; i < notes.length; i++) {
+		// 	const note = notes[i];
+		// 	const parent = parents[note.parent_id] ? parents[note.parent_id] : await Folder.load(note.parent_id);
+		// 	parents[note.parent_id] = parent;
+
+		// 	const idx = note.body.indexOf(pattern);
+		// 	let line = '';
+		// 	if (idx >= 0) {
+		// 		let fragment = note.body.substr(Math.max(0, idx - fragmentLength / 2), fragmentLength);
+		// 		fragment = fragment.replace(/\n/g, ' ');
+		// 		line = sprintf('%s: %s / %s: %s', BaseModel.shortId(note.id), parent.title, note.title, fragment);
+		// 	} else {
+		// 		line = sprintf('%s: %s / %s', BaseModel.shortId(note.id), parent.title, note.title);
+		// 	}
+
+		// 	this.stdout(line);
+		// }
 	}
 
 }

CliClient/app/command-sync.js

@@ -4,7 +4,6 @@ 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');
@@ -117,6 +116,7 @@ class Command extends BaseCommand {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
+		// TODO: use SQLite database to do lock?
 		const lockFilePath = require('os').tmpdir() + '/synclock_' + md5(escape(Setting.value('profileDir'))); // https://github.com/pvorb/node-md5/issues/41
 		if (!await fs.pathExists(lockFilePath)) await fs.writeFile(lockFilePath, 'synclock');
 
@@ -191,15 +191,6 @@ 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,7 +3,6 @@ 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 {
 
@@ -12,19 +11,11 @@ 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 (use -l for long option).');
+		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.');
 	}
-
-	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) {
@@ -50,28 +41,7 @@ class Command extends BaseCommand {
 		} else if (command == 'list') {
 			if (tag) {
 				let notes = await Tag.notes(tag.id);
-				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);
-				});
+				notes.map((note) => { this.stdout(note.title); });
 			} else {
 				let tags = await Tag.all();
 				tags.map((tag) => { this.stdout(tag.title); });

CliClient/app/gui/FolderListWidget.js

@@ -32,6 +32,8 @@ 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(' ');
 		};
@@ -83,6 +85,7 @@ class FolderListWidget extends ListWidget {
 	}
 
 	set notesParentType(v) {
+		//if (this.notesParentType_ === v) return;
 		this.notesParentType_ = v;
 		this.updateIndexFromSelectedItemId()
 		this.invalidate();
@@ -120,14 +123,6 @@ 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_) {
@@ -135,19 +130,7 @@ class FolderListWidget extends ListWidget {
 			const wasSelectedItemId = this.selectedJoplinItemId;
 			const previousParentType = this.notesParentType;
 
-			let newItems = [];
-			const orderFolders = (parentId) => {
-				for (let i = 0; i < this.folders.length; i++) {
-					const f = this.folders[i];
-					const folderParentId = f.parent_id ? f.parent_id : '';
-					if (folderParentId === parentId) {
-						newItems.push(f);
-						if (this.folderHasChildren_(this.folders, f.id)) orderFolders(f.id);
-					}
-				}
-			}
-
-			orderFolders('');
+			let newItems = this.folders.slice();
 
 			if (this.tags.length) {
 				if (newItems.length) newItems.push('-');

CliClient/app/main.js

@@ -1,8 +1,5 @@
 #!/usr/bin/env node
 
-// Use njstrace to find out what Node.js might be spending time on
-// var njstrace = require('njstrace').inject();
-
 // Make it possible to require("/lib/...") without specifying full path
 require('app-module-path').addPath(__dirname);
 

CliClient/locales/ca.po

@@ -125,10 +125,9 @@ msgstr "Marca un llistat de tasques pendents com a fet."
 msgid "Note is not a to-do: \"%s\""
 msgstr "La nota no és un llistat de tasques pendents: «%s»"
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "Gestiona la configuració E2EE. Les ordres són «enable», «disable», "
 "«decrypt», «status» i «target-status»"
@@ -461,17 +460,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 "
@@ -590,20 +585,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "S'està exportant a «%s» com a format «%s». Espereu..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Títol del bloc de notes:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Blocs de notes"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "S'està important des de «%s» com a format «%s». Espereu..."
@@ -611,8 +592,8 @@ msgstr "S'està important des de «%s» com a format «%s». Espereu..."
 msgid "PDF File"
 msgstr "Fitxer PDF"
 
-msgid "Synchronisation status"
-msgstr "Estat de la sincronització"
+msgid "File"
+msgstr "Fitxer"
 
 msgid "New note"
 msgstr "Nota nova"
@@ -623,43 +604,14 @@ msgstr "Llistat de tasques pendents nou"
 msgid "New notebook"
 msgstr "Bloc de notes nou"
 
-msgid "Print"
-msgstr "Imprimeix"
-
-msgid "General Options"
-msgstr "Opcions generals"
-
-msgid "Encryption options"
-msgstr "Opcions del xifratge"
-
-msgid "Web clipper options"
-msgstr "Opcions del desa-retalls de webs"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Fitxer"
-
-msgid "About Joplin"
-msgstr "Quant al Joplin"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr "Comprova les actualitzacions..."
-
 msgid "Import"
 msgstr "Importació"
 
 msgid "Export"
 msgstr "Exportació"
 
-msgid "Synchronise"
-msgstr "Sincronitza"
+msgid "Print"
+msgstr "Imprimeix"
 
 #, javascript-format
 msgid "Hide %s"
@@ -668,8 +620,7 @@ msgstr "Amaga %s"
 msgid "Quit"
 msgstr "Surt"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Edita"
 
 msgid "Copy"
@@ -681,19 +632,12 @@ msgstr "Retalla"
 msgid "Paste"
 msgstr "Enganxa"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Seleccioneu una data"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -703,12 +647,7 @@ 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"
-
-#, fuzzy
-msgid "&View"
+msgid "View"
 msgstr "Visualització"
 
 msgid "Toggle sidebar"
@@ -717,16 +656,22 @@ msgstr "Mostra o amaga la barra lateral"
 msgid "Toggle editor layout"
 msgstr "Canvia el disseny de l'editor"
 
-#, fuzzy
-msgid "Focus"
-msgstr "Vés al cos"
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Eines"
 
-#, fuzzy
-msgid "&Help"
+msgid "Synchronisation status"
+msgstr "Estat de la sincronització"
+
+msgid "Web clipper options"
+msgstr "Opcions del desa-retalls de webs"
+
+msgid "Encryption options"
+msgstr "Opcions del xifratge"
+
+msgid "General Options"
+msgstr "Opcions generals"
+
+msgid "Help"
 msgstr "Ajuda"
 
 msgid "Website and documentation"
@@ -735,6 +680,16 @@ msgstr "Lloc web i documentació"
 msgid "Make a donation"
 msgstr "Donatius"
 
+msgid "Check for updates..."
+msgstr "Comprova les actualitzacions..."
+
+msgid "About Joplin"
+msgstr "Quant al Joplin"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, javascript-format
 msgid "Open %s"
 msgstr "Obre %s"
@@ -751,30 +706,15 @@ msgstr "Cancel·la"
 msgid "Current version is up-to-date."
 msgstr "La versió actual està actualitzada"
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr "Hi ha disponible una actualització. Voleu baixar-la ara?"
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 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 "
@@ -825,31 +765,13 @@ 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ó"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes i la configuració es desen a: %s"
 
-msgid "Browse..."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr "Comprova la configuració de la sincronització"
-
 msgid "Apply"
 msgstr ""
 
@@ -944,10 +866,6 @@ msgstr "Estat"
 msgid "Encryption is:"
 msgstr "El xifratge és:"
 
-#, fuzzy
-msgid "Usage"
-msgstr "Ús: %s"
-
 msgid "Back"
 msgstr "Enrere"
 
@@ -998,6 +916,28 @@ msgstr "Alguns elements no s'han pogut desxifrar."
 msgid "Set the password"
 msgstr "Establiu la contrasenya"
 
+msgid "Add or remove tags"
+msgstr "Afegeix o suprimeix etiquetes"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Copia"
+
+msgid "Switch between note and to-do type"
+msgstr "Alterna entre el tipus nota i tasques pendents"
+
+msgid "Copy Markdown link"
+msgstr "Copia l'enllaç Markdown"
+
+msgid "Delete"
+msgstr "Suprimeix"
+
+msgid "Delete notes?"
+msgstr "Voleu suprimir les notes?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "No hi ha cap nota aquí. Creeu-ne una fent clic a «Nota nova»."
 
@@ -1007,15 +947,6 @@ 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..."
 
@@ -1032,9 +963,6 @@ 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"
@@ -1047,9 +975,6 @@ msgstr ""
 "Aquesta nota no té contingut. Feu clic a «%s» per a anar a l'editor i "
 "modificar-la."
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1137,83 +1062,24 @@ msgstr "Opcions de xifratge"
 msgid "Clipper Options"
 msgstr "Opcions del desa-retalls"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-"Voleu suprimir el bloc de notes? També se suprimiran tots els sub-blocs "
-"d'aquest bloc de notes."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Voleu suprimir aquesta etiqueta de totes les notes?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Voleu suprimir aquesta cerca de la barra laterla?"
 
-msgid "Delete"
-msgstr "Suprimeix"
-
 msgid "Rename"
 msgstr "Canvia el nom"
 
+msgid "Synchronise"
+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ó"
 
-msgid "Add or remove tags"
-msgstr "Afegeix o suprimeix etiquetes"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Surt de l'aplicació"
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-msgstr "Copia"
-
-msgid "Switch between note and to-do type"
-msgstr "Alterna entre el tipus nota i tasques pendents"
-
-#, 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"
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Voleu suprimir les notes?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Voleu suprimir aquestes notes?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Ús: %s"
@@ -1255,9 +1121,6 @@ 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"
@@ -1305,6 +1168,10 @@ 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..."
 
@@ -1332,25 +1199,32 @@ msgstr "Xifrat"
 msgid "Encrypted items cannot be modified"
 msgstr "Els elements xifrats no es poden modificar"
 
-msgid "title"
-msgstr "títol"
-
-msgid "updated date"
-msgstr "data d'actualització"
-
 msgid "Conflicts"
 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."
 
+msgid "title"
+msgstr "títol"
+
+msgid "updated date"
+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ó."
 
@@ -1362,13 +1236,6 @@ msgstr "No es pot copiar la nota al bloc de notes «%s»"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "No es pot moure la nota al bloc de notes «%s»"
 
-#, 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 "Language"
 msgstr "Llengua"
 
@@ -1399,10 +1266,6 @@ msgstr "Ordena les notes per"
 msgid "Reverse sort order"
 msgstr "Ordre invers"
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Ordena les notes per"
-
 msgid "Save geo-location with notes"
 msgstr "Desa la geolocalització a les notes"
 
@@ -1418,65 +1281,15 @@ msgstr "Vés al cos"
 msgid "When creating a new note:"
 msgstr "En crear una nota:"
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Activa el xifratge"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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"
 
@@ -1491,13 +1304,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Actualitza automàticament l'aplicació"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Interval de sincronització"
 
@@ -1541,6 +1347,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Directori on es farà la sincronització (camí absolut)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"El camí on sincronitzar en activar la sincronització del sistema. Vegeu "
+"«sync.target»."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "URL del Nextcloud WebDAV"
 
@@ -1576,32 +1389,6 @@ 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."
 
-#, fuzzy
-msgid "General"
-msgstr "Opcions generals"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Estat de la sincronització"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Blocs de notes"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Surt de l'aplicació"
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 msgid "Joplin Export File"
 msgstr "Fitxer d'exportació del Joplin"
 
@@ -1614,13 +1401,6 @@ 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 "File"
-msgstr "Fitxer"
-
 msgid "Directory"
 msgstr "Directori"
 
@@ -1695,12 +1475,6 @@ 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ó (+)."
 
@@ -1729,10 +1503,6 @@ 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"
 
@@ -1745,34 +1515,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Elements obtinguts: %d/%d."
 
 msgid "New tags:"
@@ -1807,20 +1551,9 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Lloc web del Joplin"
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "Per suprimir: %d"
-
 msgid "Login with Dropbox"
 msgstr "Inicia sessió amb Dropbox"
 
-msgid "Enter code here"
-msgstr ""
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Clau mestra %s"
@@ -1873,10 +1606,6 @@ 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"
 
@@ -1901,12 +1630,6 @@ msgstr "Mostra les metadades"
 msgid "View on map"
 msgstr "Mostra-ho al mapa"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Edita"
-
 msgid "Delete notebook"
 msgstr "Suprimeix el bloc de notes"
 
@@ -1929,24 +1652,3 @@ msgstr ""
 
 msgid "Welcome"
 msgstr "Benvingut"
-
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Aquesta nota s'ha modificat:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "El camí on sincronitzar en activar la sincronització del sistema. Vegeu "
-#~ "«sync.target»."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Lloc web del Joplin"
-
-#~ 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

@@ -124,10 +124,9 @@ msgstr "Označí to-do jako hotové."
 msgid "Note is not a to-do: \"%s\""
 msgstr "Poznámka není to-do: \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "Nastavuje šifrování. Příkazy jsou `enable` (zapnout), `disable` (vypnout), "
 "`decrypt` (dešifrovat), `status` (stav) a `target-status` (stav v cíli "
@@ -449,17 +448,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 "
@@ -572,20 +567,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportuji do \"%s\" jako formát \"%s\". Chvíli strpení..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Název zápisníku:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Zápisníky"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Importuji z \"%s\" jako formát \"%s\". Chvíli strpení..."
@@ -593,8 +574,8 @@ msgstr "Importuji z \"%s\" jako formát \"%s\". Chvíli strpení..."
 msgid "PDF File"
 msgstr "PDF soubor"
 
-msgid "Synchronisation status"
-msgstr "Stav synchronizace"
+msgid "File"
+msgstr "Soubor"
 
 msgid "New note"
 msgstr "Nová poznámka"
@@ -605,43 +586,14 @@ msgstr "Nové to-do"
 msgid "New notebook"
 msgstr "Nový zápisník"
 
-msgid "Print"
-msgstr "Tisk"
-
-msgid "General Options"
-msgstr "Obecná nastavení"
-
-msgid "Encryption options"
-msgstr "Nastavení šifrování"
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Soubor"
-
-msgid "About Joplin"
-msgstr "O aplikaci Joplin"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr "Zkontrolovat updaty..."
-
 msgid "Import"
 msgstr "Import"
 
 msgid "Export"
 msgstr "Export"
 
-msgid "Synchronise"
-msgstr "Synchronizovat"
+msgid "Print"
+msgstr "Tisk"
 
 #, javascript-format
 msgid "Hide %s"
@@ -650,8 +602,7 @@ msgstr "Schovat %s"
 msgid "Quit"
 msgstr "Ukončit"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Upravit"
 
 msgid "Copy"
@@ -663,19 +614,12 @@ msgstr "Vyjmout"
 msgid "Paste"
 msgstr "Vložit"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Vybrat datum"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -685,12 +629,7 @@ 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"
-
-#, fuzzy
-msgid "&View"
+msgid "View"
 msgstr "Zobrazit"
 
 msgid "Toggle sidebar"
@@ -699,16 +638,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr "Změňit layout editoru"
 
-#, fuzzy
-msgid "Focus"
-msgstr "Vybrat text poznámky"
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Nástroje"
 
-#, fuzzy
-msgid "&Help"
+msgid "Synchronisation status"
+msgstr "Stav synchronizace"
+
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr "Nastavení šifrování"
+
+msgid "General Options"
+msgstr "Obecná nastavení"
+
+msgid "Help"
 msgstr "Nápověda"
 
 msgid "Website and documentation"
@@ -717,6 +662,16 @@ msgstr "Web a dokumentace"
 msgid "Make a donation"
 msgstr "Přispět"
 
+msgid "Check for updates..."
+msgstr "Zkontrolovat updaty..."
+
+msgid "About Joplin"
+msgstr "O aplikaci Joplin"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, javascript-format
 msgid "Open %s"
 msgstr "Otevřít %s"
@@ -733,30 +688,15 @@ msgstr "Zrušit"
 msgid "Current version is up-to-date."
 msgstr "Současná verze je aktuální."
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr "Je k dispozici update, chcete jej stáhnout?"
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 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 ""
 
@@ -800,31 +740,13 @@ 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"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Poznámky a nastavení uloženo v: %s"
 
-msgid "Browse..."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr "Zkontrolujte nastavení synchronizace"
-
 msgid "Apply"
 msgstr ""
 
@@ -914,10 +836,6 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Šifrování je:"
 
-#, fuzzy
-msgid "Usage"
-msgstr "Použití: %s"
-
 msgid "Back"
 msgstr "Zpět"
 
@@ -970,6 +888,29 @@ msgstr "Některé položky nelze rozšifrovat."
 msgid "Set the password"
 msgstr "Nastavit heslo"
 
+msgid "Add or remove tags"
+msgstr "Přidat či odebrat tagy"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopírovat"
+
+msgid "Switch between note and to-do type"
+msgstr "Přepnout mezi poznámkou a to-do"
+
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
+msgid "Delete"
+msgstr "Smazat"
+
+msgid "Delete notes?"
+msgstr "Smazat poznámky?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "Žádné poznámky. Vytvořte jednu kliknutím na \"Nová poznámka\"."
 
@@ -977,15 +918,6 @@ 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..."
 
@@ -1002,9 +934,6 @@ 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"
@@ -1015,9 +944,6 @@ msgid ""
 "note."
 msgstr "Tato poznámka je prázdný. Klikněte na  \"%s\" pro otevření editoru."
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1106,82 +1032,24 @@ msgstr "Nastavení šifrování"
 msgid "Clipper Options"
 msgstr "Obecná nastavení"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr "Smazat zápisník? Budou smazány i všechny poznámky v něm obsažené."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Odebrat tento tag ze všech poznámek?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Smazat tento hledaný výraz z panelu?"
 
-msgid "Delete"
-msgstr "Smazat"
-
 msgid "Rename"
 msgstr "Přejmenovat"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Přidat či odebrat tagy"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Ukončí aplikaci."
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-msgstr "Kopírovat"
-
-msgid "Switch between note and to-do type"
-msgstr "Přepnout mezi poznámkou a to-do"
-
-#, 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"
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Smazat poznámky?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Smazat tyto poznámky?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Použití: %s"
@@ -1223,9 +1091,6 @@ 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"
@@ -1273,6 +1138,10 @@ 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..."
 
@@ -1300,14 +1169,6 @@ msgstr "Zašifrováno"
 msgid "Encrypted items cannot be modified"
 msgstr "Nelze editovat zašifrovanou položku"
 
-#, fuzzy
-msgid "title"
-msgstr "Bez názvu"
-
-#, fuzzy
-msgid "updated date"
-msgstr "Upraveno: %d."
-
 msgid "Conflicts"
 msgstr "Konflikty"
 
@@ -1315,14 +1176,29 @@ 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."
 
+#, fuzzy
+msgid "title"
+msgstr "Bez názvu"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Upraveno: %d."
+
 #, fuzzy
 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."
 
@@ -1334,13 +1210,6 @@ msgstr "Poznámku \"%s\" nelze zkopírovat do zápisníku"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Poznámku nelze přesunout do zápisníku \"%s\""
 
-#, 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 "Language"
 msgstr "Jazyk"
 
@@ -1372,10 +1241,6 @@ msgstr "Řadit poznámky podle"
 msgid "Reverse sort order"
 msgstr "Řadit od konce"
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Řadit poznámky podle"
-
 msgid "Save geo-location with notes"
 msgstr "Ukládat k poznámkám informace o poloze (geolokaci)"
 
@@ -1391,65 +1256,15 @@ msgstr "Vybrat text poznámky"
 msgid "When creating a new note:"
 msgstr "Při vytváření nové poznámky:"
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Zapnout šifrování"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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"
 
@@ -1464,13 +1279,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automaticky updatovat aplikaci"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Interval synchronizace"
 
@@ -1514,6 +1322,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Složka k synchronizaci (absolutní cesta)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Cesta ke složce, se kterou synchronizovat, pokud je cílem synchronizace "
+"místní souborový systém. Viz `sync.target`."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
@@ -1549,32 +1364,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Neplatná hodnota: \"%s\". Přípustné hodnoty jsou: %s."
 
-#, fuzzy
-msgid "General"
-msgstr "Obecná nastavení"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Stav synchronizace"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Zápisníky"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Ukončí aplikaci."
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 msgid "Joplin Export File"
 msgstr "Soubor Joplin Export"
 
@@ -1587,13 +1376,6 @@ msgstr "Složka pro export"
 msgid "Evernote Export File"
 msgstr "Soubor Evernote Exportu"
 
-#, fuzzy
-msgid "Json Export Directory"
-msgstr "Složka pro export"
-
-msgid "File"
-msgstr "Soubor"
-
 msgid "Directory"
 msgstr "Adresář"
 
@@ -1668,12 +1450,6 @@ 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 (+)."
 
@@ -1702,10 +1478,6 @@ 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"
@@ -1719,34 +1491,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Získané položky: %d/%d."
 
 msgid "New tags:"
@@ -1774,21 +1520,10 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Web Joplinu"
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "K smazání: %d"
-
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Přihlásit se pomocí OneDrive"
 
-msgid "Enter code here"
-msgstr ""
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Master heslo %s"
@@ -1840,10 +1575,6 @@ 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"
 
@@ -1868,12 +1599,6 @@ msgstr "Zobrazit metadata"
 msgid "View on map"
 msgstr "Zobrazit na map+"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Upravit"
-
 msgid "Delete notebook"
 msgstr "Smazat zápisník"
 
@@ -1896,26 +1621,5 @@ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+
 msgid "Welcome"
 msgstr "Vítejte"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Poznámka byla upravena:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Cesta ke složce, se kterou synchronizovat, pokud je cílem synchronizace "
-#~ "místní souborový systém. Viz `sync.target`."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Web Joplinu"
-
-#~ 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

@@ -123,10 +123,9 @@ msgstr "Markerer en opgave som udført."
 msgid "Note is not a to-do: \"%s\""
 msgstr "Noten er ikke en opgave: \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "Udfører E2EE konfiguration. Kommandoer er `enable`(aktiver), "
 "`disable`(sluk), `decrypt`(dekrypter), `status` og `target-status` (modtager-"
@@ -453,17 +452,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 "
@@ -577,20 +572,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksporterer til \"%s\" som \"%s\"-format. Vent venligst..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Notesbogs titel:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Notesbøger"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Importerer fra \"%s\" som \"%s\"-format. Vent venligst..."
@@ -598,8 +579,8 @@ msgstr "Importerer fra \"%s\" som \"%s\"-format. Vent venligst..."
 msgid "PDF File"
 msgstr "PDF fil"
 
-msgid "Synchronisation status"
-msgstr "Synkroniserings status"
+msgid "File"
+msgstr "Fil"
 
 msgid "New note"
 msgstr "Ny note"
@@ -610,43 +591,14 @@ msgstr "Ny opgave"
 msgid "New notebook"
 msgstr "Ny notesbog"
 
-msgid "Print"
-msgstr "Udskriv"
-
-msgid "General Options"
-msgstr "Generelle indstillinger"
-
-msgid "Encryption options"
-msgstr "Krypterings muligheder"
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Fil"
-
-msgid "About Joplin"
-msgstr "Om Joplin"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr "Checker om der er opdateringer.."
-
 msgid "Import"
 msgstr "Importer"
 
 msgid "Export"
 msgstr "Eksporter"
 
-msgid "Synchronise"
-msgstr "Synkroniser"
+msgid "Print"
+msgstr "Udskriv"
 
 #, javascript-format
 msgid "Hide %s"
@@ -655,8 +607,7 @@ msgstr "Skjul %s"
 msgid "Quit"
 msgstr "Afslut"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Ret"
 
 msgid "Copy"
@@ -668,19 +619,12 @@ msgstr "Klip"
 msgid "Paste"
 msgstr "Indsæt"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Vælg dato"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -690,12 +634,7 @@ 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"
-
-#, fuzzy
-msgid "&View"
+msgid "View"
 msgstr "Vis"
 
 msgid "Toggle sidebar"
@@ -704,16 +643,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr "Skift editor layout"
 
-#, fuzzy
-msgid "Focus"
-msgstr "Fokuser på brødtekst"
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Værktøjer"
 
-#, fuzzy
-msgid "&Help"
+msgid "Synchronisation status"
+msgstr "Synkroniserings status"
+
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr "Krypterings muligheder"
+
+msgid "General Options"
+msgstr "Generelle indstillinger"
+
+msgid "Help"
 msgstr "Hjælp"
 
 msgid "Website and documentation"
@@ -722,6 +667,16 @@ msgstr "Joplins hjemmeside og dokumentation"
 msgid "Make a donation"
 msgstr "Giv en donation"
 
+msgid "Check for updates..."
+msgstr "Checker om der er opdateringer.."
+
+msgid "About Joplin"
+msgstr "Om Joplin"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, javascript-format
 msgid "Open %s"
 msgstr "Åben %s"
@@ -738,30 +693,15 @@ msgstr "Fortryd"
 msgid "Current version is up-to-date."
 msgstr "Aktuel version er nyeste."
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr "Opdatering er til rådighed, vil du hente den nu?"
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 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 ""
 
@@ -805,31 +745,13 @@ 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"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Noter og indstillinger er gemt i: %s"
 
-msgid "Browse..."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr "Check synkroniserings Indstillinger"
-
 msgid "Apply"
 msgstr ""
 
@@ -923,10 +845,6 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Kryptering er:"
 
-#, fuzzy
-msgid "Usage"
-msgstr "Forbrug: %s"
-
 msgid "Back"
 msgstr "Tilbage"
 
@@ -979,6 +897,29 @@ msgstr "Nogle emner kan ikke krypteres."
 msgid "Set the password"
 msgstr "Indstil kodeord"
 
+msgid "Add or remove tags"
+msgstr "Tilføj eller slet mærker"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopier"
+
+msgid "Switch between note and to-do type"
+msgstr "Skift mellem note-  og opgave type"
+
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
+msgid "Delete"
+msgstr "Slet"
+
+msgid "Delete notes?"
+msgstr "Slet noter?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "Der er ingen noter her. Opret en ved at klikke på \"Ny note\"."
 
@@ -986,15 +927,6 @@ 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..."
 
@@ -1011,9 +943,6 @@ 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"
@@ -1024,9 +953,6 @@ msgid ""
 "note."
 msgstr "Denne note er tom. Klik på \"%s\" for at starte editor og rette noten."
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1115,82 +1041,24 @@ msgstr "Krypterings indstillinger"
 msgid "Clipper Options"
 msgstr "Generelle indstillinger"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr "Slet notesbog? Alle noter i notesbogen bliver også slettet."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Slet denne markering fra alle noter?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Slet denne søgning fra sidebjælke?"
 
-msgid "Delete"
-msgstr "Slet"
-
 msgid "Rename"
 msgstr "Omdøb"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Tilføj eller slet mærker"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Forlad/luk program."
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-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"
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Slet noter?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Slet disse noter?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Forbrug: %s"
@@ -1232,9 +1100,6 @@ 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"
@@ -1282,6 +1147,10 @@ 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..."
 
@@ -1309,14 +1178,6 @@ msgstr "Krypteret"
 msgid "Encrypted items cannot be modified"
 msgstr "Krypteret emner kan ikke rettes"
 
-#, fuzzy
-msgid "title"
-msgstr "Samlet"
-
-#, fuzzy
-msgid "updated date"
-msgstr "Opdateret %d."
-
 msgid "Conflicts"
 msgstr "Konflikter"
 
@@ -1324,14 +1185,29 @@ 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."
 
+#, fuzzy
+msgid "title"
+msgstr "Samlet"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Opdateret %d."
+
 #, fuzzy
 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."
 
@@ -1343,13 +1219,6 @@ msgstr "Kan ikke kopiere note til \"%s\" notesbog"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Kan ikke flytte note til \"%s\" notesbog"
 
-#, 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 "Language"
 msgstr "Sprog"
 
@@ -1381,10 +1250,6 @@ msgstr "Sorter noter efter"
 msgid "Reverse sort order"
 msgstr "Modsat sorterings orden"
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Sorter noter efter"
-
 msgid "Save geo-location with notes"
 msgstr "Gem geo-lokation i noter"
 
@@ -1400,65 +1265,15 @@ msgstr "Fokuser på brødtekst"
 msgid "When creating a new note:"
 msgstr "Ved oprettelse af ny note:"
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Start kryptering"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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"
 
@@ -1473,13 +1288,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automatisk app update"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Synkroniserings interval"
 
@@ -1523,6 +1331,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Mappe der skal synkroniseres med (absolut sti)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Sti til synkronisering, når filsystem synkronisering er slået til. Se `sync."
+"target`."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
@@ -1558,32 +1373,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ulovlig værdi: \"%s\".  Mulige valg er: %s."
 
-#, fuzzy
-msgid "General"
-msgstr "Generelle indstillinger"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Synkroniserings status"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Notesbøger"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Forlad/luk program."
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 msgid "Joplin Export File"
 msgstr "Joplin eksport fil"
 
@@ -1596,13 +1385,6 @@ msgstr "Joplin eksport mappe"
 msgid "Evernote Export File"
 msgstr "Evernote eksport fil"
 
-#, fuzzy
-msgid "Json Export Directory"
-msgstr "Joplin eksport mappe"
-
-msgid "File"
-msgstr "Fil"
-
 msgid "Directory"
 msgstr "Indeks"
 
@@ -1677,12 +1459,6 @@ 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."
 
@@ -1711,10 +1487,6 @@ 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"
@@ -1728,34 +1500,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Hentede emner: %d/%d."
 
 msgid "New tags:"
@@ -1783,21 +1529,10 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Joplin hjemmeside"
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "Til sletning: %d"
-
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Log på med OneDrive"
 
-msgid "Enter code here"
-msgstr ""
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Hoved nøgle %s"
@@ -1849,10 +1584,6 @@ 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"
 
@@ -1877,12 +1608,6 @@ msgstr "Vis metadata"
 msgid "View on map"
 msgstr "Vis på kort"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Ret"
-
 msgid "Delete notebook"
 msgstr "Slet notesbog"
 
@@ -1905,27 +1630,6 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
 msgid "Welcome"
 msgstr "Velkommen"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Denne note er ændret:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Sti til synkronisering, når filsystem synkronisering er slået til. Se "
-#~ "`sync.target`."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin hjemmeside"
-
-#~ 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/en_GB.po

@@ -119,7 +119,7 @@ msgstr ""
 
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 
 msgid "Enter master password:"
@@ -408,16 +408,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 msgstr ""
 
 #, javascript-format
@@ -508,18 +505,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
@@ -527,7 +512,7 @@ msgstr ""
 msgid "PDF File"
 msgstr ""
 
-msgid "Synchronisation status"
+msgid "File"
 msgstr ""
 
 msgid "New note"
@@ -539,41 +524,13 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
-msgid "&File"
-msgstr ""
-
-msgid "About Joplin"
-msgstr ""
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "Import"
 msgstr ""
 
 msgid "Export"
 msgstr ""
 
-msgid "Synchronise"
+msgid "Print"
 msgstr ""
 
 #, javascript-format
@@ -583,7 +540,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-msgid "&Edit"
+msgid "Edit"
 msgstr ""
 
 msgid "Copy"
@@ -595,18 +552,12 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-msgid "Select all"
-msgstr ""
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -616,10 +567,7 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
-msgid "Search in current note"
-msgstr ""
-
-msgid "&View"
+msgid "View"
 msgstr ""
 
 msgid "Toggle sidebar"
@@ -628,13 +576,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr ""
 
-msgid "Focus"
+msgid "Tools"
 msgstr ""
 
-msgid "&Tools"
+msgid "Synchronisation status"
 msgstr ""
 
-msgid "&Help"
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr ""
+
+msgid "General Options"
+msgstr ""
+
+msgid "Help"
 msgstr ""
 
 msgid "Website and documentation"
@@ -643,6 +600,16 @@ msgstr ""
 msgid "Make a donation"
 msgstr ""
 
+msgid "Check for updates..."
+msgstr ""
+
+msgid "About Joplin"
+msgstr ""
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr ""
+
 #, javascript-format
 msgid "Open %s"
 msgstr ""
@@ -659,30 +626,15 @@ msgstr ""
 msgid "Current version is up-to-date."
 msgstr ""
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 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 ""
 
@@ -726,30 +678,13 @@ 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."
+msgid "Check synchronisation configuration"
 msgstr ""
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Browse..."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr ""
-
 msgid "Apply"
 msgstr ""
 
@@ -828,9 +763,6 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
-msgstr ""
-
 msgid "Back"
 msgstr ""
 
@@ -881,6 +813,28 @@ msgstr ""
 msgid "Set the password"
 msgstr ""
 
+msgid "Add or remove tags"
+msgstr ""
+
+msgid "Duplicate"
+msgstr ""
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr ""
+
+msgid "Switch between note and to-do type"
+msgstr ""
+
+msgid "Copy Markdown link"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete notes?"
+msgstr ""
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr ""
 
@@ -888,15 +842,6 @@ 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 ""
 
@@ -913,9 +858,6 @@ 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 ""
@@ -926,9 +868,6 @@ msgid ""
 "note."
 msgstr ""
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1015,78 +954,24 @@ msgstr ""
 msgid "Clipper Options"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-
-#, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr ""
 
 msgid "Remove this search from the sidebar?"
 msgstr ""
 
-msgid "Delete"
+msgid "Rename"
 msgstr ""
 
-msgid "Rename"
+msgid "Synchronise"
 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 ""
 
-msgid "Add or remove tags"
-msgstr ""
-
-msgid "Duplicate"
-msgstr ""
-
-#, javascript-format
-msgid "%s - Copy"
-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 ""
-
-#, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr ""
-
-#, javascript-format
-msgid "Delete these %d notes?"
-msgstr ""
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr ""
@@ -1126,9 +1011,6 @@ msgid ""
 "synchronisation again may fix the problem."
 msgstr ""
 
-msgid "Untitled"
-msgstr ""
-
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1170,6 +1052,10 @@ msgstr ""
 msgid "Fetched items: %d/%d."
 msgstr ""
 
+#, javascript-format
+msgid "State: %s."
+msgstr ""
+
 msgid "Cancelling..."
 msgstr ""
 
@@ -1197,25 +1083,32 @@ msgstr ""
 msgid "Encrypted items cannot be modified"
 msgstr ""
 
-msgid "title"
-msgstr ""
-
-msgid "updated date"
-msgstr ""
-
 msgid "Conflicts"
 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 ""
 
+msgid "title"
+msgstr ""
+
+msgid "updated date"
+msgstr ""
+
 msgid "created date"
 msgstr ""
 
+msgid "Untitled"
+msgstr ""
+
 msgid "This note does not have geolocation information."
 msgstr ""
 
@@ -1227,13 +1120,6 @@ msgstr ""
 msgid "Cannot move note to \"%s\" notebook"
 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 "Language"
 msgstr ""
 
@@ -1264,9 +1150,6 @@ msgstr ""
 msgid "Reverse sort order"
 msgstr ""
 
-msgid "Sort notebooks by"
-msgstr ""
-
 msgid "Save geo-location with notes"
 msgstr ""
 
@@ -1282,63 +1165,15 @@ msgstr ""
 msgid "When creating a new note:"
 msgstr ""
 
-msgid "Enable soft breaks"
-msgstr ""
-
-msgid "Enable math expressions"
-msgstr ""
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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 ""
 
@@ -1350,13 +1185,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr ""
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -1394,6 +1222,11 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr ""
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
@@ -1429,28 +1262,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
-msgid "General"
-msgstr ""
-
-msgid "Synchronisation"
-msgstr ""
-
-msgid "Appearance"
-msgstr ""
-
-msgid "Note"
-msgstr ""
-
-msgid "Plugins"
-msgstr ""
-
-msgid "Application"
-msgstr ""
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 msgid "Joplin Export File"
 msgstr ""
 
@@ -1463,12 +1274,6 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr ""
 
-msgid "Json Export Directory"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Directory"
 msgstr ""
 
@@ -1538,12 +1343,6 @@ 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 ""
 
@@ -1572,9 +1371,6 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""
 
-msgid "Clear alarm"
-msgstr ""
-
 msgid "Save alarm"
 msgstr ""
 
@@ -1587,31 +1383,8 @@ 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 ""
-"Could not authorise application:\n"
-"\n"
-"%s\n"
-"\n"
-"Please try again."
-msgstr ""
-
-#, javascript-format
-msgid "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr ""
 
 msgid "New tags:"
@@ -1639,20 +1412,9 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, javascript-format
-msgid "FTS enabled: %d"
-msgstr ""
-
 msgid "Login with Dropbox"
 msgstr ""
 
-msgid "Enter code here"
-msgstr ""
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1704,9 +1466,6 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr ""
 
-msgid "Take photo"
-msgstr ""
-
 msgid "Attach photo"
 msgstr ""
 
@@ -1731,12 +1490,6 @@ msgstr ""
 msgid "View on map"
 msgstr ""
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr ""
-
 msgid "Delete notebook"
 msgstr ""
 

CliClient/locales/es_ES.po

@@ -1,21 +1,19 @@
 # Joplin translation to Spanish (Spain)
 # Copyright (C) 2017 Lucas Vieites
-# Copyright (C) 2019 Andros Fenollosa
 # This file is distributed under the same license as the Joplin-CLI package.
 # Lucas Vieites <lucas.vieites@gmail.com>, 2017.
-# Andros Fenollosa <andros@fenollosa.email>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Andros Fenollosa <andros@fenollosa.email>\n"
+"Last-Translator: Fernando Martín <f@mrtn.es>\n"
 "Language-Team: Spanish <lucas.vieites@gmail.com>\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 1.8.11\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
@@ -37,7 +35,7 @@ msgid "No notebook selected."
 msgstr "No se ha seleccionado ninguna libreta."
 
 msgid "No notebook has been specified."
-msgstr "Ninguna libreta fue especificada."
+msgstr "Ninguna libreta fue especificada"
 
 msgid "Y"
 msgstr "Y"
@@ -127,10 +125,9 @@ msgstr "Marca una tarea como hecha."
 msgid "Note is not a to-do: \"%s\""
 msgstr "La nota no es una tarea: \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "Maneja la configuración E2EE. Comandos disponibles `enable`, `disable`, "
 "`decrypt`, `status` y `target-status`."
@@ -460,16 +457,13 @@ msgstr "No se puede inicializar sincronizador."
 msgid "Starting synchronisation..."
 msgstr "Iniciando sincronización..."
 
-msgid "Downloading resources..."
-msgstr "Descargando recursos..."
-
 msgid "Cancelling... Please wait."
 msgstr "Cancelando... Por favor espere."
 
 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 "
@@ -587,18 +581,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando el formato de \"%s\" a \"%s\". Por favor espere..."
 
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-msgid "Note list"
-msgstr "Lista de notas"
-
-msgid "Note title"
-msgstr "Titulo de nota"
-
-msgid "Note body"
-msgstr "Cuerpo de nota"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
@@ -606,8 +588,8 @@ msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
 msgid "PDF File"
 msgstr "Archivo PDF"
 
-msgid "Synchronisation status"
-msgstr "Estado de la sincronización"
+msgid "File"
+msgstr "Archivo"
 
 msgid "New note"
 msgstr "Nueva nota"
@@ -618,42 +600,14 @@ msgstr "Nueva lista de tareas"
 msgid "New notebook"
 msgstr "Nueva libreta"
 
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opciones generales"
-
-msgid "Encryption options"
-msgstr "Opciones de cifrado"
-
-msgid "Web clipper options"
-msgstr "Opciones de recorte web"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-msgid "&File"
-msgstr "&Archivo"
-
-msgid "About Joplin"
-msgstr "Acerca de Joplin"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr "Comprobar actualizaciones..."
-
 msgid "Import"
 msgstr "Importar"
 
 msgid "Export"
 msgstr "Exportar"
 
-msgid "Synchronise"
-msgstr "Sincronizar"
+msgid "Print"
+msgstr "Imprimir"
 
 #, javascript-format
 msgid "Hide %s"
@@ -662,8 +616,8 @@ msgstr "Oculta %s"
 msgid "Quit"
 msgstr "Salir"
 
-msgid "&Edit"
-msgstr "&Editar"
+msgid "Edit"
+msgstr "Editar"
 
 msgid "Copy"
 msgstr "Copiar"
@@ -674,32 +628,23 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Pegar"
 
-msgid "Select all"
-msgstr "Seleccionar todo"
-
 msgid "Bold"
-msgstr "Negrita"
+msgstr ""
 
 msgid "Italic"
-msgstr "Cursiva"
-
-msgid "Link"
-msgstr "Enlace"
+msgstr ""
 
 msgid "Insert Date Time"
-msgstr "Introduce fecha"
+msgstr ""
 
 msgid "Edit in external editor"
-msgstr "Editar con un editor externo"
+msgstr ""
 
 msgid "Search in all the notes"
 msgstr "Buscar en todas las notas"
 
-msgid "Search in current note"
-msgstr "Buscar en nota actual"
-
-msgid "&View"
-msgstr "&Ver"
+msgid "View"
+msgstr "Ver"
 
 msgid "Toggle sidebar"
 msgstr "Cambia la barra lateral"
@@ -707,14 +652,23 @@ msgstr "Cambia la barra lateral"
 msgid "Toggle editor layout"
 msgstr "Cambia el diseño del editor"
 
-msgid "Focus"
-msgstr "Foco"
+msgid "Tools"
+msgstr "Herramientas"
 
-msgid "&Tools"
-msgstr "&Herramientas"
+msgid "Synchronisation status"
+msgstr "Estado de la sincronización"
 
-msgid "&Help"
-msgstr "&Ayuda"
+msgid "Web clipper options"
+msgstr "Opciones de recorte web"
+
+msgid "Encryption options"
+msgstr "Opciones de cifrado"
+
+msgid "General Options"
+msgstr "Opciones generales"
+
+msgid "Help"
+msgstr "Ayuda"
 
 msgid "Website and documentation"
 msgstr "Sitio web y documentación"
@@ -722,6 +676,16 @@ msgstr "Sitio web y documentación"
 msgid "Make a donation"
 msgstr "Hacer una donación"
 
+msgid "Check for updates..."
+msgstr "Comprobar actualizaciones..."
+
+msgid "About Joplin"
+msgstr "Acerca de Joplin"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, javascript-format
 msgid "Open %s"
 msgstr "Abrir %s"
@@ -738,34 +702,20 @@ msgstr "Cancelar"
 msgid "Current version is up-to-date."
 msgstr "La versión actual está actualizada."
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr "%s (pre-lanzamiento)"
-
 msgid "An update is available, do you want to download it now?"
 msgstr "Hay disponible una actualización. ¿Quiere descargarla ahora?"
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr "Tu versión: %s"
-
-#, javascript-format
-msgid "New version: %s"
-msgstr "Nueva versión: %s"
-
 msgid "Yes"
 msgstr "Sí"
 
 msgid "No"
 msgstr "No"
 
-msgid "Token has been copied to the clipboard!"
-msgstr "¡El token ha sido copiado al portapapeles!"
-
+#, fuzzy
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
-"El servicio de recorte web está habilitado y configurado para que inicie "
-"automáticamente."
+"El servicio de recorte web está habilitado y configurado para inicie "
+"automaticamente"
 
 #, javascript-format
 msgid "Status: Started on port %d"
@@ -812,32 +762,15 @@ msgstr "Paso 2: Instalar la extensión"
 msgid "Download and install the relevant extension for your browser:"
 msgstr "Descargar e instalar para su navegador:"
 
-msgid "Advanced options"
-msgstr "Opciones avanzadas"
-
-msgid "Authorisation token:"
-msgstr "Token de autorización:"
-
-msgid "Copy token"
-msgstr "Copiar token"
-
-msgid ""
-"This authorisation token is only needed to allow third-party applications to "
-"access Joplin."
-msgstr ""
+msgid "Check synchronisation configuration"
+msgstr "Comprobar sincronización"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Las notas y los ajustes se guardan en: %s"
 
-msgid "Browse..."
-msgstr "Explorar..."
-
-msgid "Check synchronisation configuration"
-msgstr "Comprobar sincronización"
-
 msgid "Apply"
-msgstr "Aplicar"
+msgstr ""
 
 msgid "Submit"
 msgstr "Aceptar"
@@ -929,9 +862,6 @@ msgstr "Estado"
 msgid "Encryption is:"
 msgstr "El cifrado está:"
 
-msgid "Usage"
-msgstr "Uso"
-
 msgid "Back"
 msgstr "Atrás"
 
@@ -950,7 +880,7 @@ msgid "Notebook title:"
 msgstr "Título de libreta:"
 
 msgid "Add or remove tags:"
-msgstr "Agregar o borrar etiquetas:"
+msgstr "Agregar o borrar etiquetas: "
 
 msgid "Separate each tag by a comma."
 msgstr "Separar cada etiqueta por una coma."
@@ -982,6 +912,28 @@ msgstr "No se han podido descifrar algunos elementos."
 msgid "Set the password"
 msgstr "Establecer la contraseña"
 
+msgid "Add or remove tags"
+msgstr "Añadir o borrar etiquetas"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Copiar"
+
+msgid "Switch between note and to-do type"
+msgstr "Cambiar entre nota y lista de tareas"
+
+msgid "Copy Markdown link"
+msgstr "Copiar el enlace de Markdown"
+
+msgid "Delete"
+msgstr "Eliminar"
+
+msgid "Delete notes?"
+msgstr "¿Desea eliminar notas?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "No hay ninguna nota. Cree una pulsando «Nota nueva»."
 
@@ -989,21 +941,12 @@ 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 "Localización"
-
-msgid "URL"
-msgstr "URL"
-
-msgid "Note properties"
-msgstr "Propiedades de nota"
-
 msgid "Open..."
 msgstr "Abrir..."
 
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "This file could not be opened: %s"
-msgstr "No se ha podido abrir este archivo: %s"
+msgstr "No se ha podido guardar esta libreta: %s"
 
 msgid "Save as..."
 msgstr "Guardar como..."
@@ -1012,10 +955,7 @@ 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 "El adjunto no ha sido descargado o desencriptado todavía."
+msgstr ""
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -1029,20 +969,17 @@ msgstr ""
 "Esta nota no tiene contenido. Pulse en \"%s\" para cambiar al editor y "
 "editar la nota."
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr "Solo una nota puede ser impresa o exportada a PDF a la vez."
-
 msgid "strong text"
-msgstr "texto destacado"
+msgstr ""
 
 msgid "emphasized text"
-msgstr "texto resaltado"
+msgstr ""
 
 msgid "List item"
-msgstr "Listar elementos"
+msgstr ""
 
 msgid "Insert Hyperlink"
-msgstr "Insertar hipervínculo"
+msgstr ""
 
 msgid "Attach file"
 msgstr "Adjuntar archivo"
@@ -1053,36 +990,37 @@ msgstr "Etiquetas"
 msgid "Set alarm"
 msgstr "Establecer alarma"
 
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "In: %s"
-msgstr "En: %s"
+msgstr "%s: %s"
 
 msgid "Hyperlink"
-msgstr "Hipervínculo"
+msgstr ""
 
 msgid "Code"
-msgstr "Código"
+msgstr ""
 
 msgid "Numbered List"
-msgstr "Lista numerada"
+msgstr ""
 
 msgid "Bulleted List"
-msgstr "Lista con viñetas"
+msgstr ""
 
 msgid "Checkbox"
-msgstr "Casilla"
+msgstr ""
 
 msgid "Heading"
-msgstr "Título"
+msgstr ""
 
 msgid "Horizontal Rule"
-msgstr "Regla horizontal"
+msgstr ""
 
 msgid "Click to stop external editing"
-msgstr "Pulsa para detener la edición externa"
+msgstr ""
 
+#, fuzzy
 msgid "Watching..."
-msgstr "Mirando..."
+msgstr "Cancelando..."
 
 msgid "to-do"
 msgstr "lista de tareas"
@@ -1118,81 +1056,24 @@ msgstr "Opciones de cifrado"
 msgid "Clipper Options"
 msgstr "Opciones de recorte"
 
-#, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-"Borrar Libreta \"%s\"?\n"
-"\n"
-"Todas las notas y sublibretas de esta libreta serán borradas."
-
-#, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
-msgstr "Desea borrar las etiquetas pertenecientes a \"%s\" de todas las notas?"
+msgid "Remove this tag from all the notes?"
+msgstr "¿Desea eliminar esta etiqueta de todas las notas?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "¿Desea eliminar esta búsqueda de la barra lateral?"
 
-msgid "Delete"
-msgstr "Eliminar"
-
 msgid "Rename"
 msgstr "Renombrar"
 
+msgid "Synchronise"
+msgstr "Sincronizar"
+
 msgid "Notebooks"
 msgstr "Libretas"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Descifrando elementos: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d"
-msgstr "Obteniendo refuersos: %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"
 
-msgid "Add or remove tags"
-msgstr "Añadir o borrar etiquetas"
-
-msgid "Duplicate"
-msgstr "Duplicado"
-
-#, javascript-format
-msgid "%s - Copy"
-msgstr "%s - Copiar"
-
-msgid "Switch between note and to-do type"
-msgstr "Cambiar entre nota y lista de tareas"
-
-msgid "Switch to note type"
-msgstr "Cambiar a  nota"
-
-msgid "Switch to to-do type"
-msgstr "Cambiar a lista de tareas"
-
-msgid "Copy Markdown link"
-msgstr "Copiar el enlace de Markdown"
-
-#, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "¿Borrar nota \"%s\"?"
-
-#, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Borrar %d notas?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
@@ -1234,9 +1115,6 @@ 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"
@@ -1284,6 +1162,10 @@ 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..."
 
@@ -1311,25 +1193,35 @@ msgstr "Cifrado"
 msgid "Encrypted items cannot be modified"
 msgstr "Los elementos cifrados no pueden ser modificados"
 
-msgid "title"
-msgstr "título"
-
-msgid "updated date"
-msgstr "fecha de actualización"
-
 msgid "Conflicts"
 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"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Actualizado: %d."
+
+#, fuzzy
 msgid "created date"
-msgstr "fecha de creación"
+msgstr "Creado: %d."
+
+msgid "Untitled"
+msgstr "Sin título"
 
 msgid "This note does not have geolocation information."
 msgstr "Esta nota no tiene informacion de geolocalización."
@@ -1342,16 +1234,6 @@ msgstr "No se ha podido copiar la nota a la libreta «%s»"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "No se ha podido mover la nota a la libreta «%s»"
 
-#, 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 ""
-"Atención: Si cambias esta ubicación, asegúrate de copiar todo tu contenido "
-"antes de sincronizarlo, de lo contrario todos los archivos serán eliminados. "
-"Consulte las preguntas frecuentes para obtener más detalles: %s"
-
 msgid "Language"
 msgstr "Idioma"
 
@@ -1382,10 +1264,6 @@ msgstr "Ordenar notas por"
 msgid "Reverse sort order"
 msgstr "Invierte el orden"
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Ordenar notas por"
-
 msgid "Save geo-location with notes"
 msgstr "Guardar geolocalización en las notas"
 
@@ -1401,67 +1279,15 @@ msgstr "Foco en el cuerpo"
 msgid "When creating a new note:"
 msgstr "Cuando se crear una nota nueva:"
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Habilitar cifrado"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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 ""
-"Esto permitirá que Joplin se ejecute en segundo plano. Se recomienda "
-"habilitar esta configuración para que sus notas estén sincronizadas "
-"constantemente, reduciendo así el número de conflictos."
-
-msgid "Start application minimised in the tray icon"
-msgstr "Iniciar aplicación minimizada en el icono de la bandeja"
-
 msgid "Global zoom percentage"
 msgstr "Establecer el porcentaje de aumento de la aplicación"
 
-msgid "Editor font size"
-msgstr "Editar tamaño de fuente"
-
 msgid "Editor font family"
 msgstr "Fuente del editor"
 
@@ -1476,13 +1302,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Actualizar la aplicación automáticamente"
 
-msgid "Get pre-releases when checking for updates"
-msgstr "Obtenga pre-lanzamientos cuando busque actualizaciones"
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr "Ver la página de pre-lanzamiento para más detalles: %s"
-
 msgid "Synchronisation interval"
 msgstr "Intervalo de sincronización"
 
@@ -1498,16 +1317,17 @@ 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 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."
+"El editor que se usará para abrir una nota. Se intentará auto-detectar el "
+"editor predeterminado si no se proporciona ninguno."
 
 msgid "Show advanced options"
 msgstr "Mostrar opciones avanzadas"
@@ -1526,6 +1346,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Directorio con el que sincronizarse (ruta completa)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"La ruta a la que sincronizar cuando se activa la sincronización con sistema "
+"de archivos. Vea «sync.target»."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "Servidor WebDAV de Nextcloud"
 
@@ -1545,7 +1372,7 @@ msgid "WebDAV password"
 msgstr "Contraseña de WebDAV"
 
 msgid "Custom TLS certificates"
-msgstr "Certificados TLS personalizados"
+msgstr ""
 
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
@@ -1553,41 +1380,14 @@ 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 "Ignorar errores en certificados TLS"
+msgstr ""
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Opción inválida: «%s». Los valores posibles son: %s."
 
-msgid "General"
-msgstr "General"
-
-msgid "Synchronisation"
-msgstr "Sincronización"
-
-msgid "Appearance"
-msgstr "Apariencia"
-
-msgid "Note"
-msgstr "Nota"
-
-msgid "Plugins"
-msgstr ""
-
-msgid "Application"
-msgstr "Aplicación"
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr "La etiqueta \"%s\" ya existe. Por favor, busque un nuevo nombre."
-
 msgid "Joplin Export File"
 msgstr "Archivo de exportación de Joplin"
 
@@ -1600,12 +1400,6 @@ msgstr "Directorio para exportar de Joplin"
 msgid "Evernote Export File"
 msgstr "Archivo exportado de Evernote"
 
-msgid "Json Export Directory"
-msgstr "Directorio para exportar JSON"
-
-msgid "File"
-msgstr "Archivo"
-
 msgid "Directory"
 msgstr "Directorio"
 
@@ -1680,12 +1474,6 @@ msgstr "Alarmas próximas"
 msgid "On %s: %s"
 msgstr "En %s: %s"
 
-msgid "Permission to use camera"
-msgstr "Permiso para usar tu cámara"
-
-msgid "Your permission to use your camera is required."
-msgstr "El permiso para usar tu cámara es necesario."
-
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "No hay notas. Cree una pulsando en el botón (+)."
 
@@ -1714,9 +1502,7 @@ msgstr "¿Desea mover %d notas a libreta «%s»?"
 msgid "Press to set the decryption password."
 msgstr "Presione para establecer la contraseña de descifrado."
 
-msgid "Clear alarm"
-msgstr "Quitar alarma"
-
+#, fuzzy
 msgid "Save alarm"
 msgstr "Establecer alarma"
 
@@ -1729,39 +1515,9 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"
 
-msgid "Checking... Please wait."
-msgstr "Comprobando... Por favor espere."
-
-msgid "Success! Synchronisation configuration appears to be correct."
-msgstr "¡Éxito! La configuración de sincronización es correcta."
-
-msgid ""
-"Error. Please check that URL, username, password, etc. are correct and that "
-"the sync target is accessible. The reported error was:"
-msgstr ""
-"Error. Por favor comprueba URL, nombre de usuario, contraseña, etc. son "
-"correctos y el servicio a sincronizar este accesible. El código de error fue:"
-
-msgid "The application has been authorised!"
-msgstr "¡La aplicacion ha sido autorizada!"
-
-#, javascript-format
-msgid ""
-"Could not authorise application:\n"
-"\n"
-"%s\n"
-"\n"
-"Please try again."
-msgstr ""
-"No se pudo autorizar aplicación:\n"
-"\n"
-"%s\n"
-"\n"
-"Por favor, vuelva a intentarlo."
-
-#, javascript-format
-msgid "Decrypted items: %s / %s"
-msgstr "Descifrando elementos: %s / %s"
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementos obtenidos: %d/%d."
 
 msgid "New tags:"
 msgstr "Nuevas etiquetas:"
@@ -1795,20 +1551,9 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Sitio web de Joplin"
 
-#, javascript-format
-msgid "Database v%s"
-msgstr "Base de datos v%s"
-
-#, javascript-format
-msgid "FTS enabled: %d"
-msgstr "FTS activado: %d"
-
 msgid "Login with Dropbox"
 msgstr "Acceder con Dropbox"
 
-msgid "Enter code here"
-msgstr "Introduce código aquí"
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Clave maestra %s"
@@ -1861,9 +1606,6 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagen no soportado: %s"
 
-msgid "Take photo"
-msgstr "Tomar foto"
-
 msgid "Attach photo"
 msgstr "Adjuntar foto"
 
@@ -1888,12 +1630,6 @@ msgstr "Mostrar metadatos"
 msgid "View on map"
 msgstr "Ver en un mapa"
 
-msgid "Go to source URL"
-msgstr "Ir a  origen URL"
-
-msgid "Edit"
-msgstr "Editar"
-
 msgid "Delete notebook"
 msgstr "Borrar libreta"
 
@@ -1917,32 +1653,6 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Esta nota ha sido modificada:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "La ruta a la que sincronizar cuando se activa la sincronización con "
-#~ "sistema de archivos. Vea «sync.target»."
-
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"
-
-#~ msgid "Remove?"
-#~ msgstr "¿Borrar?"
-
-#~ msgid "Delete notes?"
-#~ msgstr "¿Desea eliminar notas?"
-
-#~ 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"
@@ -1987,6 +1697,9 @@ msgstr "Bienvenido"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Enfocar el panel anterior"
 
+#~ msgid "Enter command line mode"
+#~ msgstr "Entrar en modo línea de comandos"
+
 #~ msgid "Exit command line mode"
 #~ msgstr "Salir del modo línea de comandos"
 
@@ -1996,6 +1709,9 @@ msgstr "Bienvenido"
 #~ msgid "Cancel the current command."
 #~ msgstr "Cancelar el comando actual."
 
+#~ msgid "Exit the application."
+#~ msgstr "Salir de la aplicación."
+
 #~ msgid "Delete the currently selected note or notebook."
 #~ msgstr "Eliminar la nota o libreta seleccionada."
 
@@ -2046,6 +1762,9 @@ msgstr "Bienvenido"
 #~ msgid "Delete notebook?"
 #~ msgstr "Eliminar libreta?"
 
+#~ msgid "Delete notebook \"%s\"?"
+#~ msgstr "Elimina una libreta \"%s\"?"
+
 #, fuzzy
 #~ msgid "File system synchronisation target directory"
 #~ msgstr "Sincronización de sistema de archivos  en directorio objetivo"

CliClient/locales/eu.po

@@ -125,10 +125,9 @@ msgstr "Markatu zeregina egindakotzat."
 msgid "Note is not a to-do: \"%s\""
 msgstr "Oharra ez da zeregina: \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "E2EEren konfigurazioa erabiltzen du. Komandoak dira `enable`, `disable`, "
 "`decrypt`, `status` eta `target-status`."
@@ -456,17 +455,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 msgstr ""
 "<tag-command> izan daiteke \"add\", \"remove\" edo \"list\" [oharra]tik "
 "[etiketa] esleitu edo kentzeko, edo [etiketa]rekin elkartutako oharrak "
@@ -583,20 +578,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Koadernoaren izenburua: "
-
-#, fuzzy
-msgid "Note body"
-msgstr "Koadernoak"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
@@ -605,8 +586,8 @@ msgstr ""
 msgid "PDF File"
 msgstr "Fitxategia"
 
-msgid "Synchronisation status"
-msgstr "Sinkronizazioaren egoera"
+msgid "File"
+msgstr "Fitxategia"
 
 msgid "New note"
 msgstr "Ohar berria"
@@ -617,35 +598,6 @@ msgstr "Zeregin berria"
 msgid "New notebook"
 msgstr "Koaderno berria"
 
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr "Ezarpenak"
-
-msgid "Encryption options"
-msgstr "Zifratzeko aukerak"
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Fitxategia"
-
-msgid "About Joplin"
-msgstr "Joplin-i buruz"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "Import"
 msgstr "Inportatu"
 
@@ -653,8 +605,8 @@ msgstr "Inportatu"
 msgid "Export"
 msgstr "Inportatu"
 
-msgid "Synchronise"
-msgstr "Sinkronizatu"
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -663,8 +615,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Irten"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Editatu"
 
 msgid "Copy"
@@ -676,19 +627,12 @@ msgstr "Moztu"
 msgid "Paste"
 msgstr "Itsatsi"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Data aukeratu"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -698,11 +642,7 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Bilatu ohar guztietan"
 
-#, fuzzy
-msgid "Search in current note"
-msgstr "Bilatu ohar guztietan"
-
-msgid "&View"
+msgid "View"
 msgstr ""
 
 msgid "Toggle sidebar"
@@ -711,15 +651,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr ""
 
-msgid "Focus"
-msgstr ""
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Tresnak"
 
-#, fuzzy
-msgid "&Help"
+msgid "Synchronisation status"
+msgstr "Sinkronizazioaren egoera"
+
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr "Zifratzeko aukerak"
+
+msgid "General Options"
+msgstr "Ezarpenak"
+
+msgid "Help"
 msgstr "Laguntza"
 
 msgid "Website and documentation"
@@ -729,6 +676,16 @@ msgstr "Web orria eta dokumentazioa (en)"
 msgid "Make a donation"
 msgstr "Web orria eta dokumentazioa (en)"
 
+msgid "Check for updates..."
+msgstr ""
+
+msgid "About Joplin"
+msgstr "Joplin-i buruz"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, fuzzy, javascript-format
 msgid "Open %s"
 msgstr "On %s: %s"
@@ -745,21 +702,9 @@ msgstr "Utzi"
 msgid "Current version is up-to-date."
 msgstr ""
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 msgstr ""
 
@@ -767,9 +712,6 @@ 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 ""
 
@@ -814,31 +756,13 @@ 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 ""
+msgid "Check synchronisation configuration"
+msgstr "Sinkronizazioa utzi"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Oharrak eta ezarpenak hemen daude gordeta: %s"
 
-msgid "Browse..."
-msgstr ""
-
-#, fuzzy
-msgid "Check synchronisation configuration"
-msgstr "Sinkronizazioa utzi"
-
 msgid "Apply"
 msgstr ""
 
@@ -929,10 +853,6 @@ msgstr "Egoera"
 msgid "Encryption is:"
 msgstr "Zifratua  da:"
 
-#, fuzzy
-msgid "Usage"
-msgstr "Erabili: %s"
-
 msgid "Back"
 msgstr "Atzera"
 
@@ -987,6 +907,28 @@ msgstr "Zenbait item ezin dira deszifratu."
 msgid "Set the password"
 msgstr "Ezarri pasahitza"
 
+msgid "Add or remove tags"
+msgstr "Gehitu edo ezabatu etiketak"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopiatu"
+
+msgid "Switch between note and to-do type"
+msgstr "Aldatu oharra eta zeregin eren artean."
+
+msgid "Copy Markdown link"
+msgstr ""
+
+msgid "Delete"
+msgstr "Ezabatu"
+
+msgid "Delete notes?"
+msgstr "Oharrak ezabatu?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "Hemen ez dago oharrik. Sortu bat \"Ohar berria\" sakatuta."
 
@@ -994,15 +936,6 @@ 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 ""
 
@@ -1020,9 +953,6 @@ 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"
@@ -1033,9 +963,6 @@ msgid ""
 "note."
 msgstr ""
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1127,82 +1054,25 @@ msgstr "Zifratzeko aukerak"
 msgid "Clipper Options"
 msgstr "Ezarpenak"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr "Koadernoa ezabatu? Dituen ohar guztiak ere ezabatuko dira."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Kendu etiketa hori ohar guztietatik?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Kendu bilaketa hori ohar guztietatik?"
 
-msgid "Delete"
-msgstr "Ezabatu"
-
 msgid "Rename"
 msgstr "Berrizendatu"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Gehitu edo ezabatu etiketak"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Irten aplikaziotik"
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-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 ""
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Oharrak ezabatu?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Oharrok ezabatu?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Erabili: %s"
@@ -1246,9 +1116,6 @@ 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"
@@ -1295,6 +1162,10 @@ 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..."
 
@@ -1322,14 +1193,6 @@ msgstr "Zifratuta"
 msgid "Encrypted items cannot be modified"
 msgstr "Zifratutako itemak ezin aldatu daitezke"
 
-#, fuzzy
-msgid "title"
-msgstr "Titulu gabekoa"
-
-#, fuzzy
-msgid "updated date"
-msgstr "Eguneratuta: %d."
-
 msgid "Conflicts"
 msgstr "Gatazkak"
 
@@ -1337,15 +1200,30 @@ 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 ""
 "Koadernoak ezin izendatu daitezke \"%s\", izen hori Joplinek gordeta dauka"
 
+#, fuzzy
+msgid "title"
+msgstr "Titulu gabekoa"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Eguneratuta: %d."
+
 #, fuzzy
 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."
 
@@ -1357,13 +1235,6 @@ msgstr "Ezin kopia daiteke oharra \"%s\" koadernora"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Ezin eraman daiteke oharra \"%s\" koadernora"
 
-#, 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 "Language"
 msgstr "Hizkuntza"
 
@@ -1397,10 +1268,6 @@ msgstr ""
 msgid "Reverse sort order"
 msgstr "Alderantziz antolatzen du."
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Editatu koadernoa"
-
 msgid "Save geo-location with notes"
 msgstr "Gore geokokapena oharrekin"
 
@@ -1418,66 +1285,16 @@ msgstr ""
 msgid "When creating a new note:"
 msgstr "Ohar berria sortzen du."
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Zifratua gaitu"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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 ""
 
@@ -1489,13 +1306,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automatikoki eguneratu aplikazioa"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Sinkronizazio tartea"
 
@@ -1540,6 +1350,12 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Sinkronizatzeko direktorioa (bide-izena osorik)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Sinkronizazio sistema gaituta dagoenerako bide-izena. Ikus `sync.target`."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
@@ -1578,32 +1394,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Balio aukera baliogabea: \"%s\". Litezkeen balioak: %s."
 
-#, fuzzy
-msgid "General"
-msgstr "Ezarpenak"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Sinkronizazioaren egoera"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Koadernoak"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Irten aplikaziotik"
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 #, fuzzy
 msgid "Joplin Export File"
 msgstr "Evernotetik esportatutako fitxategiak"
@@ -1618,13 +1408,6 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr "Evernotetik esportatutako fitxategiak"
 
-#, fuzzy
-msgid "Json Export Directory"
-msgstr "Evernotetik esportatutako fitxategiak"
-
-msgid "File"
-msgstr "Fitxategia"
-
 msgid "Directory"
 msgstr ""
 
@@ -1697,12 +1480,6 @@ 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."
 
@@ -1731,10 +1508,6 @@ 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"
@@ -1748,34 +1521,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Itemak eskuratuta: %d%d."
 
 msgid "New tags:"
@@ -1803,22 +1550,10 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "Ezabatzeko: %d"
-
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Login with OneDrive"
 
-#, fuzzy
-msgid "Enter code here"
-msgstr "Sartu komando-lerro moduan "
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Pasahitz Nagusia %s"
@@ -1870,10 +1605,6 @@ 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"
 
@@ -1898,12 +1629,6 @@ msgstr "Erakutsi metadatuak"
 msgid "View on map"
 msgstr "Ikusi mapan"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Editatu"
-
 msgid "Delete notebook"
 msgstr "Ezabatu koadernoa"
 
@@ -1926,23 +1651,6 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
 msgid "Welcome"
 msgstr "Ongi etorri!"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Ohar hau mugitua izan da:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Sinkronizazio sistema gaituta dagoenerako bide-izena. Ikus `sync.target`."
-
-#, 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"
 
@@ -1978,6 +1686,9 @@ msgstr "Ongi etorri!"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Eraman fokua aurreko panelera"
 
+#~ msgid "Enter command line mode"
+#~ msgstr "Sartu komando-lerro moduan "
+
 #~ msgid "Exit command line mode"
 #~ msgstr "Irten komando-lerro modutik"
 
@@ -1987,6 +1698,9 @@ msgstr "Ongi etorri!"
 #~ msgid "Cancel the current command."
 #~ msgstr "Utzi uneko komandoa"
 
+#~ msgid "Exit the application."
+#~ msgstr "Irten aplikaziotik"
+
 #~ msgid "Delete the currently selected note or notebook."
 #~ msgstr "Ezabatu aukeratutako oharra edo koadernoa"
 

CliClient/locales/fr_FR.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.2.1\n"
+"X-Generator: Poedit 2.0.3\n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "Pour supprimer une vignette, enlever là des notes associées."
@@ -59,7 +59,7 @@ msgstr ""
 "La commande \"%s\" est disponible uniquement en mode d'interface graphique"
 
 msgid "Cannot change encrypted item"
-msgstr "Un objet chiffré ne peut pas être modifié"
+msgstr "Un objet crypté ne peut pas être modifié"
 
 #, javascript-format
 msgid "Missing required argument: %s"
@@ -125,11 +125,10 @@ msgstr "La note n'est pas une tâche : \"%s\""
 
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
-"Gérer la configuration E2EE (Chiffrement de bout à bout). Les commandes sont "
-"`enable`, `disable`, `decrypt` et `status`, `decrypt-file` et `target-"
-"status`."
+"Gérer la configuration E2EE (Cryptage de bout à bout). Les commandes sont "
+"`enable`, `disable`, `decrypt` et `status` et `target-status`."
 
 msgid "Enter master password:"
 msgstr "Entrer le mot de passe maître :"
@@ -141,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échiffrement... Veuillez patienter car cela pourrait prendre "
-"plusieurs minutes selon le nombre d'objets à déchiffrer."
+"Démarrage du décryptage... Veuillez patienter car cela pourrait prendre "
+"plusieurs minutes selon le nombre d'objets à décrypter."
 
 msgid "Completed decryption."
-msgstr "Déchiffrement complété."
+msgstr "Décryptage complété."
 
 msgid "Enabled"
 msgstr "Activé"
@@ -155,7 +154,7 @@ msgstr "Désactivé"
 
 #, javascript-format
 msgid "Encryption is: %s"
-msgstr "Le chiffrement est : %s"
+msgstr "Le cryptage est : %s"
 
 msgid "Edit note."
 msgstr "Éditer la note."
@@ -459,21 +458,18 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 (utilisez l'option -l pour les options complètes)."
+"lister les étiquettes."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -575,27 +571,15 @@ 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 chiffré et il se peut que vous deviez "
+"Au moins un objet est actuellement crypté 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 chiffrés vont "
-"être déchiffré en tâche de fond et seront disponible prochainement."
+"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."
 
 #, javascript-format
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exporter vers \"%s\" au format \"%s\". Veuillez patienter..."
 
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-msgid "Note list"
-msgstr "Liste de notes"
-
-msgid "Note title"
-msgstr "Titre de la note"
-
-msgid "Note body"
-msgstr "Corps de la note"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
@@ -603,8 +587,8 @@ msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
 msgid "PDF File"
 msgstr "Fichier PDF"
 
-msgid "Synchronisation status"
-msgstr "État de la synchronisation"
+msgid "File"
+msgstr "Fichier"
 
 msgid "New note"
 msgstr "Nouvelle note"
@@ -615,42 +599,14 @@ msgstr "Nouvelle tâche"
 msgid "New notebook"
 msgstr "Nouveau carnet"
 
-msgid "Print"
-msgstr "Imprimer"
-
-msgid "General Options"
-msgstr "Options générales"
-
-msgid "Encryption options"
-msgstr "Options de chiffrement"
-
-msgid "Web clipper options"
-msgstr "Options du Web Clipper"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-msgid "&File"
-msgstr "&Fichier"
-
-msgid "About Joplin"
-msgstr "A propos de Joplin"
-
-msgid "Preferences..."
-msgstr "Préférences…"
-
-msgid "Check for updates..."
-msgstr "Vérifier les mises à jour..."
-
 msgid "Import"
 msgstr "Importer"
 
 msgid "Export"
 msgstr "Exporter"
 
-msgid "Synchronise"
-msgstr "Synchroniser"
+msgid "Print"
+msgstr "Imprimer"
 
 #, javascript-format
 msgid "Hide %s"
@@ -659,8 +615,8 @@ msgstr "Cacher %s"
 msgid "Quit"
 msgstr "Quitter"
 
-msgid "&Edit"
-msgstr "&Édition"
+msgid "Edit"
+msgstr "Édition"
 
 msgid "Copy"
 msgstr "Copier"
@@ -671,18 +627,12 @@ msgstr "Couper"
 msgid "Paste"
 msgstr "Coller"
 
-msgid "Select all"
-msgstr "Sélectionner tout"
-
 msgid "Bold"
 msgstr "Gras"
 
 msgid "Italic"
 msgstr "Italique"
 
-msgid "Link"
-msgstr "Lien"
-
 msgid "Insert Date Time"
 msgstr "Insérer la date et l'heure"
 
@@ -692,11 +642,8 @@ 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"
+msgid "View"
+msgstr "Affichage"
 
 msgid "Toggle sidebar"
 msgstr "Basculer barre latérale"
@@ -704,14 +651,23 @@ msgstr "Basculer barre latérale"
 msgid "Toggle editor layout"
 msgstr "Basculer l'agencement de l'éditeur"
 
-msgid "Focus"
-msgstr "Naviguer"
+msgid "Tools"
+msgstr "Outils"
 
-msgid "&Tools"
-msgstr "&Outils"
+msgid "Synchronisation status"
+msgstr "État de la synchronisation"
 
-msgid "&Help"
-msgstr "&Aide"
+msgid "Web clipper options"
+msgstr "Options du Web Clipper"
+
+msgid "Encryption options"
+msgstr "Options de cryptage"
+
+msgid "General Options"
+msgstr "Options générales"
+
+msgid "Help"
+msgstr "Aide"
 
 msgid "Website and documentation"
 msgstr "Documentation en ligne"
@@ -719,6 +675,16 @@ msgstr "Documentation en ligne"
 msgid "Make a donation"
 msgstr "Faire un don"
 
+msgid "Check for updates..."
+msgstr "Vérifier les mises à jour..."
+
+msgid "About Joplin"
+msgstr "A propos de Joplin"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, javascript-format
 msgid "Open %s"
 msgstr "Ouvrir %s"
@@ -735,31 +701,16 @@ msgstr "Annuler"
 msgid "Current version is up-to-date."
 msgstr "La version actuelle est à jour."
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr "%s (pré-release)"
-
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 "Une mise à jour est disponible, souhaitez vous la télécharger maintenant ?"
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr "Votre version : %s"
-
-#, javascript-format
-msgid "New version: %s"
-msgstr "Nouvelle version : %s"
-
 msgid "Yes"
 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."
 
@@ -810,32 +761,13 @@ 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"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes et paramètres se trouve dans : %s"
 
-msgid "Browse..."
-msgstr "Parcourir…"
-
-msgid "Check synchronisation configuration"
-msgstr "Vérifier config synchronisation"
-
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -850,9 +782,9 @@ msgid ""
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
 "continue?"
 msgstr ""
-"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 ?"
+"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 ?"
 
 msgid ""
 "Enabling encryption means *all* your notes and attachments are going to be "
@@ -860,17 +792,17 @@ msgid ""
 "password as, for security purposes, this will be the *only* way to decrypt "
 "the data! To enable encryption, please enter your password below."
 msgstr ""
-"Activer le 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 "
+"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 "
 "perdez pas votre mot de passe car, pour des raisons de sécurité, ce sera la "
-"*seule* façon de déchiffrer les données ! Pour activer le chiffrement, "
-"veuillez entrer votre mot de passe ci-dessous."
+"*seule* façon de décrypter les données ! Pour activer le cryptage, veuillez "
+"entrer votre mot de passe ci-dessous."
 
 msgid "Disable encryption"
-msgstr "Désactiver le chiffrement"
+msgstr "Désactiver le cryptage"
 
 msgid "Enable encryption"
-msgstr "Activer le chiffrement"
+msgstr "Activer le cryptage"
 
 msgid "Master Keys"
 msgstr "Clefs maître"
@@ -901,10 +833,10 @@ msgid ""
 "as \"active\"). Any of the keys might be used for decryption, depending on "
 "how the notes or notebooks were originally encrypted."
 msgstr ""
-"Note : seule une clef maître va être utilisée pour le chiffrement (celle "
+"Note : seule une clef maître va être utilisée pour le cryptage (celle "
 "marquée comme \"actif\" ci-dessus). N'importe quelle clef peut être utilisée "
-"pour le déchiffrement, selon la façon dont les notes ou carnets étaient "
-"chiffrés à l'origine."
+"pour le décryptage, selon la façon dont les notes ou carnets étaient cryptés "
+"à l'origine."
 
 msgid "Missing Master Keys"
 msgstr "Clefs maître manquantes"
@@ -914,7 +846,7 @@ msgid ""
 "however the application does not currently have access to them. It is likely "
 "they will eventually be downloaded via synchronisation."
 msgstr ""
-"Les clefs maître avec ces identifiants sont utilisées pour chiffrer certains "
+"Les clefs maître avec ces identifiants sont utilisées pour crypter 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."
 
@@ -922,17 +854,14 @@ msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
 "to enable it please check the documentation:"
 msgstr ""
-"Pour plus d'informations sur le chiffrement de bout en bout, ainsi que des "
+"Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
 "conseils pour l'activer, veuillez consulter la documentation :"
 
 msgid "Status"
 msgstr "État"
 
 msgid "Encryption is:"
-msgstr "Le chiffrement est :"
-
-msgid "Usage"
-msgstr "Utilisation"
+msgstr "Le cryptage est :"
 
 msgid "Back"
 msgstr "Retour"
@@ -981,11 +910,33 @@ msgid "View them now"
 msgstr "Les voir maintenant"
 
 msgid "Some items cannot be decrypted."
-msgstr "Certains objets ne peuvent être déchiffrés."
+msgstr "Certains objets ne peuvent être décryptés."
 
 msgid "Set the password"
 msgstr "Définir le mot de passe"
 
+msgid "Add or remove tags"
+msgstr "Gérer les étiquettes"
+
+msgid "Duplicate"
+msgstr "Dupliquer"
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr "%s - Copie"
+
+msgid "Switch between note and to-do type"
+msgstr "Alterner entre note et tâche"
+
+msgid "Copy Markdown link"
+msgstr "Copier lien Markdown"
+
+msgid "Delete"
+msgstr "Supprimer"
+
+msgid "Delete notes?"
+msgstr "Supprimer les notes ?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr ""
 "Pas de notes ici. Créez-en une en pressant le bouton \"Nouvelle note\"."
@@ -996,15 +947,6 @@ 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..."
 
@@ -1021,9 +963,6 @@ 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"
@@ -1036,11 +975,6 @@ msgstr ""
 "Cette note n'a pas de contenu. Cliquer sur \"%s\" pour basculer vers "
 "l'éditeur et éditer cette note."
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-"Les notes ne peuvent être imprimées ou exportées en PDF qu'une seule à la "
-"fois."
-
 msgid "strong text"
 msgstr "texte en gras"
 
@@ -1122,89 +1056,30 @@ msgid "Synchronisation Status"
 msgstr "État de la synchronisation"
 
 msgid "Encryption Options"
-msgstr "Options de chiffrement"
+msgstr "Options de cryptage"
 
 msgid "Clipper Options"
 msgstr "Options du Web Clipper"
 
-#, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-"Effacer le carnet \"%s\" ?\n"
-"\n"
-"Toutes les notes et sous-carnets dans ce carnet seront également effacés."
-
-#, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
-msgstr "Enlever l’étiquette \"%s\" de toutes les notes ?"
+msgid "Remove this tag from all the notes?"
+msgstr "Enlever cette étiquette de toutes les notes ?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Enlever cette recherche de la barre latérale ?"
 
-msgid "Delete"
-msgstr "Supprimer"
-
 msgid "Rename"
 msgstr "Renommer"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Gérer les étiquettes"
-
-msgid "Duplicate"
-msgstr "Dupliquer"
-
-#, javascript-format
-msgid "%s - Copy"
-msgstr "%s - Copie"
-
-msgid "Switch between note and to-do type"
-msgstr "Alterner entre note et tâche"
-
-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"
-
-#, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Supprimer note \"%s\" ?"
-
-#, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Supprimer ces %d notes ?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-"Entrez le titre d’une note, ou entrez # suivit du nom d’une étiquette, ou @ "
-"suivit du nom d’un carnet."
-
-msgid "Goto Anything..."
-msgstr "Navigation rapide…"
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Utilisation : %s"
@@ -1246,9 +1121,6 @@ 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"
@@ -1296,6 +1168,10 @@ 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..."
 
@@ -1318,16 +1194,10 @@ msgid "Synchronisation is already in progress. State: %s"
 msgstr "La synchronisation est déjà en cours. État : %s"
 
 msgid "Encrypted"
-msgstr "Chiffré"
+msgstr "Crypté"
 
 msgid "Encrypted items cannot be modified"
-msgstr "Les objets chiffrés ne peuvent être modifiés"
-
-msgid "title"
-msgstr "titre"
-
-msgid "updated date"
-msgstr "date de modification"
+msgstr "Les objets cryptés ne peuvent être modifiés"
 
 msgid "Conflicts"
 msgstr "Conflits"
@@ -1335,13 +1205,26 @@ 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é."
 
+msgid "title"
+msgstr "titre"
+
+msgid "updated date"
+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."
 
@@ -1353,16 +1236,6 @@ msgstr "Impossible de copier la note vers le carnet \"%s\""
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Impossible de déplacer la note vers le carnet \"%s\""
 
-#, 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 "Language"
 msgstr "Langue"
 
@@ -1393,9 +1266,6 @@ msgstr "Trier les notes par"
 msgid "Reverse sort order"
 msgstr "Inverser l'ordre"
 
-msgid "Sort notebooks by"
-msgstr "Trier les carnets par"
-
 msgid "Save geo-location with notes"
 msgstr "Enregistrer l'emplacement avec les notes"
 
@@ -1411,66 +1281,15 @@ msgstr "Curseur sur corps du message"
 msgid "When creating a new note:"
 msgstr "Lors de la création d'une note :"
 
-msgid "Enable soft breaks"
-msgstr "Activer retours à la ligne \"doux\""
-
-msgid "Enable math expressions"
-msgstr "Activer les expressions mathématiques"
-
-msgid "Enable ==mark== syntax"
-msgstr "Activer la syntaxe pour ==surligner=="
-
-msgid "Enable footnotes"
-msgstr "Activer les notes de bas de page"
-
-msgid "Enable table of contents extension"
-msgstr "Activer la table des matières"
-
-msgid "Enable ~sub~ syntax"
-msgstr "Activer la syntaxe ~indice~"
-
-msgid "Enable ^sup^ syntax"
-msgstr "Activer la syntaxe ^exposant^"
-
-msgid "Enable deflist syntax"
-msgstr "Activer les listes de définitions"
-
-msgid "Enable abbreviation syntax"
-msgstr "Activer la syntaxe pour abréviations"
-
-msgid "Enable markdown emoji"
-msgstr "Activer la syntaxe émoji"
-
-msgid "Enable ++insert++ syntax"
-msgstr "Activer la syntaxe ++insertion++"
-
-msgid "Enable multimarkdown table extension"
-msgstr "Activer les tables multi-markdown"
-
 msgid "Show tray icon"
 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"
 
@@ -1485,13 +1304,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Mettre à jour le logiciel automatiquement"
 
-msgid "Get pre-releases when checking for updates"
-msgstr "Recevoir les pré-release lors de la vérification des mises à jour"
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr "Voir la page des pré-release pour plus de détails : %s"
-
 msgid "Synchronisation interval"
 msgstr "Intervalle de synchronisation"
 
@@ -1534,6 +1346,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Répertoire avec lequel synchroniser (chemin absolu)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Le chemin du répertoire avec lequel synchroniser lorsque la synchronisation "
+"par système de fichier est activée. Voir `sync.target`."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud : URL WebDAV"
 
@@ -1574,28 +1393,6 @@ 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."
 
-msgid "General"
-msgstr "Général"
-
-msgid "Synchronisation"
-msgstr "Synchronisation"
-
-msgid "Appearance"
-msgstr "Apparence"
-
-msgid "Note"
-msgstr "Note"
-
-msgid "Plugins"
-msgstr "Modules"
-
-msgid "Application"
-msgstr "Application"
-
-#, 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"
 
@@ -1608,12 +1405,6 @@ msgstr "Dossier d'export Joplin"
 msgid "Evernote Export File"
 msgstr "Fichiers d'export Evernote"
 
-msgid "Json Export Directory"
-msgstr "Dossier d'export JSON"
-
-msgid "File"
-msgstr "Fichier"
-
 msgid "Directory"
 msgstr "Dossier"
 
@@ -1630,7 +1421,7 @@ msgid ""
 "This item is currently encrypted: %s \"%s\". Please wait for all items to be "
 "decrypted and try again."
 msgstr ""
-"Cet objet est chiffré : %s \"%s\". Veuillez attendre que tout soit déchiffré "
+"Cet objet est crypté : %s \"%s\". Veuillez attendre que tout soit décrypté "
 "et réessayez."
 
 msgid "There is no data to export."
@@ -1688,12 +1479,6 @@ 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 "
@@ -1709,7 +1494,7 @@ msgid "Export Debug Report"
 msgstr "Exporter rapport de débogage"
 
 msgid "Encryption Config"
-msgstr "Config chiffrement"
+msgstr "Config cryptage"
 
 msgid "Configuration"
 msgstr "Configuration"
@@ -1724,9 +1509,6 @@ 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"
 
@@ -1739,39 +1521,9 @@ 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 ""
-"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 "Decrypting items: %d/%d"
+msgstr "Décryptage des objets : %d/%d"
 
 msgid "New tags:"
 msgstr "Nouvelles étiquettes :"
@@ -1804,20 +1556,9 @@ msgstr "- Position : Pour attacher à une note les coordonnées GPS."
 msgid "Joplin website"
 msgstr "Site web de Joplin"
 
-#, javascript-format
-msgid "Database v%s"
-msgstr "Base de données v%s"
-
-#, javascript-format
-msgid "FTS enabled: %d"
-msgstr "FTS activé : %d"
-
 msgid "Login with Dropbox"
 msgstr "Se connecter à Dropbox"
 
-msgid "Enter code here"
-msgstr "Entrez le code ici"
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Clef maître %s"
@@ -1870,9 +1611,6 @@ 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"
 
@@ -1897,12 +1635,6 @@ msgstr "Voir métadonnées"
 msgid "View on map"
 msgstr "Voir sur carte"
 
-msgid "Go to source URL"
-msgstr "Aller à l'URL source"
-
-msgid "Edit"
-msgstr "Édition"
-
 msgid "Delete notebook"
 msgstr "Supprimer le carnet"
 
@@ -1927,41 +1659,12 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Cette note a été modifiée :"
-
-#~ msgid "Table of contents"
-#~ msgstr "Table des matières"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Le chemin du répertoire avec lequel synchroniser lorsque la "
-#~ "synchronisation par système de fichier est activée. Voir `sync.target`."
-
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"
-
-#~ msgid "Remove?"
-#~ msgstr "Supprimer ?"
-
-#~ msgid "Delete notes?"
-#~ msgstr "Supprimer les notes ?"
-
-#~ 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 le chiffrement de bout en bout, ainsi que "
-#~ "des conseils pour l'activer, veuillez consulter la documentation"
+#~ "Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
+#~ "conseils pour l'activer, veuillez consulter la documentation"
 
 #~ msgid "Searches"
 #~ msgstr "Recherches"
@@ -2000,6 +1703,9 @@ msgstr "Bienvenue"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Activer le volet précédent"
 
+#~ msgid "Enter command line mode"
+#~ msgstr "Démarrer le mode de ligne de commande"
+
 #~ msgid "Exit command line mode"
 #~ msgstr "Sortir du mode de ligne de commande"
 
@@ -2069,6 +1775,9 @@ msgstr "Bienvenue"
 #~ msgid "Delete notebook?"
 #~ msgstr "Supprimer le carnet ?"
 
+#~ msgid "Delete notebook \"%s\"?"
+#~ msgstr "Supprimer le carnet \"%s\" ?"
+
 #~ msgid "File system synchronisation target directory"
 #~ msgstr "Cible de la synchronisation sur le disque dur"
 

CliClient/locales/gl_ES.po

@@ -122,10 +122,9 @@ msgstr "Marca unha tarefa como feita."
 msgid "Note is not a to-do: \"%s\""
 msgstr "A nota non é unha tarefa: «%s»"
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "Xestiona a configuración E2EE. As orde son «enable», «disable», «decrypt», "
 "«status» e «target-status»."
@@ -453,17 +452,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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» "
@@ -577,20 +572,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando a «%s» como formato «%s». Agarde..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Título do caderno:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Cadernos"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Importando de «%s» como formato «%s». Agarde..."
@@ -598,8 +579,8 @@ msgstr "Importando de «%s» como formato «%s». Agarde..."
 msgid "PDF File"
 msgstr "Ficheiro PDF"
 
-msgid "Synchronisation status"
-msgstr "Estado da sincronización"
+msgid "File"
+msgstr "Ficheiro"
 
 msgid "New note"
 msgstr "Nova nota"
@@ -610,43 +591,14 @@ msgstr "Nova tarefa"
 msgid "New notebook"
 msgstr "Novo caderno"
 
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opcións xerais"
-
-msgid "Encryption options"
-msgstr "Opcións de cifrado"
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Ficheiro"
-
-msgid "About Joplin"
-msgstr "Sobre o Joplin"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr "Buscar actualizacións…"
-
 msgid "Import"
 msgstr "Importar"
 
 msgid "Export"
 msgstr "Exportar"
 
-msgid "Synchronise"
-msgstr "Sincronizar"
+msgid "Print"
+msgstr "Imprimir"
 
 #, javascript-format
 msgid "Hide %s"
@@ -655,8 +607,7 @@ msgstr "Ocultar %s"
 msgid "Quit"
 msgstr "Saír"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Edtar"
 
 msgid "Copy"
@@ -668,19 +619,12 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Pegar"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Seleccionar data"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -690,12 +634,7 @@ 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"
-
-#, fuzzy
-msgid "&View"
+msgid "View"
 msgstr "Vista"
 
 msgid "Toggle sidebar"
@@ -704,16 +643,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr "Cambiar a disposición do editor"
 
-#, fuzzy
-msgid "Focus"
-msgstr "Focar no corpo"
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Ferramentas"
 
-#, fuzzy
-msgid "&Help"
+msgid "Synchronisation status"
+msgstr "Estado da sincronización"
+
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr "Opcións de cifrado"
+
+msgid "General Options"
+msgstr "Opcións xerais"
+
+msgid "Help"
 msgstr "Axuda"
 
 msgid "Website and documentation"
@@ -722,6 +667,16 @@ msgstr "Sitio web e documentación"
 msgid "Make a donation"
 msgstr "Doar"
 
+msgid "Check for updates..."
+msgstr "Buscar actualizacións…"
+
+msgid "About Joplin"
+msgstr "Sobre o Joplin"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, javascript-format
 msgid "Open %s"
 msgstr "Abrir %s"
@@ -738,30 +693,15 @@ msgstr "Cancelar"
 msgid "Current version is up-to-date."
 msgstr "A versión actual está actualizada."
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr "Hai unha actualización dispoñíbel, desexa descargala agora?"
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 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 ""
 
@@ -805,31 +745,13 @@ 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"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "As notas e axustes gardáronse en: %s"
 
-msgid "Browse..."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr "Comprobar a configuración da sincronización"
-
 msgid "Apply"
 msgstr ""
 
@@ -921,10 +843,6 @@ msgstr "Estado"
 msgid "Encryption is:"
 msgstr "O cifrado é:"
 
-#, fuzzy
-msgid "Usage"
-msgstr "Uso: %s"
-
 msgid "Back"
 msgstr "Anterior"
 
@@ -976,6 +894,29 @@ msgstr "Non é posíbel descifrar algúns elementos."
 msgid "Set the password"
 msgstr "Estabelecer un contrasinal"
 
+msgid "Add or remove tags"
+msgstr "Engadir ou eliminar etiquetas"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Copiar"
+
+msgid "Switch between note and to-do type"
+msgstr "Cambiar entre notas e tarefas"
+
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
+msgid "Delete"
+msgstr "Eliminar"
+
+msgid "Delete notes?"
+msgstr "Desexa eliminar as notas?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "Aquí non hai notas. Cree unha premendo en «Nova nota»."
 
@@ -983,15 +924,6 @@ 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…"
 
@@ -1008,9 +940,6 @@ 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"
@@ -1023,9 +952,6 @@ msgstr ""
 "Esta nota non ten contido. Prema en «%s» para ir ao editor e modificar a "
 "nota."
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1114,83 +1040,24 @@ msgstr "Opcións de cifrado"
 msgid "Clipper Options"
 msgstr "Opcións xerais"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-"Desexa eliminar o caderno? Tamén se eliminarán todas as notas deste caderno."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Desexa eliminar esta etiqueta de todas as notas?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Desexa eliminar esta busca da barra lateral?"
 
-msgid "Delete"
-msgstr "Eliminar"
-
 msgid "Rename"
 msgstr "Renomear"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Engadir ou eliminar etiquetas"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Sae do aplicativo."
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-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"
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Desexa eliminar as notas?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Desexa eliminar estas notas?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
@@ -1232,9 +1099,6 @@ 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"
@@ -1282,6 +1146,10 @@ 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..."
 
@@ -1309,14 +1177,6 @@ msgstr "Cifrado"
 msgid "Encrypted items cannot be modified"
 msgstr "Non é posíbel modificar elementos cifrados"
 
-#, fuzzy
-msgid "title"
-msgstr "Sen título"
-
-#, fuzzy
-msgid "updated date"
-msgstr "Actualizado: %d."
-
 msgid "Conflicts"
 msgstr "Conflitos"
 
@@ -1324,14 +1184,29 @@ 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."
 
+#, fuzzy
+msgid "title"
+msgstr "Sen título"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Actualizado: %d."
+
 #, fuzzy
 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."
 
@@ -1343,13 +1218,6 @@ msgstr "Non é posíbel copiar a nota ao caderno «%s»"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Non é posíbel mover a nota ao caderno «%s»"
 
-#, 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 "Language"
 msgstr "Idioma"
 
@@ -1381,10 +1249,6 @@ msgstr "Ordenar notas por"
 msgid "Reverse sort order"
 msgstr "Orde inversa"
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Ordenar notas por"
-
 msgid "Save geo-location with notes"
 msgstr "Gardar xeolocalización coas notas"
 
@@ -1400,65 +1264,15 @@ msgstr "Focar no corpo"
 msgid "When creating a new note:"
 msgstr "Cando se crea unha nova nota:"
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Activar cifrado"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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"
 
@@ -1473,13 +1287,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Actualizar automaticamente o aplicativo"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Intervalo de sincronización"
 
@@ -1523,6 +1330,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Cartafol a sincronizar con (ruta absoluta)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Ruta para sincronizar cando estea activada a sincronización do sistema de "
+"ficheiros. Vexa «sync.target»."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "URL de Nextcloud WebDAV"
 
@@ -1558,32 +1372,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Valor incorrecto de opción: «%s». Os valores posíbeis son: %s."
 
-#, fuzzy
-msgid "General"
-msgstr "Opcións xerais"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Estado da sincronización"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Cadernos"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Sae do aplicativo."
-
-#, 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"
 
@@ -1596,13 +1384,6 @@ 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 "File"
-msgstr "Ficheiro"
-
 msgid "Directory"
 msgstr "Cartafol"
 
@@ -1677,12 +1458,6 @@ 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 (+)."
 
@@ -1711,10 +1486,6 @@ 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"
@@ -1728,34 +1499,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Elementos obtidos: %d/%d."
 
 msgid "New tags:"
@@ -1783,21 +1528,10 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Sitio web de Joplin"
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "Borrar: %d"
-
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Acceder con OneDrive"
 
-msgid "Enter code here"
-msgstr ""
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Chave mestra %s"
@@ -1849,10 +1583,6 @@ 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"
 
@@ -1877,12 +1607,6 @@ msgstr "Mostrar metadatos"
 msgid "View on map"
 msgstr "Ver no mapa"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Edtar"
-
 msgid "Delete notebook"
 msgstr "Eliminar caderno"
 
@@ -1904,24 +1628,3 @@ msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
 
 msgid "Welcome"
 msgstr "Benvido/a"
-
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Esta nota foi modificada:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Ruta para sincronizar cando estea activada a sincronización do sistema de "
-#~ "ficheiros. Vexa «sync.target»."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Sitio web de Joplin"
-
-#~ 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

@@ -128,7 +128,7 @@ msgstr "Bilješka nije zadatak: \"%s\""
 
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 
 msgid "Enter master password:"
@@ -455,9 +455,6 @@ 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."
 
@@ -465,7 +462,7 @@ msgstr "Prekidam... Pričekaj."
 msgid ""
 "<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
 "[tag] from [note], or to list the notes associated with [tag]. The command "
-"`tag list` can be used to list all the tags (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 "
@@ -579,20 +576,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Naslov bilježnice:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Bilježnice"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
@@ -601,8 +584,8 @@ msgstr ""
 msgid "PDF File"
 msgstr "Datoteka"
 
-msgid "Synchronisation status"
-msgstr "Status sinkronizacije"
+msgid "File"
+msgstr "Datoteka"
 
 msgid "New note"
 msgstr "Nova bilješka"
@@ -613,36 +596,6 @@ msgstr "Novi zadatak"
 msgid "New notebook"
 msgstr "Nova bilježnica"
 
-msgid "Print"
-msgstr ""
-
-#, fuzzy
-msgid "General Options"
-msgstr "Opcije"
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Datoteka"
-
-msgid "About Joplin"
-msgstr "O Joplinu"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "Import"
 msgstr "Uvoz"
 
@@ -650,8 +603,8 @@ msgstr "Uvoz"
 msgid "Export"
 msgstr "Uvoz"
 
-msgid "Synchronise"
-msgstr "Sinkroniziraj"
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -660,8 +613,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Izađi"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Uredi"
 
 msgid "Copy"
@@ -673,19 +625,12 @@ msgstr "Izreži"
 msgid "Paste"
 msgstr "Zalijepi"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Odaberi datum"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -695,11 +640,7 @@ 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"
+msgid "View"
 msgstr ""
 
 msgid "Toggle sidebar"
@@ -708,16 +649,23 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr ""
 
-#, fuzzy
-msgid "Focus"
-msgstr "Naslov bilješke:"
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Alati"
 
+msgid "Synchronisation status"
+msgstr "Status sinkronizacije"
+
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr ""
+
 #, fuzzy
-msgid "&Help"
+msgid "General Options"
+msgstr "Opcije"
+
+msgid "Help"
 msgstr "Pomoć"
 
 msgid "Website and documentation"
@@ -727,6 +675,16 @@ msgstr "Website i dokumentacija"
 msgid "Make a donation"
 msgstr "Website i dokumentacija"
 
+msgid "Check for updates..."
+msgstr ""
+
+msgid "About Joplin"
+msgstr "O Joplinu"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, fuzzy, javascript-format
 msgid "Open %s"
 msgstr "On %s: %s"
@@ -743,21 +701,9 @@ msgstr "Odustani"
 msgid "Current version is up-to-date."
 msgstr ""
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 msgstr ""
 
@@ -765,9 +711,6 @@ 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 ""
 
@@ -812,31 +755,13 @@ 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 ""
+msgid "Check synchronisation configuration"
+msgstr "Prekini sinkronizaciju"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Bilješke i postavke su pohranjene u: %s"
 
-msgid "Browse..."
-msgstr ""
-
-#, fuzzy
-msgid "Check synchronisation configuration"
-msgstr "Prekini sinkronizaciju"
-
 msgid "Apply"
 msgstr ""
 
@@ -915,10 +840,6 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr ""
 
-#, fuzzy
-msgid "Usage"
-msgstr "Korištenje: %s"
-
 msgid "Back"
 msgstr "Natrag"
 
@@ -974,6 +895,28 @@ msgstr "Neke stavke se ne mogu sinkronizirati."
 msgid "Set the password"
 msgstr ""
 
+msgid "Add or remove tags"
+msgstr "Dodaj ili makni oznake"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopiraj"
+
+msgid "Switch between note and to-do type"
+msgstr "Zamijeni bilješku i zadatak"
+
+msgid "Copy Markdown link"
+msgstr ""
+
+msgid "Delete"
+msgstr "Obriši"
+
+msgid "Delete notes?"
+msgstr "Obriši bilješke?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "Ovdje nema bilješki. Stvori novu pritiskom na \"Nova bilješka\"."
 
@@ -981,15 +924,6 @@ 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 ""
 
@@ -1007,9 +941,6 @@ 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"
@@ -1020,9 +951,6 @@ msgid ""
 "note."
 msgstr ""
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1113,82 +1041,24 @@ msgstr ""
 msgid "Clipper Options"
 msgstr "Opcije"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-"Obrisati bilježnicu? Sve bilješke u toj bilježnici će također biti obrisane."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Makni ovu oznaku iz svih bilješki?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Makni ovu pretragu iz izbornika?"
 
-msgid "Delete"
-msgstr "Obriši"
-
 msgid "Rename"
 msgstr "Preimenuj"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Dodaj ili makni oznake"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Izađi iz aplikacije."
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-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 ""
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Obriši bilješke?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Obriši ove bilješke?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Korištenje: %s"
@@ -1228,9 +1098,6 @@ 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"
@@ -1278,6 +1145,10 @@ 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..."
 
@@ -1306,14 +1177,6 @@ msgstr ""
 msgid "Encrypted items cannot be modified"
 msgstr "Neke stavke se ne mogu sinkronizirati."
 
-#, fuzzy
-msgid "title"
-msgstr "Nenaslovljen"
-
-#, fuzzy
-msgid "updated date"
-msgstr "Ažurirano: %d."
-
 msgid "Conflicts"
 msgstr "Sukobi"
 
@@ -1321,14 +1184,29 @@ 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."
 
+#, fuzzy
+msgid "title"
+msgstr "Nenaslovljen"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Ažurirano: %d."
+
 #, fuzzy
 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."
 
@@ -1340,13 +1218,6 @@ msgstr "Ne mogu kopirati bilješku u bilježnicu %s"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Ne mogu premjestiti bilješku u bilježnicu %s"
 
-#, 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 "Language"
 msgstr "Jezik"
 
@@ -1380,10 +1251,6 @@ msgstr ""
 msgid "Reverse sort order"
 msgstr "Mijenja redoslijed."
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Uredi bilježnicu"
-
 msgid "Save geo-location with notes"
 msgstr "Spremi geolokacijske podatke sa bilješkama"
 
@@ -1402,64 +1269,15 @@ msgstr ""
 msgid "When creating a new note:"
 msgstr "Stvara novu bilješku."
 
-msgid "Enable soft breaks"
-msgstr ""
-
-msgid "Enable math expressions"
-msgstr ""
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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 ""
 
@@ -1471,13 +1289,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automatsko instaliranje nove verzije"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Interval sinkronizacije"
 
@@ -1519,6 +1330,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Direktorij za sinkroniziranje (apsolutna putanja)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Putanja do direktorija za sinkronizaciju u slučaju kad je sinkronizacija sa "
+"datotečnim sustavom omogućena. Vidi `sync.target`."
+
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
@@ -1554,32 +1372,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Nevažeća vrijednost: \"%s\". Moguće vrijednosti su: %s."
 
-#, fuzzy
-msgid "General"
-msgstr "Opcije"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Status sinkronizacije"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Bilježnice"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Izađi iz aplikacije."
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 #, fuzzy
 msgid "Joplin Export File"
 msgstr "Evernote izvozne datoteke"
@@ -1594,13 +1386,6 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr "Evernote izvozne datoteke"
 
-#, fuzzy
-msgid "Json Export Directory"
-msgstr "Evernote izvozne datoteke"
-
-msgid "File"
-msgstr "Datoteka"
-
 msgid "Directory"
 msgstr ""
 
@@ -1671,12 +1456,6 @@ 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."
 
@@ -1705,10 +1484,6 @@ 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"
@@ -1722,34 +1497,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Stvorene lokalne stavke: %d."
 
 msgid "New tags:"
@@ -1777,22 +1526,10 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "Za brisanje: %d"
-
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Prijavi se u OneDrive"
 
-#, fuzzy
-msgid "Enter code here"
-msgstr "Otvori naredbeni redak"
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1845,10 +1582,6 @@ 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"
 
@@ -1873,12 +1606,6 @@ msgstr "Prikaži metapodatke"
 msgid "View on map"
 msgstr "Vidi na karti"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Uredi"
-
 msgid "Delete notebook"
 msgstr "Obriši bilježnicu"
 
@@ -1901,24 +1628,6 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobro došli"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Bilješka je promijenjena:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Putanja do direktorija za sinkronizaciju u slučaju kad je sinkronizacija "
-#~ "sa datotečnim sustavom omogućena. Vidi `sync.target`."
-
-#, 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"
 
@@ -1953,6 +1662,9 @@ msgstr "Dobro došli"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Fokusiraj prethodno okno"
 
+#~ msgid "Enter command line mode"
+#~ msgstr "Otvori naredbeni redak"
+
 #~ msgid "Exit command line mode"
 #~ msgstr "Napusti naredbeni redak"
 
@@ -1962,6 +1674,9 @@ msgstr "Dobro došli"
 #~ msgid "Cancel the current command."
 #~ msgstr "Prekini trenutnu naredbu."
 
+#~ msgid "Exit the application."
+#~ msgstr "Izađi iz aplikacije."
+
 #~ msgid "Delete the currently selected note or notebook."
 #~ msgstr "Obriši odabranu bilješku ili bilježnicu."
 

CliClient/locales/joplin.pot

@@ -119,7 +119,7 @@ msgstr ""
 
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 
 msgid "Enter master password:"
@@ -408,16 +408,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 msgstr ""
 
 #, javascript-format
@@ -508,18 +505,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
@@ -527,7 +512,7 @@ msgstr ""
 msgid "PDF File"
 msgstr ""
 
-msgid "Synchronisation status"
+msgid "File"
 msgstr ""
 
 msgid "New note"
@@ -539,41 +524,13 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
-msgid "&File"
-msgstr ""
-
-msgid "About Joplin"
-msgstr ""
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "Import"
 msgstr ""
 
 msgid "Export"
 msgstr ""
 
-msgid "Synchronise"
+msgid "Print"
 msgstr ""
 
 #, javascript-format
@@ -583,7 +540,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-msgid "&Edit"
+msgid "Edit"
 msgstr ""
 
 msgid "Copy"
@@ -595,18 +552,12 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-msgid "Select all"
-msgstr ""
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -616,10 +567,7 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
-msgid "Search in current note"
-msgstr ""
-
-msgid "&View"
+msgid "View"
 msgstr ""
 
 msgid "Toggle sidebar"
@@ -628,13 +576,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr ""
 
-msgid "Focus"
+msgid "Tools"
 msgstr ""
 
-msgid "&Tools"
+msgid "Synchronisation status"
 msgstr ""
 
-msgid "&Help"
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr ""
+
+msgid "General Options"
+msgstr ""
+
+msgid "Help"
 msgstr ""
 
 msgid "Website and documentation"
@@ -643,6 +600,16 @@ msgstr ""
 msgid "Make a donation"
 msgstr ""
 
+msgid "Check for updates..."
+msgstr ""
+
+msgid "About Joplin"
+msgstr ""
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr ""
+
 #, javascript-format
 msgid "Open %s"
 msgstr ""
@@ -659,30 +626,15 @@ msgstr ""
 msgid "Current version is up-to-date."
 msgstr ""
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 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 ""
 
@@ -726,30 +678,13 @@ 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."
+msgid "Check synchronisation configuration"
 msgstr ""
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Browse..."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr ""
-
 msgid "Apply"
 msgstr ""
 
@@ -828,9 +763,6 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
-msgstr ""
-
 msgid "Back"
 msgstr ""
 
@@ -881,6 +813,28 @@ msgstr ""
 msgid "Set the password"
 msgstr ""
 
+msgid "Add or remove tags"
+msgstr ""
+
+msgid "Duplicate"
+msgstr ""
+
+#, javascript-format
+msgid "%s - Copy"
+msgstr ""
+
+msgid "Switch between note and to-do type"
+msgstr ""
+
+msgid "Copy Markdown link"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete notes?"
+msgstr ""
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr ""
 
@@ -888,15 +842,6 @@ 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 ""
 
@@ -913,9 +858,6 @@ 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 ""
@@ -926,9 +868,6 @@ msgid ""
 "note."
 msgstr ""
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1015,78 +954,24 @@ msgstr ""
 msgid "Clipper Options"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-
-#, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr ""
 
 msgid "Remove this search from the sidebar?"
 msgstr ""
 
-msgid "Delete"
+msgid "Rename"
 msgstr ""
 
-msgid "Rename"
+msgid "Synchronise"
 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 ""
 
-msgid "Add or remove tags"
-msgstr ""
-
-msgid "Duplicate"
-msgstr ""
-
-#, javascript-format
-msgid "%s - Copy"
-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 ""
-
-#, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr ""
-
-#, javascript-format
-msgid "Delete these %d notes?"
-msgstr ""
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr ""
@@ -1126,9 +1011,6 @@ msgid ""
 "synchronisation again may fix the problem."
 msgstr ""
 
-msgid "Untitled"
-msgstr ""
-
 msgid ""
 "Could not synchronize with OneDrive.\n"
 "\n"
@@ -1170,6 +1052,10 @@ msgstr ""
 msgid "Fetched items: %d/%d."
 msgstr ""
 
+#, javascript-format
+msgid "State: %s."
+msgstr ""
+
 msgid "Cancelling..."
 msgstr ""
 
@@ -1197,25 +1083,32 @@ msgstr ""
 msgid "Encrypted items cannot be modified"
 msgstr ""
 
-msgid "title"
-msgstr ""
-
-msgid "updated date"
-msgstr ""
-
 msgid "Conflicts"
 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 ""
 
+msgid "title"
+msgstr ""
+
+msgid "updated date"
+msgstr ""
+
 msgid "created date"
 msgstr ""
 
+msgid "Untitled"
+msgstr ""
+
 msgid "This note does not have geolocation information."
 msgstr ""
 
@@ -1227,13 +1120,6 @@ msgstr ""
 msgid "Cannot move note to \"%s\" notebook"
 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 "Language"
 msgstr ""
 
@@ -1264,9 +1150,6 @@ msgstr ""
 msgid "Reverse sort order"
 msgstr ""
 
-msgid "Sort notebooks by"
-msgstr ""
-
 msgid "Save geo-location with notes"
 msgstr ""
 
@@ -1282,63 +1165,15 @@ msgstr ""
 msgid "When creating a new note:"
 msgstr ""
 
-msgid "Enable soft breaks"
-msgstr ""
-
-msgid "Enable math expressions"
-msgstr ""
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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 ""
 
@@ -1350,13 +1185,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr ""
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -1394,6 +1222,11 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr ""
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
@@ -1429,28 +1262,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
-msgid "General"
-msgstr ""
-
-msgid "Synchronisation"
-msgstr ""
-
-msgid "Appearance"
-msgstr ""
-
-msgid "Note"
-msgstr ""
-
-msgid "Plugins"
-msgstr ""
-
-msgid "Application"
-msgstr ""
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 msgid "Joplin Export File"
 msgstr ""
 
@@ -1463,12 +1274,6 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr ""
 
-msgid "Json Export Directory"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Directory"
 msgstr ""
 
@@ -1538,12 +1343,6 @@ 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 ""
 
@@ -1572,9 +1371,6 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""
 
-msgid "Clear alarm"
-msgstr ""
-
 msgid "Save alarm"
 msgstr ""
 
@@ -1587,31 +1383,8 @@ 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 ""
-"Could not authorise application:\n"
-"\n"
-"%s\n"
-"\n"
-"Please try again."
-msgstr ""
-
-#, javascript-format
-msgid "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr ""
 
 msgid "New tags:"
@@ -1639,20 +1412,9 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, javascript-format
-msgid "FTS enabled: %d"
-msgstr ""
-
 msgid "Login with Dropbox"
 msgstr ""
 
-msgid "Enter code here"
-msgstr ""
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1704,9 +1466,6 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr ""
 
-msgid "Take photo"
-msgstr ""
-
 msgid "Attach photo"
 msgstr ""
 
@@ -1731,12 +1490,6 @@ msgstr ""
 msgid "View on map"
 msgstr ""
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr ""
-
 msgid "Delete notebook"
 msgstr ""
 

CliClient/locales/nl_BE.po

@@ -125,10 +125,9 @@ msgstr "Markeer een to-do als voltooid. "
 msgid "Note is not a to-do: \"%s\""
 msgstr "Notitie is geen to-do: \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "Beheert E2EE configuratie. Commando's zijn `enable`, `disable`, `decrypt`, "
 "`status` and `target-status`."
@@ -457,17 +456,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 "
@@ -585,20 +580,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Notitieboek titel:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Notitieboeken"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
@@ -607,8 +588,8 @@ msgstr ""
 msgid "PDF File"
 msgstr "Bestand"
 
-msgid "Synchronisation status"
-msgstr "Synchronisatie status"
+msgid "File"
+msgstr "Bestand"
 
 msgid "New note"
 msgstr "Nieuwe notitie"
@@ -619,35 +600,6 @@ msgstr "Nieuwe to-do"
 msgid "New notebook"
 msgstr "Nieuw notitieboek"
 
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr "Algemene opties"
-
-msgid "Encryption options"
-msgstr "Versleutelopties"
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Bestand"
-
-msgid "About Joplin"
-msgstr "Over Joplin"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "Import"
 msgstr "Importeer"
 
@@ -655,8 +607,8 @@ msgstr "Importeer"
 msgid "Export"
 msgstr "Importeer"
 
-msgid "Synchronise"
-msgstr "Synchroniseer"
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -665,8 +617,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Stop"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Bewerk"
 
 msgid "Copy"
@@ -678,19 +629,12 @@ msgstr "Knip"
 msgid "Paste"
 msgstr "Plak"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Selecteer datum"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -700,11 +644,7 @@ 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"
+msgid "View"
 msgstr ""
 
 msgid "Toggle sidebar"
@@ -713,15 +653,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr ""
 
-msgid "Focus"
-msgstr ""
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Tools"
 
-#, fuzzy
-msgid "&Help"
+msgid "Synchronisation status"
+msgstr "Synchronisatie status"
+
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr "Versleutelopties"
+
+msgid "General Options"
+msgstr "Algemene opties"
+
+msgid "Help"
 msgstr "Help"
 
 msgid "Website and documentation"
@@ -731,6 +678,16 @@ msgstr "Website en documentatie"
 msgid "Make a donation"
 msgstr "Website en documentatie"
 
+msgid "Check for updates..."
+msgstr ""
+
+msgid "About Joplin"
+msgstr "Over Joplin"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, fuzzy, javascript-format
 msgid "Open %s"
 msgstr "Op %s: %s"
@@ -747,21 +704,9 @@ msgstr "Annuleer"
 msgid "Current version is up-to-date."
 msgstr ""
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 msgstr ""
 
@@ -769,9 +714,6 @@ 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 ""
 
@@ -816,31 +758,13 @@ 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 ""
+msgid "Check synchronisation configuration"
+msgstr "Annuleer synchronisatie"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen zijn opgeslaan in %s"
 
-msgid "Browse..."
-msgstr ""
-
-#, fuzzy
-msgid "Check synchronisation configuration"
-msgstr "Annuleer synchronisatie"
-
 msgid "Apply"
 msgstr ""
 
@@ -931,10 +855,6 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Versleuteling is:"
 
-#, fuzzy
-msgid "Usage"
-msgstr "Gebruik: %s"
-
 msgid "Back"
 msgstr "Terug"
 
@@ -989,6 +909,28 @@ msgstr "Sommige items kunnen niet gedecodeerd worden."
 msgid "Set the password"
 msgstr "Stel wachtwoord in"
 
+msgid "Add or remove tags"
+msgstr "Voeg tag toe of verwijder tag"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopieer"
+
+msgid "Switch between note and to-do type"
+msgstr "Wissel tussen notitie en to-do type"
+
+msgid "Copy Markdown link"
+msgstr ""
+
+msgid "Delete"
+msgstr "Verwijderen"
+
+msgid "Delete notes?"
+msgstr "Notities verwijderen?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr "Geen notities. Maak een notitie door op \"Nieuwe notitie\" te klikken."
 
@@ -998,15 +940,6 @@ 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 ""
 
@@ -1024,9 +957,6 @@ 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"
@@ -1037,9 +967,6 @@ msgid ""
 "note."
 msgstr ""
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1130,83 +1057,24 @@ msgstr "Versleutelopties"
 msgid "Clipper Options"
 msgstr "Algemene opties"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-"Notitieboek verwijderen? Alle notities in dit notitieboek zullen ook "
-"verwijderd worden."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Deze tag verwijderen van alle notities?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Dit item verwijderen van de zijbalk?"
 
-msgid "Delete"
-msgstr "Verwijderen"
-
 msgid "Rename"
 msgstr "Hernoem"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Voeg tag toe of verwijder tag"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Sluit de applicatie."
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-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 ""
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Notities verwijderen?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Deze notities verwijderen?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Gebruik: %s"
@@ -1249,9 +1117,6 @@ 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"
@@ -1299,6 +1164,10 @@ 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..."
 
@@ -1326,14 +1195,6 @@ msgstr "Versleuteld"
 msgid "Encrypted items cannot be modified"
 msgstr "Versleutelde items kunnen niet aangepast worden"
 
-#, fuzzy
-msgid "title"
-msgstr "Untitled"
-
-#, fuzzy
-msgid "updated date"
-msgstr "Bijgewerkt: %d."
-
 msgid "Conflicts"
 msgstr "Conflicten"
 
@@ -1341,16 +1202,31 @@ 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 ""
 "Notitieboeken kunnen niet \"%s\" genoemd worden, dit is een gereserveerd "
 "woord."
 
+#, fuzzy
+msgid "title"
+msgstr "Untitled"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Bijgewerkt: %d."
+
 #, fuzzy
 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."
 
@@ -1362,13 +1238,6 @@ msgstr "Kan notitie niet naar notitieboek \"%s\" kopiëren."
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Kan notitie niet naar notitieboek \"%s\" verplaatsen."
 
-#, 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 "Language"
 msgstr "Taal"
 
@@ -1402,10 +1271,6 @@ msgstr ""
 msgid "Reverse sort order"
 msgstr "Draait de sorteervolgorde om."
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Bewerk notitieboek"
-
 msgid "Save geo-location with notes"
 msgstr "Sla geo-locatie op bij notities"
 
@@ -1423,65 +1288,15 @@ msgstr ""
 msgid "When creating a new note:"
 msgstr "Maakt een nieuwe notitie aan."
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Schakel encryptie in"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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 ""
 
@@ -1493,13 +1308,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Update de applicatie automatisch"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Synchronisatie interval"
 
@@ -1542,6 +1350,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Folder om mee te synchroniseren (absolute pad)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Het pad om mee te synchroniseren als bestandssysteem synchronisatie is "
+"ingeschakeld. Zie `sync.target`."
+
 msgid "Nextcloud WebDAV URL"
 msgstr ""
 
@@ -1579,32 +1394,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ongeldige optie: \"%s\". Geldige waarden zijn: %s."
 
-#, fuzzy
-msgid "General"
-msgstr "Algemene opties"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Synchronisatie status"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Notitieboeken"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Sluit de applicatie."
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 #, fuzzy
 msgid "Joplin Export File"
 msgstr "Exporteer Evernote bestanden"
@@ -1619,13 +1408,6 @@ msgstr ""
 msgid "Evernote Export File"
 msgstr "Exporteer Evernote bestanden"
 
-#, fuzzy
-msgid "Json Export Directory"
-msgstr "Exporteer Evernote bestanden"
-
-msgid "File"
-msgstr "Bestand"
-
 msgid "Directory"
 msgstr ""
 
@@ -1699,12 +1481,6 @@ 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."
@@ -1734,10 +1510,6 @@ 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"
@@ -1751,34 +1523,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Opgehaalde items: %d/%d."
 
 msgid "New tags:"
@@ -1806,22 +1552,10 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "Verwijderen: %d"
-
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Log in met OneDrive"
 
-#, fuzzy
-msgid "Enter code here"
-msgstr "Ga naar command line modus"
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Hoofdsleutel: %s"
@@ -1873,10 +1607,6 @@ 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"
 
@@ -1901,12 +1631,6 @@ msgstr "Toon metadata"
 msgid "View on map"
 msgstr "Toon op de kaart"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Bewerk"
-
 msgid "Delete notebook"
 msgstr "Verwijder notitieboek"
 
@@ -1931,24 +1655,6 @@ msgstr ""
 msgid "Welcome"
 msgstr "Welkom"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Deze notitie werd aangepast:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Het pad om mee te synchroniseren als bestandssysteem synchronisatie is "
-#~ "ingeschakeld. Zie `sync.target`."
-
-#, 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"
 
@@ -1984,6 +1690,9 @@ msgstr "Welkom"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Focus op het vorige paneel"
 
+#~ msgid "Enter command line mode"
+#~ msgstr "Ga naar command line modus"
+
 #~ msgid "Exit command line mode"
 #~ msgstr "Ga uit command line modus"
 
@@ -1993,6 +1702,9 @@ msgstr "Welkom"
 #~ msgid "Cancel the current command."
 #~ msgstr "Annuleer het huidige commando."
 
+#~ msgid "Exit the application."
+#~ msgstr "Sluit de applicatie."
+
 #~ msgid "Delete the currently selected note or notebook."
 #~ msgstr ""
 #~ "Verwijder de geselecteerde notitie of het geselecteerde notitieboek."

CliClient/locales/sl_SI.po

@@ -123,10 +123,9 @@ msgstr "Označi seznam opravil kot končan."
 msgid "Note is not a to-do: \"%s\""
 msgstr "Zabeležka ni formata seznam opravil: \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status`, `decrypt-file` and `target-status`."
+"`status` and `target-status`."
 msgstr ""
 "Upravlja z E2EE nastavitvami. Ukazi so `enable`, `disable`, `decrypt`, "
 "`status` in `target-status`."
@@ -456,17 +455,13 @@ 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 (use -l for long option)."
+"`tag list` can be used to list all the tags."
 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 "
@@ -583,20 +578,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Izvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Naslov beležnice:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Beležnice"
-
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Uvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
@@ -604,8 +585,8 @@ msgstr "Uvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
 msgid "PDF File"
 msgstr "PDF datoteka"
 
-msgid "Synchronisation status"
-msgstr "Status sinhronizacije"
+msgid "File"
+msgstr "Datoteka"
 
 msgid "New note"
 msgstr "Nova zabeležka"
@@ -616,43 +597,14 @@ msgstr "Novi seznam opravil"
 msgid "New notebook"
 msgstr "Nova beležnica"
 
-msgid "Print"
-msgstr "Natisni"
-
-msgid "General Options"
-msgstr "Splošne možnosti"
-
-msgid "Encryption options"
-msgstr "Možnosti enkripcije"
-
-msgid "Web clipper options"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
-msgid "&File"
-msgstr "Datoteka"
-
-msgid "About Joplin"
-msgstr "O Joplinu"
-
-msgid "Preferences..."
-msgstr ""
-
-msgid "Check for updates..."
-msgstr "Preverjanje za posodobitvami..."
-
 msgid "Import"
 msgstr "Uvozi"
 
 msgid "Export"
 msgstr "Izvozi"
 
-msgid "Synchronise"
-msgstr "Sinhroniziraj"
+msgid "Print"
+msgstr "Natisni"
 
 #, javascript-format
 msgid "Hide %s"
@@ -661,8 +613,7 @@ msgstr "Skrij %s"
 msgid "Quit"
 msgstr "Izhod"
 
-#, fuzzy
-msgid "&Edit"
+msgid "Edit"
 msgstr "Uredi"
 
 msgid "Copy"
@@ -674,19 +625,12 @@ msgstr "Izreži"
 msgid "Paste"
 msgstr "Prilepi"
 
-#, fuzzy
-msgid "Select all"
-msgstr "Izberi datum"
-
 msgid "Bold"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 
-msgid "Link"
-msgstr ""
-
 msgid "Insert Date Time"
 msgstr ""
 
@@ -696,12 +640,7 @@ 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"
-
-#, fuzzy
-msgid "&View"
+msgid "View"
 msgstr "Pogled"
 
 msgid "Toggle sidebar"
@@ -710,16 +649,22 @@ msgstr ""
 msgid "Toggle editor layout"
 msgstr "Spremeni izgled urejevalnika"
 
-#, fuzzy
-msgid "Focus"
-msgstr "Fokusiraj vsebino"
-
-#, fuzzy
-msgid "&Tools"
+msgid "Tools"
 msgstr "Orodja"
 
-#, fuzzy
-msgid "&Help"
+msgid "Synchronisation status"
+msgstr "Status sinhronizacije"
+
+msgid "Web clipper options"
+msgstr ""
+
+msgid "Encryption options"
+msgstr "Možnosti enkripcije"
+
+msgid "General Options"
+msgstr "Splošne možnosti"
+
+msgid "Help"
 msgstr "Pomoč"
 
 msgid "Website and documentation"
@@ -728,6 +673,16 @@ msgstr "Spletna stran in dokumentacija"
 msgid "Make a donation"
 msgstr "Doniraj"
 
+msgid "Check for updates..."
+msgstr "Preverjanje za posodobitvami..."
+
+msgid "About Joplin"
+msgstr "O Joplinu"
+
+#, javascript-format
+msgid "%s %s (%s, %s)"
+msgstr "%s %s (%s, %s)"
+
 #, javascript-format
 msgid "Open %s"
 msgstr "Odpri %s"
@@ -744,30 +699,15 @@ msgstr "Prekliči"
 msgid "Current version is up-to-date."
 msgstr "Sedanja verzija je najnovejša."
 
-#, javascript-format
-msgid "%s (pre-release)"
-msgstr ""
-
 msgid "An update is available, do you want to download it now?"
 msgstr "Posodobitev je na voljo, jo želite prenesti sedaj?"
 
-#, javascript-format
-msgid "Your version: %s"
-msgstr ""
-
-#, javascript-format
-msgid "New version: %s"
-msgstr ""
-
 msgid "Yes"
 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 ""
 
@@ -811,31 +751,13 @@ 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"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Zabeležke in nastavitve so shranjene v: %s"
 
-msgid "Browse..."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr "Preveri nastavitve sinhronizacije"
-
 msgid "Apply"
 msgstr ""
 
@@ -929,10 +851,6 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Enkripcija je:"
 
-#, fuzzy
-msgid "Usage"
-msgstr "Uporaba: %s"
-
 msgid "Back"
 msgstr "Nazaj"
 
@@ -986,6 +904,29 @@ msgstr "Nekateri predmeti ne morejo biti dekriptirani."
 msgid "Set the password"
 msgstr "Nastavi geslo"
 
+msgid "Add or remove tags"
+msgstr "Dodaj ali odstrani oznake"
+
+msgid "Duplicate"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s - Copy"
+msgstr "Kopiraj"
+
+msgid "Switch between note and to-do type"
+msgstr "Menjaj med zabeležko in seznamom opravil"
+
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Sistem označevanja"
+
+msgid "Delete"
+msgstr "Izbriši"
+
+msgid "Delete notes?"
+msgstr "Izbriši zabeležke?"
+
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr ""
 "Trenutno ni tukaj nobene zabeležke. Ustvarite jo z klikom na \"Nova zabeležka"
@@ -997,15 +938,6 @@ 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..."
 
@@ -1022,9 +954,6 @@ 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"
@@ -1037,9 +966,6 @@ msgstr ""
 "Ta zabeležka nima vsebine. Kliknite na \"%s\" da menjate med urejevalnikom "
 "in urejanje zabeležke."
 
-msgid "Only one note can be printed or exported to PDF at a time."
-msgstr ""
-
 msgid "strong text"
 msgstr ""
 
@@ -1128,84 +1054,24 @@ msgstr "Možnosti enkripcije"
 msgid "Clipper Options"
 msgstr "Splošne možnosti"
 
-#, fuzzy, javascript-format
-msgid ""
-"Delete notebook \"%s\"?\n"
-"\n"
-"All notes and sub-notebooks within this notebook will also be deleted."
-msgstr ""
-"Želite izbrisati beležnico? Vse zabeležke znotraj beležke bodo hkrati "
-"izbrisane."
-
-#, fuzzy, javascript-format
-msgid "Remove tag \"%s\" from all notes?"
+msgid "Remove this tag from all the notes?"
 msgstr "Odstranite to oznako iz vseh zabeležk?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Odstranite ta iskalni niz iz stranske vrstice?"
 
-msgid "Delete"
-msgstr "Izbriši"
-
 msgid "Rename"
 msgstr "Preimenuj"
 
+msgid "Synchronise"
+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"
 
-msgid "Add or remove tags"
-msgstr "Dodaj ali odstrani oznake"
-
-#, fuzzy
-msgid "Duplicate"
-msgstr "Izhod iz aplikacije."
-
-#, fuzzy, javascript-format
-msgid "%s - Copy"
-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"
-
-#, fuzzy, javascript-format
-msgid "Delete note \"%s\"?"
-msgstr "Izbriši zabeležke?"
-
-#, fuzzy, javascript-format
-msgid "Delete these %d notes?"
-msgstr "Izbriši te zabeležke?"
-
-msgid ""
-"Type a note title to jump to it. Or type # followed by a tag name, or @ "
-"followed by a notebook name."
-msgstr ""
-
-msgid "Goto Anything..."
-msgstr ""
-
 #, javascript-format
 msgid "Usage: %s"
 msgstr "Uporaba: %s"
@@ -1247,9 +1113,6 @@ 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"
@@ -1297,6 +1160,10 @@ 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..."
 
@@ -1324,14 +1191,6 @@ msgstr "Enkriptirano"
 msgid "Encrypted items cannot be modified"
 msgstr "Enkriptirani predmeti ne morejo biti spremenjeni"
 
-#, fuzzy
-msgid "title"
-msgstr "Neimenovano"
-
-#, fuzzy
-msgid "updated date"
-msgstr "Posodobljeno: %d."
-
 msgid "Conflicts"
 msgstr "Konfikti"
 
@@ -1339,14 +1198,29 @@ 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."
 
+#, fuzzy
+msgid "title"
+msgstr "Neimenovano"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Posodobljeno: %d."
+
 #, fuzzy
 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."
 
@@ -1358,13 +1232,6 @@ msgstr "Ni moč kopirati zabeležke v \"%s\" beležnico"
 msgid "Cannot move note to \"%s\" notebook"
 msgstr "Ni moč premakniti zabeležke v \"%s\" beležnico"
 
-#, 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 "Language"
 msgstr "Jezik"
 
@@ -1396,10 +1263,6 @@ msgstr "Razporedi zabeležko po"
 msgid "Reverse sort order"
 msgstr "Obrni vrstni red"
 
-#, fuzzy
-msgid "Sort notebooks by"
-msgstr "Razporedi zabeležko po"
-
 msgid "Save geo-location with notes"
 msgstr "Shrani geo-lokacijo z zabeležkami"
 
@@ -1415,65 +1278,15 @@ msgstr "Fokusiraj vsebino"
 msgid "When creating a new note:"
 msgstr "Ob ustvarjanju nove zabeležke:"
 
-msgid "Enable soft breaks"
-msgstr ""
-
-#, fuzzy
-msgid "Enable math expressions"
-msgstr "Omogoči enkripcijo"
-
-msgid "Enable ==mark== syntax"
-msgstr ""
-
-msgid "Enable footnotes"
-msgstr ""
-
-msgid "Enable table of contents extension"
-msgstr ""
-
-msgid "Enable ~sub~ syntax"
-msgstr ""
-
-msgid "Enable ^sup^ syntax"
-msgstr ""
-
-msgid "Enable deflist syntax"
-msgstr ""
-
-msgid "Enable abbreviation syntax"
-msgstr ""
-
-msgid "Enable markdown emoji"
-msgstr ""
-
-msgid "Enable ++insert++ syntax"
-msgstr ""
-
-msgid "Enable multimarkdown table extension"
-msgstr ""
-
 msgid "Show tray icon"
 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"
 
@@ -1488,13 +1301,6 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Samodejno posodobi aplikacijo"
 
-msgid "Get pre-releases when checking for updates"
-msgstr ""
-
-#, javascript-format
-msgid "See the pre-release page for more details: %s"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr "Časovni interval sinhronizacije"
 
@@ -1538,6 +1344,13 @@ msgstr ""
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Mesto ciljne sinhronizacije (absolutna pot)"
 
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+"Pot za sinhronizacijo, ki bo uporabljena ob omogočeni sinhronizaciji. Poglej "
+"`sync.target`."
+
 msgid "Nextcloud WebDAV URL"
 msgstr "Nextcloud WebDAV URL"
 
@@ -1573,32 +1386,6 @@ msgstr ""
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Neveljavna vrednost: \"%s\". Možne vrednosti so : %s."
 
-#, fuzzy
-msgid "General"
-msgstr "Splošne možnosti"
-
-#, fuzzy
-msgid "Synchronisation"
-msgstr "Status sinhronizacije"
-
-msgid "Appearance"
-msgstr ""
-
-#, fuzzy
-msgid "Note"
-msgstr "Beležnice"
-
-msgid "Plugins"
-msgstr ""
-
-#, fuzzy
-msgid "Application"
-msgstr "Izhod iz aplikacije."
-
-#, javascript-format
-msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
-
 msgid "Joplin Export File"
 msgstr "Joplin izvozna datoteka"
 
@@ -1611,13 +1398,6 @@ msgstr "Joplin izvozno mesto"
 msgid "Evernote Export File"
 msgstr "Evernote izvozna datoteka"
 
-#, fuzzy
-msgid "Json Export Directory"
-msgstr "Joplin izvozno mesto"
-
-msgid "File"
-msgstr "Datoteka"
-
 msgid "Directory"
 msgstr "Mesto datoteke"
 
@@ -1692,12 +1472,6 @@ 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."
 
@@ -1726,10 +1500,6 @@ 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"
@@ -1743,34 +1513,8 @@ 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 "Decrypted items: %s / %s"
+msgid "Decrypting items: %d/%d"
 msgstr "Preneseni predmeti: %d/%d."
 
 msgid "New tags:"
@@ -1798,21 +1542,10 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Joplin spletna stran"
 
-#, javascript-format
-msgid "Database v%s"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "FTS enabled: %d"
-msgstr "Za izbris: %d"
-
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Prijavi se z OneDrive"
 
-msgid "Enter code here"
-msgstr ""
-
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Glavno geslo %s"
@@ -1864,10 +1597,6 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodprt tip slike: %s"
 
-#, fuzzy
-msgid "Take photo"
-msgstr "Pripni fotografijo"
-
 msgid "Attach photo"
 msgstr "Pripni fotografijo"
 
@@ -1892,12 +1621,6 @@ msgstr "Prikaži meta podatke"
 msgid "View on map"
 msgstr "Prikaži na zemljevidu"
 
-msgid "Go to source URL"
-msgstr ""
-
-msgid "Edit"
-msgstr "Uredi"
-
 msgid "Delete notebook"
 msgstr "Izbriši beležnico"
 
@@ -1920,26 +1643,5 @@ msgstr "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Ta zabeležka je bila spremenjena:"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "Pot za sinhronizacijo, ki bo uporabljena ob omogočeni sinhronizaciji. "
-#~ "Poglej `sync.target`."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin spletna stran"
-
-#~ 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/package.json

@@ -15,12 +15,11 @@
     "years": [
       2016,
       2017,
-      2018,
-      2019
+      2018
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.125",
+  "version": "1.0.112",
   "bin": {
     "joplin": "./main.js"
   },
@@ -32,21 +31,18 @@
     "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
     "compare-version": "^0.1.2",
-    "diacritics": "^1.3.0",
     "es6-promise-pool": "^2.5.0",
     "follow-redirects": "^1.2.4",
     "form-data": "^2.1.4",
     "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.11",
+    "joplin-turndown": "^4.0.8",
     "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",
@@ -60,7 +56,7 @@
     "redux": "^3.7.2",
     "sax": "^1.2.2",
     "server-destroy": "^1.0.1",
-    "sharp": "^0.20.8",
+    "sharp": "^0.18.4",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^4.0.1",
     "string-padding": "^1.0.2",

CliClient/run_test.sh

@@ -26,18 +26,10 @@ 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_ItemChange.js
 npm test tests-build/models_Note.js
-npm test tests-build/models_Resource.js
 npm test tests-build/models_Setting.js
-npm test tests-build/models_Tag.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/services_rest_Api.js
-npm test tests-build/services_SearchEngine.js
-npm test tests-build/StringUtils.js
 npm test tests-build/synchronizer.js
 npm test tests-build/urlUtils.js

CliClient/tests/EnexToMd.js

@@ -1,6 +1,5 @@
 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');
@@ -38,14 +37,9 @@ describe('EnexToMd', function() {
 			// if (htmlFilename !== 'text2.html') continue;
 
 			const html = await shim.fsDriver().readFile(htmlPath);
-			let expectedMd = await shim.fsDriver().readFile(mdPath);
+			const expectedMd = await shim.fsDriver().readFile(mdPath);
 
-			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')
-			}
+			const actualMd = await enexXmlToMd('<div>' + html + '</div>', []);
 
 			if (actualMd !== expectedMd) {
 				console.info('');

CliClient/tests/HtmlToMd.js

@@ -1,6 +1,5 @@
 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,17 +36,12 @@ describe('HtmlToMd', function() {
 			const htmlPath = basePath + '/' + htmlFilename;
 			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
 
-			// if (htmlFilename !== 'picture.html') continue;
+			// if (htmlFilename !== 'code_1.html') continue;
 
 			const html = await shim.fsDriver().readFile(htmlPath);
-			let expectedMd = await shim.fsDriver().readFile(mdPath);
+			const expectedMd = await shim.fsDriver().readFile(mdPath);
 
-			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')
-			}
+			const actualMd = await htmlToMd.parse('<div>' + html + '</div>', []);
 
 			if (actualMd !== expectedMd) {
 				console.info('');

CliClient/tests/StringUtils.js

@@ -1,45 +0,0 @@
-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 StringUtils = require('lib/string-utils');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-describe('StringUtils', function() {
-
-	beforeEach(async (done) => {
-		done();
-	});
-
-	it('should surround keywords with strings', async (done) => {
-		const testCases = [
-			[[], 'test', 'a', 'b', 'test'],
-			[['test'], 'test', 'a', 'b', 'atestb'],
-			[['test'], 'Test', 'a', 'b', 'aTestb'],
-			[['te[]st'], 'Te[]st', 'a', 'b', 'aTe[]stb'],
-			// [['test1', 'test2'], 'bla test1 blabla test1 bla test2 not this one - test22', 'a', 'b', 'bla atest1b blabla atest1b bla atest2b not this one - test22'],
-			[['test1', 'test2'], 'bla test1 test1 bla test2', '<span class="highlighted-keyword">', '</span>', 'bla <span class="highlighted-keyword">test1</span> <span class="highlighted-keyword">test1</span> bla <span class="highlighted-keyword">test2</span>'],
-			// [[{ type:'regex', value:'test.*?'}], 'bla test1 test1 bla test2 test tttest', 'a', 'b', 'bla atest1b atest1b bla atest2b atestb tttest'],
-		];
-
-		for (let i = 0; i < testCases.length; i++) {
-			const t = testCases[i];
-
-			const keywords = t[0];
-			const input = t[1];
-			const prefix = t[2];
-			const suffix = t[3];
-			const expected = t[4];
-
-			const actual = StringUtils.surroundKeywords(keywords, input, prefix, suffix);
-
-			expect(actual).toBe(expected, 'Test case ' + i);
-		}
-
-		done();
-	});
-
-});

CliClient/tests/enex_to_md/list4.html

@@ -1,5 +0,0 @@
-<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

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

CliClient/tests/html_to_md/anchor_with_inner_tags.html

@@ -1 +1 @@
-<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</h1></a>
+<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>

CliClient/tests/html_to_md/anchor_with_inner_tags.md

@@ -1 +1 @@
-[# ![](https://joplinapp.org/images/Icon512.png)oplin](https://joplinapp.org)
+[# ![](https://joplin.cozic.net/images/Icon512.png)oplin](https://joplin.cozic.net)

CliClient/tests/html_to_md/anchor_with_url_with_spaces.html

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

CliClient/tests/html_to_md/anchor_with_url_with_spaces.md

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

CliClient/tests/html_to_md/picture.html

@@ -1,47 +0,0 @@
-<figure itemprop="associatedMedia image" itemscope="" itemtype="http://schema.org/ImageObject" data-component="image" data-media-id="75583fcfe2eb74f1e89ea320355ff4156f4ade7b" id="img-1">
-<meta itemprop="representativeOfPage" content="true">
-<meta itemprop="url" content="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=700&amp;quality=85&amp;auto=format&amp;fit=max&amp;s=2a6a7ba9738c6a6a79eab39ba46c34cd">
-<meta itemprop="width" content="3904">
-<meta itemprop="height" content="2342">
-<a href="#img-1" data-link-name="Launch Article Lightbox" data-is-ajax="">
-<div>
-<picture>
-<!--[if IE 9]><video style="display: none;"><![endif]-->
-<source media="(min-width: 980px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: 980px) and (min-resolution: 120dpi)" sizes="620px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=620&amp;quality=45&amp;auto=format&amp;fit=max&amp;dpr=2&amp;s=bacff59339e5ba117f957c24218ef76b 1240w">
-<source media="(min-width: 980px)" sizes="620px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=620&amp;quality=85&amp;auto=format&amp;fit=max&amp;s=f1427ce6689688d3d6e0087fe9cb5c18 620w">
-<source media="(min-width: 740px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: 740px) and (min-resolution: 120dpi)" sizes="700px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=700&amp;quality=45&amp;auto=format&amp;fit=max&amp;dpr=2&amp;s=70accd3c6e7d2c36f5ccc7321eab097e 1400w">
-<source media="(min-width: 740px)" sizes="700px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=700&amp;quality=85&amp;auto=format&amp;fit=max&amp;s=2a6a7ba9738c6a6a79eab39ba46c34cd 700w">
-<source media="(min-width: 660px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: 660px) and (min-resolution: 120dpi)" sizes="620px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=620&amp;quality=45&amp;auto=format&amp;fit=max&amp;dpr=2&amp;s=bacff59339e5ba117f957c24218ef76b 1240w">
-<source media="(min-width: 660px)" sizes="620px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=620&amp;quality=85&amp;auto=format&amp;fit=max&amp;s=f1427ce6689688d3d6e0087fe9cb5c18 620w">
-<source media="(min-width: 480px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: 480px) and (min-resolution: 120dpi)" sizes="645px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=645&amp;quality=45&amp;auto=format&amp;fit=max&amp;dpr=2&amp;s=6751fcff1b880acc45ed5aab6511a2ca 1290w">
-<source media="(min-width: 480px)" sizes="645px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=645&amp;quality=85&amp;auto=format&amp;fit=max&amp;s=d18702564383ce5d613d22b96ec6d726 645w">
-<source media="(min-width: 0px) and (-webkit-min-device-pixel-ratio: 1.25), (min-width: 0px) and (min-resolution: 120dpi)" sizes="465px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=465&amp;quality=45&amp;auto=format&amp;fit=max&amp;dpr=2&amp;s=a7b87fb26b9813d197f3c236a5282ca4 930w">
-<source media="(min-width: 0px)" sizes="465px" srcset="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=465&amp;quality=85&amp;auto=format&amp;fit=max&amp;s=821ae9e950ae92371b40a35e98a31116 465w">
-<!--[if IE 9]></video><![endif]-->
-<img itemprop="contentUrl" alt="A blood moon" src="https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=300&amp;quality=85&amp;auto=format&amp;fit=max&amp;s=1e9b643d2c109a1e271f50046eac1324">
-</picture>
-</div>
-<span>
-<svg width="22" height="22" viewBox="0 0 22 22">
-<path d="M3.4 20.2L9 14.5 7.5 13l-5.7 5.6L1 14H0v7.5l.5.5H8v-1l-4.6-.8M18.7 1.9L13 7.6 14.4 9l5.7-5.7.5 4.7h1.2V.6l-.5-.5H14v1.2l4.7.6"></path>
-</svg>
-</span>
-</a>
-
-<label for="show-caption">
-<span>
-<svg width="6" height="14" viewBox="0 0 6 14">
-<path d="M4.6 12l-.4 1.4c-.7.2-1.9.6-3 .6-.7 0-1.2-.2-1.2-.9 0-.2 0-.3.1-.5l2-6.7H.7l.4-1.5 4.2-.6h.2L3 12h1.6zm-.3-9.2c-.9 0-1.4-.5-1.4-1.3C2.9.5 3.7 0 4.6 0 5.4 0 6 .5 6 1.3c0 1-.8 1.5-1.7 1.5z"></path>
-</svg>
-</span>
-</label>
-<figcaption itemprop="description">
-<span>
-<svg width="11" height="10" viewBox="0 0 11 10">
-<path fill-rule="evenodd" d="M5.5 0L11 10H0z"></path>
-</svg>
-</span>
-A blood moon last occurred in July 2018, though clouds largely obscured the celestial phenomenon in the UK.
-Photograph: JM F Almeida/Getty Images
-</figcaption>
-</figure>

CliClient/tests/html_to_md/picture.md

@@ -1,3 +0,0 @@
- [![A blood moon](https://i.guim.co.uk/img/media/75583fcfe2eb74f1e89ea320355ff4156f4ade7b/0_49_3904_2342/master/3904.jpg?width=300&quality=85&auto=format&fit=max&s=1e9b643d2c109a1e271f50046eac1324)](#img-1)
-
-A blood moon last occurred in July 2018, though clouds largely obscured the celestial phenomenon in the UK. Photograph: JM F Almeida/Getty Images

CliClient/tests/html_to_md/picture_with_no_img.html

@@ -1,29 +0,0 @@
-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

@@ -1 +0,0 @@
-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,7 +39,6 @@ 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

@@ -1,51 +0,0 @@
-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_Folder.js

@@ -52,77 +52,4 @@ describe('models_Folder', function() {
 		expect(all.length).toBe(0);
 	}));
 
-	it('should sort by last modified, based on content', asyncTest(async () => {
-		let folders;
-
-		let f1 = await Folder.save({ title: "folder1" }); await sleep(0.1);
-		let f2 = await Folder.save({ title: "folder2" }); await sleep(0.1);
-		let f3 = await Folder.save({ title: "folder3" }); await sleep(0.1);
-		let n1 = await Note.save({ title: 'note1', parent_id: f2.id });
-
-		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
-		expect(folders.length).toBe(3);
-		expect(folders[0].id).toBe(f2.id);
-		expect(folders[1].id).toBe(f3.id);
-		expect(folders[2].id).toBe(f1.id);
-
-		let n2 = await Note.save({ title: 'note1', parent_id: f1.id });
-
-		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
-		expect(folders[0].id).toBe(f1.id);
-		expect(folders[1].id).toBe(f2.id);
-		expect(folders[2].id).toBe(f3.id);
-
-		await Note.save({ id: n1.id, title: 'note1 mod' });
-
-		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
-		expect(folders[0].id).toBe(f2.id);
-		expect(folders[1].id).toBe(f1.id);
-		expect(folders[2].id).toBe(f3.id);
-
-		folders = await Folder.orderByLastModified(await Folder.all(), 'asc');
-		expect(folders[0].id).toBe(f3.id);
-		expect(folders[1].id).toBe(f1.id);
-		expect(folders[2].id).toBe(f2.id);
-	}));
-
-	it('should sort by last modified, based on content (sub-folders too)', asyncTest(async () => {
-		let folders;
-
-		let f1 = await Folder.save({ title: "folder1" }); await sleep(0.1);
-		let f2 = await Folder.save({ title: "folder2" }); await sleep(0.1);
-		let f3 = await Folder.save({ title: "folder3", parent_id: f1.id }); await sleep(0.1);
-		let n1 = await Note.save({ title: 'note1', parent_id: f3.id });
-
-		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
-		expect(folders.length).toBe(3);
-		expect(folders[0].id).toBe(f1.id);
-		expect(folders[1].id).toBe(f3.id);
-		expect(folders[2].id).toBe(f2.id);
-
-		let n2 = await Note.save({ title: 'note2', parent_id: f2.id });
-		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
-
-		expect(folders[0].id).toBe(f2.id);
-		expect(folders[1].id).toBe(f1.id);
-		expect(folders[2].id).toBe(f3.id);
-
-		await Note.save({ id: n1.id, title: 'note1 MOD' });
-		
-		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
-		expect(folders[0].id).toBe(f1.id);
-		expect(folders[1].id).toBe(f3.id);
-		expect(folders[2].id).toBe(f2.id);
-
-		let f4 = await Folder.save({ title: "folder4", parent_id: f1.id }); await sleep(0.1);
-		let n3 = await Note.save({ title: 'note3', parent_id: f4.id });
-
-		folders = await Folder.orderByLastModified(await Folder.all(), 'desc');
-		expect(folders.length).toBe(4);
-		expect(folders[0].id).toBe(f1.id);
-		expect(folders[1].id).toBe(f4.id);
-		expect(folders[2].id).toBe(f3.id);
-		expect(folders[3].id).toBe(f2.id);
-	}));
-
 });

CliClient/tests/models_ItemChange.js

@@ -1,53 +0,0 @@
-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 SearchEngine = require('lib/services/SearchEngine');
-const ResourceService = require('lib/services/ResourceService');
-const ItemChangeUtils = require('lib/services/ItemChangeUtils');
-const Note = require('lib/models/Note');
-const Setting = require('lib/models/Setting');
-const ItemChange = require('lib/models/ItemChange');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-let searchEngine = null;
-
-describe('models_ItemChange', function() {
-
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		searchEngine = new SearchEngine();
-		searchEngine.setDb(db());
-		done();
-	});
-
-	it('should delete old changes that have been processed', asyncTest(async () => {
-		const n1 = await Note.save({ title: "abcd efgh" }); // 3
-
-		await ItemChange.waitForAllSaved();
-
-		expect(await ItemChange.lastChangeId()).toBe(1);
-
-		const resourceService = new ResourceService();
-
-		await searchEngine.syncTables();
-
-		// If we run this now, it should not delete any change because
-		// the resource service has not yet processed the change
-		await ItemChangeUtils.deleteProcessedChanges();
-
-		expect(await ItemChange.lastChangeId()).toBe(1);
-
-		await resourceService.indexNoteResources();
-
-		// Now that the resource service has processed the change,
-		// the change can be deleted.
-		await ItemChangeUtils.deleteProcessedChanges();
-
-		expect(await ItemChange.lastChangeId()).toBe(0);
-	}));
-
-});

CliClient/tests/models_Note.js

@@ -5,7 +5,6 @@ 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) => {
@@ -35,56 +34,6 @@ 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

@@ -1,59 +0,0 @@
-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

@@ -1,60 +0,0 @@
-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 NoteTag = require('lib/models/NoteTag.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);
-	}));
-
-	it('should not return tags without notes', 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']);
-
-		let tags = await Tag.allWithNotes();
-		expect(tags.length).toBe(1);
-
-		await Note.delete(note1.id);
-
-		tags = await Tag.allWithNotes();
-		expect(tags.length).toBe(0);
-	}));
-
-});

CliClient/tests/pathUtils.js

@@ -1,76 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { extractExecutablePath, quotePath, unquotePath, 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();
-	});
-
-	it('should quote and unquote paths', async (done) => {
-		const testCases = [
-			['', ''],
-			['/my/path', '/my/path'],
-			['/my/path with spaces', '"/my/path with spaces"'],
-			['/my/weird"path', '"/my/weird\\"path"'],
-			['c:\\Windows\\test.dll', 'c:\\Windows\\test.dll'],
-			['c:\\Windows\\test test.dll', '"c:\\Windows\\test test.dll"'],
-		];
-
-		for (let i = 0; i < testCases.length; i++) {
-			const t = testCases[i];
-			expect(quotePath(t[0])).toBe(t[1]);
-			expect(unquotePath(quotePath(t[0]))).toBe(t[0]);
-		} 
-
-		done();
-	});
-
-	it('should extract executable path from command', async (done) => {
-		const testCases = [
-			['', ''],
-			['/my/cmd -some -args', '/my/cmd'],
-			['"/my/cmd" -some -args', '"/my/cmd"'],
-			['"/my/cmd"', '"/my/cmd"'],
-			['"/my/cmd and space" -some -flags', '"/my/cmd and space"'],
-			['"" -some -flags', '""'],
-		];
-
-		for (let i = 0; i < testCases.length; i++) {
-			const t = testCases[i];
-			expect(extractExecutablePath(t[0])).toBe(t[1]);
-		} 
-
-		done();
-	});
-
-});

CliClient/tests/services_InteropService.js

@@ -310,51 +310,4 @@ 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

@@ -1,21 +1,19 @@
 require('app-module-path').addPath(__dirname);
 
 const { time } = require('lib/time-utils.js');
-const { asyncTest, resourceService, decryptionWorker, encryptionService, loadEncryptionMasterKey, allSyncTargetItemsEncrypted, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const InteropService = require('lib/services/InteropService.js');
 const Folder = require('lib/models/Folder.js');
 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');
 const ArrayUtils = require('lib/ArrayUtils');
 const ObjectUtils = require('lib/ObjectUtils');
 const { shim } = require('lib/shim.js');
-const SearchEngine = require('lib/services/SearchEngine');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -38,7 +36,6 @@ describe('services_ResourceService', function() {
 
 	beforeEach(async (done) => {
 		await setupDatabaseAndSynchronizer(1);
-		await setupDatabaseAndSynchronizer(2);
 		await switchClient(1);
 		done();
 	});
@@ -82,6 +79,7 @@ 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();
 
@@ -108,109 +106,4 @@ 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);
-	}));
-
-	it('should not delete resources that are associated with an encrypted note', asyncTest(async () => {
-		// https://github.com/laurent22/joplin/issues/1433
-		//
-		// Client 1 and client 2 have E2EE setup.
-		//
-		// - Client 1 creates note N1 and add resource R1 to it
-		// - Client 1 syncs
-		// - Client 2 syncs and get N1
-		// - Client 2 add resource R2 to N1
-		// - Client 2 syncs
-		// - Client 1 syncs
-		// - Client 1 runs resource indexer - but because N1 hasn't been decrypted yet, it found that R1 is no longer associated with any note
-		// - Client 1 decrypts notes, but too late
-		// 
-		// Eventually R1 is deleted because service thinks that it was at some point associated with a note, but no longer.
-
-		const masterKey = await loadEncryptionMasterKey();
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-		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'); // R1
-		await resourceService().indexNoteResources();
-		await synchronizer().start();
-		expect(await allSyncTargetItemsEncrypted()).toBe(true);
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-		await decryptionWorker().start();
-		{
-			const n1 = await Note.load(note1.id);
-			await shim.attachFileToNote(n1, __dirname + '/../tests/support/photo.jpg'); // R2
-		}
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-		await resourceService().indexNoteResources();
-		await resourceService().deleteOrphanResources(0); // Previously, R1 would be deleted here because it's not indexed
-		expect((await Resource.all()).length).toBe(2);
-	}));
-
-	it('should double-check if the resource is still linked before deleting it', asyncTest(async () => {
-		SearchEngine.instance().setDb(db()); // /!\ Note that we use the global search engine here, which we shouldn't but will work for now
-
-		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');
-		await resourceService().indexNoteResources();
-		const bodyWithResource = note1.body;
-		await Note.save({ id: note1.id, body: '' });
-		await resourceService().indexNoteResources();
-		await Note.save({ id: note1.id, body: bodyWithResource });
-		await SearchEngine.instance().syncTables();
-		await resourceService().deleteOrphanResources(0);
-
-		expect((await Resource.all()).length).toBe(1); // It should not have deleted the resource
-		const nr = (await NoteResource.all())[0];
-		expect(!!nr.is_associated).toBe(true); // And it should have fixed the situation by re-indexing the note content
-	}));
-
 });

CliClient/tests/services_SearchEngine.js

@@ -1,326 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, 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');
-const ItemChange = require('lib/models/ItemChange');
-const Setting = require('lib/models/Setting');
-
-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', asyncTest(async () => {
-		let rows, n1, n2, n3;
-
-		n1 = await Note.save({ title: "a" });
-		n2 = await Note.save({ title: "b" });
-		await engine.syncTables();
-		rows = await engine.search('a');
-		expect(rows.length).toBe(1);
-		expect(rows[0].title).toBe('a');
-
-		await Note.delete(n1.id);
-		await engine.syncTables();
-		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' });
-		await engine.syncTables();
-		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 });
-		await engine.syncTables();
-		rows = await engine.search('c');
-		expect(rows.length).toBe(0);
-
-		await Note.save({ id: n2.id, encryption_applied: 0 });
-		await engine.syncTables();
-		rows = await engine.search('c');
-		expect(rows.length).toBe(1);
-	}));
-
-	it('should, after initial indexing, save the last change ID', asyncTest(async () => {
-		const n1 = await Note.save({ title: "abcd efgh" }); // 3
-		const n2 = await Note.save({ title: "abcd aaaaa abcd abcd" }); // 1
-
-		expect(Setting.value('searchEngine.initialIndexingDone')).toBe(false);
-
-		await ItemChange.waitForAllSaved();
-		const lastChangeId = await ItemChange.lastChangeId();
-
-		await engine.syncTables();
-
-		expect(Setting.value('searchEngine.lastProcessedChangeId')).toBe(lastChangeId);
-		expect(Setting.value('searchEngine.initialIndexingDone')).toBe(true);
-	}));
-
-
-	it('should order search results by relevance (1)', asyncTest(async () => {
-		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
-
-		await engine.syncTables();
-		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);
-	}));
-
-	it('should order search results by relevance (2)', asyncTest(async () => {
-		// 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" });
-
-		await engine.syncTables();
-		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);
-	}));
-
-	it('should order search results by relevance (last updated first)', asyncTest(async () => {
-		let rows;
-
-		const n1 = await Note.save({ title: "abcd" });
-		await sleep(0.1);
-		const n2 = await Note.save({ title: "abcd" });
-		await sleep(0.1);
-		const n3 = await Note.save({ title: "abcd" });
-		await sleep(0.1);
-
-		await engine.syncTables();
-		rows = await engine.search('abcd');
-
-		expect(rows[0].id).toBe(n3.id);
-		expect(rows[1].id).toBe(n2.id);
-		expect(rows[2].id).toBe(n1.id);
-
-		await Note.save({ id: n1.id, title: "abcd" });
-
-		await engine.syncTables();
-		rows = await engine.search('abcd');
-		expect(rows[0].id).toBe(n1.id);
-		expect(rows[1].id).toBe(n3.id);
-		expect(rows[2].id).toBe(n2.id);
-	}));
-
-	it('should order search results by relevance (completed to-dos last)', asyncTest(async () => {
-		let rows;
-
-		const n1 = await Note.save({ title: "abcd", is_todo: 1 });
-		await sleep(0.1);
-		const n2 = await Note.save({ title: "abcd", is_todo: 1 });
-		await sleep(0.1);
-		const n3 = await Note.save({ title: "abcd", is_todo: 1 });
-		await sleep(0.1);
-
-		await engine.syncTables();
-		rows = await engine.search('abcd');
-
-		expect(rows[0].id).toBe(n3.id);
-		expect(rows[1].id).toBe(n2.id);
-		expect(rows[2].id).toBe(n1.id);
-
-		await Note.save({ id: n3.id, todo_completed: Date.now() });
-
-		await engine.syncTables();
-		rows = await engine.search('abcd');
-		expect(rows[0].id).toBe(n2.id);
-		expect(rows[1].id).toBe(n1.id);
-		expect(rows[2].id).toBe(n3.id);
-	}));
-
-	it('should supports various query types', asyncTest(async () => {
-		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" });
-		const n3 = await Note.save({ title: "Агентство Рейтер" });
-		const n4 = await Note.save({ title: "Dog" });
-		const n5 = await Note.save({ title: "СООБЩИЛО" });
-
-		await engine.syncTables();
-
-		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);
-
-		rows = await engine.search('Рейтер');
-		expect(rows.length).toBe(1);
-
-		rows = await engine.search('рейтер');
-		expect(rows.length).toBe(1);
-
-		rows = await engine.search('Dog');
-		expect(rows.length).toBe(1);
-
-		rows = await engine.search('dog');
-		expect(rows.length).toBe(1);
-
-		rows = await engine.search('сообщило');
-		expect(rows.length).toBe(1);
-	}));
-
-	it('should support queries with or without accents', asyncTest(async () => {
-		let rows;
-		const n1 = await Note.save({ title: "père noël" });
-
-		await engine.syncTables();
-
-		expect((await engine.search('père')).length).toBe(1);
-		expect((await engine.search('pere')).length).toBe(1);
-		expect((await engine.search('noe*')).length).toBe(1);
-		expect((await engine.search('noë*')).length).toBe(1);
-	}));
-
-	it('should support queries with Chinese characters', asyncTest(async () => {
-		let rows;
-		const n1 = await Note.save({ title: "我是法国人" });
-
-		await engine.syncTables();
-
-		expect((await engine.search('我')).length).toBe(1);
-		expect((await engine.search('法国人')).length).toBe(1);
-	}));
-
-	it('should support queries with Japanese characters', asyncTest(async () => {
-		let rows;
-		const n1 = await Note.save({ title: "私は日本語を話すことができません" });
-
-		await engine.syncTables();
-
-		expect((await engine.search('日本')).length).toBe(1);
-		expect((await engine.search('できません')).length).toBe(1);
-	}));
-
-	it('should support queries with Korean characters', asyncTest(async () => {
-		let rows;
-		const n1 = await Note.save({ title: "이것은 한국말이다" });
-
-		await engine.syncTables();
-
-		expect((await engine.search('이것은')).length).toBe(1);
-		expect((await engine.search('말')).length).toBe(1);
-	}));
-
-	it('should support field restricted queries with Chinese characters', asyncTest(async () => {
-		let rows;
-		const n1 = await Note.save({ title: "你好", body: "我是法国人" });
-
-		await engine.syncTables();
-
-		expect((await engine.search('title:你好*')).length).toBe(1);
-		expect((await engine.search('body:你好')).length).toBe(0);
-		expect((await engine.search('title:你好 body:法国人')).length).toBe(1);
-		expect((await engine.search('title:你好 body:bla')).length).toBe(0);
-		expect((await engine.search('title:你好 我是')).length).toBe(1);
-		expect((await engine.search('title:bla 我是')).length).toBe(0);
-
-		// For non-alpha char, only the first field is looked at, the following ones are ignored
-		expect((await engine.search('title:你好 title:hello')).length).toBe(1);
-	}));
-
-	it('should parse normal query strings', asyncTest(async () => {
-		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'] }],
-			['title:abcd title:efgh', { title: ['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);
-
-			const _Values = actual.terms._ ? actual.terms._.map(v => v.value) : undefined;
-			const titleValues = actual.terms.title ? actual.terms.title.map(v => v.value) : undefined;
-			const bodyValues = actual.terms.body ? actual.terms.body.map(v => v.value) : undefined;
-
-			expect(JSON.stringify(_Values)).toBe(JSON.stringify(expected._), 'Test case (_) ' + i);
-			expect(JSON.stringify(titleValues)).toBe(JSON.stringify(expected.title), 'Test case (title) ' + i);
-			expect(JSON.stringify(bodyValues)).toBe(JSON.stringify(expected.body), 'Test case (body) ' + i);
-		}
-	}));
-
-	it('should handle queries with special characters', asyncTest(async () => {
-		let rows;
-
-		const testCases = [
-			['did-not-match', 'did-not-match'],
-			['does match', 'does match'],
-		];
-
-		for (let i = 0; i < testCases.length; i++) {
-			const t = testCases[i];
-			const content = t[0];
-			const query = t[1];
-
-			const n = await Note.save({ title: content });
-			await engine.syncTables();
-			rows = await engine.search(query);
-			expect(rows.length).toBe(1);
-
-			await Note.delete(n.id);
-		}
-	}));
-
-});

CliClient/tests/services_rest_Api.js

@@ -1,300 +0,0 @@
-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 folders with supplied ID', async (done) => {
-		const response = await api.route('POST', 'folders', null, JSON.stringify({
-			id: '12345678123456781234567812345678',
-			title: 'from api',
-		}));
-
-		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

@@ -1,13 +1,12 @@
 require('app-module-path').addPath(__dirname);
 
 const { time } = require('lib/time-utils.js');
-const { setupDatabase, allSyncTargetItemsEncrypted, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js');
+const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js');
 const { shim } = require('lib/shim.js');
 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');
@@ -15,7 +14,6 @@ const MasterKey = require('lib/models/MasterKey');
 const BaseItem = require('lib/models/BaseItem.js');
 const BaseModel = require('lib/BaseModel.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
-const WelcomeUtils = require('lib/WelcomeUtils');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -29,6 +27,38 @@ async function allItems() {
 	return folders.concat(notes);
 }
 
+async function allSyncTargetItemsEncrypted() {
+	const list = await fileApi().list();
+	const files = list.items;
+
+	//console.info(Setting.value('resourceDir'));
+
+	let totalCount = 0;
+	let encryptedCount = 0;
+	for (let i = 0; i < files.length; i++) {
+		const file = files[i];
+		const remoteContentString = await fileApi().get(file.path);
+		const remoteContent = await BaseItem.unserialize(remoteContentString);
+		const ItemClass = BaseItem.itemClass(remoteContent);
+
+		if (!ItemClass.encryptionSupported()) continue;
+
+		totalCount++;
+
+		if (remoteContent.type_ === BaseModel.TYPE_RESOURCE) {
+			const content = await fileApi().get('.resource/' + remoteContent.id);
+			totalCount++;
+			if (content.substr(0, 5) === 'JED01') output = encryptedCount++;
+		}
+
+		if (!!remoteContent.encryption_applied) encryptedCount++;
+	}
+
+	if (!totalCount) throw new Error('No encryptable item on sync target');
+
+	return totalCount === encryptedCount;
+}
+
 async function localItemsSameAsRemote(locals, expect) {
 	let error = null;
 	try {
@@ -842,49 +872,12 @@ describe('Synchronizer', function() {
 		let allResources = await Resource.all();
 		expect(allResources.length).toBe(1);
 		let resource1_2 = allResources[0];
-		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(resource1_2.id).toBe(resource1.id);
 		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);
 
@@ -933,10 +926,6 @@ 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);
@@ -1068,46 +1057,4 @@ describe('Synchronizer', function() {
 		expect(note2.title).toBe("un UPDATE");
 	}));
 
-	it("should create a new Welcome notebook on each client", asyncTest(async () => {
-		// Create the Welcome items on two separate clients
-
-		await WelcomeUtils.createWelcomeItems();
-		await synchronizer().start();
-
-		await switchClient(2);
-
-		await WelcomeUtils.createWelcomeItems();
-		const beforeFolderCount = (await Folder.all()).length;
-		const beforeNoteCount = (await Note.all()).length;
-		expect(beforeFolderCount === 1).toBe(true);
-		expect(beforeNoteCount > 1).toBe(true);
-		
-		await synchronizer().start();
-
-		const afterFolderCount = (await Folder.all()).length;
-		const afterNoteCount = (await Note.all()).length;
-
-		expect(afterFolderCount).toBe(beforeFolderCount * 2);
-		expect(afterNoteCount).toBe(beforeNoteCount * 2);
-
-		// Changes to the Welcome items should be synced to all clients
-
-		const f1 = (await Folder.all())[0];
-		await Folder.save({ id: f1.id, title: 'Welcome MOD' });
-
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-
-		const f1_1 = await Folder.load(f1.id);
-		expect(f1_1.title).toBe('Welcome MOD');
-
-		// Now check that it created the duplicate tag
-
-		const tags = await Tag.modelSelectAll('SELECT * FROM tags WHERE title = "organising"');
-		expect(tags.length).toBe(2);
-	}));
-
 });

CliClient/tests/test-utils.js

@@ -4,7 +4,6 @@ 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');
@@ -30,7 +29,6 @@ const SyncTargetNextcloud = require('lib/SyncTargetNextcloud.js');
 const SyncTargetDropbox = require('lib/SyncTargetDropbox.js');
 const EncryptionService = require('lib/services/EncryptionService.js');
 const DecryptionWorker = require('lib/services/DecryptionWorker.js');
-const ResourceService = require('lib/services/ResourceService.js');
 const WebDavApi = require('lib/WebDavApi');
 const DropboxApi = require('lib/DropboxApi');
 
@@ -38,7 +36,6 @@ let databases_ = [];
 let synchronizers_ = [];
 let encryptionServices_ = [];
 let decryptionWorkers_ = [];
-let resourceServices_ = [];
 let fileApi_ = null;
 let currentClient_ = 1;
 
@@ -51,9 +48,7 @@ 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);
@@ -85,7 +80,6 @@ BaseItem.loadClass('MasterKey', MasterKey);
 
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
-Setting.setConstant('tempDir', tempDir);
 
 BaseService.logger_ = logger;
 
@@ -104,8 +98,6 @@ function sleep(n) {
 }
 
 async function switchClient(id) {
-	if (!databases_[id]) throw new Error('Call setupDatabaseAndSynchronizer(' + id + ') first!!');
-
 	await time.msleep(sleepTime); // Always leave a little time so that updated_time properties don't overlap
 	await Setting.saveAll();
 
@@ -127,8 +119,6 @@ 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',
@@ -141,7 +131,6 @@ async function clearDatabase(id = null) {
 		'DELETE FROM settings',		
 		'DELETE FROM deleted_items',
 		'DELETE FROM sync_items',
-		'DELETE FROM notes_normalized',
 	];
 
 	await databases_[id].transactionExecBatch(queries);
@@ -202,7 +191,6 @@ async function setupDatabaseAndSynchronizer(id = null) {
 	encryptionServices_[id] = new EncryptionService();
 	decryptionWorkers_[id] = new DecryptionWorker();
 	decryptionWorkers_[id].setEncryptionService(encryptionServices_[id]);
-	resourceServices_[id] = new ResourceService();
 
 	await fileApi().clearRoot();
 }
@@ -227,11 +215,6 @@ function decryptionWorker(id = null) {
 	return decryptionWorkers_[id];
 }
 
-function resourceService(id = null) {
-	if (id === null) id = currentClient_;
-	return resourceServices_[id];
-}
-
 async function loadEncryptionMasterKey(id = null, useExisting = false) {
 	const service = encryptionService(id);
 
@@ -324,34 +307,4 @@ function asyncTest(callback) {
 	}
 }
 
-async function allSyncTargetItemsEncrypted() {
-	const list = await fileApi().list();
-	const files = list.items;
-
-	let totalCount = 0;
-	let encryptedCount = 0;
-	for (let i = 0; i < files.length; i++) {
-		const file = files[i];
-		const remoteContentString = await fileApi().get(file.path);
-		const remoteContent = await BaseItem.unserialize(remoteContentString);
-		const ItemClass = BaseItem.itemClass(remoteContent);
-
-		if (!ItemClass.encryptionSupported()) continue;
-
-		totalCount++;
-
-		if (remoteContent.type_ === BaseModel.TYPE_RESOURCE) {
-			const content = await fileApi().get('.resource/' + remoteContent.id);
-			totalCount++;
-			if (content.substr(0, 5) === 'JED01') output = encryptedCount++;
-		}
-
-		if (!!remoteContent.encryption_applied) encryptedCount++;
-	}
-
-	if (!totalCount) throw new Error('No encryptable item on sync target');
-
-	return totalCount === encryptedCount;
-}
-
-module.exports = { resourceService, allSyncTargetItemsEncrypted, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest };
+module.exports = { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest };

CliClientDemo/.gitignore

@@ -0,0 +1 @@
+node_modules

CliClientDemo/index.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const spawn = require('child_process').spawn;
+const os = require('os');
+const fs = require('fs-extra');
+
+const joplinPath = __dirname + '/node_modules/.bin/joplin';
+const profileDir = os.homedir() + '/.config/demo-joplin';
+const dbFilename = 'database.sqlite';
+
+fs.ensureDirSync(profileDir);
+if (!fs.pathExistsSync(profileDir + '/' + dbFilename)) {
+	fs.copySync(__dirname + '/' + dbFilename, profileDir + '/' + dbFilename);
+}
+
+const opt = {
+	cwd: __dirname,
+	env: (function() {
+		process.env.NODE_PATH = '.';
+		return process.env;
+	}()),
+	stdio: [process.stdin, process.stdout, process.stderr]
+};
+
+const app = spawn(joplinPath, ['--is-demo', '--profile', profileDir], opt);
+
+app.on('close', (code) => {
+	process.exit(code);
+});

CliClientDemo/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "demo-joplin",
+  "version": "1.0.8",
+  "description": "Demo for Joplin CLI",
+  "bin": {
+    "demo-joplin": "./index.js"
+  },
+  "bugs": {
+    "url": "https://github.com/laurent22/joplin/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/laurent22/joplin"
+  },
+  "engines": {
+    "node": ">=8.7.0"
+  },
+  "copyright": {
+    "title": "Demo for Joplin CLI",
+    "years": [
+      2016,
+      2017,
+      2018
+    ],
+    "owner": "Laurent Cozic"
+  },
+  "dependencies": {
+    "fs-extra": "^4.0.2",
+    "joplin": "^0.10.69"
+  },
+  "author": "Laurent Cozic",
+  "license": "MIT"
+}

CliClientDemo/publish.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+npm version patch
+npm publish

Clipper/joplin-webclipper/content_scripts/index.js

@@ -30,21 +30,6 @@
 		return output;
 	}
 
-	function getImageSizes(element) {
-		const images = element.getElementsByTagName('img');
-		const output = {};
-		for (let i = 0; i < images.length; i++) {
-			const img = images[i];
-			output[img.src] = {
-				width: img.width,
-				height: img.height,
-				naturalWidth: img.naturalWidth,
-				naturalHeight: img.naturalHeight,
-			};
-		}
-		return output;
-	}
-
 	// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
 	function cleanUpElement(element) {
 		const childNodes = element.childNodes;
@@ -89,16 +74,14 @@
 	async function prepareCommandResponse(command) {
 		console.info('Got command: ' + command.name);
 
-		const clippedContentResponse = (title, html, imageSizes) => {
+		const clippedContentResponse = (title, html) => {
 			return {
 				name: 'clippedContent',
 				title: title,
 				html: html,
 				base_url: baseUrl(),
-				url: location.origin + location.pathname + location.search,
+				url: location.origin + location.pathname,
 				parent_id: command.parent_id,
-				tags: command.tags || '',
-				image_sizes: imageSizes,
 			};			
 		}
 
@@ -115,20 +98,20 @@
 				response.warning = 'Could not retrieve simplified version of page - full page has been saved instead.';
 				return response;
 			}
-			return clippedContentResponse(article.title, article.body, getImageSizes(document));
+			return clippedContentResponse(article.title, article.body);
 
 		} else if (command.name === "completePageHtml") {
 
 			const cleanDocument = document.body.cloneNode(true);
 			cleanUpElement(cleanDocument);
-			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, getImageSizes(document));
+			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML);
 
 		} else if (command.name === "selectedHtml") {
 
 		    const range = window.getSelection().getRangeAt(0);
 		    const container = document.createElement('div');
 		    container.appendChild(range.cloneContents());
-		    return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document));
+		    return clippedContentResponse(pageTitle(), container.innerHTML);
 
 		} else if (command.name === 'screenshot') {
 
@@ -154,7 +137,6 @@
 			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'
@@ -232,7 +214,6 @@
 						crop_rect: selectionArea,
 						url: location.origin + location.pathname,
 						parent_id: command.parent_id,
-						tags: command.tags,
 					};
 
 					browser_.runtime.sendMessage({
@@ -249,10 +230,6 @@
 
 			return {};
 
-		} else if (command.name === "pageUrl") {
-			let url = location.origin + location.pathname + location.search;
-			return clippedContentResponse(pageTitle(), url, getImageSizes(document));
-
 		} else {
 			throw new Error('Unknown command: ' + JSON.stringify(command));
 		}

Clipper/joplin-webclipper/manifest.json

@@ -1,12 +1,10 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.0.13",
+    "version": "1.0.6",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
-    "homepage_url": "https://joplinapp.org",
-    "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
+    "homepage_url": "https://joplin.cozic.net",
     "icons": {
-        "32": "icons/32.png",
         "48": "icons/48.png",
         "96": "icons/96.png"
     },

Clipper/joplin-webclipper/popup/.env

@@ -1 +0,0 @@
-INLINE_RUNTIME_CHUNK=false

Clipper/joplin-webclipper/popup/index.html

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

Clipper/joplin-webclipper/popup/package.json

@@ -7,7 +7,7 @@
     "react": "^16.3.2",
     "react-dom": "^16.3.2",
     "react-redux": "^5.0.7",
-    "react-scripts": "^2.1.5",
+    "react-scripts": "1.1.4",
     "redux": "^4.0.0"
   },
   "scripts": {
@@ -19,13 +19,7 @@
     "postinstall": "node scripts/postinstall.js"
   },
   "devDependencies": {
-    "cra-build-watch": "^1.4.0",
+    "cra-build-watch": "^1.0.1",
     "fs-extra": "^6.0.1"
-  },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ]
+  }
 }

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

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

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

@@ -14,15 +14,10 @@ class AppComponent extends Component {
 
 		this.state = ({
 			contentScriptLoaded: false,
-			selectedTags: [],
-			contentScriptError: '',
 		});
 
 		this.confirm_click = () => {
-			const content = Object.assign({}, this.props.clippedContent);
-			content.tags = this.state.selectedTags.join(',');
-			content.parent_id = this.props.selectedFolderId;
-			bridge().sendContentToJoplin(content);
+			bridge().sendContentToJoplin(this.props.clippedContent);
 		}
 
 		this.contentTitle_change = (event) => {
@@ -35,24 +30,21 @@ 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',
-			});
-		}
-
-		this.clipUrl_click = () => {
-			bridge().sendCommandToActiveTab({
-				name: 'pageUrl',
+				parent_id: this.props.selectedFolderId,
 			});
 		}
 
@@ -64,7 +56,6 @@ class AppComponent extends Component {
 					name: 'screenshot',
 					api_base_url: baseUrl,
 					parent_id: this.props.selectedFolderId,
-					tags: this.state.selectedTags.join(','),
 				});
 
 				window.close();
@@ -74,7 +65,7 @@ class AppComponent extends Component {
 		}
 
 		this.clipperServerHelpLink_click = () => {
-			bridge().tabsCreate({ url: 'https://joplinapp.org/clipper/' });
+			bridge().tabsCreate({ url: 'https://joplin.cozic.net/clipper' });
 		}
 
 		this.folderSelect_change = (event) => {
@@ -83,41 +74,6 @@ 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() {
@@ -127,58 +83,14 @@ class AppComponent extends Component {
 	}
 
 	async componentDidMount() {
-		try {
-			await this.loadContentScripts();
-		} catch (error) {
-			console.error('Could not load content scripts', error);
-			this.setState({ contentScriptError: error.message });
-			return;
-		}
-
+		await this.loadContentScripts();
 		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() {
-		if (!this.state.contentScriptLoaded) {
-			let msg = 'Loading...';
-			if (this.state.contentScriptError) msg = 'The Joplin extension is not available on this tab due to: ' + this.state.contentScriptError;
-			return <div style={{padding: 10, fontSize: 12, maxWidth: 200}}>{msg}</div>;
-		}
+		if (!this.state.contentScriptLoaded) return 'Loading...';
 
 		const warningComponent = !this.props.warning ? null : <div className="Warning">{ this.props.warning }</div>
 
@@ -207,17 +119,24 @@ class AppComponent extends Component {
 					<p className="Info">{ msg }</p>
 				</div>
 			);
-		} else if (hasContent) {
-			previewComponent = (
-				<div className="Preview">
-					<a className={"Confirm Button"} onClick={this.confirm_click}>Confirm</a>
-					<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>
+		} 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>
 					</div>
-				</div>
-			);
+				);
+			} else {
+				previewComponent = (
+					<div className="Preview">
+						<p className="Info">(No preview yet)</p>
+					</div>
+				);
+			}
 		}
 
 		const clipperStatusComp = () => {
@@ -247,6 +166,8 @@ 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 = [];
 
@@ -275,37 +196,6 @@ 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">			
@@ -314,18 +204,11 @@ class AppComponent extends Component {
 						<li><a className="Button" onClick={this.clipComplete_click}>Clip complete page</a></li>
 						<li><a className="Button" onClick={this.clipSelection_click}>Clip selection</a></li>
 						<li><a className="Button" onClick={this.clipScreenshot_click}>Clip screenshot</a></li>
-						<li><a className="Button" onClick={this.clipUrl_click}>Clip URL</a></li>
 					</ul>
 				</div>
 				{ foldersComp() }
-				<div className="Tags">
-					<label>Tags:</label>
-					{tagsComp()}
-					<datalist id="tags">
-						{tagDataListOptions}
-					</datalist>
-				</div>
 				{ warningComponent }
+				<h2>Preview:</h2>
 				{ previewComponent }
 				{ clipperStatusComp() }
 			</div>
@@ -341,7 +224,6 @@ 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 {
 
-	async init(browser, browserSupportsPromises, dispatch) {
+	init(browser, browserSupportsPromises, dispatch) {
 		console.info('Popup: Init bridge');
 
 		this.browser_ = browser;
@@ -28,8 +28,6 @@ class Bridge {
 					base_url: command.base_url,
 					source_url: command.url,
 					parent_id: command.parent_id,
-					tags: command.tags || '',
-					image_sizes: command.image_sizes || {},
 				};
 
 				this.dispatch({ type: 'CLIPPED_CONTENT_SET', content: content });
@@ -38,7 +36,7 @@ class Bridge {
 
 		this.browser_.runtime.onMessage.addListener(this.browser_notify);
 
-		const backgroundPage = await this.backgroundPage(this.browser_);
+		const backgroundPage = this.browser_.extension.getBackgroundPage();
 
 		// Not sure why the getBackgroundPage() sometimes returns null, so
 		// in that case default to "prod" environment, which means the live
@@ -55,17 +53,6 @@ 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_;
 	}
@@ -124,11 +111,6 @@ 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,7 +16,6 @@ const defaultState = {
 		port: null,
 	},
 	folders: [],
-	tags: [],
 	selectedFolderId: null,
 	env: 'prod',
 };
@@ -66,11 +65,6 @@ 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);
@@ -94,18 +88,11 @@ function reducer(state = defaultState, action) {
 	return newState;
 }
 
-async function main() {
-	const store = createStore(reducer, applyMiddleware(reduxMiddleware));
+const store = createStore(reducer, applyMiddleware(reduxMiddleware));
 
-	console.info('Popup: Init bridge and restore state...');
+bridge().init(window.browser ? window.browser : window.chrome, !!window.browser, store.dispatch);
+bridge().restoreState();
 
-	await bridge().init(window.browser ? window.browser : window.chrome, !!window.browser, store.dispatch);
+console.info('Popup: Creating React app...');
 
-	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);
-});
+ReactDOM.render(<Provider store={store}><App /></Provider>, document.getElementById('root'));

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

@@ -3,5 +3,4 @@ app/packageInfo.js
 dist/
 app/lib/
 app/gui/*.min.js
-app/plugins/*.min.js
 .DS_Store

ElectronClient/app/ElectronAppWrapper.js

@@ -54,21 +54,15 @@ class ElectronAppWrapper {
 			y: windowState.y,
 			width: windowState.width,
 			height: windowState.height,
-                        backgroundColor: '#fff', // required to enable sub pixel rendering, can't be in css
-			webPreferences: {
-				nodeIntegration: true,
-			},
 		};
 
 		// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098
 		// Fix: https://github.com/electron-userland/electron-builder/issues/2269
-		if (shim.isLinux()) windowOptions.icon = path.join(__dirname, '..', 'build/icons/128x128.png');
+		if (shim.isLinux()) windowOptions.icon = __dirname + '/build/icons/128x128.png';
 
 		require('electron-context-menu')({
 			shouldShowMenu: (event, params) => {
-				// params.inputFieldType === 'none' when right-clicking the text editor. This is a bit of a hack to detect it because in this
-				// case we don't want to use the built-in context menu but a custom one.
-				return params.isEditable && params.inputFieldType !== 'none';
+				return params.isEditable;
 			},
 		});
 
@@ -81,7 +75,7 @@ class ElectronAppWrapper {
 		}))
 
 		// Uncomment this to view errors if the application does not start
-		// if (this.env_ === 'dev') this.win_.webContents.openDevTools();
+		if (this.env_ === 'dev') this.win_.webContents.openDevTools();
 
 		this.win_.on('close', (event) => {
 			// If it's on macOS, the app is completely closed only if the user chooses to close the app (willQuitApp_ will be true)
@@ -195,24 +189,19 @@ class ElectronAppWrapper {
 	ensureSingleInstance() {
 		if (this.env_ === 'dev') return false;
 
-		const gotTheLock = this.electronApp_.requestSingleInstanceLock();
+		return new Promise((resolve, reject) => {
+			const alreadyRunning = this.electronApp_.makeSingleInstance((commandLine, workingDirectory) => {
+				const win = this.window();
+				if (!win) return;
+				if (win.isMinimized()) win.restore();
+				win.show();
+				win.focus();
+			});
 
-		if (!gotTheLock) {
-			// Another instance is already running - exit
-			this.electronApp_.quit();
-			return true;
-		}
+			if (alreadyRunning) this.electronApp_.quit();
 
-		// Someone tried to open a second instance - focus our window instead
-		this.electronApp_.on('second-instance', (event, commandLine, workingDirectory) => {
-			const win = this.window();
-			if (!win) return;
-			if (win.isMinimized()) win.restore();
-			win.show();
-			win.focus();
+			resolve(alreadyRunning);
 		});
-
-		return false;
 	}
 
 	async start() {
@@ -220,8 +209,8 @@ class ElectronAppWrapper {
 		// the "ready" event. So we use the function below to make sure that the app is ready.
 		await this.waitForElectronAppReady();
 
-		const alreadyRunning = this.ensureSingleInstance();
-		if (alreadyRunning) return;		
+		const alreadyRunning = await this.ensureSingleInstance();
+		if (alreadyRunning) return;
 
 		this.createWindow();
 
@@ -240,4 +229,4 @@ class ElectronAppWrapper {
 
 }
 
-module.exports = { ElectronAppWrapper };
+module.exports = { ElectronAppWrapper };

ElectronClient/app/InteropServiceHelper.js

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

ElectronClient/app/app.js

@@ -24,15 +24,10 @@ const InteropService = require('lib/services/InteropService');
 const InteropServiceHelper = require('./InteropServiceHelper.js');
 const ResourceService = require('lib/services/ResourceService');
 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;
-const PluginManager = require('lib/services/PluginManager');
-
-const pluginClasses = [
-	require('./plugins/GotoAnything.min'),
-];
 
 const appDefaultState = Object.assign({}, defaultState, {
 	route: {
@@ -47,7 +42,6 @@ const appDefaultState = Object.assign({}, defaultState, {
 	sidebarVisibility: true,
 	windowContentSize: bridge().windowContentSize(),
 	watchedNoteFiles: [],
-	lastEditorScrollPercents: {},
 });
 
 class Application extends BaseApplication {
@@ -55,6 +49,7 @@ class Application extends BaseApplication {
 	constructor() {
 		super();
 		this.lastMenuScreen_ = null;
+		this.powerSaveBlockerId_ = null;
 	}
 
 	hasGui() {
@@ -171,18 +166,8 @@ class Application extends BaseApplication {
 
 				case 'NOTE_FILE_WATCHER_CLEAR':
 
-					if (state.watchedNoteFiles.length) {
-						newState = Object.assign({}, state);
-						newState.watchedNoteFiles = [];
-					}
-					break;
-
-				case 'EDITOR_SCROLL_PERCENT_SET':
-
 					newState = Object.assign({}, state);
-					const newPercents = Object.assign({}, newState.lastEditorScrollPercents);
-					newPercents[action.noteId] = action.percent;
-					newState.lastEditorScrollPercents = newPercents;
+					newState.watchedNoteFiles = [];
 					break;
 
 			}
@@ -211,6 +196,10 @@ class Application extends BaseApplication {
 			this.updateEditorFont();
 		}
 
+		if (["NOTE_UPDATE_ONE", "NOTE_DELETE", "FOLDER_UPDATE_ONE", "FOLDER_DELETE"].indexOf(action.type) >= 0) {
+			if (!await reg.syncTarget().syncStarted()) reg.scheduleSync(30 * 1000, { syncSteps: ["update_remote", "delete_remote"] });
+		}
+
 		if (['EVENT_NOTE_ALARM_FIELD_CHANGE', 'NOTE_DELETE'].indexOf(action.type) >= 0) {
 			await AlarmService.updateNoteNotification(action.id, action.type === 'NOTE_DELETE');
 		}
@@ -230,6 +219,17 @@ 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;
 	}
 
@@ -239,82 +239,27 @@ class Application extends BaseApplication {
 		this.updateMenu(screen);
 	}
 
-	focusElement_(target) {
-		this.dispatch({
-			type: 'WINDOW_COMMAND',
-			name: 'focusElement',
-			target: target,
-		});
-	}
-
 	updateMenu(screen) {
 		if (this.lastMenuScreen_ === screen) return;
 
-		const sortNoteFolderItems = (type) => {
-			const sortItems = [];
-			const sortOptions = Setting.enumOptions(type + '.sortOrder.field');
-			for (let field in sortOptions) {
-				if (!sortOptions.hasOwnProperty(field)) continue;
-				sortItems.push({
-					label: sortOptions[field],
-					screens: ['Main'],
-					type: 'checkbox',
-					checked: Setting.value(type + '.sortOrder.field') === field,
-					click: () => {
-						Setting.setValue(type + '.sortOrder.field', field);
-						this.refreshMenu();
-					}
-				});
-			}
-			
-			sortItems.push({ type: 'separator' });
-
-			sortItems.push({
-				label: Setting.settingMetadata(type + '.sortOrder.reverse').label(),
-				type: 'checkbox',
-				checked: Setting.value(type + '.sortOrder.reverse'),
+		const sortNoteItems = [];
+		const sortNoteOptions = Setting.enumOptions('notes.sortOrder.field');
+		for (let field in sortNoteOptions) {
+			if (!sortNoteOptions.hasOwnProperty(field)) continue;
+			sortNoteItems.push({
+				label: sortNoteOptions[field],
 				screens: ['Main'],
+				type: 'checkbox',
+				checked: Setting.value('notes.sortOrder.field') === field,
 				click: () => {
-					Setting.setValue(type + '.sortOrder.reverse', !Setting.value(type + '.sortOrder.reverse'));
-				},
+					Setting.setValue('notes.sortOrder.field', field);
+					this.refreshMenu();
+				}
 			});
-
-			return sortItems;
 		}
 
-		const sortNoteItems = sortNoteFolderItems('notes');
-		const sortFolderItems = sortNoteFolderItems('folders');
-
-		const focusItems = [];
-
-		focusItems.push({
-			label: _('Sidebar'),
-			click: () => { this.focusElement_('sideBar') },
-			accelerator: 'CommandOrControl+Shift+S',
-		});
-
-		focusItems.push({
-			label: _('Note list'),
-			click: () => { this.focusElement_('noteList') },
-			accelerator: 'CommandOrControl+Shift+L',
-		});
-
-		focusItems.push({
-			label: _('Note title'),
-			click: () => { this.focusElement_('noteTitle') },
-			accelerator: 'CommandOrControl+Shift+N',
-		});
-
-		focusItems.push({
-			label: _('Note body'),
-			click: () => { this.focusElement_('noteBody') },
-			accelerator: 'CommandOrControl+Shift+B',
-		});
-
 		const importItems = [];
 		const exportItems = [];
-		const preferencesItems = [];
-		const toolsItemsFirst = [];
 		const ioService = new InteropService();
 		const ioModules = ioService.modules();
 		for (let i = 0; i < ioModules.length; i++) {
@@ -362,9 +307,6 @@ class Application extends BaseApplication {
 							importOptions.path = path;
 							importOptions.format = module.format;
 							importOptions.destinationFolderId = !module.isNoteArchive && moduleSource === 'file' ? selectedFolderId : null;
-							importOptions.onError = (error) => {
-								console.warn(error);
-							}
 
 							const service = new InteropService();
 							try {
@@ -395,199 +337,39 @@ class Application extends BaseApplication {
 			}
 		});
 
-		/* We need a dummy entry, otherwise the ternary operator to show a
-		 * menu item only on a specific OS does not work. */
-		const noItem = {
-			type: 'separator',
-			visible: false
-		}
-
-		const syncStatusItem = {
-			label: _('Synchronisation status'),
-			click: () => {
-				this.dispatch({
-					type: 'NAV_GO',
-					routeName: 'Status',
-				});
-			}
-		}
-
-		const newNoteItem = {
-			label: _('New note'),
-			accelerator: 'CommandOrControl+N',
-			screens: ['Main'],
-			click: () => {
-				this.dispatch({
-					type: 'WINDOW_COMMAND',
-					name: 'newNote',
-				});
-			}
-		}
-
-		const newTodoItem = {
-			label: _('New to-do'),
-			accelerator: 'CommandOrControl+T',
-			screens: ['Main'],
-			click: () => {
-				this.dispatch({
-					type: 'WINDOW_COMMAND',
-					name: 'newTodo',
-				});
-			}
-		}
-
-		const newNotebookItem = {
-			label: _('New notebook'),
-			screens: ['Main'],
-			click: () => {
-				this.dispatch({
-					type: 'WINDOW_COMMAND',
-					name: 'newNotebook',
-				});
-			}
-		}
-
-		const printItem = {
-			label: _('Print'),
-			accelerator: 'CommandOrControl+P',
-			screens: ['Main'],
-			click: () => {
-				this.dispatch({
-					type: 'WINDOW_COMMAND',
-					name: 'print',
-				});
-			}
-		}
-
-		preferencesItems.push({
-			label: _('General Options'),
-			accelerator: 'CommandOrControl+,',
-			click: () => {
-				this.dispatch({
-					type: 'NAV_GO',
-					routeName: 'Config',
-				});
-			}
-		}, {
-			label: _('Encryption options'),
-			click: () => {
-				this.dispatch({
-					type: 'NAV_GO',
-					routeName: 'EncryptionConfig',
-				});
-			}
-		}, {
-			label: _('Web clipper options'),
-			click: () => {
-				this.dispatch({
-					type: 'NAV_GO',
-					routeName: 'ClipperConfig',
-				});
-			}
-		});
-
-		toolsItemsFirst.push(syncStatusItem, {
-			type: 'separator',
-			screens: ['Main'],
-		});
-
-		const toolsItems = toolsItemsFirst.concat(preferencesItems);
-
-		function _checkForUpdates(ctx) {
-			bridge().checkForUpdates(false, bridge().window(), ctx.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
-		}
-
-		function _showAbout() {
-			const p = packageInfo;
-			let message = [
-				p.description,
-				'',
-				'Copyright © 2016-2019 Laurent Cozic',
-				_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
-			];
-			bridge().showInfoMessageBox(message.join('\n'), {
-				icon: bridge().electronApp().buildDir() + '/icons/32x32.png',
-			});
-		}
-
-		const rootMenuFile = {
-			/* Using a dummy entry for macOS here, because first menu
-			 * becomes 'Joplin' and we need a nenu called 'File' later. */
-			label: shim.isMac() ? '&JoplinMainMenu' : _('&File'),
-			/* `&` before one of the char in the label name mean, that
-			 * <Alt + F> will open this menu. It's needed becase electron
-			 * opens the first menu on Alt press if no hotkey assigned.
-			 * Issue: https://github.com/laurent22/joplin/issues/934 */
-			submenu: [{
-				label: _('About Joplin'),
-				visible: shim.isMac() ? true : false,
-				click: () => _showAbout()
-			}, {
-				type: 'separator',
-				visible: shim.isMac() ? true : false
-			}, {
-				label: _('Preferences...'),
-				visible: shim.isMac() ? true : false,
-				submenu: preferencesItems
-			}, {
-				label: _('Check for updates...'),
-				visible: shim.isMac() ? true : false,
-				click: () => _checkForUpdates(this)
-			}, {
-				type: 'separator',
-				visible: shim.isMac() ? true : false
-			},
-			shim.isMac() ? noItem : newNoteItem,
-			shim.isMac() ? noItem : newTodoItem,
-			shim.isMac() ? noItem : newNotebookItem, {
-				type: 'separator',
-				visible: shim.isMac() ? false : true
-			}, {
-				label: _('Import'),
-				visible: shim.isMac() ? false : true,
-				submenu: importItems,
-			}, {
-				label: _('Export'),
-				visible: shim.isMac() ? false : true,
-				submenu: exportItems,
-			}, {
-				type: 'separator',
-			}, {
-				label: _('Synchronise'),
-				accelerator: 'CommandOrControl+S',
-				screens: ['Main'],
-				click: async () => {
-					this.dispatch({
-						type: 'WINDOW_COMMAND',
-						name: 'synchronize',
-					});
-				}
-			}, shim.isMac() ? syncStatusItem : noItem, {
-				type: 'separator',
-			}, shim.isMac() ? noItem : printItem, {
-				type: 'separator',
-				platforms: ['darwin'],
-			}, {
-				label: _('Hide %s', 'Joplin'),
-				platforms: ['darwin'],
-				accelerator: 'CommandOrControl+H',
-				click: () => { bridge().electronApp().hide() }
-			}, {
-				type: 'separator',
-			}, {
-				label: _('Quit'),
-				accelerator: 'CommandOrControl+Q',
-				click: () => { bridge().electronApp().quit() }
-			}]
-		};
-
-		const rootMenuFileMacOs = {
-			label: _('&File'),
-			visible: shim.isMac() ? true : false,
-			submenu: [
-				newNoteItem,
-				newTodoItem,
-				newNotebookItem, {
+		const template = [
+			{
+				label: _('File'),
+				submenu: [{
+					label: _('New note'),
+					accelerator: 'CommandOrControl+N',
+					screens: ['Main'],
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'newNote',
+						});
+					}
+				}, {
+					label: _('New to-do'),
+					accelerator: 'CommandOrControl+T',
+					screens: ['Main'],
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'newTodo',
+						});
+					}
+				}, {
+					label: _('New notebook'),
+					screens: ['Main'],
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'newNotebook',
+						});
+					}
+				}, {
 					type: 'separator',
 				}, {
 					label: _('Import'),
@@ -597,14 +379,33 @@ class Application extends BaseApplication {
 					submenu: exportItems,
 				}, {
 					type: 'separator',
-				},
-				printItem
-			]
-		};
-
-		const rootMenus = {
-			edit: {
-				label: _('&Edit'),
+				}, {
+					label: _('Print'),
+					accelerator: 'CommandOrControl+P',
+					screens: ['Main'],
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'print',
+						});
+					}
+				}, {
+					type: 'separator',
+					platforms: ['darwin'],
+				}, {
+					label: _('Hide %s', 'Joplin'),
+					platforms: ['darwin'],
+					accelerator: 'CommandOrControl+H',
+					click: () => { bridge().electronApp().hide() }
+				}, {
+					type: 'separator',
+				}, {
+					label: _('Quit'),
+					accelerator: 'CommandOrControl+Q',
+					click: () => { bridge().electronApp().quit() }
+				}]
+			}, {
+				label: _('Edit'),
 				submenu: [{
 					label: _('Copy'),
 					role: 'copy',
@@ -617,10 +418,6 @@ class Application extends BaseApplication {
 					label: _('Paste'),
 					role: 'paste',
 					accelerator: 'CommandOrControl+V',
-				}, {
-					label: _('Select all'),
-					role: 'selectall',
-					accelerator: 'CommandOrControl+A',
 				}, {
 					type: 'separator',
 					screens: ['Main'],
@@ -644,22 +441,10 @@ class Application extends BaseApplication {
 							name: 'textItalic',
 						});
 					},
-				}, {
-					label: _('Link'),
-					screens: ['Main'],
-					accelerator: 'CommandOrControl+K',
-					click: () => {
-						this.dispatch({
-							type: 'WINDOW_COMMAND',
-							name: 'textLink',
-						});
-					},
-				}, {
-					type: 'separator',
-					screens: ['Main'],
 				}, {
 					label: _('Insert Date Time'),
 					screens: ['Main'],
+					visible: false,
 					accelerator: 'CommandOrControl+Shift+T',
 					click: () => {
 						this.dispatch({
@@ -680,37 +465,23 @@ class Application extends BaseApplication {
 							name: 'commandStartExternalEditing',
 						});
 					},
-				}, {
-					type: 'separator',
-					screens: ['Main'],
 				}, {
 					label: _('Search in all the notes'),
 					screens: ['Main'],
-					accelerator: shim.isMac() ? 'Shift+Command+F' : 'F6',
+					accelerator: 'CommandOrControl+F',
 					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: 'showLocalSearch',
-						});
-					},
 				}],
-			},
-			view: {
-				label: _('&View'),
+			}, {
+				label: _('View'),
 				submenu: [{
 					label: _('Toggle sidebar'),
 					screens: ['Main'],
-					accelerator: shim.isMac() ? 'Option+Command+S' : 'F10',
+					accelerator: 'F10',
 					click: () => {
 						this.dispatch({
 							type: 'WINDOW_COMMAND',
@@ -735,9 +506,13 @@ class Application extends BaseApplication {
 					screens: ['Main'],
 					submenu: sortNoteItems,
 				}, {
-					label: Setting.settingMetadata('folders.sortOrder.field').label(),
+					label: Setting.settingMetadata('notes.sortOrder.reverse').label(),
+					type: 'checkbox',
+					checked: Setting.value('notes.sortOrder.reverse'),
 					screens: ['Main'],
-					submenu: sortFolderItems,
+					click: () => {
+						Setting.setValue('notes.sortOrder.reverse', !Setting.value('notes.sortOrder.reverse'));
+					},
 				}, {
 					label: Setting.settingMetadata('uncompletedTodosOnTop').label(),
 					type: 'checkbox',
@@ -754,67 +529,81 @@ class Application extends BaseApplication {
 					click: () => {
 						Setting.setValue('showCompletedTodos', !Setting.value('showCompletedTodos'));
 					},
+				}],
+			}, {
+				label: _('Tools'),
+				submenu: [{
+					label: _('Synchronisation status'),
+					click: () => {
+						this.dispatch({
+							type: 'NAV_GO',
+							routeName: 'Status',
+						});
+					}
 				}, {
 					type: 'separator',
 					screens: ['Main'],
-				}, {
-					label: _('Focus'),
-					screens: ['Main'],
-					submenu: focusItems,
+				},{
+					label: _('Web clipper options'),
+					click: () => {
+						this.dispatch({
+							type: 'NAV_GO',
+							routeName: 'ClipperConfig',
+						});
+					}
+				},{
+					label: _('Encryption options'),
+					click: () => {
+						this.dispatch({
+							type: 'NAV_GO',
+							routeName: 'EncryptionConfig',
+						});
+					}
+				},{
+					label: _('General Options'),
+					accelerator: 'CommandOrControl+,',
+					click: () => {
+						this.dispatch({
+							type: 'NAV_GO',
+							routeName: 'Config',
+						});
+					}
 				}],
-			},
-			tools: {
-				label: _('&Tools'),
-				submenu: shim.isMac() ? [] : toolsItems,
-			},
-			help: {
-				label: _('&Help'),
+			}, {
+				label: _('Help'),
 				submenu: [{
 					label: _('Website and documentation'),
 					accelerator: 'F1',
-					click () { bridge().openExternal('https://joplinapp.org') }
+					click () { bridge().openExternal('https://joplin.cozic.net') }
 				}, {
 					label: _('Make a donation'),
-					click () { bridge().openExternal('https://joplinapp.org/donate/') }
+					click () { bridge().openExternal('https://joplin.cozic.net/donate') }
 				}, {
 					label: _('Check for updates...'),
-					visible: shim.isMac() ? false : true,
-					click: () => _checkForUpdates(this)
+					click: () => {
+						bridge().checkForUpdates(false, bridge().window(), this.checkForUpdateLoggerPath());
+					}
 				}, {
 					type: 'separator',
-					visible: shim.isMac() ? false : true,
 					screens: ['Main'],
 				}, {
 					label: _('About Joplin'),
-					visible: shim.isMac() ? false : true,
-					click: () => _showAbout()
+					click: () => {
+						const p = packageInfo;
+						let message = [
+							p.description,
+							'',
+							'Copyright © 2016-2018 Laurent Cozic',
+							_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
+						];
+						bridge().showInfoMessageBox(message.join('\n'), {
+							icon: bridge().electronApp().buildDir() + '/icons/32x32.png',
+						});
+					}
 				}]
-			},	
-		};
-
-		if (shim.isMac()) {
-			rootMenus.macOsApp = rootMenuFile;
-			rootMenus.file = rootMenuFileMacOs;
-		} else {
-			rootMenus.file = rootMenuFile;
-		}
-
-		const pluginMenuItems = PluginManager.instance().menuItems();
-		for (const item of pluginMenuItems) {
-			let itemParent = rootMenus[item.parent] ? rootMenus[item.parent] : 'tools';
-			itemParent.submenu.push(item);
-		}
-
-		const template = [
-			rootMenus.file,
-			rootMenus.edit,
-			rootMenus.view,
-			rootMenus.tools,
-			rootMenus.help,
+			},
 		];
 
-		if (shim.isMac()) template.splice(0, 0, rootMenus.macOsApp);
-
 		function isEmptyMenu(template) {
 			for (let i = 0; i < template.length; i++) {
 				const t = template[i];
@@ -893,23 +682,6 @@ 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');
 
@@ -928,10 +700,6 @@ class Application extends BaseApplication {
 			bridge().window().webContents.openDevTools();
 		}
 
-		PluginManager.instance().dispatch_ = this.dispatch.bind(this);
-		PluginManager.instance().setLogger(reg.logger());
-		PluginManager.instance().register(pluginClasses);
-
 		this.updateMenu('Main');
 
 		this.initRedux();
@@ -967,19 +735,14 @@ class Application extends BaseApplication {
 			ids: Setting.value('collapsedFolderIds'),
 		});
 
-		const cssString = await this.loadCustomCss(Setting.value('profileDir') + '/userstyle.css');
-
-		this.store().dispatch({
-			type: 'LOAD_CUSTOM_CSS',
-			css: cssString
-		});
+		if (shim.isLinux()) bridge().setAllowPowerSaveBlockerToggle(true);
 
 		// Note: Auto-update currently doesn't work in Linux: it downloads the update
 		// but then doesn't install it on exit.
 		if (shim.isWindows() || shim.isMac()) {
 			const runAutoUpdateCheck = () => {
 				if (Setting.value('autoUpdateEnabled')) {
-					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
+					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath());
 				}
 			}
 
@@ -995,10 +758,6 @@ class Application extends BaseApplication {
 			AlarmService.garbageCollect();
 		}, 1000 * 60 * 60);
 
-		if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
-			bridge().window().hide();
-		}
-
 		ResourceService.runInBackground();
 
 		if (Setting.value('env') === 'dev') {
@@ -1023,9 +782,6 @@ class Application extends BaseApplication {
 		if (Setting.value('clipperServer.autoStart')) {
 			ClipperServer.instance().start();
 		}
-
-		ExternalEditWatcher.instance().setLogger(reg.logger());
-		ExternalEditWatcher.instance().dispatch = this.store().dispatch;
 	}
 
 }