Android release v1.0.128

Add Catalan Translation

.travis.yml

@@ -3,6 +3,14 @@ if: tag IS present
 
 rvm: 2.3.3
 
+# It's important to only build production branches otherwise Electron Builder
+# might take assets from dev branches and overwrite those of production.
+# https://docs.travis-ci.com/user/customizing-the-build/#Building-Specific-Branches
+branches:
+  only:
+    - master
+    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+
 matrix:
   include:
     - os: osx

Assets/JoplinLetter.svg

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="116.54575mm"
+   height="131.19589mm"
+   viewBox="0 0 116.54575 131.19589"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="JoplinLetter.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="152.11122"
+     inkscape:cy="-26.090631"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-2.7903623,-2.175533)">
+    <path
+       style="fill:#000000;stroke-width:0.26458332"
+       d="m 43.790458,133.13317 c -8.32317,-1.11843 -12.937,-2.40956 -18.46857,-5.16822 -10.21924,-5.09644 -18.1023498,-13.95338 -21.1745998,-23.79038 -1.22214,-3.91319 -1.3607,-4.872332 -1.35685,-9.392712 0.003,-3.72804 0.0907,-4.66941 0.59927,-6.44569 1.0664,-3.7246 2.49409,-6.1704 5.19529,-8.90014 3.2574198,-3.29184 6.6565798,-4.77332 11.3929598,-4.96548 4.53189,-0.18388 7.54661,0.59927 10.40386,2.70266 1.82035,1.34007 3.67693,3.96421 4.71565,6.66525 0.65839,1.71204 0.70959,2.1839 0.90042,8.29756 0.19973,6.39855 0.36372,7.6318 1.39223,10.469902 1.40468,3.87611 3.78939,6.56189 7.33039,8.25588 3.20047,1.53108 5.63801,2.00183 9.60817,1.8556 2.58182,-0.0951 3.60332,-0.25442 5.15337,-0.80371 4.61358,-1.63493 8.46322,-5.31381 10.31326,-9.85579 1.91154,-4.693002 1.90785,-4.609372 1.90213,-43.127082 -0.005,-33.78395 -0.0106,-34.14337 -0.54484,-35.32188 -1.30698,-2.882895 -2.68223,-3.398165 -9.66971,-3.622945 l -5.12472,-0.16486 V 10.998334 2.175533 l 31.41927,0.06723 31.419272,0.06723 0.0697,8.755726 0.0697,8.755724 -5.09675,0.1793 c -2.82759,0.0995 -5.60596,0.33101 -6.24051,0.52006 -1.72896,0.5151 -2.82899,1.538795 -3.52569,3.281045 l -0.61059,1.5269 -0.16762,34.7927 c -0.16988,35.26321 -0.19381,36.08914 -1.18496,40.914372 -1.81292,8.82581 -8.301582,17.89221 -16.959672,23.69719 -6.95182,4.66099 -14.48972,7.21214 -24.82645,8.40235 -2.7431,0.31585 -14.57797,0.31433 -16.93333,-0.002 z"
+       id="path21"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

BUILD.md

@@ -8,7 +8,7 @@
 	brew install yarn node
 	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
@@ -37,12 +37,25 @@ 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`
 
-For node-gyp to work, you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
-
 That will create the executable file in the `dist` directory.
 
 From `/ElectronClient` you can also run `run.sh` to run the app for testing.
 
+## Building Electron application on Windows
+
+```
+cd Tools
+npm install
+cd ..\ElectronClient\app
+xcopy /C /I /H /R /Y /S ..\..\ReactNativeClient\lib lib
+npm install
+yarn dist
+```
+
+If node-gyp does not works (MSBUILD: error MSB3428: Could not load the Visual C++ component "VCBuild.exe"), you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
+
+If `yarn dist` fails, it may need administrative rights.
+
 # 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,20 +1,19 @@
+# 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.
+
 # Reporting a bug
 
-Please check first that it [has not already been reported](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). Also consider [enabling debug mode](https://github.com/laurent22/joplin/blob/master/README_debugging.md) before reporting the issue so that you can provide as much details as possible to help fix it.
+Please check first that it [has not already been reported](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). Also consider [enabling debug mode](https://github.com/laurent22/joplin/blob/master/readme/debugging.md) before reporting the issue so that you can provide as much details as possible to help fix it.
 
 If possible, **please provide a screenshot**. A screenshot showing the problem is often more useful than a paragraph describing it as it can make it immediately clear what the issue is.
 
 # Feature requests
 
-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. Adding a "+1" comment does nothing.
+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.
 
 # Adding new features
 
-If you want to add a new feature, consider asking about it before implementing it to make sure it is within the scope of the project. Of course you are free to create the pull request directly but it is not guaranteed it is going to be accepted.
+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
-
-- Only use tabs for indentation, not spaces.
-- Do not remove or add optional characters from other lines (such as colons or new line characters) as it can make the commit needlessly big, and create conflicts with other changes.

CliClient/.gitignore

@@ -18,4 +18,5 @@ tests/cli-integration/
 tests/sync
 out.txt
 linkToLocal.sh
-yarn-error.log
+yarn-error.log
+tests/support/dropbox-auth.txt

CliClient/app/app-gui.js

@@ -1,5 +1,6 @@
 const { Logger } = require('lib/logger.js');
 const Folder = require('lib/models/Folder.js');
+const BaseItem = require('lib/models/BaseItem.js');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
@@ -9,6 +10,8 @@ const { reducer, defaultState } = require('lib/reducer.js');
 const { splitCommandString } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
 const { _ } = require('lib/locale.js');
+const Entities = require('html-entities').AllHtmlEntities;
+const htmlentities = (new Entities()).encode;
 
 const chalk = require('chalk');
 const tk = require('terminal-kit');
@@ -287,6 +290,8 @@ class AppGui {
 
 	addCommandToConsole(cmd) {
 		if (!cmd) return;
+		const isConfigPassword = cmd.indexOf('config ') >= 0 && cmd.indexOf('password') >= 0;
+		if (isConfigPassword) return;
 		this.stdout(chalk.cyan.bold('> ' + cmd));	
 	}
 
@@ -494,7 +499,7 @@ class AppGui {
 		cmd = cmd.trim();
 		if (!cmd.length) return;
 
-		this.logger().info('Got command: ' + cmd);
+		// this.logger().debug('Got command: ' + cmd);
 
 		try {			
 			let note = this.widget('noteList').currentItem;
@@ -636,12 +641,27 @@ class AppGui {
 				return true;
 			}
 
-			if (link.type === 'resource') {
-				const resourceId = link.id;
-				let resource = await Resource.load(resourceId);
-				if (!resource) throw new Error('No resource with ID ' + resourceId); // Should be nearly impossible
-				if (resource.mime) response.setHeader('Content-Type', resource.mime);
-				response.write(await Resource.content(resource));
+			if (link.type === 'item') {
+				const itemId = link.id;
+				let item = await BaseItem.loadItemById(itemId);
+				if (!item) throw new Error('No item with ID ' + itemId); // Should be nearly impossible
+
+				if (item.type_ === BaseModel.TYPE_RESOURCE) {
+					if (item.mime) response.setHeader('Content-Type', item.mime);
+					response.write(await Resource.content(item));
+				} else if (item.type_ === BaseModel.TYPE_NOTE) {
+					const html = [`
+						<!DOCTYPE html>
+						<html class="client-nojs" lang="en" dir="ltr">
+						<head><meta charset="UTF-8"/></head><body>
+					`];
+					html.push('<pre>' + htmlentities(item.title) + '\n\n' + htmlentities(item.body) + '</pre>');
+					html.push('</body></html>');
+					response.write(html.join(''));
+				} else {
+					throw new Error('Unsupported item type: ' + item.type_);
+				}
+
 				return true;
 			}
 
@@ -657,7 +677,7 @@ class AppGui {
 
 				if (resourceIdRegex.test(url)) {
 					noteLinks[index] = {
-						type: 'resource',
+						type: 'item',
 						id: url.substr(2),
 					};					
 				} else if (hasProtocol(url, ['http', 'https', 'file', 'ftp'])) {
@@ -755,7 +775,7 @@ class AppGui {
 				if (statusBar.promptActive) processShortcutKeys = false;
 
 				if (processShortcutKeys) {
-					this.logger().info('Shortcut:', shortcutKey, keymapItem);
+					this.logger().debug('Shortcut:', shortcutKey, keymapItem);
 
 					this.currentShortcutKeys_ = [];
 

CliClient/app/app.js

@@ -5,6 +5,7 @@ const { JoplinDatabase } = require('lib/joplin-database.js');
 const { Database } = require('lib/database.js');
 const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
+const ResourceService = require('lib/services/ResourceService');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
 const BaseItem = require('lib/models/BaseItem.js');
@@ -283,7 +284,7 @@ class Application extends BaseApplication {
 			exit: () => {},
 			showModalOverlay: (text) => {},
 			hideModalOverlay: () => {},
-			stdoutMaxWidth: () => { return 78; },
+			stdoutMaxWidth: () => { return 100; },
 			forceRender: () => {},
 			termSaveState: () => {},
 			termRestoreState: (state) => {},
@@ -292,7 +293,7 @@ class Application extends BaseApplication {
 
 	async execCommand(argv) {
 		if (!argv.length) return this.execCommand(['help']);
-		reg.logger().info('execCommand()', argv);
+		// reg.logger().debug('execCommand()', argv);
 		const commandName = argv[0];
 		this.activeCommand_ = this.findCommandByName(commandName);
 
@@ -387,10 +388,11 @@ class Application extends BaseApplication {
 				await this.execCommand(argv);
 			} catch (error) {
 				if (this.showStackTraces_) {
-					console.info(error);
+					console.error(error);
 				} else {
 					console.info(error.message);
 				}
+				process.exit(1);
 			}
 		} else { // Otherwise open the GUI
 			this.initRedux();
@@ -411,6 +413,8 @@ class Application extends BaseApplication {
 
 			const tags = await Tag.allWithNotes();
 
+			ResourceService.runInBackground();
+
 			this.dispatch({
 				type: 'TAG_UPDATE_ALL',
 				items: tags,

CliClient/app/autocompletion.js

@@ -36,7 +36,7 @@ async function handleAutocompletionPromise(line) {
 	if (next[0] === '-') {
 		for (let i = 0; i<metadata.options.length; i++) {
 			const options = metadata.options[i][0].split(' ');
-		//if there are multiple options then they will be seperated by comma and
+		//if there are multiple options then they will be separated by comma and
 			//space. The comma should be removed
 			if (options[0][options[0].length - 1] === ',') {
 				options[0] = options[0].slice(0, -1);

CliClient/app/base-command.js

@@ -32,10 +32,6 @@ class BaseCommand {
 		return this.compatibleUis().indexOf(ui) >= 0;
 	}
 
-	aliases() {
-		return [];
-	}
-
 	options() {
 		return [];
 	}

CliClient/app/build-doc.js

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

CliClient/app/command-export.js

@@ -1,5 +1,5 @@
 const { BaseCommand } = require('./base-command.js');
-const { Exporter } = require('lib/services/exporter.js');
+const InteropService = require('lib/services/InteropService.js');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
 const { reg } = require('lib/registry.js');
@@ -10,15 +10,21 @@ const fs = require('fs-extra');
 class Command extends BaseCommand {
 
 	usage() {
-		return 'export <directory>';
+		return 'export <path>';
 	}
 
 	description() {
-		return _('Exports Joplin data to the given directory. By default, it will export the complete database including notebooks, notes, tags and resources.');
+		return _('Exports Joplin data to the given path. By default, it will export the complete database including notebooks, notes, tags and resources.');
 	}
 
 	options() {
+		const service = new InteropService();
+		const formats = service.modules()
+			.filter(m => m.type === 'exporter')
+			.map(m => m.format + (m.description ? ' (' + m.description + ')' : ''));
+
 		return [
+			['--format <format>', _('Destination format: %s', formats.join(', '))],
 			['--note <note>', _('Exports only the given note.')],
 			['--notebook <notebook>', _('Exports only the given notebook.')],
 		];
@@ -26,13 +32,9 @@ class Command extends BaseCommand {
 	
 	async action(args) {
 		let exportOptions = {};
-		exportOptions.destDir = args.directory;
-		exportOptions.writeFile = (filePath, data) => {
-			return fs.writeFile(filePath, data);
-		};
-		exportOptions.copyFile = (source, dest) => {
-			return fs.copy(source, dest, { overwrite: true });
-		};
+		exportOptions.path = args.path;
+
+		exportOptions.format = args.options.format ? args.options.format : 'jex';
 
 		if (args.options.note) {
 
@@ -48,10 +50,10 @@ class Command extends BaseCommand {
 
 		}
 
-		const exporter = new Exporter();
-		const result = await exporter.export(exportOptions);
+		const service = new InteropService();
+		const result = await service.export(exportOptions);
 
-		reg.logger().info('Export result: ', result);
+		result.warnings.map((w) => this.stdout(w));
 	}
 
 }

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', 'http://joplin.cozic.net/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()) {
@@ -72,11 +72,11 @@ class Command extends BaseCommand {
 			this.stdout('');
 			this.stdout(commandNames.join(', '));
 			this.stdout('');
-			this.stdout(_('In any command, a note or notebook can be refered to by title or ID, or using the shortcuts `$n` or `$b` for, respectively, the currently selected note or notebook. `$c` can be used to refer to the currently selected item.'));
+			this.stdout(_('In any command, a note or notebook can be referred to by title or ID, or using the shortcuts `$n` or `$b` for, respectively, the currently selected note or notebook. `$c` can be used to refer to the currently selected item.'));
 			this.stdout('');
 			this.stdout(_('To move from one pane to another, press Tab or Shift+Tab.'));
 			this.stdout(_('Use the arrows and page up/down to scroll the lists and text areas (including this console).'));
-			this.stdout(_('To maximise/minimise the console, press "TC".'));
+			this.stdout(_('To maximise/minimise the console, press "tc".'));
 			this.stdout(_('To enter command line mode, press ":"'));
 			this.stdout(_('To exit command line mode, press ESCAPE'));
 			this.stdout(_('For the list of keyboard shortcuts and config options, type `help keymap`'));

CliClient/app/command-import-enex.js

@@ -1,68 +0,0 @@
-const { BaseCommand } = require('./base-command.js');
-const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
-const { importEnex } = require('lib/import-enex');
-const { filename, basename } = require('lib/path-utils.js');
-const { cliUtils } = require('./cli-utils.js');
-
-class Command extends BaseCommand {
-
-	usage() {
-		return 'import-enex <file> [notebook]';
-	}
-
-	description() {
-		return _('Imports an Evernote notebook file (.enex file).');
-	}
-
-	options() {
-		return [
-			['-f, --force', _('Do not ask for confirmation.')],
-		];
-	}
-
-	async action(args) {
-		let filePath = args.file;
-		let folder = null;
-		let folderTitle = args['notebook'];
-		let force = args.options.force === true;
-
-		if (!folderTitle) folderTitle = filename(filePath);
-		folder = await Folder.loadByField('title', folderTitle);
-		const msg = folder ? _('File "%s" will be imported into existing notebook "%s". Continue?', basename(filePath), folderTitle) : _('New notebook "%s" will be created and file "%s" will be imported into it. Continue?', folderTitle, basename(filePath));
-		const ok = force ? true : await this.prompt(msg);
-		if (!ok) return;
-
-		let lastProgress = '';
-
-		let options = {
-			onProgress: (progressState) => {
-				let line = [];
-				line.push(_('Found: %d.', progressState.loaded));
-				line.push(_('Created: %d.', progressState.created));
-				if (progressState.updated) line.push(_('Updated: %d.', progressState.updated));
-				if (progressState.skipped) line.push(_('Skipped: %d.', progressState.skipped));
-				if (progressState.resourcesCreated) line.push(_('Resources: %d.', progressState.resourcesCreated));
-				if (progressState.notesTagged) line.push(_('Tagged: %d.', progressState.notesTagged));
-				lastProgress = line.join(' ');
-				cliUtils.redraw(lastProgress);
-			},
-			onError: (error) => {
-				let s = error.trace ? error.trace : error.toString();
-				this.stdout(s);
-			},
-		}
-
-		folder = !folder ? await Folder.save({ title: folderTitle }) : folder;
-		
-		app().gui().showConsole();
-		this.stdout(_('Importing notes...'));
-		await importEnex(folder.id, filePath, options);
-		cliUtils.redrawDone();
-		this.stdout(_('The notes have been imported: %s', lastProgress));
-	}
-
-}
-
-module.exports = Command;

CliClient/app/command-import.js

@@ -0,0 +1,75 @@
+const { BaseCommand } = require('./base-command.js');
+const InteropService = require('lib/services/InteropService.js');
+const BaseModel = require('lib/BaseModel.js');
+const Note = require('lib/models/Note.js');
+const { filename, basename, fileExtension } = require('lib/path-utils.js');
+const { importEnex } = require('lib/import-enex');
+const { cliUtils } = require('./cli-utils.js');
+const { reg } = require('lib/registry.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const fs = require('fs-extra');
+
+class Command extends BaseCommand {
+	
+	usage() {
+		return 'import <path> [notebook]';
+	}
+
+	description() {
+		return _('Imports data into Joplin.');
+	}
+
+	options() {
+		const service = new InteropService();
+		const formats = service.modules().filter(m => m.type === 'importer').map(m => m.format);
+
+		return [
+			['--format <format>', _('Source format: %s', (['auto'].concat(formats)).join(', '))],
+			['-f, --force', _('Do not ask for confirmation.')],
+		];
+	}
+	
+	async action(args) {
+		let folder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
+
+		if (args.notebook && !folder) throw new Error(_('Cannot find "%s".', args.notebook));
+
+		const importOptions = {};
+		importOptions.path = args.path;
+		importOptions.format = args.options.format ? args.options.format : 'auto';
+		importOptions.destinationFolderId = folder ? folder.id : null;
+
+		let lastProgress = '';
+
+		// onProgress/onError supported by Enex import only
+
+		importOptions.onProgress = (progressState) => {
+			let line = [];
+			line.push(_('Found: %d.', progressState.loaded));
+			line.push(_('Created: %d.', progressState.created));
+			if (progressState.updated) line.push(_('Updated: %d.', progressState.updated));
+			if (progressState.skipped) line.push(_('Skipped: %d.', progressState.skipped));
+			if (progressState.resourcesCreated) line.push(_('Resources: %d.', progressState.resourcesCreated));
+			if (progressState.notesTagged) line.push(_('Tagged: %d.', progressState.notesTagged));
+			lastProgress = line.join(' ');
+			cliUtils.redraw(lastProgress);
+		};
+
+		importOptions.onError = (error) => {
+			let s = error.trace ? error.trace : error.toString();
+			this.stdout(s);
+		};
+
+		app().gui().showConsole();
+		this.stdout(_('Importing notes...'));
+		const service = new InteropService();
+		const result = await service.import(importOptions);
+		result.warnings.map((w) => this.stdout(w));
+		cliUtils.redrawDone();
+		if (lastProgress) this.stdout(_('The notes have been imported: %s', lastProgress));
+	}
+
+}
+
+module.exports = Command;

CliClient/app/command-mkbook.js

@@ -14,10 +14,6 @@ class Command extends BaseCommand {
 		return _('Creates a new notebook.');
 	}
 
-	aliases() {
-		return ['mkdir'];
-	}
-
 	async action(args) {
 		let folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });		
 		app().switchCurrentFolder(folder);

CliClient/app/command-rmbook.js

@@ -29,7 +29,7 @@ class Command extends BaseCommand {
 
 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, pattern);
 		if (!folder) throw new Error(_('Cannot find "%s".', pattern));
-		const ok = force ? true : await this.prompt(_('Delete notebook? All notes within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
+		const ok = force ? true : await this.prompt(_('Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
 		if (!ok) return;
 
 		await Folder.delete(folder.id);

CliClient/app/command-sync.js

@@ -10,7 +10,6 @@ const { cliUtils } = require('./cli-utils.js');
 const md5 = require('md5');
 const locker = require('proper-lockfile');
 const fs = require('fs-extra');
-const osTmpdir = require('os-tmpdir');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry');
 
 class Command extends BaseCommand {
@@ -79,10 +78,26 @@ class Command extends BaseCommand {
 				return false;
 			}
 
+			return true;
+		} else if (syncTargetMd.name === 'dropbox') { // Dropbox
+			const api = await syncTarget.api();
+			const loginUrl = api.loginUrl();
+			this.stdout(_('To allow Joplin to synchronise with Dropbox, please follow the steps below:'));
+			this.stdout(_('Step 1: Open this URL in your browser to authorise the application:'));
+			this.stdout(loginUrl);
+			const authCode = await this.prompt(_('Step 2: Enter the code provided by Dropbox:'), { type: 'string' });
+			if (!authCode) {
+				this.stdout(_('Authentication was not completed (did not receive an authentication token).'));
+				return false;
+			}
+
+			const response = await api.execAuthToken(authCode);
+			Setting.setValue('sync.' + this.syncTargetId_ + '.auth', response.access_token);
+			api.setAuthToken(response.access_token);
 			return true;
 		}
 
-		this.stdout(_('Not authentified with %s. Please provide any missing credentials.', syncTarget.label()));
+		this.stdout(_('Not authentified with %s. Please provide any missing credentials.', syncTargetMd.label));
 		return false;
 	}
 
@@ -101,7 +116,8 @@ class Command extends BaseCommand {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
-		const lockFilePath = osTmpdir() + '/synclock_' + md5(escape(Setting.value('profileDir'))); // https://github.com/pvorb/node-md5/issues/41
+		// 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');
 
 		try {
@@ -131,7 +147,7 @@ class Command extends BaseCommand {
 
 			const syncTarget = reg.syncTarget(this.syncTargetId_);
 
-			if (!syncTarget.isAuthenticated()) {
+			if (!await syncTarget.isAuthenticated()) {
 				app().gui().showConsole();
 				app().gui().maximizeConsole();
 
@@ -198,7 +214,7 @@ class Command extends BaseCommand {
 
 		const syncTarget = reg.syncTarget(syncTargetId);
 
-		if (syncTarget.isAuthenticated()) {
+		if (await syncTarget.isAuthenticated()) {
 			const sync = await syncTarget.synchronizer();
 			if (sync) await sync.cancel();
 		} else {

CliClient/app/gui/FolderListWidget.js

@@ -18,19 +18,20 @@ class FolderListWidget extends ListWidget {
 		this.notesParentType_ = 'Folder';
 		this.updateIndexFromSelectedFolderId_ = false;
 		this.updateItems_ = false;
+		this.trimItemTitle = false;
 
 		this.itemRenderer = (item) => {
 			let output = [];
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
-				output.push(Folder.displayTitle(item));
+				output.push(' '.repeat(this.folderDepth(this.folders, item.id)) + Folder.displayTitle(item));
 			} else if (item.type_ === Tag.modelType()) {
 				output.push('[' + Folder.displayTitle(item) + ']');
 			} else if (item.type_ === BaseModel.TYPE_SEARCH) {
 				output.push(_('Search:'));
 				output.push(item.title);
-			}			
+			}
 
 			// if (item && item.id) output.push(item.id.substr(0, 5));
 			
@@ -38,6 +39,17 @@ class FolderListWidget extends ListWidget {
 		};
 	}
 
+	folderDepth(folders, folderId) {
+		let output = 0;
+		while (true) {
+			const folder = BaseModel.byId(folders, folderId);
+			if (!folder.parent_id) return output;
+			output++;
+			folderId = folder.parent_id;
+		}
+		throw new Error('unreachable');
+	}
+
 	get selectedFolderId() {
 		return this.selectedFolderId_;
 	}

CliClient/app/gui/StatusBarWidget.js

@@ -133,7 +133,8 @@ class StatusBarWidget extends BaseWidget {
 						resolveResult = input ? input.trim() : input;
 						// Add the command to history but only if it's longer than one character.
 						// Below that it's usually an answer like "y"/"n", etc.
-						if (!isSecurePrompt && input && input.length > 1) this.history_.push(input);
+						const isConfigPassword = input.indexOf('config ') >= 0 && input.indexOf('password') >= 0;
+						if (!isSecurePrompt && input && input.length > 1 && !isConfigPassword) this.history_.push(input);
 					}
 				}
 

CliClient/app/help-utils.js

@@ -53,9 +53,8 @@ function renderCommandHelp(cmd, width = null) {
 				desc.push(label);
 			}
 
-			if (md.description) {
-				desc.push(md.description());
-			}
+			const description = Setting.keyDescription(md.key, 'cli');
+			if (description) desc.push(description);
 
 			desc.push(_('Type: %s.', md.isEnum ? _('Enum') : Setting.typeToString(md.type)));
 			if (md.isEnum) desc.push(_('Possible values: %s.', Setting.enumOptionsDoc(md.key, '%s (%s)')));

CliClient/app/main.js

@@ -66,54 +66,14 @@ process.stdout.on('error', function( err ) {
 	}
 });
 
-
-
-
-
-// async function main() {
-// 	const WebDavApi = require('lib/WebDavApi');
-// 	const api = new WebDavApi('http://nextcloud.local/remote.php/dav/files/admin/Joplin', { username: 'admin', password: '1234567' });
-// 	const { FileApiDriverWebDav } = new require('lib/file-api-driver-webdav');
-// 	const driver = new FileApiDriverWebDav(api);
-
-// 	const stat = await driver.stat('');
-// 	console.info(stat);
-
-// 	// const stat = await driver.stat('testing.txt');
-// 	// console.info(stat);
-
-
-// 	// const content = await driver.get('testing.txta');
-// 	// console.info(content);
-
-// 	// const content = await driver.get('testing.txta', { target: 'file', path: '/var/www/joplin/CliClient/testing-file.txt' });
-// 	// console.info(content);
-
-// 	// const content = await driver.mkdir('newdir5');
-// 	// console.info(content);
-
-// 	//await driver.put('myfile4.md', 'this is my content');
-
-// 	// await driver.put('testimg.jpg', null, { source: 'file', path: '/mnt/d/test.jpg' });
-
-// 	// await driver.delete('myfile4.md');
-
-// 	// const deltaResult = await driver.delta('', {
-// 	// 	allItemIdsHandler: () => { return []; }
-// 	// });
-// 	// console.info(deltaResult);
-// }
-
-// main().catch((error) => { console.error(error); });
-
-
-
-
-
-
-
-
 application.start(process.argv).catch((error) => {
-	console.error(_('Fatal error:'));
-	console.error(error);
+	if (error.code == 'flagError') {
+		console.error(error.message);
+		console.error(_('Type `joplin help` for usage information.'));
+	} else {
+		console.error(_('Fatal error:'));
+		console.error(error);
+	}
+
+	process.exit(1);
 });

CliClient/locales/en_GB.po

@@ -174,10 +174,14 @@ msgid "Exits the application."
 msgstr ""
 
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 
+#, javascript-format
+msgid "Destination format: %s"
+msgstr ""
+
 msgid "Exports only the given note."
 msgstr ""
 
@@ -206,7 +210,7 @@ msgid "The possible commands are:"
 msgstr ""
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -219,7 +223,7 @@ msgid ""
 "(including this console)."
 msgstr ""
 
-msgid "To maximise/minimise the console, press \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr ""
 
 msgid "To enter command line mode, press \":\""
@@ -232,22 +236,16 @@ msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
 msgstr ""
 
-msgid "Imports an Evernote notebook file (.enex file)."
+msgid "Imports data into Joplin."
+msgstr ""
+
+#, javascript-format
+msgid "Source format: %s"
 msgstr ""
 
 msgid "Do not ask for confirmation."
 msgstr ""
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-
 #, javascript-format
 msgid "Found: %d."
 msgstr ""
@@ -334,7 +332,9 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -374,6 +374,16 @@ msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr ""
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -451,6 +461,9 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
+msgid "Type `joplin help` for usage information."
+msgstr ""
+
 msgid "Fatal error:"
 msgstr ""
 
@@ -488,6 +501,17 @@ msgid ""
 "background and will be available soon."
 msgstr ""
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+msgid "PDF File"
+msgstr ""
+
 msgid "File"
 msgstr ""
 
@@ -500,10 +524,13 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import Evernote notes"
+msgid "Import"
 msgstr ""
 
-msgid "Evernote Export Files"
+msgid "Export"
+msgstr ""
+
+msgid "Print"
 msgstr ""
 
 #, javascript-format
@@ -525,12 +552,24 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr ""
 
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -540,6 +579,9 @@ msgstr ""
 msgid "Synchronisation status"
 msgstr ""
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""
 
@@ -552,6 +594,9 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Make a donation"
+msgstr ""
+
 msgid "Check for updates..."
 msgstr ""
 
@@ -575,11 +620,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
+msgid "Current version is up-to-date."
 msgstr ""
 
 msgid "An update is available, do you want to download it now?"
@@ -591,7 +632,47 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-msgid "Current version is up-to-date."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Status: %s"
+msgstr ""
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
 msgid "Check synchronisation configuration"
@@ -604,6 +685,9 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -662,6 +746,11 @@ msgid ""
 "they will eventually be downloaded via synchronisation."
 msgstr ""
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -694,13 +783,16 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""
 
+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""
 
-msgid "Search"
+msgid "Layout"
 msgstr ""
 
-msgid "Layout"
+msgid "Search..."
 msgstr ""
 
 msgid "Some items cannot be synchronised."
@@ -721,6 +813,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -737,13 +832,38 @@ msgstr ""
 msgid "Open..."
 msgstr ""
 
+#, javascript-format
+msgid "This file could not be opened: %s"
+msgstr ""
+
 msgid "Save as..."
 msgstr ""
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr ""
 
@@ -753,6 +873,37 @@ msgstr ""
 msgid "Set alarm"
 msgstr ""
 
+#, javascript-format
+msgid "In: %s"
+msgstr ""
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+msgid "Watching..."
+msgstr ""
+
 msgid "to-do"
 msgstr ""
 
@@ -772,7 +923,7 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Import"
+msgid "Dropbox Login"
 msgstr ""
 
 msgid "Options"
@@ -784,6 +935,9 @@ msgstr ""
 msgid "Encryption Options"
 msgstr ""
 
+msgid "Clipper Options"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr ""
 
@@ -799,9 +953,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Searches"
-msgstr ""
-
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -813,6 +964,9 @@ msgstr ""
 msgid "Unknown flag: %s"
 msgstr ""
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr ""
 
@@ -883,7 +1037,7 @@ msgid "Fetched items: %d/%d."
 msgstr ""
 
 #, javascript-format
-msgid "State: \"%s\"."
+msgid "State: %s."
 msgstr ""
 
 msgid "Cancelling..."
@@ -893,6 +1047,16 @@ msgstr ""
 msgid "Completed: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Last error: %s"
+msgstr ""
+
+msgid "Idle"
+msgstr ""
+
+msgid "In progress"
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
@@ -906,6 +1070,9 @@ msgstr ""
 msgid "Conflicts"
 msgstr ""
 
+msgid "Cannot move notebook to this location"
+msgstr ""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr ""
@@ -914,6 +1081,15 @@ msgstr ""
 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 ""
 
@@ -954,7 +1130,16 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Show uncompleted to-dos on top of the lists"
+msgid "Uncompleted to-dos on top"
+msgstr ""
+
+msgid "Show completed to-dos"
+msgstr ""
+
+msgid "Sort notes by"
+msgstr ""
+
+msgid "Reverse sort order"
 msgstr ""
 
 msgid "Save geo-location with notes"
@@ -975,7 +1160,18 @@ msgstr ""
 msgid "Show tray icon"
 msgstr ""
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
+msgid "Global zoom percentage"
+msgstr ""
+
+msgid "Editor font family"
+msgstr ""
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 
 msgid "Automatically update the application"
@@ -1033,10 +1229,57 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""
 
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
+msgid "Joplin Export File"
+msgstr ""
+
+msgid "Markdown"
+msgstr ""
+
+msgid "Joplin Export Directory"
+msgstr ""
+
+msgid "Evernote Export File"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr ""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+
+msgid "There is no data to export."
+msgstr ""
+
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr ""
 
@@ -1111,6 +1354,9 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""
 
+msgid "Save alarm"
+msgstr ""
+
 msgid "Select date"
 msgstr ""
 
@@ -1120,6 +1366,38 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+msgid "Login with Dropbox"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1159,6 +1437,14 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
@@ -1169,6 +1455,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""
 
@@ -1190,6 +1479,9 @@ msgstr ""
 msgid "Login with OneDrive"
 msgstr ""
 
+msgid "Search"
+msgstr ""
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."

CliClient/locales/eu.po

@@ -2,7 +2,7 @@
 # Copyright (C) YEAR Laurent Cozic
 # This file is distributed under the same license as the Joplin-CLI package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
@@ -189,10 +189,14 @@ msgstr "Irten aplikaziotik."
 
 #, fuzzy
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr "Esportatu Joplineko datuak esandako karpetara"
 
+#, fuzzy, javascript-format
+msgid "Destination format: %s"
+msgstr "Data-formatua"
+
 msgid "Exports only the given note."
 msgstr "Esportatu emandako oharra soilik."
 
@@ -223,7 +227,7 @@ msgid "The possible commands are:"
 msgstr "Litezkeen komandoak hauek dira:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -242,7 +246,8 @@ msgstr ""
 "Erabili geziak edo page up/down list eta testu guneen artean aldatzeko "
 "(kontsola hau ere kontuan izanda)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Kontsola maximizatu edo minimizatzeko, saka \"TC\" ."
 
 msgid "To enter command line mode, press \":\""
@@ -256,26 +261,16 @@ msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
 msgstr "Laster bideen zerrenda osoa ikusteko, idatzi `help shortcuts`"
 
-msgid "Imports an Evernote notebook file (.enex file)."
-msgstr "Inportatu Evernote koaderno fitxategia (.enex fitxategia)."
+msgid "Imports data into Joplin."
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Source format: %s"
+msgstr "Ez dago komandorik: %s"
 
 msgid "Do not ask for confirmation."
 msgstr "Ez galdetu berresteko."
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-" \"%s\" izeneko fitxategia \"%s\" izeneko koadernoan inportatzekotan zaude. "
-"Jarraitu nahi duzu?"
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-" \"%s\" izeneko koaderno berria sortzekotan zaude eta bertan \"%s\" "
-"fitxategia bertara inportatzekotan zaude. Jarraitu nahi duzu?"
-
 #, javascript-format
 msgid "Found: %d."
 msgstr "Aurkitua: %d"
@@ -373,7 +368,10 @@ msgstr "Ezabatu emandako koadernoak."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Ezabatu koadernoak berrespenik gabe."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Koadernoa ezabatu? Dituen ohar guztiak ere ezabatuko dira."
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -420,6 +418,16 @@ msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Autentifikazioa ez da egin osorik (ez du token-ik hartu)."
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr "Ez da autentifikatu %s -rekin. Eman galdutako kredentzialak."
@@ -509,6 +517,10 @@ msgstr "Lehenetsia: %s"
 msgid "Possible keys/values:"
 msgstr "Litezkeen balioak:"
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "Erakutsi erabilera datuak."
+
 msgid "Fatal error:"
 msgstr "Aio! Agur! :_( "
 
@@ -562,6 +574,18 @@ msgstr ""
 "Dagoeneko pasahitza ordezkatua baduzu, itemak deszifratzen ari izango dira "
 "atzeko planoan eta laster izango dira eskuragarri."
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, fuzzy
+msgid "PDF File"
+msgstr "Fitxategia"
+
 msgid "File"
 msgstr "Fitxategia"
 
@@ -574,11 +598,15 @@ msgstr "Zeregin berria"
 msgid "New notebook"
 msgstr "Koaderno berria"
 
-msgid "Import Evernote notes"
-msgstr "Inportatu Evernoteko oharrak"
+msgid "Import"
+msgstr "Inportatu"
 
-msgid "Evernote Export Files"
-msgstr "Evernotetik esportatutako fitxategiak"
+#, fuzzy
+msgid "Export"
+msgstr "Inportatu"
+
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -599,12 +627,24 @@ msgstr "Moztu"
 msgid "Paste"
 msgstr "Itsatsi"
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Bilatu ohar guztietan"
 
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -614,6 +654,9 @@ msgstr "Tresnak"
 msgid "Synchronisation status"
 msgstr "Sinkronizazioaren egoera"
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Zifratzeko aukerak"
 
@@ -626,6 +669,10 @@ msgstr "Laguntza"
 msgid "Website and documentation"
 msgstr "Web orria eta dokumentazioa (en)"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Web orria eta dokumentazioa (en)"
+
 msgid "Check for updates..."
 msgstr ""
 
@@ -649,12 +696,8 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Utzi"
 
-#, fuzzy, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr "Oharrak ezabatu?"
+msgid "Current version is up-to-date."
+msgstr ""
 
 msgid "An update is available, do you want to download it now?"
 msgstr ""
@@ -666,7 +709,47 @@ msgstr ""
 msgid "No"
 msgstr "E"
 
-msgid "Current version is up-to-date."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Egoera: \"%s\"."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
 #, fuzzy
@@ -680,6 +763,9 @@ msgstr "Oharrak eta ezarpenak hemen daude gordeta: %s"
 msgid "Save"
 msgstr "Gorde"
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -750,6 +836,11 @@ msgid ""
 "they will eventually be downloaded via synchronisation."
 msgstr ""
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+
 msgid "Status"
 msgstr "Egoera"
 
@@ -784,15 +875,20 @@ msgstr "Banatu etiketak koma erabiliaz."
 msgid "Rename notebook:"
 msgstr "Berrizendatu koadernoa:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Berrizendatu"
+
 msgid "Set alarm:"
 msgstr "Ezarri alarma:"
 
-msgid "Search"
-msgstr "Bilatu"
-
 msgid "Layout"
 msgstr "Diseinua"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Bilatu"
+
 msgid "Some items cannot be synchronised."
 msgstr "Zenbait item ezin dira sinkronizatu."
 
@@ -811,6 +907,9 @@ msgstr "Gehitu edo ezabatu etiketak"
 msgid "Switch between note and to-do type"
 msgstr "Aldatu oharra eta zeregin eren artean."
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -827,14 +926,39 @@ msgstr "Momentuz ez dago koadernorik. Sortu bat \"Koaderno berria\" sakatuta."
 msgid "Open..."
 msgstr ""
 
+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Koadernoa ezin gorde daiteke: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Gorde aldaketak"
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Esteka edo mezu ez dago onartua: %s"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Erantsi fitxategia"
 
@@ -844,6 +968,38 @@ msgstr "Etiketak"
 msgid "Set alarm"
 msgstr "Ezarri alarma"
 
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Bertan behera uzten..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Zeregin berria"
@@ -866,8 +1022,8 @@ msgstr "Garbitu"
 msgid "OneDrive Login"
 msgstr "Logeatu OneDriven"
 
-msgid "Import"
-msgstr "Inportatu"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Aukerak"
@@ -878,6 +1034,10 @@ msgstr "Sinkronizazioaren egoera"
 msgid "Encryption Options"
 msgstr "Zifratzeko aukerak"
 
+#, fuzzy
+msgid "Clipper Options"
+msgstr "Ezarpenak"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Kendu etiketa hori ohar guztietatik?"
 
@@ -893,9 +1053,6 @@ msgstr "Sinkronizatu"
 msgid "Notebooks"
 msgstr "Koadernoak"
 
-msgid "Searches"
-msgstr "Bilaketak"
-
 #, fuzzy
 msgid "Please select where the sync status should be exported to"
 msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
@@ -908,6 +1065,9 @@ msgstr "Erabili: %s"
 msgid "Unknown flag: %s"
 msgstr "Marka ezezaguna: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "Fitxategi sistema"
 
@@ -986,8 +1146,8 @@ msgstr "Urruneko itemak ezabatuta: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Itemak eskuratuta: %d%d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "Egoera: \"%s\"."
 
 msgid "Cancelling..."
@@ -997,6 +1157,16 @@ msgstr "Bertan behera uzten..."
 msgid "Completed: %s"
 msgstr "Osatuta: %s"
 
+#, fuzzy, javascript-format
+msgid "Last error: %s"
+msgstr "Aio! Agur! :_( "
+
+msgid "Idle"
+msgstr ""
+
+msgid "In progress"
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizazioa hasita dago. Egoera: %s"
@@ -1010,6 +1180,10 @@ msgstr "Zifratutako itemak ezin aldatu daitezke"
 msgid "Conflicts"
 msgstr "Gatazkak"
 
+#, fuzzy
+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\""
@@ -1019,6 +1193,18 @@ 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"
 
@@ -1062,9 +1248,20 @@ msgid "Dark"
 msgstr "Iluna"
 
 #, fuzzy
-msgid "Show uncompleted to-dos on top of the lists"
+msgid "Uncompleted to-dos on top"
 msgstr "Bete gabeko zereginak erakutsi zerrendaren goiko partean"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Bete gabeko zereginak erakutsi zerrendaren goiko partean"
+
+msgid "Sort notes by"
+msgstr ""
+
+#, fuzzy
+msgid "Reverse sort order"
+msgstr "Alderantziz antolatzen du."
+
 msgid "Save geo-location with notes"
 msgstr "Gore geokokapena oharrekin"
 
@@ -1085,9 +1282,21 @@ msgstr "Ohar berria sortzen du."
 msgid "Show tray icon"
 msgstr ""
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
+#, fuzzy
+msgid "Global zoom percentage"
 msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
 
+msgid "Editor font family"
+msgstr ""
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
+msgstr ""
+
 msgid "Automatically update the application"
 msgstr "Automatikoki eguneratu aplikazioa"
 
@@ -1150,10 +1359,60 @@ msgstr "Nextcloud erabiltzaile-izena"
 msgid "WebDAV password"
 msgstr "Ezarri pasahitza"
 
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Balio aukera baliogabea: \"%s\". Litezkeen balioak: %s."
 
+#, fuzzy
+msgid "Joplin Export File"
+msgstr "Evernotetik esportatutako fitxategiak"
+
+msgid "Markdown"
+msgstr ""
+
+msgid "Joplin Export Directory"
+msgstr ""
+
+#, fuzzy
+msgid "Evernote Export File"
+msgstr "Evernotetik esportatutako fitxategiak"
+
+msgid "Directory"
+msgstr ""
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr ""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+
+msgid "There is no data to export."
+msgstr ""
+
+#, fuzzy
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
+
 msgid "Items that cannot be synchronised"
 msgstr "Itemok ezin sinkronizatu"
 
@@ -1230,6 +1489,10 @@ msgstr "Mugitu %d oharrak \"%s\" koadernora?"
 msgid "Press to set the decryption password."
 msgstr "Sakatu deszifratze pasahitza ezartzeko."
 
+#, fuzzy
+msgid "Save alarm"
+msgstr "Ezarri alarma"
+
 msgid "Select date"
 msgstr "Data aukeratu"
 
@@ -1239,6 +1502,39 @@ msgstr "Baieztatu"
 msgid "Cancel synchronisation"
 msgstr "Sinkronizazioa utzi"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Itemak eskuratuta: %d%d."
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "Login with OneDrive"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Pasahitz Nagusia %s"
@@ -1278,6 +1574,14 @@ msgstr "Gorde aldaketak"
 msgid "Discard changes"
 msgstr "Bertan behera utzi aldaketak"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Irudi formatua ez onartua: %s"
@@ -1288,6 +1592,9 @@ msgstr "Argazkia erantsi"
 msgid "Attach any file"
 msgstr "Erantsi fitxategiren bat"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Oharra bihurtu"
 
@@ -1309,6 +1616,9 @@ msgstr "Ezabatu koadernoa"
 msgid "Login with OneDrive"
 msgstr "Login with OneDrive"
 
+msgid "Search"
+msgstr "Bilatu"
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
@@ -1322,6 +1632,35 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
 msgid "Welcome"
 msgstr "Ongi etorri!"
 
+#~ msgid "Searches"
+#~ msgstr "Bilaketak"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Oharrak ezabatu?"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Inportatu Evernote koaderno fitxategia (.enex fitxategia)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ " \"%s\" izeneko fitxategia \"%s\" izeneko koadernoan inportatzekotan "
+#~ "zaude. Jarraitu nahi duzu?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ " \"%s\" izeneko koaderno berria sortzekotan zaude eta bertan \"%s\" "
+#~ "fitxategia bertara inportatzekotan zaude. Jarraitu nahi duzu?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Inportatu Evernoteko oharrak"
+
 #~ msgid "Give focus to next pane"
 #~ msgstr "Eraman fokua hurrengo panelera"
 

CliClient/locales/fr_FR.po

@@ -95,8 +95,8 @@ msgid ""
 "current configuration."
 msgstr ""
 "Obtient ou modifie une valeur de configuration. Si la [valeur] n'est pas "
-"fournie, la valeur de [nom] est affichée. Si ni le [nom] ni la [valeur] ne "
-"sont fournis, la configuration complète est affichée."
+"fournie, la valeur de [nom] sera affichée. Si ni le [nom] ni la [valeur] ne "
+"sont fournis, la configuration complète sera affichée."
 
 msgid "Also displays unset and hidden config variables."
 msgstr "Afficher également les variables cachées."
@@ -188,12 +188,15 @@ msgid "Exits the application."
 msgstr "Quitter le logiciel."
 
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
-"Exporter les données de Joplin vers le dossier fourni. Par défaut, la base "
-"de donnée complète sera exportée, y compris les carnets, notes, tags et "
-"resources."
+"Exporter les données de Joplin. Par défaut, la base de donnée complète sera "
+"exportée, y compris les carnets, notes, tags et ressources."
+
+#, javascript-format
+msgid "Destination format: %s"
+msgstr "Format de la destination : %s"
 
 msgid "Exports only the given note."
 msgstr "Exporter uniquement la note spécifiée."
@@ -210,6 +213,7 @@ msgstr "Affiche les informations d'utilisation."
 #, javascript-format
 msgid "For information on how to customise the shortcuts please visit %s"
 msgstr ""
+"Pour personnaliser les raccourcis veuillez consulter la documentation à %s"
 
 msgid "Shortcuts are not available in CLI mode."
 msgstr "Les raccourcis ne sont pas disponible en mode de ligne de commande."
@@ -225,7 +229,7 @@ msgid "The possible commands are:"
 msgstr "Les commandes possibles sont :"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -244,8 +248,8 @@ msgstr ""
 "Utilisez les touches fléchées et page précédente/suivante pour faire défiler "
 "les listes et zones de texte (y compris cette console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
-msgstr "Pour maximiser ou minimiser la console, pressez \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
+msgstr "Pour maximiser ou minimiser la console, pressez \"tc\"."
 
 msgid "To enter command line mode, press \":\""
 msgstr "Pour démarrer le mode ligne de commande, pressez \":\""
@@ -253,31 +257,20 @@ msgstr "Pour démarrer le mode ligne de commande, pressez \":\""
 msgid "To exit command line mode, press ESCAPE"
 msgstr "Pour sortir du mode ligne de commande, pressez ECHAP"
 
-#, fuzzy
 msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
-msgstr ""
-"Pour la liste complète des raccourcis disponibles, tapez `help shortcuts`"
+msgstr "Pour la liste complète des raccourcis disponibles, tapez `help keymap`"
 
-msgid "Imports an Evernote notebook file (.enex file)."
-msgstr "Importer un carnet Evernote (fichier .enex)."
+msgid "Imports data into Joplin."
+msgstr "Importer des données dans Joplin."
+
+#, javascript-format
+msgid "Source format: %s"
+msgstr "Format de la source : %s"
 
 msgid "Do not ask for confirmation."
 msgstr "Ne pas demander de confirmation."
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-"Le fichier \"%s\" va être importé dans le carnet existant \"%s\". Continuer ?"
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-"Un nouveau carnet \"%s\" va être créé et le fichier \"%s\" va être importé "
-"dedans. Continuer ?"
-
 #, javascript-format
 msgid "Found: %d."
 msgstr "Trouvés : %d."
@@ -372,10 +365,12 @@ msgstr "Supprimer le carnet."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Supprimer le carnet sans demander la confirmation."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
-"Effacer le carnet ? Toutes les notes dans ce carnet seront également "
-"effacées."
+"Effacer le carnet ? Toutes les notes et sous-carnets dans ce carnet seront "
+"également effacés."
 
 msgid "Deletes the notes matching <note-pattern>."
 msgstr "Supprimer les notes correspondants à <note-pattern>."
@@ -420,6 +415,20 @@ msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Impossible d'autoriser le logiciel (jeton d'identification non-reçu)."
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+"Pour permettre à Joplin de synchroniser avec Dropbox, veuillez suivre les "
+"étapes ci-dessous :"
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+"Étape 1: Veuillez ouvrir cette URL dans votre navigateur internet pour "
+"autoriser le logiciel :"
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr "Étape 2 : Entrez le code fourni par Dropbox :"
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -511,6 +520,9 @@ msgstr "Défaut : %s"
 msgid "Possible keys/values:"
 msgstr "Clefs/Valeurs possibles :"
 
+msgid "Type `joplin help` for usage information."
+msgstr "Tapez `Joplin help` pour afficher l'aide."
+
 msgid "Fatal error:"
 msgstr "Erreur fatale :"
 
@@ -564,6 +576,17 @@ msgstr ""
 "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..."
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
+
+msgid "PDF File"
+msgstr "Fichier PDF"
+
 msgid "File"
 msgstr "Fichier"
 
@@ -576,11 +599,14 @@ msgstr "Nouvelle tâche"
 msgid "New notebook"
 msgstr "Nouveau carnet"
 
-msgid "Import Evernote notes"
-msgstr "Importer notes d'Evernote"
+msgid "Import"
+msgstr "Importer"
 
-msgid "Evernote Export Files"
-msgstr "Fichiers d'export Evernote"
+msgid "Export"
+msgstr "Exporter"
+
+msgid "Print"
+msgstr "Imprimer"
 
 #, javascript-format
 msgid "Hide %s"
@@ -601,12 +627,24 @@ msgstr "Couper"
 msgid "Paste"
 msgstr "Coller"
 
+msgid "Bold"
+msgstr "Gras"
+
+msgid "Italic"
+msgstr "Italique"
+
+msgid "Edit in external editor"
+msgstr "Ouvrir dans un éditeur externe"
+
 msgid "Search in all the notes"
 msgstr "Chercher dans toutes les notes"
 
 msgid "View"
 msgstr "Affichage"
 
+msgid "Toggle sidebar"
+msgstr "Basculer barre latérale"
+
 msgid "Toggle editor layout"
 msgstr "Basculer l'agencement de l'éditeur"
 
@@ -616,6 +654,9 @@ msgstr "Outils"
 msgid "Synchronisation status"
 msgstr "État de la synchronisation"
 
+msgid "Web clipper options"
+msgstr "Options du Web Clipper"
+
 msgid "Encryption options"
 msgstr "Options de cryptage"
 
@@ -628,6 +669,9 @@ msgstr "Aide"
 msgid "Website and documentation"
 msgstr "Documentation en ligne"
 
+msgid "Make a donation"
+msgstr "Faire un don"
+
 msgid "Check for updates..."
 msgstr "Vérifier les mises à jour..."
 
@@ -651,15 +695,8 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annuler"
 
-#, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr ""
-"Notes de version :\n"
-"\n"
-"%s"
+msgid "Current version is up-to-date."
+msgstr "La version actuelle est à jour."
 
 msgid "An update is available, do you want to download it now?"
 msgstr ""
@@ -671,8 +708,55 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-msgid "Current version is up-to-date."
-msgstr "La version actuelle est à jour."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr "Le service du Web Clipper est activé et démarrera automatiquement."
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr "État : Démarré sur le port %d"
+
+#, javascript-format
+msgid "Status: %s"
+msgstr "État : %s"
+
+msgid "Disable Web Clipper Service"
+msgstr "Désactiver le service du Web Clipper"
+
+msgid "The web clipper service is not enabled."
+msgstr "Le service du Web Clipper n'est pas activé."
+
+msgid "Enable Web Clipper Service"
+msgstr "Activer le service du Web Clipper"
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+"Le Web Clipper permet d'enregistrer des pages web et des captures d'écran "
+"depuis votre navigateur vers Joplin."
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr "Pour utiliser le Web Clipper, veuillez suivre ces instructions :"
+
+msgid "Step 1: Enable the clipper service"
+msgstr "Étape 1 : Activez le service du Web Clipper"
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+"Le service permet au module complémentaire de communiquer avec Joplin. "
+"Lorsque vous aller l'activer, il se pourrait que votre pare feu vous demande "
+"d'autoriser l'application Joplin."
+
+msgid "Step 2: Install the extension"
+msgstr "Étape 2 : Installez le module complémentaire"
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+"Téléchargez et installez le module complémentaire correspondant à votre "
+"navigateur :"
 
 msgid "Check synchronisation configuration"
 msgstr "Vérifier config synchronisation"
@@ -684,6 +768,9 @@ msgstr "Les notes et paramètres se trouve dans : %s"
 msgid "Save"
 msgstr "Enregistrer"
 
+msgid "Submit"
+msgstr "Envoyer"
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -741,7 +828,7 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 "Note : seule une clef maître va être utilisée pour le cryptage (celle "
-"marquée comme \"actif\" ci-dessus). N'importe quel clef peut-être utilisée "
+"marquée comme \"actif\" ci-dessus). N'importe quelle clef peut être utilisée "
 "pour le décryptage, selon la façon dont les notes ou carnets étaient cryptés "
 "à l'origine."
 
@@ -757,6 +844,13 @@ msgstr ""
 "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."
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+"Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
+"conseils pour l'activer, veuillez consulter la documentation :"
+
 msgid "Status"
 msgstr "État"
 
@@ -791,15 +885,18 @@ msgstr "Séparez chaque étiquette par une virgule."
 msgid "Rename notebook:"
 msgstr "Renommer le carnet :"
 
+msgid "Rename tag:"
+msgstr "Renommer étiquette :"
+
 msgid "Set alarm:"
 msgstr "Régler alarme :"
 
-msgid "Search"
-msgstr "Chercher"
-
 msgid "Layout"
 msgstr "Disposition"
 
+msgid "Search..."
+msgstr "Chercher..."
+
 msgid "Some items cannot be synchronised."
 msgstr "Certains objets ne peuvent être synchronisés."
 
@@ -818,6 +915,9 @@ msgstr "Gérer les étiquettes"
 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"
 
@@ -837,13 +937,40 @@ msgstr ""
 msgid "Open..."
 msgstr "Ouvrir..."
 
+#, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Ce fichier n'a pas pu être ouvert : %s"
+
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
+msgid "Copy path to clipboard"
+msgstr "Copier le chemin"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Lien ou message non géré : %s"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Cette note n'a pas de contenu. Cliquer sur \"%s\" pour basculer vers "
+"l'éditeur et éditer cette note."
+
+msgid "strong text"
+msgstr "texte en gras"
+
+msgid "emphasized text"
+msgstr "texte en italique"
+
+msgid "List item"
+msgstr "Élément de liste"
+
+msgid "Insert Hyperlink"
+msgstr "Insérer lien"
+
 msgid "Attach file"
 msgstr "Attacher un fichier"
 
@@ -853,6 +980,37 @@ msgstr "Étiquettes"
 msgid "Set alarm"
 msgstr "Régler alarme"
 
+#, javascript-format
+msgid "In: %s"
+msgstr "Dans : %s"
+
+msgid "Hyperlink"
+msgstr "Lien"
+
+msgid "Code"
+msgstr "Code"
+
+msgid "Numbered List"
+msgstr "Liste numérotée"
+
+msgid "Bulleted List"
+msgstr "Liste à puces"
+
+msgid "Checkbox"
+msgstr "Case à cocher"
+
+msgid "Heading"
+msgstr "Titre"
+
+msgid "Horizontal Rule"
+msgstr "Règle horizontale"
+
+msgid "Click to stop external editing"
+msgstr "Cliquez pour arrêter l'édition externe"
+
+msgid "Watching..."
+msgstr "En cours..."
+
 msgid "to-do"
 msgstr "tâche"
 
@@ -872,8 +1030,8 @@ msgstr "Supprimer"
 msgid "OneDrive Login"
 msgstr "Connexion OneDrive"
 
-msgid "Import"
-msgstr "Importer"
+msgid "Dropbox Login"
+msgstr "Connection à Dropbox"
 
 msgid "Options"
 msgstr "Options"
@@ -884,6 +1042,9 @@ msgstr "État de la synchronisation"
 msgid "Encryption Options"
 msgstr "Options de cryptage"
 
+msgid "Clipper Options"
+msgstr "Options du Web Clipper"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Enlever cette étiquette de toutes les notes ?"
 
@@ -899,9 +1060,6 @@ msgstr "Synchroniser"
 msgid "Notebooks"
 msgstr "Carnets"
 
-msgid "Searches"
-msgstr "Recherches"
-
 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"
@@ -914,6 +1072,9 @@ msgstr "Utilisation : %s"
 msgid "Unknown flag: %s"
 msgstr "Paramètre inconnu : %s"
 
+msgid "Dropbox"
+msgstr "Dropbox"
+
 msgid "File system"
 msgstr "Système de fichier"
 
@@ -992,8 +1153,8 @@ msgid "Fetched items: %d/%d."
 msgstr "Téléchargés : %d/%d."
 
 #, javascript-format
-msgid "State: \"%s\"."
-msgstr "État : \"%s\"."
+msgid "State: %s."
+msgstr "État : %s."
 
 msgid "Cancelling..."
 msgstr "Annulation..."
@@ -1002,6 +1163,16 @@ msgstr "Annulation..."
 msgid "Completed: %s"
 msgstr "Terminé : %s"
 
+#, javascript-format
+msgid "Last error: %s"
+msgstr "Dernière erreur : %s"
+
+msgid "Idle"
+msgstr "Arrêté"
+
+msgid "In progress"
+msgstr "En cours"
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La synchronisation est déjà en cours. État : %s"
@@ -1015,6 +1186,9 @@ msgstr "Les objets cryptés ne peuvent être modifiés"
 msgid "Conflicts"
 msgstr "Conflits"
 
+msgid "Cannot move notebook to this location"
+msgstr "Impossible de déplacer le carnet vers le carnet \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Un carnet avec ce titre existe déjà : \"%s\""
@@ -1023,6 +1197,15 @@ msgstr "Un carnet avec ce titre existe déjà : \"%s\""
 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 modification"
+
+msgid "created date"
+msgstr "Date création"
+
 msgid "Untitled"
 msgstr "Sans titre"
 
@@ -1065,8 +1248,17 @@ msgstr "Clair"
 msgid "Dark"
 msgstr "Sombre"
 
-msgid "Show uncompleted to-dos on top of the lists"
-msgstr "Tâches non-terminées en haut des listes"
+msgid "Uncompleted to-dos on top"
+msgstr "Tâches non-terminées en haut"
+
+msgid "Show completed to-dos"
+msgstr "Afficher les tâches complétées"
+
+msgid "Sort notes by"
+msgstr "Trier les notes par"
+
+msgid "Reverse sort order"
+msgstr "Inverser l'ordre"
 
 msgid "Save geo-location with notes"
 msgstr "Enregistrer l'emplacement avec les notes"
@@ -1084,11 +1276,25 @@ msgid "When creating a new note:"
 msgstr "Lors de la création d'une note :"
 
 msgid "Show tray icon"
-msgstr "Afficher icône dans la zone de notifications"
+msgstr "Afficher l'icône dans la zone de notifications"
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr "Note : Ne fonctionne pas dans tous les environnements de bureau."
+
+msgid "Global zoom percentage"
 msgstr "Niveau de zoom"
 
+msgid "Editor font family"
+msgstr "Police de l'éditeur"
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
+msgstr ""
+"Il faut que ce soit une police *monospace* ou cela ne fonctionnera pas "
+"correctement. Si la police est incorrecte ou non-spécifiée, une police "
+"monospace sera utilisée par défaut."
+
 msgid "Automatically update the application"
 msgstr "Mettre à jour le logiciel automatiquement"
 
@@ -1149,10 +1355,62 @@ msgstr "WebDAV : Nom utilisateur"
 msgid "WebDAV password"
 msgstr "WebDAV : Mot de passe"
 
+msgid "Custom TLS certificates"
+msgstr "Certificats TLS personnalisés"
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+"Liste séparée par des virgules contenant les chemins des répertoires "
+"contenants des certificats, ou les chemins de certificats individuels. Par "
+"exemple : /my/cert_dir, /other/custom.pem"
+
+msgid "Ignore TLS certificate errors"
+msgstr "Ignorer les erreurs de certificats TLS"
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Option invalide: \"%s\". Les valeurs possibles sont : %s."
 
+msgid "Joplin Export File"
+msgstr "Fichier d'export Joplin"
+
+msgid "Markdown"
+msgstr "Markdown"
+
+msgid "Joplin Export Directory"
+msgstr "Dossier d'export Joplin"
+
+msgid "Evernote Export File"
+msgstr "Fichiers d'export Evernote"
+
+msgid "Directory"
+msgstr "Dossier"
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr "Impossible de charger module \"%s\" pour le format \"%s\""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr "Veuillez spécifier le format d'import pour %s"
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+"Cet objet est crypté : %s \"%s\". Veuillez attendre que tout soit décrypté "
+"et réessayez."
+
+msgid "There is no data to export."
+msgstr "Il n'y a pas de données à exporter."
+
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr "Veuillez sélectionner le carnet où les notes doivent être importées."
+
 msgid "Items that cannot be synchronised"
 msgstr "Objets qui ne peuvent pas être synchronisés"
 
@@ -1232,6 +1490,9 @@ msgstr "Déplacer %d notes vers carnet \"%s\" ?"
 msgid "Press to set the decryption password."
 msgstr "Définir mot de passe de synchronisation."
 
+msgid "Save alarm"
+msgstr "Enregistrer alarme"
+
 msgid "Select date"
 msgstr "Sélectionner date"
 
@@ -1241,6 +1502,44 @@ msgstr "Confirmer"
 msgid "Cancel synchronisation"
 msgstr "Annuler synchronisation"
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Décryptage des objets : %d/%d."
+
+msgid "New tags:"
+msgstr "Nouvelles étiquettes :"
+
+msgid "Type new tags or select from list"
+msgstr "Entrez de nouvelles étiquettes ou sélectionnez de la liste"
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+"Pour fonctionner correctement, l'appli a besoin des autorisations suivantes. "
+"Veuillez les activer dans les paramètres de votre téléphone, dans le menu "
+"Applications > Joplin > Autorisations"
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+"- Stockage : Pour attacher des fichiers aux notes et pour activer la "
+"synchronisation vers le système de fichier."
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+"- Appareil photo : Pour pouvoir prendre une photo et l'attacher à une note."
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr "- Position : Pour attacher à une note les coordonnées GPS."
+
+msgid "Joplin website"
+msgstr "Site web de Joplin"
+
+msgid "Login with Dropbox"
+msgstr "Se connecter à Dropbox"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Clef maître %s"
@@ -1280,6 +1579,15 @@ msgstr "Enregistrer les changements"
 msgid "Discard changes"
 msgstr "Ignorer les changements"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr "Aucun objet avec identifiant %s"
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+"L'application mobile Joplin ne gère pas pour l'instant ce type de lien : %s"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Type d'image non géré : %s"
@@ -1290,6 +1598,9 @@ msgstr "Attacher une photo"
 msgid "Attach any file"
 msgstr "Attacher un fichier"
 
+msgid "Share"
+msgstr "Partager"
+
 msgid "Convert to note"
 msgstr "Convertir en note"
 
@@ -1311,6 +1622,9 @@ msgstr "Supprimer le carnet"
 msgid "Login with OneDrive"
 msgstr "Se connecter à OneDrive"
 
+msgid "Search"
+msgstr "Chercher"
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
@@ -1326,6 +1640,44 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
+#~ msgid ""
+#~ "For more information about End-To-End Encryption (E2EE) and advices on "
+#~ "how to enable it please check the documentation"
+#~ msgstr ""
+#~ "Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
+#~ "conseils pour l'activer, veuillez consulter la documentation"
+
+#~ msgid "Searches"
+#~ msgstr "Recherches"
+
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Notes de version :\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Importer un carnet Evernote (fichier .enex)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "Le fichier \"%s\" va être importé dans le carnet existant \"%s\". "
+#~ "Continuer ?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "Un nouveau carnet \"%s\" va être créé et le fichier \"%s\" va être "
+#~ "importé dedans. Continuer ?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Importer notes d'Evernote"
+
 #~ msgid "Give focus to next pane"
 #~ msgstr "Activer le volet suivant"
 
@@ -1485,12 +1837,6 @@ msgstr "Bienvenue"
 #~ msgid "Done."
 #~ msgstr "Terminé."
 
-#~ msgid ""
-#~ "Please open this URL in your browser to authenticate the application:"
-#~ msgstr ""
-#~ "Veuillez ouvrir cette URL dans votre navigateur internet pour autoriser "
-#~ "le logiciel :"
-
 #~ msgid "Note does not exist."
 #~ msgstr "Cette note n'existe pas."
 

CliClient/locales/hr_HR.po

@@ -188,13 +188,18 @@ msgstr "Bilješka je spremljena."
 msgid "Exits the application."
 msgstr "Izlaz iz aplikacije."
 
+#, fuzzy
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 "Izvozi podatke u dati direktorij. Po defaultu izvozi sve podatke uključujući "
 "bilježnice, bilješke, zadatke i resurse."
 
+#, fuzzy, javascript-format
+msgid "Destination format: %s"
+msgstr "Format datuma"
+
 msgid "Exports only the given note."
 msgstr "Izvozi samo datu bilješku."
 
@@ -224,15 +229,11 @@ msgstr ""
 msgid "The possible commands are:"
 msgstr "Moguće naredbe su:"
 
-#, fuzzy
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
-"In any command, a note or notebook can be refered to by title or ID, or "
-"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
-"note or notebook. `$c` can be used to refer to the currently selected item."
 
 msgid "To move from one pane to another, press Tab or Shift+Tab."
 msgstr "Za prijelaz iz jednog okna u drugo, pritisni Tab ili Shift+Tab."
@@ -245,7 +246,8 @@ msgstr ""
 "Use the arrows and page up/down to scroll the lists and text areas "
 "(including this console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Za maksimiziranje/minimiziranje konzole, pritisni \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -259,25 +261,16 @@ msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
 msgstr "Za potpunu listu mogućih prečaca, upiši `help shortcuts`"
 
-msgid "Imports an Evernote notebook file (.enex file)."
-msgstr "Uvozi Evernote bilježnicu (.enex datoteku)."
+msgid "Imports data into Joplin."
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Source format: %s"
+msgstr "Ne postoji naredba: %s"
 
 msgid "Do not ask for confirmation."
 msgstr "Ne pitaj za potvrdu."
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-"Datoteka \"%s\" će biti uvezena u postojeću bilježnicu \"%s\". Nastavi?"
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-"Nova bilježnica \"%s\" će biti stvorena i datoteka \"%s\" će biti uvezena u "
-"nju. Nastavi?"
-
 #, javascript-format
 msgid "Found: %d."
 msgstr "Nađeno: %d."
@@ -375,7 +368,10 @@ msgstr "Briše datu bilježnicu."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Briše bilježnicu bez traženja potvrde."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? 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."
 
@@ -424,6 +420,16 @@ msgid ""
 msgstr ""
 "Ovjera nije dovršena (nije dobivena potvrda ovjere - authentication token)."
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -514,6 +520,10 @@ msgstr "Default: %s"
 msgid "Possible keys/values:"
 msgstr "Mogući ključevi/vrijednosti:"
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "Prikazuje informacije o korištenju."
+
 msgid "Fatal error:"
 msgstr "Fatalna greška:"
 
@@ -562,6 +572,18 @@ msgid ""
 "background and will be available soon."
 msgstr ""
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, fuzzy
+msgid "PDF File"
+msgstr "Datoteka"
+
 msgid "File"
 msgstr "Datoteka"
 
@@ -574,11 +596,15 @@ msgstr "Novi zadatak"
 msgid "New notebook"
 msgstr "Nova bilježnica"
 
-msgid "Import Evernote notes"
-msgstr "Uvezi Evernote bilješke"
+msgid "Import"
+msgstr "Uvoz"
 
-msgid "Evernote Export Files"
-msgstr "Evernote izvozne datoteke"
+#, fuzzy
+msgid "Export"
+msgstr "Uvoz"
+
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -599,12 +625,24 @@ msgstr "Izreži"
 msgid "Paste"
 msgstr "Zalijepi"
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Pretraži u svim bilješkama"
 
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -614,6 +652,9 @@ msgstr "Alati"
 msgid "Synchronisation status"
 msgstr "Status sinkronizacije"
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""
 
@@ -627,6 +668,10 @@ msgstr "Pomoć"
 msgid "Website and documentation"
 msgstr "Website i dokumentacija"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Website i dokumentacija"
+
 msgid "Check for updates..."
 msgstr ""
 
@@ -650,12 +695,8 @@ msgstr "U redu"
 msgid "Cancel"
 msgstr "Odustani"
 
-#, fuzzy, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr "Obriši bilješke?"
+msgid "Current version is up-to-date."
+msgstr ""
 
 msgid "An update is available, do you want to download it now?"
 msgstr ""
@@ -667,7 +708,47 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-msgid "Current version is up-to-date."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Stanje: \"%s\"."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
 #, fuzzy
@@ -681,6 +762,9 @@ msgstr "Bilješke i postavke su pohranjene u: %s"
 msgid "Save"
 msgstr "Spremi"
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -739,6 +823,11 @@ msgid ""
 "they will eventually be downloaded via synchronisation."
 msgstr ""
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+
 msgid "Status"
 msgstr "Status"
 
@@ -773,15 +862,20 @@ msgstr "Odvoji oznake zarezom."
 msgid "Rename notebook:"
 msgstr "Preimenuj bilježnicu:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Preimenuj"
+
 msgid "Set alarm:"
 msgstr "Postavi upozorenje:"
 
-msgid "Search"
-msgstr "Traži"
-
 msgid "Layout"
 msgstr "Izgled"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Traži"
+
 msgid "Some items cannot be synchronised."
 msgstr "Neke stavke se ne mogu sinkronizirati."
 
@@ -801,6 +895,9 @@ msgstr "Dodaj ili makni oznake"
 msgid "Switch between note and to-do type"
 msgstr "Zamijeni bilješku i zadatak"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Obriši"
 
@@ -817,14 +914,39 @@ msgstr "Ovdje nema bilježnica. Stvori novu pritiskom na \"Nova bilježnica\"."
 msgid "Open..."
 msgstr ""
 
+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Bilježnicu nije moguće snimiti: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Spremi promjene"
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana poveznica ili poruka: %s"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
@@ -834,6 +956,38 @@ msgstr "Oznake"
 msgid "Set alarm"
 msgstr "Postavi upozorenje"
 
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Prekidam..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Novi zadatak"
@@ -855,8 +1009,8 @@ msgstr "Očisti"
 msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
-msgid "Import"
-msgstr "Uvoz"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Opcije"
@@ -867,6 +1021,10 @@ msgstr "Status Sinkronizacije"
 msgid "Encryption Options"
 msgstr ""
 
+#, fuzzy
+msgid "Clipper Options"
+msgstr "Opcije"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Makni ovu oznaku iz svih bilješki?"
 
@@ -882,9 +1040,6 @@ msgstr "Sinkroniziraj"
 msgid "Notebooks"
 msgstr "Bilježnice"
 
-msgid "Searches"
-msgstr "Pretraživanja"
-
 msgid "Please select where the sync status should be exported to"
 msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
 
@@ -896,6 +1051,9 @@ msgstr "Korištenje: %s"
 msgid "Unknown flag: %s"
 msgstr "Nepoznata zastavica: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "Datotečni sustav"
 
@@ -971,8 +1129,8 @@ msgstr "Obrisane udaljene stavke: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Stvorene lokalne stavke: %d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "Stanje: \"%s\"."
 
 msgid "Cancelling..."
@@ -982,6 +1140,16 @@ msgstr "Prekidam..."
 msgid "Completed: %s"
 msgstr "Dovršeno: %s"
 
+#, fuzzy, javascript-format
+msgid "Last error: %s"
+msgstr "Fatalna greška:"
+
+msgid "Idle"
+msgstr ""
+
+msgid "In progress"
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizacija je već u toku. Stanje: %s"
@@ -996,6 +1164,10 @@ msgstr "Neke stavke se ne mogu sinkronizirati."
 msgid "Conflicts"
 msgstr "Sukobi"
 
+#, fuzzy
+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\""
@@ -1004,6 +1176,18 @@ msgstr "Bilježnica s ovim naslovom već postoji: \"%s\""
 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"
 
@@ -1047,9 +1231,20 @@ msgid "Dark"
 msgstr "Tamna"
 
 #, fuzzy
-msgid "Show uncompleted to-dos on top of the lists"
+msgid "Uncompleted to-dos on top"
 msgstr "Prikaži nezavršene zadatke na vrhu liste"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Prikaži nezavršene zadatke na vrhu liste"
+
+msgid "Sort notes by"
+msgstr ""
+
+#, fuzzy
+msgid "Reverse sort order"
+msgstr "Mijenja redoslijed."
+
 msgid "Save geo-location with notes"
 msgstr "Spremi geolokacijske podatke sa bilješkama"
 
@@ -1071,7 +1266,18 @@ msgstr "Stvara novu bilješku."
 msgid "Show tray icon"
 msgstr ""
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
+msgid "Global zoom percentage"
+msgstr ""
+
+msgid "Editor font family"
+msgstr ""
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 
 msgid "Automatically update the application"
@@ -1131,10 +1337,60 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""
 
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Nevažeća vrijednost: \"%s\". Moguće vrijednosti su: %s."
 
+#, fuzzy
+msgid "Joplin Export File"
+msgstr "Evernote izvozne datoteke"
+
+msgid "Markdown"
+msgstr ""
+
+msgid "Joplin Export Directory"
+msgstr ""
+
+#, fuzzy
+msgid "Evernote Export File"
+msgstr "Evernote izvozne datoteke"
+
+msgid "Directory"
+msgstr ""
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr ""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+
+msgid "There is no data to export."
+msgstr ""
+
+#, fuzzy
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
+
 msgid "Items that cannot be synchronised"
 msgstr "Stavke koje se ne mogu sinkronizirati"
 
@@ -1209,6 +1465,10 @@ msgstr "Premjesti %d bilješke u bilježnicu \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr ""
 
+#, fuzzy
+msgid "Save alarm"
+msgstr "Postavi upozorenje"
+
 msgid "Select date"
 msgstr "Odaberi datum"
 
@@ -1218,6 +1478,39 @@ msgstr "Potvrdi"
 msgid "Cancel synchronisation"
 msgstr "Prekini sinkronizaciju"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Stvorene lokalne stavke: %d."
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "Prijavi se u OneDrive"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1258,6 +1551,14 @@ msgstr "Spremi promjene"
 msgid "Discard changes"
 msgstr "Odbaci promjene"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodržana vrsta slike: %s"
@@ -1268,6 +1569,9 @@ msgstr "Priloži sliku"
 msgid "Attach any file"
 msgstr "Priloži datoteku"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Pretvori u bilješku"
 
@@ -1289,6 +1593,9 @@ msgstr "Obriši bilježnicu"
 msgid "Login with OneDrive"
 msgstr "Prijavi se u OneDrive"
 
+msgid "Search"
+msgstr "Traži"
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
@@ -1302,6 +1609,34 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobro došli"
 
+#~ msgid "Searches"
+#~ msgstr "Pretraživanja"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Obriši bilješke?"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Uvozi Evernote bilježnicu (.enex datoteku)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "Datoteka \"%s\" će biti uvezena u postojeću bilježnicu \"%s\". Nastavi?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "Nova bilježnica \"%s\" će biti stvorena i datoteka \"%s\" će biti uvezena "
+#~ "u nju. Nastavi?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Uvezi Evernote bilješke"
+
 #~ msgid "Give focus to next pane"
 #~ msgstr "Fokusiraj sljedeće okno"
 

CliClient/locales/it_IT.po

@@ -183,14 +183,19 @@ msgstr "La nota è stata salvata."
 msgid "Exits the application."
 msgstr "Esci dall'applicazione."
 
+#, fuzzy
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 "Esporta i dati da Joplin nella directory selezionata. Come impostazione "
 "predefinita verrà esportato il database completo, inclusi blocchi note, "
 "note, etichette e risorse."
 
+#, fuzzy, javascript-format
+msgid "Destination format: %s"
+msgstr "Formato della data"
+
 msgid "Exports only the given note."
 msgstr "Esporta solo la seguente nota."
 
@@ -221,7 +226,7 @@ msgid "The possible commands are:"
 msgstr "I possibili comandi sono:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -240,7 +245,8 @@ msgstr ""
 "Usa le frecce e pagina su/giù per scorrere le liste e le aree di testo "
 "(compresa questa console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Per massimizzare/minimizzare la console, premi \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -255,25 +261,16 @@ msgid ""
 msgstr ""
 "Per la lista completa delle scorciatoie disponibili, digita `help shortcuts`"
 
-msgid "Imports an Evernote notebook file (.enex file)."
-msgstr "Importa un file blocco note di Evernote (.enex file)."
+msgid "Imports data into Joplin."
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Source format: %s"
+msgstr "Nessun comando: %s"
 
 msgid "Do not ask for confirmation."
 msgstr "Non chiedere conferma."
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-"Il file \"%s\" sarà importato nel blocco note esistente \"%s\". Continuare?"
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-"Un nuovo blocco note \"%s\" sarà creato e al suo interno verrà importato il "
-"file \"%s\" . Continuare?"
-
 #, javascript-format
 msgid "Found: %d."
 msgstr "Trovato: %d."
@@ -367,7 +364,9 @@ msgstr "Elimina il seguente blocco note."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Elimina il blocco note senza richiedere una conferma."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -411,6 +410,16 @@ msgstr ""
 "Autenticazione non completata (non è stato ricevuto alcun token di "
 "autenticazione)."
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -500,6 +509,10 @@ msgstr "Predefinito: %s"
 msgid "Possible keys/values:"
 msgstr "Chiave/valore possibili:"
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "Mostra le informazioni di utilizzo."
+
 msgid "Fatal error:"
 msgstr "Errore fatale:"
 
@@ -544,6 +557,18 @@ msgid ""
 "background and will be available soon."
 msgstr ""
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, fuzzy
+msgid "PDF File"
+msgstr "File"
+
 msgid "File"
 msgstr "File"
 
@@ -556,11 +581,15 @@ msgstr "Nuova attività"
 msgid "New notebook"
 msgstr "Nuovo blocco note"
 
-msgid "Import Evernote notes"
-msgstr "Importa le note da Evernote"
+msgid "Import"
+msgstr "Importa"
 
-msgid "Evernote Export Files"
-msgstr "Esposta i files di Evernote"
+#, fuzzy
+msgid "Export"
+msgstr "Importa"
+
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -581,12 +610,24 @@ msgstr "Taglia"
 msgid "Paste"
 msgstr "Incolla"
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Cerca in tutte le note"
 
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -596,6 +637,9 @@ msgstr "Strumenti"
 msgid "Synchronisation status"
 msgstr "Stato di sincronizzazione"
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""
 
@@ -609,6 +653,10 @@ msgstr "Aiuto"
 msgid "Website and documentation"
 msgstr "Sito web e documentazione"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Sito web e documentazione"
+
 msgid "Check for updates..."
 msgstr ""
 
@@ -632,12 +680,8 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancella"
 
-#, fuzzy, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr "Eliminare le note?"
+msgid "Current version is up-to-date."
+msgstr ""
 
 msgid "An update is available, do you want to download it now?"
 msgstr ""
@@ -649,7 +693,47 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-msgid "Current version is up-to-date."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Stato: \"%s\"."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
 #, fuzzy
@@ -663,6 +747,9 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -723,6 +810,11 @@ msgid ""
 "they will eventually be downloaded via synchronisation."
 msgstr ""
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+
 msgid "Status"
 msgstr "Stato"
 
@@ -755,15 +847,20 @@ msgstr "Separa ogni etichetta da una virgola."
 msgid "Rename notebook:"
 msgstr "Rinomina il blocco note:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Rinomina"
+
 msgid "Set alarm:"
 msgstr "Imposta allarme:"
 
-msgid "Search"
-msgstr "Cerca"
-
 msgid "Layout"
 msgstr "Disposizione"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Cerca"
+
 msgid "Some items cannot be synchronised."
 msgstr "Alcuni elementi non possono essere sincronizzati."
 
@@ -783,6 +880,9 @@ msgstr "Aggiungi o rimuovi etichetta"
 msgid "Switch between note and to-do type"
 msgstr "Passa da un tipo di nota a un elenco di attività"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Elimina"
 
@@ -800,14 +900,39 @@ msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
 msgid "Open..."
 msgstr ""
 
+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Il blocco note non può essere salvato: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Salva i cambiamenti"
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Collegamento o messaggio non supportato: %s"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Allega file"
 
@@ -817,6 +942,38 @@ msgstr "Etichette"
 msgid "Set alarm"
 msgstr "Imposta allarme"
 
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Cancellazione..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Nuova attività"
@@ -838,8 +995,8 @@ msgstr "Pulisci"
 msgid "OneDrive Login"
 msgstr "Login OneDrive"
 
-msgid "Import"
-msgstr "Importa"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Opzioni"
@@ -850,6 +1007,10 @@ msgstr "Stato della Sincronizzazione"
 msgid "Encryption Options"
 msgstr ""
 
+#, fuzzy
+msgid "Clipper Options"
+msgstr "Opzioni"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Rimuovere questa etichetta da tutte le note?"
 
@@ -865,9 +1026,6 @@ msgstr "Sincronizza"
 msgid "Notebooks"
 msgstr "Blocchi note"
 
-msgid "Searches"
-msgstr "Ricerche"
-
 #, fuzzy
 msgid "Please select where the sync status should be exported to"
 msgstr "Per favore seleziona la nota o il blocco note da eliminare."
@@ -880,6 +1038,9 @@ msgstr "Uso: %s"
 msgid "Unknown flag: %s"
 msgstr "Etichetta sconosciuta: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "File system"
 
@@ -957,8 +1118,8 @@ msgstr "Elementi remoti eliminati: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Elementi locali creati: %d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "Stato: \"%s\"."
 
 msgid "Cancelling..."
@@ -968,6 +1129,16 @@ msgstr "Cancellazione..."
 msgid "Completed: %s"
 msgstr "Completata: %s"
 
+#, fuzzy, javascript-format
+msgid "Last error: %s"
+msgstr "Errore fatale:"
+
+msgid "Idle"
+msgstr ""
+
+msgid "In progress"
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronizzazione è già in corso. Stato: %s"
@@ -982,6 +1153,10 @@ msgstr "Alcuni elementi non possono essere sincronizzati."
 msgid "Conflicts"
 msgstr "Conflitti"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Non posso spostare la nota nel blocco note \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Esiste già un blocco note col titolo \"%s\""
@@ -990,6 +1165,18 @@ msgstr "Esiste già un blocco note col titolo \"%s\""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "I blocchi non possono essere chiamati \"%s\". È un titolo riservato."
 
+#, fuzzy
+msgid "title"
+msgstr "Senza titolo"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Aggiornato: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Creato: %d."
+
 msgid "Untitled"
 msgstr "Senza titolo"
 
@@ -1033,9 +1220,20 @@ msgid "Dark"
 msgstr "Scuro"
 
 #, fuzzy
-msgid "Show uncompleted to-dos on top of the lists"
+msgid "Uncompleted to-dos on top"
 msgstr "Mostra todo inclompleti in cima alla lista"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Mostra todo inclompleti in cima alla lista"
+
+msgid "Sort notes by"
+msgstr ""
+
+#, fuzzy
+msgid "Reverse sort order"
+msgstr "Inverti l'ordine."
+
 msgid "Save geo-location with notes"
 msgstr "Salva geo-localizzazione con le note"
 
@@ -1057,7 +1255,18 @@ msgstr "Crea una nuova nota."
 msgid "Show tray icon"
 msgstr ""
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
+msgid "Global zoom percentage"
+msgstr ""
+
+msgid "Editor font family"
+msgstr ""
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 
 msgid "Automatically update the application"
@@ -1117,10 +1326,60 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""
 
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Oprione non valida: \"%s\". I valori possibili sono: %s."
 
+#, fuzzy
+msgid "Joplin Export File"
+msgstr "Esposta i files di Evernote"
+
+msgid "Markdown"
+msgstr ""
+
+msgid "Joplin Export Directory"
+msgstr ""
+
+#, fuzzy
+msgid "Evernote Export File"
+msgstr "Esposta i files di Evernote"
+
+msgid "Directory"
+msgstr ""
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr ""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+
+msgid "There is no data to export."
+msgstr ""
+
+#, fuzzy
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr "Per favore seleziona la nota o il blocco note da eliminare."
+
 msgid "Items that cannot be synchronised"
 msgstr "Elementi che non possono essere sincronizzati"
 
@@ -1195,6 +1454,10 @@ msgstr "Spostare le note %d sul blocco note \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr ""
 
+#, fuzzy
+msgid "Save alarm"
+msgstr "Imposta allarme"
+
 msgid "Select date"
 msgstr "Seleziona la data"
 
@@ -1204,6 +1467,39 @@ msgstr "Conferma"
 msgid "Cancel synchronisation"
 msgstr "Cancella la sincronizzazione"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementi locali creati: %d."
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "Accedi a OneDrive"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1244,6 +1540,14 @@ msgstr "Salva i cambiamenti"
 msgid "Discard changes"
 msgstr "Ignora modifiche"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"
@@ -1254,6 +1558,9 @@ msgstr "Allega foto"
 msgid "Attach any file"
 msgstr "Allega qualsiasi file"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converti in nota"
 
@@ -1275,6 +1582,9 @@ msgstr "Cancella blocco note"
 msgid "Login with OneDrive"
 msgstr "Accedi a OneDrive"
 
+msgid "Search"
+msgstr "Cerca"
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
@@ -1290,6 +1600,35 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvenuto"
 
+#~ msgid "Searches"
+#~ msgstr "Ricerche"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Eliminare le note?"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Importa un file blocco note di Evernote (.enex file)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "Il file \"%s\" sarà importato nel blocco note esistente \"%s\". "
+#~ "Continuare?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "Un nuovo blocco note \"%s\" sarà creato e al suo interno verrà importato "
+#~ "il file \"%s\" . Continuare?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Importa le note da Evernote"
+
 #~ msgid "Give focus to next pane"
 #~ msgstr "Pannello successivo"
 

CliClient/locales/ja_JP.po

@@ -182,13 +182,18 @@ msgstr "ノートは保存されました。"
 msgid "Exits the application."
 msgstr "アプリケーションの終了。"
 
+#, fuzzy
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 "Joplinのデータを選択されたディレクトリに出力する。標準では、ノートブック・"
 "ノート・タグ・添付データを含むすべてのデータベースを出力します。"
 
+#, fuzzy, javascript-format
+msgid "Destination format: %s"
+msgstr "日付の形式"
+
 msgid "Exports only the given note."
 msgstr "選択されたノートのみを出力する。"
 
@@ -219,7 +224,7 @@ msgid "The possible commands are:"
 msgstr "有効なコマンドは："
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -235,7 +240,8 @@ msgid ""
 "(including this console)."
 msgstr "リストや入力エリアの移動には矢印キーまたはPage Up/Downを使用します。"
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "コンソールの最大化・最小化には\"TC\"と入力してください。"
 
 msgid "To enter command line mode, press \":\""
@@ -251,25 +257,16 @@ msgstr ""
 "有効なすべてのキーボードショートカットを表示するには、`help shortcuts`と入力"
 "してください。"
 
-msgid "Imports an Evernote notebook file (.enex file)."
-msgstr "Evernoteノートブックファイル(.enex)のインポート"
+msgid "Imports data into Joplin."
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Source format: %s"
+msgstr "コマンドが違います：%s"
 
 msgid "Do not ask for confirmation."
 msgstr "確認を行わない。"
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-"ファイル \"%s\" はノートブック \"%s\"に取り込まれます。よろしいですか？"
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-"新しいノートブック\"%s\"が作成され、ファイル\"%s\"が取り込まれます。よろしい"
-"ですか？"
-
 #, javascript-format
 msgid "Found: %d."
 msgstr "見つかりました：%d"
@@ -364,7 +361,10 @@ msgstr "指定されたノートブックを削除します。"
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "ノートブックを確認なしで削除します。"
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "ノートブックを削除しますか？中にあるノートはすべて消えてしまいます。"
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -408,6 +408,16 @@ msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "認証は完了していません(認証トークンが得られませんでした)"
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -496,6 +506,10 @@ msgstr "規定値: %s"
 msgid "Possible keys/values:"
 msgstr "取り得るキーバリュー: "
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "使い方を表示する。"
+
 msgid "Fatal error:"
 msgstr "致命的なエラー: "
 
@@ -545,6 +559,18 @@ msgid ""
 "background and will be available soon."
 msgstr ""
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, fuzzy
+msgid "PDF File"
+msgstr "ファイル"
+
 msgid "File"
 msgstr "ファイル"
 
@@ -557,11 +583,15 @@ msgstr "新しいToDo"
 msgid "New notebook"
 msgstr "新しいノートブック"
 
-msgid "Import Evernote notes"
-msgstr "Evernoteのインポート"
+msgid "Import"
+msgstr "インポート"
 
-msgid "Evernote Export Files"
-msgstr "Evernote Exportファイル"
+#, fuzzy
+msgid "Export"
+msgstr "インポート"
+
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -582,12 +612,24 @@ msgstr "切り取り"
 msgid "Paste"
 msgstr "貼り付け"
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "すべてのノートを検索"
 
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -597,6 +639,9 @@ msgstr "ツール"
 msgid "Synchronisation status"
 msgstr "同期状況"
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""
 
@@ -610,6 +655,10 @@ msgstr "ヘルプ"
 msgid "Website and documentation"
 msgstr "Webサイトとドキュメント"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Webサイトとドキュメント"
+
 msgid "Check for updates..."
 msgstr ""
 
@@ -633,12 +682,8 @@ msgstr ""
 msgid "Cancel"
 msgstr "キャンセル"
 
-#, fuzzy, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr "ノートを削除しますか？"
+msgid "Current version is up-to-date."
+msgstr ""
 
 msgid "An update is available, do you want to download it now?"
 msgstr ""
@@ -649,7 +694,47 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-msgid "Current version is up-to-date."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "状態: \"%s\"。"
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
 #, fuzzy
@@ -663,6 +748,9 @@ msgstr "ノートと設定は、%sに保存されます。"
 msgid "Save"
 msgstr "保存"
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -725,6 +813,11 @@ msgid ""
 "they will eventually be downloaded via synchronisation."
 msgstr ""
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+
 msgid "Status"
 msgstr "状態"
 
@@ -759,15 +852,20 @@ msgstr "それぞれのタグをカンマ(,)で区切ってください。"
 msgid "Rename notebook:"
 msgstr "ノートブックの名前を変更："
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "名前の変更"
+
 msgid "Set alarm:"
 msgstr "アラームをセット："
 
-msgid "Search"
-msgstr "検索"
-
 msgid "Layout"
 msgstr "レイアウト"
 
+#, fuzzy
+msgid "Search..."
+msgstr "検索"
+
 msgid "Some items cannot be synchronised."
 msgstr "いくつかの項目は同期されませんでした。"
 
@@ -787,6 +885,9 @@ msgstr "タグの追加・削除"
 msgid "Switch between note and to-do type"
 msgstr "ノートとToDoを切り替え"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "削除"
 
@@ -803,14 +904,39 @@ msgstr "ノートブックがありません。新しいノートブックを作
 msgid "Open..."
 msgstr ""
 
+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "ノートブックは保存できませんでした：%s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "変更を保存"
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "ファイルを添付"
 
@@ -820,6 +946,38 @@ msgstr "タグ"
 msgid "Set alarm"
 msgstr "アラームをセット"
 
+#, javascript-format
+msgid "In: %s"
+msgstr ""
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "中止中..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "新しいToDo"
@@ -841,8 +999,8 @@ msgstr "クリア"
 msgid "OneDrive Login"
 msgstr "OneDriveログイン"
 
-msgid "Import"
-msgstr "インポート"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "オプション"
@@ -853,6 +1011,10 @@ msgstr "同期状況"
 msgid "Encryption Options"
 msgstr ""
 
+#, fuzzy
+msgid "Clipper Options"
+msgstr "オプション"
+
 msgid "Remove this tag from all the notes?"
 msgstr "すべてのノートからこのタグを削除しますか？"
 
@@ -868,9 +1030,6 @@ msgstr "同期"
 msgid "Notebooks"
 msgstr "ノートブック"
 
-msgid "Searches"
-msgstr "検索"
-
 msgid "Please select where the sync status should be exported to"
 msgstr "同期状況の出力先を選択してください"
 
@@ -882,6 +1041,9 @@ msgstr "使用方法: %s"
 msgid "Unknown flag: %s"
 msgstr "不明なフラグ: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "ファイルシステム"
 
@@ -959,8 +1121,8 @@ msgstr "リモートアイテムの削除: %d."
 msgid "Fetched items: %d/%d."
 msgstr "ローカルアイテムの作成: %d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "状態: \"%s\"。"
 
 msgid "Cancelling..."
@@ -970,6 +1132,16 @@ msgstr "中止中..."
 msgid "Completed: %s"
 msgstr "完了: %s"
 
+#, fuzzy, javascript-format
+msgid "Last error: %s"
+msgstr "致命的なエラー: "
+
+msgid "Idle"
+msgstr ""
+
+msgid "In progress"
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "同期作業はすでに実行中です。状態: %s"
@@ -984,6 +1156,10 @@ msgstr "いくつかの項目は同期されませんでした。"
 msgid "Conflicts"
 msgstr "衝突"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "ノートをノートブック \"%s\"に移動できませんでした。"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "\"%s\"という名前のノートブックはすでに存在しています。"
@@ -994,6 +1170,18 @@ msgstr ""
 "\"%s\"と言う名前はシステムで使用するために予約済みです。名前の変更が出来ませ"
 "ん。"
 
+#, fuzzy
+msgid "title"
+msgstr "名称未設定"
+
+#, fuzzy
+msgid "updated date"
+msgstr "アップデートしました：%d"
+
+#, fuzzy
+msgid "created date"
+msgstr "作成しました：%d"
+
 msgid "Untitled"
 msgstr "名称未設定"
 
@@ -1037,9 +1225,20 @@ msgid "Dark"
 msgstr "暗い"
 
 #, fuzzy
-msgid "Show uncompleted to-dos on top of the lists"
+msgid "Uncompleted to-dos on top"
 msgstr "未完のToDoをリストの上部に表示"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "未完のToDoをリストの上部に表示"
+
+msgid "Sort notes by"
+msgstr ""
+
+#, fuzzy
+msgid "Reverse sort order"
+msgstr "逆順に並び替える。"
+
 msgid "Save geo-location with notes"
 msgstr "ノートに位置情報を保存"
 
@@ -1061,7 +1260,18 @@ msgstr "あたらしいノートを作成します。"
 msgid "Show tray icon"
 msgstr ""
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
+msgid "Global zoom percentage"
+msgstr ""
+
+msgid "Editor font family"
+msgstr ""
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 
 msgid "Automatically update the application"
@@ -1121,10 +1331,60 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""
 
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "無効な設定値: \"%s\"。有効な値は: %sです。"
 
+#, fuzzy
+msgid "Joplin Export File"
+msgstr "Evernote Exportファイル"
+
+msgid "Markdown"
+msgstr ""
+
+msgid "Joplin Export Directory"
+msgstr ""
+
+#, fuzzy
+msgid "Evernote Export File"
+msgstr "Evernote Exportファイル"
+
+msgid "Directory"
+msgstr ""
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr ""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+
+msgid "There is no data to export."
+msgstr ""
+
+#, fuzzy
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr "同期状況の出力先を選択してください"
+
 msgid "Items that cannot be synchronised"
 msgstr "同期が出来なかったアイテム"
 
@@ -1199,6 +1459,10 @@ msgstr "%d個のノートを\"%s\"に移動しますか？"
 msgid "Press to set the decryption password."
 msgstr ""
 
+#, fuzzy
+msgid "Save alarm"
+msgstr "アラームをセット"
+
 msgid "Select date"
 msgstr "日付の選択"
 
@@ -1208,6 +1472,39 @@ msgstr "確認"
 msgid "Cancel synchronisation"
 msgstr "同期の中止"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "ローカルアイテムの作成: %d."
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "OneDriveログイン"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1248,6 +1545,14 @@ msgstr "変更を保存"
 msgid "Discard changes"
 msgstr "変更を破棄"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "サポートされていないイメージ形式: %s."
@@ -1258,6 +1563,9 @@ msgstr "写真を添付"
 msgid "Attach any file"
 msgstr "ファイルを添付"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "ノートに変換"
 
@@ -1279,6 +1587,9 @@ msgstr "ノートブックを削除"
 msgid "Login with OneDrive"
 msgstr "OneDriveログイン"
 
+msgid "Search"
+msgstr "検索"
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
@@ -1294,6 +1605,34 @@ msgstr ""
 msgid "Welcome"
 msgstr "ようこそ"
 
+#~ msgid "Searches"
+#~ msgstr "検索"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "ノートを削除しますか？"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Evernoteノートブックファイル(.enex)のインポート"
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "ファイル \"%s\" はノートブック \"%s\"に取り込まれます。よろしいですか？"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "新しいノートブック\"%s\"が作成され、ファイル\"%s\"が取り込まれます。よろし"
+#~ "いですか？"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Evernoteのインポート"
+
 #~ msgid "Give focus to next pane"
 #~ msgstr "次のペインへ"
 

CliClient/locales/joplin.pot

@@ -174,10 +174,14 @@ msgid "Exits the application."
 msgstr ""
 
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 
+#, javascript-format
+msgid "Destination format: %s"
+msgstr ""
+
 msgid "Exports only the given note."
 msgstr ""
 
@@ -206,7 +210,7 @@ msgid "The possible commands are:"
 msgstr ""
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -219,7 +223,7 @@ msgid ""
 "(including this console)."
 msgstr ""
 
-msgid "To maximise/minimise the console, press \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr ""
 
 msgid "To enter command line mode, press \":\""
@@ -232,22 +236,16 @@ msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
 msgstr ""
 
-msgid "Imports an Evernote notebook file (.enex file)."
+msgid "Imports data into Joplin."
+msgstr ""
+
+#, javascript-format
+msgid "Source format: %s"
 msgstr ""
 
 msgid "Do not ask for confirmation."
 msgstr ""
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-
 #, javascript-format
 msgid "Found: %d."
 msgstr ""
@@ -334,7 +332,9 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -374,6 +374,16 @@ msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr ""
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -451,6 +461,9 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
+msgid "Type `joplin help` for usage information."
+msgstr ""
+
 msgid "Fatal error:"
 msgstr ""
 
@@ -488,6 +501,17 @@ msgid ""
 "background and will be available soon."
 msgstr ""
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+msgid "PDF File"
+msgstr ""
+
 msgid "File"
 msgstr ""
 
@@ -500,10 +524,13 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import Evernote notes"
+msgid "Import"
 msgstr ""
 
-msgid "Evernote Export Files"
+msgid "Export"
+msgstr ""
+
+msgid "Print"
 msgstr ""
 
 #, javascript-format
@@ -525,12 +552,24 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr ""
 
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -540,6 +579,9 @@ msgstr ""
 msgid "Synchronisation status"
 msgstr ""
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""
 
@@ -552,6 +594,9 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Make a donation"
+msgstr ""
+
 msgid "Check for updates..."
 msgstr ""
 
@@ -575,11 +620,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
+msgid "Current version is up-to-date."
 msgstr ""
 
 msgid "An update is available, do you want to download it now?"
@@ -591,7 +632,47 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-msgid "Current version is up-to-date."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Status: %s"
+msgstr ""
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
 msgid "Check synchronisation configuration"
@@ -604,6 +685,9 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -662,6 +746,11 @@ msgid ""
 "they will eventually be downloaded via synchronisation."
 msgstr ""
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -694,13 +783,16 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""
 
+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""
 
-msgid "Search"
+msgid "Layout"
 msgstr ""
 
-msgid "Layout"
+msgid "Search..."
 msgstr ""
 
 msgid "Some items cannot be synchronised."
@@ -721,6 +813,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -737,13 +832,38 @@ msgstr ""
 msgid "Open..."
 msgstr ""
 
+#, javascript-format
+msgid "This file could not be opened: %s"
+msgstr ""
+
 msgid "Save as..."
 msgstr ""
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr ""
 
@@ -753,6 +873,37 @@ msgstr ""
 msgid "Set alarm"
 msgstr ""
 
+#, javascript-format
+msgid "In: %s"
+msgstr ""
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+msgid "Watching..."
+msgstr ""
+
 msgid "to-do"
 msgstr ""
 
@@ -772,7 +923,7 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Import"
+msgid "Dropbox Login"
 msgstr ""
 
 msgid "Options"
@@ -784,6 +935,9 @@ msgstr ""
 msgid "Encryption Options"
 msgstr ""
 
+msgid "Clipper Options"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr ""
 
@@ -799,9 +953,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Searches"
-msgstr ""
-
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -813,6 +964,9 @@ msgstr ""
 msgid "Unknown flag: %s"
 msgstr ""
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr ""
 
@@ -883,7 +1037,7 @@ msgid "Fetched items: %d/%d."
 msgstr ""
 
 #, javascript-format
-msgid "State: \"%s\"."
+msgid "State: %s."
 msgstr ""
 
 msgid "Cancelling..."
@@ -893,6 +1047,16 @@ msgstr ""
 msgid "Completed: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Last error: %s"
+msgstr ""
+
+msgid "Idle"
+msgstr ""
+
+msgid "In progress"
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
@@ -906,6 +1070,9 @@ msgstr ""
 msgid "Conflicts"
 msgstr ""
 
+msgid "Cannot move notebook to this location"
+msgstr ""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr ""
@@ -914,6 +1081,15 @@ msgstr ""
 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 ""
 
@@ -954,7 +1130,16 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Show uncompleted to-dos on top of the lists"
+msgid "Uncompleted to-dos on top"
+msgstr ""
+
+msgid "Show completed to-dos"
+msgstr ""
+
+msgid "Sort notes by"
+msgstr ""
+
+msgid "Reverse sort order"
 msgstr ""
 
 msgid "Save geo-location with notes"
@@ -975,7 +1160,18 @@ msgstr ""
 msgid "Show tray icon"
 msgstr ""
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
+msgid "Global zoom percentage"
+msgstr ""
+
+msgid "Editor font family"
+msgstr ""
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 
 msgid "Automatically update the application"
@@ -1033,10 +1229,57 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""
 
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
+msgid "Joplin Export File"
+msgstr ""
+
+msgid "Markdown"
+msgstr ""
+
+msgid "Joplin Export Directory"
+msgstr ""
+
+msgid "Evernote Export File"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr ""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+
+msgid "There is no data to export."
+msgstr ""
+
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr ""
 
@@ -1111,6 +1354,9 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""
 
+msgid "Save alarm"
+msgstr ""
+
 msgid "Select date"
 msgstr ""
 
@@ -1120,6 +1366,38 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+msgid "Login with Dropbox"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1159,6 +1437,14 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
@@ -1169,6 +1455,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""
 
@@ -1190,6 +1479,9 @@ msgstr ""
 msgid "Login with OneDrive"
 msgstr ""
 
+msgid "Search"
+msgstr ""
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."

CliClient/locales/nl_BE.po

@@ -187,14 +187,19 @@ msgstr "Notitie is opgeslaan."
 msgid "Exits the application."
 msgstr "Sluit de applicatie."
 
+#, fuzzy
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 "Exporteert Joplin gegevens naar de opgegeven folder. Standaard zal het de "
 "volledige database exporteren, zoals notitieboeken, notities, tags en "
 "middelen."
 
+#, fuzzy, javascript-format
+msgid "Destination format: %s"
+msgstr "Datumnotatie"
+
 msgid "Exports only the given note."
 msgstr "Exporteert alleen de opgegeven notitie."
 
@@ -225,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Mogelijke commando's zijn:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -244,7 +249,8 @@ msgstr ""
 "Gebruik de pijltjes en page up/down om door de lijsten en de tekstvelden te "
 "scrollen (ook deze console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Om de console te maximaliseren/minimaliseren, typ \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -259,26 +265,16 @@ msgid ""
 msgstr ""
 "Voor de volledige lijst van beschikbare shortcuts, typ `help shortcuts`"
 
-msgid "Imports an Evernote notebook file (.enex file)."
-msgstr "Importeer een Evernote notitieboek (.enex bestand)."
+msgid "Imports data into Joplin."
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Source format: %s"
+msgstr "Geen commando gevonden: \"%s\""
 
 msgid "Do not ask for confirmation."
 msgstr "Vraag niet om bevestiging. "
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr ""
-"Bestand \"%s\" zal toegevoegd worden aan bestaand notitieboek \"%s\". "
-"Doorgaan?"
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-"Nieuw notitieboek \"%s\" zal aangemaakt worden en bestand \"%s\" zal eraan "
-"toegevoegd worden. Doorgaan?"
-
 #, javascript-format
 msgid "Found: %d."
 msgstr "Gevonden: %d."
@@ -373,7 +369,10 @@ msgstr "Verwijdert het opgegeven notitieboek."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Verwijdert het notitieboek zonder te vragen om bevestiging."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Notitieboek verwijderen? Alle notities in dit notitieboek zullen ook "
 "verwijderd worden."
@@ -420,6 +419,16 @@ msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Authenticatie was niet voltooid (geen authenticatietoken ontvangen)."
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -510,6 +519,10 @@ msgstr "Standaard: %s"
 msgid "Possible keys/values:"
 msgstr "Mogelijke sleutels/waarden:"
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "Toont gebruiksinformatie."
+
 msgid "Fatal error:"
 msgstr "Fatale fout:"
 
@@ -563,6 +576,18 @@ msgstr ""
 "hoofdsleutel al ingegeven hebt, worden de versleutelde items ontsleuteld in "
 "de achtergrond. Ze zijn binnenkort beschikbaar."
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, fuzzy
+msgid "PDF File"
+msgstr "Bestand"
+
 msgid "File"
 msgstr "Bestand"
 
@@ -575,11 +600,15 @@ msgstr "Nieuwe to-do"
 msgid "New notebook"
 msgstr "Nieuw notitieboek"
 
-msgid "Import Evernote notes"
-msgstr "Importeer Evernote notities"
+msgid "Import"
+msgstr "Importeer"
 
-msgid "Evernote Export Files"
-msgstr "Exporteer Evernote bestanden"
+#, fuzzy
+msgid "Export"
+msgstr "Importeer"
+
+msgid "Print"
+msgstr ""
 
 #, javascript-format
 msgid "Hide %s"
@@ -600,12 +629,24 @@ msgstr "Knip"
 msgid "Paste"
 msgstr "Plak"
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Zoek in alle notities"
 
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -615,6 +656,9 @@ msgstr "Tools"
 msgid "Synchronisation status"
 msgstr "Synchronisatie status"
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Versleutelopties"
 
@@ -627,6 +671,10 @@ msgstr "Help"
 msgid "Website and documentation"
 msgstr "Website en documentatie"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Website en documentatie"
+
 msgid "Check for updates..."
 msgstr ""
 
@@ -650,12 +698,8 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annuleer"
 
-#, fuzzy, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr "Notities verwijderen?"
+msgid "Current version is up-to-date."
+msgstr ""
 
 msgid "An update is available, do you want to download it now?"
 msgstr ""
@@ -667,7 +711,47 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-msgid "Current version is up-to-date."
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Status: \"%s\""
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
 msgstr ""
 
 #, fuzzy
@@ -681,6 +765,9 @@ msgstr "Notities en instellingen zijn opgeslaan in %s"
 msgid "Save"
 msgstr "Sla op"
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -751,6 +838,11 @@ msgid ""
 "they will eventually be downloaded via synchronisation."
 msgstr ""
 
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
+
 msgid "Status"
 msgstr "Status"
 
@@ -785,15 +877,20 @@ msgstr "Scheid iedere tag met een komma."
 msgid "Rename notebook:"
 msgstr "Hernoem notitieboek:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Hernoem"
+
 msgid "Set alarm:"
 msgstr "Stel melding in:"
 
-msgid "Search"
-msgstr "Zoeken"
-
 msgid "Layout"
 msgstr "Layout"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Zoeken"
+
 msgid "Some items cannot be synchronised."
 msgstr "Sommige items kunnen niet gesynchroniseerd worden."
 
@@ -812,6 +909,9 @@ msgstr "Voeg tag toe of verwijder tag"
 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"
 
@@ -830,14 +930,39 @@ msgstr ""
 msgid "Open..."
 msgstr ""
 
+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Het notitieboek kon niet opgeslaan worden: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Sla wijzigingen op"
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Link of bericht \"%s\" wordt niet ondersteund"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Voeg bestand toe"
 
@@ -847,6 +972,38 @@ msgstr "Tags"
 msgid "Set alarm"
 msgstr "Zet melding"
 
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Annuleren..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Nieuwe to-do"
@@ -868,8 +1025,8 @@ msgstr "Vrijmaken"
 msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
-msgid "Import"
-msgstr "Importeer"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Opties"
@@ -880,6 +1037,10 @@ msgstr "Synchronisatie status"
 msgid "Encryption Options"
 msgstr "Versleutelopties"
 
+#, fuzzy
+msgid "Clipper Options"
+msgstr "Algemene opties"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Deze tag verwijderen van alle notities?"
 
@@ -895,9 +1056,6 @@ msgstr "Synchroniseer"
 msgid "Notebooks"
 msgstr "Notitieboeken"
 
-msgid "Searches"
-msgstr "Zoekopdrachten"
-
 msgid "Please select where the sync status should be exported to"
 msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
 
@@ -909,6 +1067,9 @@ msgstr "Gebruik: %s"
 msgid "Unknown flag: %s"
 msgstr "Onbekende optie: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "Bestandssysteem"
 
@@ -987,8 +1148,8 @@ msgstr "Verwijderde remote items: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Opgehaalde items: %d/%d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "Status: \"%s\""
 
 msgid "Cancelling..."
@@ -998,6 +1159,16 @@ msgstr "Annuleren..."
 msgid "Completed: %s"
 msgstr "Voltooid: %s"
 
+#, fuzzy, javascript-format
+msgid "Last error: %s"
+msgstr "Fatale fout:"
+
+msgid "Idle"
+msgstr ""
+
+msgid "In progress"
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronisatie is reeds bezig. Status: %s"
@@ -1011,6 +1182,10 @@ msgstr "Versleutelde items kunnen niet aangepast worden"
 msgid "Conflicts"
 msgstr "Conflicten"
 
+#, fuzzy
+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"
@@ -1021,6 +1196,18 @@ 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"
 
@@ -1065,9 +1252,20 @@ msgid "Dark"
 msgstr "Donker"
 
 #, fuzzy
-msgid "Show uncompleted to-dos on top of the lists"
+msgid "Uncompleted to-dos on top"
 msgstr "Toon onvoltooide to-do's aan de top van de lijsten"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Toon onvoltooide to-do's aan de top van de lijsten"
+
+msgid "Sort notes by"
+msgstr ""
+
+#, fuzzy
+msgid "Reverse sort order"
+msgstr "Draait de sorteervolgorde om."
+
 msgid "Save geo-location with notes"
 msgstr "Sla geo-locatie op bij notities"
 
@@ -1088,7 +1286,18 @@ msgstr "Maakt een nieuwe notitie aan."
 msgid "Show tray icon"
 msgstr ""
 
-msgid "Set application zoom percentage"
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
+msgid "Global zoom percentage"
+msgstr ""
+
+msgid "Editor font family"
+msgstr ""
+
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 
 msgid "Automatically update the application"
@@ -1150,10 +1359,60 @@ msgstr ""
 msgid "WebDAV password"
 msgstr "Stel wachtwoord in"
 
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ongeldige optie: \"%s\". Geldige waarden zijn: %s."
 
+#, fuzzy
+msgid "Joplin Export File"
+msgstr "Exporteer Evernote bestanden"
+
+msgid "Markdown"
+msgstr ""
+
+msgid "Joplin Export Directory"
+msgstr ""
+
+#, fuzzy
+msgid "Evernote Export File"
+msgstr "Exporteer Evernote bestanden"
+
+msgid "Directory"
+msgstr ""
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr ""
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+
+msgid "There is no data to export."
+msgstr ""
+
+#, fuzzy
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
+
 msgid "Items that cannot be synchronised"
 msgstr "Items die niet gesynchroniseerd kunnen worden"
 
@@ -1232,6 +1491,10 @@ msgstr "Verplaats %d notities naar notitieboek \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Klik om het decryptie wachtwoord in te stellen"
 
+#, fuzzy
+msgid "Save alarm"
+msgstr "Zet melding"
+
 msgid "Select date"
 msgstr "Selecteer datum"
 
@@ -1241,6 +1504,39 @@ msgstr "Bevestig"
 msgid "Cancel synchronisation"
 msgstr "Annuleer synchronisatie"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Opgehaalde items: %d/%d."
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "Log in met OneDrive"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Hoofdsleutel: %s"
@@ -1280,6 +1576,14 @@ msgstr "Sla wijzigingen op"
 msgid "Discard changes"
 msgstr "Verwijder wijzigingen"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Afbeeldingstype %s wordt niet ondersteund"
@@ -1290,6 +1594,9 @@ msgstr "Voeg foto toe"
 msgid "Attach any file"
 msgstr "Voeg bestand toe"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converteer naar notitie"
 
@@ -1311,6 +1618,9 @@ msgstr "Verwijder notitieboek"
 msgid "Login with OneDrive"
 msgstr "Log in met OneDrive"
 
+msgid "Search"
+msgstr "Zoeken"
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
@@ -1326,6 +1636,35 @@ msgstr ""
 msgid "Welcome"
 msgstr "Welkom"
 
+#~ msgid "Searches"
+#~ msgstr "Zoekopdrachten"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Notities verwijderen?"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Importeer een Evernote notitieboek (.enex bestand)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "Bestand \"%s\" zal toegevoegd worden aan bestaand notitieboek \"%s\". "
+#~ "Doorgaan?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "Nieuw notitieboek \"%s\" zal aangemaakt worden en bestand \"%s\" zal "
+#~ "eraan toegevoegd worden. Doorgaan?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Importeer Evernote notities"
+
 #~ msgid "Give focus to next pane"
 #~ msgstr "Focus op het volgende paneel"
 

CliClient/locales/ru_RU.po

@@ -190,12 +190,16 @@ msgid "Exits the application."
 msgstr "Выход из приложения."
 
 msgid ""
-"Exports Joplin data to the given directory. By default, it will export the "
+"Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
-"Экспортирует данные Joplin в заданный каталог. По умолчанию экспортируется "
+"Экспортирует данные Joplin по заданному пути. По умолчанию экспортируется "
 "полная база данных, включая блокноты, заметки, теги и ресурсы."
 
+#, javascript-format
+msgid "Destination format: %s"
+msgstr "Целевой формат: %s"
+
 msgid "Exports only the given note."
 msgstr "Экспортирует только заданную заметку."
 
@@ -210,7 +214,7 @@ msgstr "Выводит информацию об использовании."
 
 #, javascript-format
 msgid "For information on how to customise the shortcuts please visit %s"
-msgstr ""
+msgstr "Информацию по настройке сочетаний можно получить, посетив %s"
 
 msgid "Shortcuts are not available in CLI mode."
 msgstr "Ярлыки недоступны в режиме командной строки."
@@ -226,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Доступные команды:"
 
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -245,7 +249,8 @@ msgstr ""
 "Используйте стрелки и клавиши перелистывания страницы вверх/вниз для "
 "прокрутки списков и текстовых областей (включая эту консоль)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Чтобы развернуть/свернуть консоль, нажимайте «TC»."
 
 msgid "To enter command line mode, press \":\""
@@ -254,31 +259,22 @@ msgstr "Чтобы войти в режим командной строки, н
 msgid "To exit command line mode, press ESCAPE"
 msgstr "Чтобы выйти из режима командной строки, нажмите ESCAPE"
 
-#, fuzzy
 msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
 msgstr ""
-"Для просмотра списка доступных клавиатурных сочетаний введите `help "
-"shortcuts`"
+"Для просмотра списка клавиатурных сочетаний и настроек конфигурации введите "
+"`help keymap`"
 
-msgid "Imports an Evernote notebook file (.enex file)."
-msgstr "Импортирует файл блокнотов Evernote (.enex-файл)."
+msgid "Imports data into Joplin."
+msgstr "Импортирует данные в Joplin."
+
+#, javascript-format
+msgid "Source format: %s"
+msgstr "Исходный формат: %s"
 
 msgid "Do not ask for confirmation."
 msgstr "Не запрашивать подтверждение."
 
-#, javascript-format
-msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
-msgstr "Файл «%s» будет импортирован в существующий блокнот «%s». Продолжить?"
-
-#, javascript-format
-msgid ""
-"New notebook \"%s\" will be created and file \"%s\" will be imported into "
-"it. Continue?"
-msgstr ""
-"Будет создан новый блокнот «%s» и в него будет импортирован файл «%s». "
-"Продолжить?"
-
 #, javascript-format
 msgid "Found: %d."
 msgstr "Найдено: %d."
@@ -373,7 +369,10 @@ msgstr "Удаляет заданный блокнот."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Удаляет блокнот без запроса подтверждения."
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Удалить блокнот? Все заметки в этом блокноте также будут удалены."
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -419,6 +418,16 @@ msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Аутентификация не была завершена (не получен токен аутентификации)."
 
+msgid ""
+"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
+msgstr ""
+
+msgid "Step 1: Open this URL in your browser to authorise the application:"
+msgstr ""
+
+msgid "Step 2: Enter the code provided by Dropbox:"
+msgstr ""
+
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
@@ -510,6 +519,9 @@ msgstr "По умолчанию: %s"
 msgid "Possible keys/values:"
 msgstr "Возможные ключи/значения:"
 
+msgid "Type `joplin help` for usage information."
+msgstr "Введите `joplin help` для получения информации об использовании."
+
 msgid "Fatal error:"
 msgstr "Фатальная ошибка:"
 
@@ -563,6 +575,17 @@ msgstr ""
 "decrypt». Если пароль уже был вами предоставлен, зашифрованные элементы "
 "расшифруются в фоновом режиме и вскоре станут доступны."
 
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr "Экспорт в «%s» в формате «%s». Пожалуйста, ожидайте..."
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr "Импорт из «%s» в формате «%s». Пожалуйста, ожидайте..."
+
+msgid "PDF File"
+msgstr "PDF-файл"
+
 msgid "File"
 msgstr "Файл"
 
@@ -575,15 +598,18 @@ msgstr "Новая задача"
 msgid "New notebook"
 msgstr "Новый блокнот"
 
-msgid "Import Evernote notes"
-msgstr "Импортировать заметки из Evernote"
+msgid "Import"
+msgstr "Импорт"
 
-msgid "Evernote Export Files"
-msgstr "Файлы экспорта Evernote"
+msgid "Export"
+msgstr "Экспорт"
+
+msgid "Print"
+msgstr "Печать"
 
 #, javascript-format
 msgid "Hide %s"
-msgstr ""
+msgstr "Скрыть %s"
 
 msgid "Quit"
 msgstr "Выход"
@@ -600,14 +626,26 @@ msgstr "Вырезать"
 msgid "Paste"
 msgstr "Вставить"
 
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Поиск во всех заметках"
 
 msgid "View"
+msgstr "Вид"
+
+msgid "Toggle sidebar"
 msgstr ""
 
 msgid "Toggle editor layout"
-msgstr ""
+msgstr "Переключить вид редактора"
 
 msgid "Tools"
 msgstr "Инструменты"
@@ -615,6 +653,9 @@ msgstr "Инструменты"
 msgid "Synchronisation status"
 msgstr "Статус синхронизации"
 
+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Настройки шифрования"
 
@@ -627,6 +668,9 @@ msgstr "Помощь"
 msgid "Website and documentation"
 msgstr "Сайт и документация"
 
+msgid "Make a donation"
+msgstr "Сделать пожертвование"
+
 msgid "Check for updates..."
 msgstr "Проверить обновления..."
 
@@ -637,12 +681,12 @@ msgstr "О Joplin"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Open %s"
-msgstr "В %s: %s"
+msgstr "Открыть %s"
 
 msgid "Exit"
-msgstr ""
+msgstr "Выход"
 
 msgid "OK"
 msgstr "OK"
@@ -650,30 +694,63 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Отмена"
 
-#, fuzzy, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr "Удалить заметки?"
-
-#, fuzzy
-msgid "An update is available, do you want to download it now?"
-msgstr "Доступно обновление. Обновить сейчас?"
-
-msgid "Yes"
-msgstr ""
-
-#, fuzzy
-msgid "No"
-msgstr "N"
-
 msgid "Current version is up-to-date."
 msgstr "Вы используете самую свежую версию."
 
-#, fuzzy
+msgid "An update is available, do you want to download it now?"
+msgstr "Доступно обновление. Желаете скачать его сейчас?"
+
+msgid "Yes"
+msgstr "Да"
+
+msgid "No"
+msgstr "Нет"
+
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Статус: «%s»."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
-msgstr "Отменить синхронизацию"
+msgstr "Проверить настройки синхронизации"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -682,6 +759,9 @@ msgstr "Заметки и настройки сохранены в: %s"
 msgid "Save"
 msgstr "Сохранить"
 
+msgid "Submit"
+msgstr ""
+
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
@@ -743,15 +823,22 @@ msgstr ""
 "ключей, в зависимости от того, как изначально были зашифрованы заметки или "
 "блокноты."
 
-#, fuzzy
 msgid "Missing Master Keys"
-msgstr "Мастер-ключи"
+msgstr "Недостающие мастер-ключи"
 
 msgid ""
 "The master keys with these IDs are used to encrypt some of your items, "
 "however the application does not currently have access to them. It is likely "
 "they will eventually be downloaded via synchronisation."
 msgstr ""
+"Мастер-ключи с такими ID используются для шифрования некоторых из ваших "
+"элементов, однако у приложения сейчас нет к ним доступа. Скорее всего, они "
+"загрузятся при синхронизации."
+
+msgid ""
+"For more information about End-To-End Encryption (E2EE) and advices on how "
+"to enable it please check the documentation:"
+msgstr ""
 
 msgid "Status"
 msgstr "Статус"
@@ -785,15 +872,20 @@ msgstr "Каждый тег отделяется запятой."
 msgid "Rename notebook:"
 msgstr "Переименовать блокнот:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Переименовать"
+
 msgid "Set alarm:"
 msgstr "Установить напоминание:"
 
-msgid "Search"
-msgstr "Поиск"
-
 msgid "Layout"
 msgstr "Вид"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Поиск"
+
 msgid "Some items cannot be synchronised."
 msgstr "Некоторые элементы не могут быть синхронизированы."
 
@@ -812,6 +904,10 @@ msgstr "Добавить или удалить теги"
 msgid "Switch between note and to-do type"
 msgstr "Переключить тип между заметкой и задачей"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Удалить"
 
@@ -826,16 +922,42 @@ msgid ""
 msgstr "Сейчас здесь нет блокнотов. Создайте новый нажав «Новый блокнот»."
 
 msgid "Open..."
-msgstr ""
+msgstr "Открыть..."
+
+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Не удалось сохранить блокнот: %s"
 
-#, fuzzy
 msgid "Save as..."
-msgstr "Сохранить изменения"
+msgstr "Сохранить как..."
+
+msgid "Copy path to clipboard"
+msgstr ""
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Неподдерживаемая ссыка или сообщение: %s"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Заметка пуста. Нажмите на «%s», чтобы переключиться в редактор и "
+"отредактировать её."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Прикрепить файл"
 
@@ -845,17 +967,47 @@ msgstr "Теги"
 msgid "Set alarm"
 msgstr "Установить напоминание"
 
-#, fuzzy
-msgid "to-do"
-msgstr "Новая задача"
-
-#, fuzzy
-msgid "note"
-msgstr "Новая заметка"
-
 #, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Отмена..."
+
+msgid "to-do"
+msgstr "задача"
+
+msgid "note"
+msgstr "заметка"
+
+#, javascript-format
 msgid "Creating new %s..."
-msgstr "Импорт заметок..."
+msgstr "Создание новой %s..."
 
 msgid "Refresh"
 msgstr "Обновить"
@@ -866,8 +1018,8 @@ msgstr "Очистить"
 msgid "OneDrive Login"
 msgstr "Вход в OneDrive"
 
-msgid "Import"
-msgstr "Импорт"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Настройки"
@@ -878,6 +1030,10 @@ msgstr "Статус синхронизации"
 msgid "Encryption Options"
 msgstr "Настройки шифрования"
 
+#, fuzzy
+msgid "Clipper Options"
+msgstr "Основные настройки"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Убрать этот тег со всех заметок?"
 
@@ -893,9 +1049,6 @@ msgstr "Синхронизировать"
 msgid "Notebooks"
 msgstr "Блокноты"
 
-msgid "Searches"
-msgstr "Запросы"
-
 msgid "Please select where the sync status should be exported to"
 msgstr "Выберите, куда должен быть экспортирован статус синхронизации"
 
@@ -907,12 +1060,14 @@ msgstr "Использование: %s"
 msgid "Unknown flag: %s"
 msgstr "Неизвестный флаг: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "Файловая система"
 
-#, fuzzy
 msgid "Nextcloud"
-msgstr "Nextcloud (Beta)"
+msgstr "Nextcloud"
 
 msgid "OneDrive"
 msgstr "OneDrive"
@@ -920,9 +1075,8 @@ msgstr "OneDrive"
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive Dev (только для тестирования)"
 
-#, fuzzy
 msgid "WebDAV"
-msgstr "Nextcloud WebDAV URL"
+msgstr "WebDAV"
 
 #, javascript-format
 msgid "Unknown log level: %s"
@@ -986,8 +1140,8 @@ msgstr "Удалено удалённых элементов: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Получено элементов: %d/%d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "Статус: «%s»."
 
 msgid "Cancelling..."
@@ -997,6 +1151,16 @@ msgstr "Отмена..."
 msgid "Completed: %s"
 msgstr "Завершено: %s"
 
+#, javascript-format
+msgid "Last error: %s"
+msgstr "Последняя ошибка: %s"
+
+msgid "Idle"
+msgstr "Простой"
+
+msgid "In progress"
+msgstr "Выполнение"
+
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизация уже выполняется. Статус: %s"
@@ -1010,6 +1174,10 @@ msgstr "Зашифрованные элементы не могут быть и
 msgid "Conflicts"
 msgstr "Конфликты"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Не удалось переместить заметку в блокнот «%s»"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Блокнот с таким названием уже существует: «%s»"
@@ -1018,6 +1186,18 @@ msgstr "Блокнот с таким названием уже существу
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Блокнот не может быть назван «%s», это зарезервированное название."
 
+#, fuzzy
+msgid "title"
+msgstr "Без имени"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Обновлено: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Создано: %d."
+
 msgid "Untitled"
 msgstr "Без имени"
 
@@ -1060,9 +1240,18 @@ msgstr "Светлая"
 msgid "Dark"
 msgstr "Тёмная"
 
+msgid "Uncompleted to-dos on top"
+msgstr "Незавершённые задачи сверху"
+
 #, fuzzy
-msgid "Show uncompleted to-dos on top of the lists"
-msgstr "Показывать незавершённые задачи вверху списков"
+msgid "Show completed to-dos"
+msgstr "Незавершённые задачи сверху"
+
+msgid "Sort notes by"
+msgstr "Сортировать заметки по"
+
+msgid "Reverse sort order"
+msgstr "Обратный порядок сортировки"
 
 msgid "Save geo-location with notes"
 msgstr "Сохранять информацию о геолокации в заметках"
@@ -1080,10 +1269,24 @@ msgid "When creating a new note:"
 msgstr "При создании новой заметки:"
 
 msgid "Show tray icon"
+msgstr "Показывать иконку в панели задач"
+
+msgid "Note: Does not work in all desktop environments."
 msgstr ""
 
-msgid "Set application zoom percentage"
-msgstr "Масштаб приложения в процентах"
+msgid "Global zoom percentage"
+msgstr "Глобальный масштаб в процентах"
+
+msgid "Editor font family"
+msgstr "Семейство шрифтов редактора"
+
+#, fuzzy
+msgid ""
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
+msgstr ""
+"Название шрифта не проверяется. Если оно указано некорректно или не задано, "
+"будет использоваться стандартный моноширинный шрифт."
 
 msgid "Automatically update the application"
 msgstr "Автоматически обновлять приложение"
@@ -1135,22 +1338,69 @@ msgstr "Имя пользователя Nextcloud"
 msgid "Nextcloud password"
 msgstr "Пароль Nextcloud"
 
-#, fuzzy
 msgid "WebDAV URL"
-msgstr "Nextcloud WebDAV URL"
+msgstr "URL WebDAV"
 
-#, fuzzy
 msgid "WebDAV username"
-msgstr "Имя пользователя Nextcloud"
+msgstr "Имя пользователя WebDAV"
 
-#, fuzzy
 msgid "WebDAV password"
-msgstr "Установить пароль"
+msgstr "Пароль WebDAV"
+
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Неверное значение параметра: «%s». Доступные значения: %s."
 
+msgid "Joplin Export File"
+msgstr "Файл экспорта Joplin"
+
+msgid "Markdown"
+msgstr "Markdown"
+
+msgid "Joplin Export Directory"
+msgstr "Папка экспорта Joplin"
+
+msgid "Evernote Export File"
+msgstr "Файл экспорта Evernote"
+
+msgid "Directory"
+msgstr "Директория"
+
+#, javascript-format
+msgid "Cannot load \"%s\" module for format \"%s\""
+msgstr "Не удалось загрузить модуль «%s» для формата «%s»"
+
+#, javascript-format
+msgid "Please specify import format for %s"
+msgstr "Пожалуйста, укажите формат импорта для %s"
+
+#, javascript-format
+msgid ""
+"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
+"decrypted and try again."
+msgstr ""
+"Этот элемент сейчас зашифрован: %s «%s». Пожалуйста, дождитесь расшифровки "
+"всех элементов и попробуйте снова."
+
+msgid "There is no data to export."
+msgstr "Нет данных для экспорта."
+
+msgid "Please specify the notebook where the notes should be imported to."
+msgstr ""
+"Пожалуйста, укажите блокнот, в который должны быть импортированы заметки."
+
 msgid "Items that cannot be synchronised"
 msgstr "Элементы, которые не могут быть синхронизированы"
 
@@ -1228,6 +1478,10 @@ msgstr "Переместить %d заметок в блокнот «%s»?"
 msgid "Press to set the decryption password."
 msgstr "Нажмите, чтобы установить пароль для расшифровки."
 
+#, fuzzy
+msgid "Save alarm"
+msgstr "Установить напоминание"
+
 msgid "Select date"
 msgstr "Выбрать дату"
 
@@ -1237,6 +1491,39 @@ msgstr "Подтвердить"
 msgid "Cancel synchronisation"
 msgstr "Отменить синхронизацию"
 
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Получено элементов: %d/%d."
+
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
+msgid "Joplin website"
+msgstr "Сайт Joplin"
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "Войти в OneDrive"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Мастер-ключ %s"
@@ -1262,11 +1549,10 @@ msgid "Edit notebook"
 msgstr "Редактировать блокнот"
 
 msgid "Show all"
-msgstr ""
+msgstr "Показать всё"
 
-#, fuzzy
 msgid "Errors only"
-msgstr "Ошибка"
+msgstr "Только ошибки"
 
 msgid "This note has been modified:"
 msgstr "Эта заметка была изменена:"
@@ -1277,6 +1563,14 @@ msgstr "Сохранить изменения"
 msgid "Discard changes"
 msgstr "Отменить изменения"
 
+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Неподдерживаемый формат изображения: %s"
@@ -1287,6 +1581,9 @@ msgstr "Прикрепить фото"
 msgid "Attach any file"
 msgstr "Прикрепить любой файл"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Преобразовать в заметку"
 
@@ -1308,6 +1605,9 @@ msgstr "Удалить блокнот"
 msgid "Login with OneDrive"
 msgstr "Войти в OneDrive"
 
+msgid "Search"
+msgstr "Поиск"
+
 msgid ""
 "Click on the (+) button to create a new note or notebook. Click on the side "
 "menu to access your existing notebooks."
@@ -1321,6 +1621,34 @@ msgstr "У вас сейчас нет блокнота. Создайте его
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
+#~ msgid "Searches"
+#~ msgstr "Запросы"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Удалить заметки?"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Импортирует файл блокнотов Evernote (.enex-файл)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "Файл «%s» будет импортирован в существующий блокнот «%s». Продолжить?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "Будет создан новый блокнот «%s» и в него будет импортирован файл «%s». "
+#~ "Продолжить?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Импортировать заметки из Evernote"
+
 #~ msgid "Give focus to next pane"
 #~ msgstr "Переключиться на следующую панель"
 

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.98",
+  "version": "1.0.108",
   "bin": {
     "joplin": "./main.js"
   },
@@ -31,10 +31,15 @@
     "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
     "compare-version": "^0.1.2",
+    "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-type": "^3.0.0",
+    "joplin-turndown": "^4.0.3",
+    "joplin-turndown-plugin-gfm": "^1.0.2",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
@@ -44,10 +49,10 @@
     "node-emoji": "^1.8.1",
     "node-fetch": "^1.7.1",
     "node-persist": "^2.1.0",
-    "os-tmpdir": "^1.0.2",
     "promise": "^7.1.1",
     "proper-lockfile": "^2.0.1",
     "query-string": "4.3.4",
+    "read-chunk": "^2.1.0",
     "redux": "^3.7.2",
     "sax": "^1.2.2",
     "server-destroy": "^1.0.1",
@@ -57,10 +62,12 @@
     "string-padding": "^1.0.2",
     "string-to-stream": "^1.1.0",
     "strip-ansi": "^4.0.0",
+    "tar": "^4.4.0",
     "tcp-port-used": "^0.1.2",
-    "tkwidgets": "^0.5.25",
+    "tkwidgets": "^0.5.26",
     "url-parse": "^1.2.0",
     "uuid": "^3.0.1",
+    "valid-url": "^1.0.9",
     "word-wrap": "^1.2.3",
     "xml2js": "^0.4.19",
     "yargs-parser": "^7.0.0"

CliClient/run_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+START_DIR="$(pwd)"
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$ROOT_DIR/tests-build"
 TEST_FILE="$1"
@@ -8,8 +9,27 @@ rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
 rsync -a "$ROOT_DIR/build/locales/" "$BUILD_DIR/locales/"
 mkdir -p "$BUILD_DIR/data"
 
-if [[ $TEST_FILE == "" ]]; then
-	(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js tests-build/encryption.js tests-build/ArrayUtils.js tests-build/models_Setting.js)
-else
+if [[ $TEST_FILE != "" ]]; then
 	(cd "$ROOT_DIR" && npm test tests-build/$TEST_FILE.js)
-fi
+	exit
+fi
+
+function finish {
+	cd "$START_DIR"
+}
+
+trap finish EXIT
+
+cd "$ROOT_DIR"
+npm test tests-build/ArrayUtils.js
+npm test tests-build/encryption.js
+npm test tests-build/EnexToMd.js
+npm test tests-build/HtmlToMd.js
+npm test tests-build/markdownUtils.js
+npm test tests-build/models_Folder.js
+npm test tests-build/models_Note.js
+npm test tests-build/models_Setting.js
+npm test tests-build/services_InteropService.js
+npm test tests-build/services_ResourceService.js
+npm test tests-build/synchronizer.js
+npm test tests-build/urlUtils.js

CliClient/tests/ArrayUtils.js

@@ -44,4 +44,13 @@ describe('ArrayUtils', function() {
 		done();
 	});
 
+	it('should compare arrays', async (done) => {
+		expect(ArrayUtils.contentEquals([], [])).toBe(true);
+		expect(ArrayUtils.contentEquals(['a'], ['a'])).toBe(true);
+		expect(ArrayUtils.contentEquals(['b', 'a'], ['a', 'b'])).toBe(true);
+		expect(ArrayUtils.contentEquals(['b'], ['a', 'b'])).toBe(false);
+
+		done();
+	});
+
 });

CliClient/tests/EnexToMd.js

@@ -0,0 +1,62 @@
+require('app-module-path').addPath(__dirname);
+
+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');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+const { enexXmlToMd } = require('lib/import-enex-md-gen.js');
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 60 * 60 * 1000; // Can run for a while since everything is in the same test unit
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('EnexToMd', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should convert from Enex to Markdown', asyncTest(async () => {
+		const basePath = __dirname + '/enex_to_md';
+		const files = await shim.fsDriver().readDirStats(basePath);
+		
+		for (let i = 0; i < files.length; i++) {
+			const htmlFilename = files[i].path;
+			if (htmlFilename.indexOf('.html') < 0) continue;
+
+			const htmlPath = basePath + '/' + htmlFilename;
+			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
+
+			// if (htmlFilename !== 'text2.html') continue;
+
+			const html = await shim.fsDriver().readFile(htmlPath);
+			const expectedMd = await shim.fsDriver().readFile(mdPath);
+
+			const actualMd = await enexXmlToMd('<div>' + html + '</div>', []);
+
+			if (actualMd !== expectedMd) {
+				console.info('');
+				console.info('Error converting file: ' + htmlFilename);
+				console.info('--------------------------------- Got:');
+				console.info(actualMd.split('\n'));
+				console.info('--------------------------------- Expected:');
+				console.info(expectedMd.split('\n'));
+				console.info('--------------------------------------------');
+				console.info('');
+
+				expect(false).toBe(true);
+				// return;
+			} else {
+				expect(true).toBe(true)
+			}
+		}
+	}));
+
+});

CliClient/tests/HtmlToMd.js

@@ -0,0 +1,66 @@
+require('app-module-path').addPath(__dirname);
+
+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');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+const HtmlToMd = require('lib/HtmlToMd');
+const { enexXmlToMd } = require('lib/import-enex-md-gen.js');
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 60 * 60 * 1000; // Can run for a while since everything is in the same test unit
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('HtmlToMd', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should convert from Html to Markdown', asyncTest(async () => {
+		const basePath = __dirname + '/html_to_md';
+		const files = await shim.fsDriver().readDirStats(basePath);
+		const htmlToMd = new HtmlToMd();
+		
+		for (let i = 0; i < files.length; i++) {
+			const htmlFilename = files[i].path;
+			if (htmlFilename.indexOf('.html') < 0) continue;
+
+			const htmlPath = basePath + '/' + htmlFilename;
+			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
+
+			// if (htmlFilename !== 'code_1.html') continue;
+
+			const html = await shim.fsDriver().readFile(htmlPath);
+			const expectedMd = await shim.fsDriver().readFile(mdPath);
+
+			const actualMd = await htmlToMd.parse('<div>' + html + '</div>', []);
+
+			if (actualMd !== expectedMd) {
+				console.info('');
+				console.info('Error converting file: ' + htmlFilename);
+				console.info('--------------------------------- Got:');
+				console.info(actualMd);
+				console.info('--------------------------------- Raw:');
+				console.info(actualMd.split('\n'));
+				console.info('--------------------------------- Expected:');
+				console.info(expectedMd.split('\n'));
+				console.info('--------------------------------------------');
+				console.info('');
+
+				expect(false).toBe(true);
+				// return;
+			} else {
+				expect(true).toBe(true)
+			}
+		}
+	}));
+
+});

CliClient/tests/enex_to_md/code1.html

@@ -0,0 +1,16 @@
+<div>
+	<p>For example, consider a web page like this:</p>
+
+<pre class="brush: html line-numbers  language-html"><code class=" language-html"><span class="token doctype">&lt;!DOCTYPE html&gt;</span>
+<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>html</span><span class="token punctuation">&gt;</span></span>
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>head</span><span class="token punctuation">&gt;</span></span>
+    <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>meta</span> <span class="token attr-name">http-equiv</span><span class="token attr-value"><span class="token punctuation">=</span><span class="token punctuation">"</span>content-type<span class="token punctuation">"</span></span> <span class="token attr-name">content</span><span class="token attr-value"><span class="token punctuation">=</span><span class="token punctuation">"</span>text/html; charset<span class="token punctuation">=</span>utf-8<span class="token punctuation">"</span></span> <span class="token punctuation">/&gt;</span></span>
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>head</span><span class="token punctuation">&gt;</span></span>
+
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>body</span><span class="token punctuation">&gt;</span></span>
+    <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>script</span> <span class="token attr-name">src</span><span class="token attr-value"><span class="token punctuation">=</span><span class="token punctuation">"</span>page-scripts/page-script.js<span class="token punctuation">"</span></span><span class="token punctuation">&gt;</span></span><span class="token script language-javascript"></span><span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>script</span><span class="token punctuation">&gt;</span></span>
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>body</span><span class="token punctuation">&gt;</span></span>
+<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>html</span><span class="token punctuation">&gt;</span></span><span class="line-numbers-rows"><span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span></span></code></pre>
+
+	<p>The script "page-script.js" does this:</p>
+</div>

CliClient/tests/enex_to_md/code1.md

@@ -0,0 +1,14 @@
+For example, consider a web page like this:
+
+	<!DOCTYPE html>
+	<html>
+	  <head>
+	    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	  </head>
+
+	  <body>
+	    <script src="page-scripts/page-script.js"></script>
+	  </body>
+	</html>
+
+The script "page-script.js" does this:

CliClient/tests/enex_to_md/code2.html

@@ -0,0 +1,7 @@
+<p>Subshell:</p>
+<pre><code>(
+    set -e
+    false
+    echo Unreachable
+) &amp;&amp; echo Great success
+</code></pre>

CliClient/tests/enex_to_md/code2.md

@@ -0,0 +1,7 @@
+Subshell:
+
+	(
+	    set -e
+	    false
+	    echo Unreachable
+	) && echo Great success

CliClient/tests/enex_to_md/heading.html

@@ -0,0 +1,9 @@
+<div>
+	<div class="note">
+		<p>Values added to the global scope of a content script with</p>
+	</div>
+
+	<h2 id="Loading_content_scripts">Loading content scripts</h2>
+
+	<p>You can load a content script into a web page in one of three ways:</p>
+</div>

CliClient/tests/enex_to_md/heading.md

@@ -0,0 +1,5 @@
+Values added to the global scope of a content script with
+
+## Loading content scripts
+
+You can load a content script into a web page in one of three ways:

CliClient/tests/enex_to_md/inlineCode.html

@@ -0,0 +1,3 @@
+<div>
+	<p>Similarly, I need another regex to match double newlines (<code>\n\n</code>) that are not part of a longer run of newline characters like <code>\n\n\n</code> or <code>\n\n\n\n\n\n</code> etc.</p>
+</div>

CliClient/tests/enex_to_md/inlineCode.md

@@ -0,0 +1 @@
+Similarly, I need another regex to match double newlines (`\n\n`) that are not part of a longer run of newline characters like `\n\n\n` or `\n\n\n\n\n\n` etc.

CliClient/tests/enex_to_md/inlineCodeWithLink.html

@@ -0,0 +1,3 @@
+<div>
+<p>the&nbsp;<code><a href="/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onConnect">runtime.onConnect</a></code> listener gets passed its own <code><a href="/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/Port">runtime.Port</a></code> object.</p>
+</div>

CliClient/tests/enex_to_md/inlineCodeWithLink.md

@@ -0,0 +1 @@
+the `[runtime.onConnect](/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onConnect)` listener gets passed its own `[runtime.Port](/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/Port)` object.

CliClient/tests/enex_to_md/link1.html

@@ -0,0 +1,4 @@
+<a href="https://arstechnica.com/civis/ucp.php?mode=login&return_to=%2Ftech-policy%2F2018%2F05%2Fjails-are-replacing-in-person-visits-with-video-calling-services-theyre-awful%2F" class="dropdown-toggle">
+      Sign in
+      <span class="icon dropdown-indicator icon-drop-indicator"></span>
+    </a>

CliClient/tests/enex_to_md/link1.md

@@ -0,0 +1 @@
+[Sign in](https://arstechnica.com/civis/ucp.php?mode=login&return_to=%2Ftech-policy%2F2018%2F05%2Fjails-are-replacing-in-person-visits-with-video-calling-services-theyre-awful%2F)

CliClient/tests/enex_to_md/list.html

@@ -0,0 +1,17 @@
+<div>
+	<p>Liste de courses</p>
+
+	<div>
+		<div><en-todo checked="true"/>Pizzas</div>
+		<div><en-todo checked="true"/>Pain</div>
+		<div><en-todo checked="true"/>Jambon</div>
+	</div>
+
+	<div><br/></div>
+
+	<div>
+		<div><en-todo checked="true"/>On its own</div>
+	</div>
+
+	<p>End</p>
+</div>

CliClient/tests/enex_to_md/list.md

@@ -0,0 +1,9 @@
+Liste de courses
+
+- [X] Pizzas
+- [X] Pain
+- [X] Jambon
+
+- [X] On its own
+
+End

CliClient/tests/enex_to_md/list2.html

@@ -0,0 +1 @@
+<ul class="find-me-on"><li><a href="https://github.com/zetter">Github</a></li><li><a href="https://twitter.com/czetter">Twitter</a></li><li><a href="http://lanyrd.com/profile/czetter/">Lanyrd</a></li></ul>

CliClient/tests/enex_to_md/list2.md

@@ -0,0 +1,3 @@
+- [Github](https://github.com/zetter)
+- [Twitter](https://twitter.com/czetter)
+- [Lanyrd](http://lanyrd.com/profile/czetter/)

CliClient/tests/enex_to_md/list3.html

@@ -0,0 +1 @@
+<ul class="find-me-on"><li>Github</li><li>Twitter</li></ul>

CliClient/tests/enex_to_md/list3.md

@@ -0,0 +1,2 @@
+- Github
+- Twitter

CliClient/tests/enex_to_md/paragraph.html

@@ -0,0 +1,11 @@
+<div>
+	<p>Short paragraphs are merged together:</p>
+	<p>Something something</p>
+	<p>Blablbla blabla lbla</p>
+	<p>Last line</p>
+</div>
+
+<div>
+	<p>Longer ones are separated by new lines. In 1894 Joplin arrived in Sedalia, Missouri. At first, Joplin stayed with the family of Arthur Marshall, at the time a 13-year-old boy but later one of Joplin's students and a rag-time composer in his own right.[26] There is no record of Joplin having a permanent residence in the town until 1904, as Joplin was making a living as a touring musician.</p>
+	<p>There is little precise evidence known about Joplin's activities at this time, although he performed as a solo musician at dances and at the major black clubs in Sedalia, the Black 400 club and the Maple Leaf Club. He performed in the Queen City Cornet Band, and his own six-piece dance orchestra.</p>
+</div>

CliClient/tests/enex_to_md/paragraph.md

@@ -0,0 +1,8 @@
+Short paragraphs are merged together:
+Something something
+Blablbla blabla lbla
+Last line
+
+Longer ones are separated by new lines. In 1894 Joplin arrived in Sedalia, Missouri. At first, Joplin stayed with the family of Arthur Marshall, at the time a 13-year-old boy but later one of Joplin's students and a rag-time composer in his own right.[26] There is no record of Joplin having a permanent residence in the town until 1904, as Joplin was making a living as a touring musician.
+
+There is little precise evidence known about Joplin's activities at this time, although he performed as a solo musician at dances and at the major black clubs in Sedalia, the Black 400 club and the Maple Leaf Club. He performed in the Queen City Cornet Band, and his own six-piece dance orchestra.

CliClient/tests/enex_to_md/table1.html

@@ -0,0 +1,12 @@
+<table>
+<tr>
+<td>
+<div>$ sudo ethtool --set-priv-flags p2p1 mlx4_rss_xor_hash_function on</div>
+<div># Three empty lines follow</div>
+<div><br/></div>
+<div><br/></div>
+</td>
+</tr>
+</table>
+
+Some text

CliClient/tests/enex_to_md/table1.md

@@ -0,0 +1,5 @@
+|     |
+| --- |
+| $ sudo ethtool --set-priv-flags p2p1 mlx4_rss_xor_hash_function on<br># Three empty lines follow |
+
+Some text

CliClient/tests/enex_to_md/tableWithNewLines.html

@@ -0,0 +1,3 @@
+<div>
+<table style="-evernote-table:true;border-collapse:collapse;width:100%;table-layout:fixed;margin-left:0px;"><tr><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div>line 1</div><div>line 2</div></td><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div><br/></div></td></tr><tr><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div>aaaaaa</div></td><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div>line 3</div><div>line 4</div></td></tr></table>
+</div>

CliClient/tests/enex_to_md/tableWithNewLines.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| line 1<br>line 2 |     |
+| aaaaaa | line 3<br>line 4 |

CliClient/tests/html_to_md/anchor_with_inner_tags.html

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

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

CliClient/tests/html_to_md/anchor_with_js.html

@@ -0,0 +1 @@
+<a href="javascript:alert('js')">Some text</a>

CliClient/tests/html_to_md/anchor_with_js.md

@@ -0,0 +1 @@
+[Some text]()

CliClient/tests/html_to_md/anchor_with_newlines.html

@@ -0,0 +1 @@
+<a href="http://example.com"><p>That</p><p>Shouldn't be allowed</p></a>

CliClient/tests/html_to_md/anchor_with_newlines.md

@@ -0,0 +1 @@
+[That<br>Shouldn't be allowed](http://example.com)

CliClient/tests/html_to_md/code_1.html

@@ -0,0 +1,8 @@
+<div>
+	<table><tbody><tr><td class="code"><pre class="python" style="font-family:monospace;"><span style="color: #ff7700;font-weight:bold;">def</span> ma_fonction<span style="color: black;">(</span><span style="color: black;">)</span>:
+    <span style="color: #483d8b;">"""
+        C'est une super fonction
+    """</span>
+    <span style="color: #ff7700;font-weight:bold;">pass</span></pre></td></tr></tbody></table>
+
+</div>

CliClient/tests/html_to_md/code_1.md

@@ -0,0 +1,5 @@
+    def ma_fonction():
+        """
+            C'est une super fonction
+        """
+        pass

CliClient/tests/html_to_md/list_with_many_items.html

@@ -0,0 +1,13 @@
+<!-- Make sure in particular that indentation is correct after the 9th item -->
+<ol>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+</ol>

CliClient/tests/html_to_md/list_with_many_items.md

@@ -0,0 +1,39 @@
+1.  One
+    
+    Two
+    
+2.  One
+    
+    Two
+    
+3.  One
+    
+    Two
+    
+4.  One
+    
+    Two
+    
+5.  One
+    
+    Two
+    
+6.  One
+    
+    Two
+    
+7.  One
+    
+    Two
+    
+8.  One
+    
+    Two
+    
+9.  One
+    
+    Two
+    
+10. One
+    
+    Two

CliClient/tests/html_to_md/skip_script.html

@@ -0,0 +1 @@
+<script id="appnexus-adload" data-reactid="7">window.apntag=window.apntag||{};window.apntag.anq=window.apntag.anq||[];</script>

CliClient/tests/html_to_md/table_no_header.html

@@ -0,0 +1,4 @@
+<table>
+	<tr><td>No</td><td>header</td></tr>
+	<tr><td>And no</td><td>suprises</td></tr>
+</table>

CliClient/tests/html_to_md/table_no_header.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| No  | header |
+| And no | suprises |

CliClient/tests/html_to_md/table_with_colspan.html

@@ -0,0 +1,15 @@
+<table>
+	<tr>
+		<td colspan="2">
+			Something that was originally spanning two columns
+		</td>
+	</tr>
+	<tr>
+		<td>
+			One
+		</td>
+		<td>
+			Two
+		</td>
+	</tr>
+</table>

CliClient/tests/html_to_md/table_with_colspan.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| Something that was originally spanning two columns |     |
+| One | Two |

CliClient/tests/html_to_md/table_with_empty_cells.html

@@ -0,0 +1,10 @@
+<table>
+	<tr>
+		<td></td>
+		<td>Previous is empty</td>
+	</tr>
+	<tr>
+		<td>Next is empty</td>
+		<td></td>
+	</tr>
+</table>

CliClient/tests/html_to_md/table_with_empty_cells.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+|     | Previous is empty |
+| Next is empty |     |

CliClient/tests/html_to_md/table_with_empty_row.html

@@ -0,0 +1,13 @@
+<table>
+	<tr>
+		<td>One</td><td>Two</td>
+	</tr>
+	<tr></tr>
+	<tr>
+		<td>One</td><td>Two</td>
+	</tr>
+	<tr></tr>
+	<tr>
+		<td>One</td><td>Two</td>
+	</tr>
+</table>

CliClient/tests/html_to_md/table_with_empty_row.md

@@ -0,0 +1,5 @@
+|     |     |
+| --- | --- |
+| One | Two |
+| One | Two |
+| One | Two |

CliClient/tests/html_to_md/table_with_newlines.html

@@ -0,0 +1,6 @@
+<table>
+	<tr>
+		<td><p>Some paragraph</p><p>inside a table cell</p></td>
+		<td>Second column</td>
+	</tr>
+</table>

CliClient/tests/html_to_md/table_with_newlines.md

@@ -0,0 +1,3 @@
+|     |     |
+| --- | --- |
+| Some paragraph<br><br>inside a table cell | Second column |

CliClient/tests/html_to_md/table_within_table.html

@@ -0,0 +1,16 @@
+<!--
+The inner table is rendered but not the outer one.
+Basically if any table contains another table, it is rendered as plain text
+-->
+<table>
+	<tr><td>
+		First column, and an inner table:
+
+		<table>
+			<tr><td>One</td><td>Two</td></tr>
+			<tr><td>One</td><td>Two</td></tr>
+		</table>
+	</td>
+	<td>Second column</td>
+	</tr>
+</table>

CliClient/tests/html_to_md/table_within_table.md

@@ -0,0 +1,8 @@
+First column, and an inner table:
+
+|     |     |
+| --- | --- |
+| One | Two |
+| One | Two |
+
+Second column

CliClient/tests/markdownUtils.js

@@ -0,0 +1,54 @@
+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');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('markdownUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should prepend a base URL', async (done) => {
+		const baseUrl = 'https://test.com/site';
+
+		const testCases = [
+			['[something](testing.html)', '[something](https://test.com/site/testing.html)'],
+			['![something](/img/test.png)', '![something](https://test.com/img/test.png)'],
+			['[![something](/img/test.png)](/index.html "Home page")', '[![something](https://test.com/img/test.png)](https://test.com/index.html "Home page")'],
+			['[onelink.com](/jmp/?id=123&u=http://something.com/test)', '[onelink.com](https://test.com/jmp/?id=123&u=http://something.com/test)'],
+			['[![some text](/img/test.png)](/jmp/?s=80&l=related&u=http://example.com "some decription")', '[![some text](https://test.com/img/test.png)](https://test.com/jmp/?s=80&l=related&u=http://example.com "some decription")'],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const expected = testCases[i][1];
+			expect(markdownUtils.prependBaseUrl(md, baseUrl)).toBe(expected);
+		}
+
+		done();
+	});
+
+	it('should extract image URLs', async (done) => {
+		const testCases = [
+			['![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']],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const expected = testCases[i][1];
+
+			expect(markdownUtils.extractImageUrls(md).join('')).toBe(expected.join(''));
+		}
+
+		done();
+	});
+
+});

CliClient/tests/models_Folder.js

@@ -0,0 +1,55 @@
+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 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_Folder', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should tell if a notebook can be nested under another one', asyncTest(async () => {
+		let f1 = await Folder.save({ title: "folder1" });
+		let f2 = await Folder.save({ title: "folder2", parent_id: f1.id });
+		let f3 = await Folder.save({ title: "folder3", parent_id: f2.id });
+		let f4 = await Folder.save({ title: "folder4" });
+
+		expect(await Folder.canNestUnder(f1.id, f2.id)).toBe(false);
+		expect(await Folder.canNestUnder(f2.id, f2.id)).toBe(false);
+		expect(await Folder.canNestUnder(f3.id, f1.id)).toBe(true);
+		expect(await Folder.canNestUnder(f4.id, f1.id)).toBe(true);
+		expect(await Folder.canNestUnder(f2.id, f3.id)).toBe(false);
+		expect(await Folder.canNestUnder(f3.id, f2.id)).toBe(true);
+		expect(await Folder.canNestUnder(f1.id, '')).toBe(true);
+		expect(await Folder.canNestUnder(f2.id, '')).toBe(true);
+	}));
+
+	it('should recursively delete notes and sub-notebooks', asyncTest(async () => {
+		let f1 = await Folder.save({ title: "folder1" });
+		let f2 = await Folder.save({ title: "folder2", parent_id: f1.id });
+		let n1 = await Note.save({ title: 'note1', parent_id: f2.id });
+
+		await Folder.delete(f1.id);
+
+		const all = await allItems();
+		expect(all.length).toBe(0);
+	}));
+
+});

CliClient/tests/models_Note.js

@@ -0,0 +1,39 @@
+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 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_Note', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should find resource and note IDs', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+
+		let items = await Note.linkedItems(note2.body);
+		expect(items.length).toBe(1);
+		expect(items[0].id).toBe(note1.id);
+
+		await shim.attachFileToNote(note2, __dirname + '/../tests/support/photo.jpg');
+		note2 = await Note.load(note2.id);
+		items = await Note.linkedItems(note2.body);
+		expect(items.length).toBe(2);
+		expect(items[0].type_).toBe(BaseModel.TYPE_NOTE);
+		expect(items[1].type_).toBe(BaseModel.TYPE_RESOURCE);
+	}));
+
+});

CliClient/tests/services_InteropService.js

@@ -0,0 +1,313 @@
+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 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 fs = require('fs-extra');
+const ArrayUtils = require('lib/ArrayUtils');
+const ObjectUtils = require('lib/ObjectUtils');
+const { shim } = require('lib/shim.js');
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+function exportDir() {
+	return __dirname + '/export';
+}
+
+function fieldsEqual(model1, model2, fieldNames) {
+	for (let i = 0; i < fieldNames.length; i++) {
+		const f = fieldNames[i];
+		expect(model1[f]).toBe(model2[f], 'For key ' + f);
+	}
+}
+
+describe('services_InteropService', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+
+		const dir = exportDir();
+		await fs.remove(dir);
+		await fs.mkdirp(dir);
+		done();
+	});
+
+	it('should export and import folders', asyncTest(async () => {
+		const service = new InteropService();
+		let folder1 = await Folder.save({ title: "folder1" });
+		folder1 = await Folder.load(folder1.id);
+		const filePath = exportDir() + '/test.jex';
+
+		await service.export({ path: filePath });
+
+		await Folder.delete(folder1.id);
+
+		await service.import({ path: filePath });
+
+		// Check that a new folder, with a new ID, has been created
+
+		expect(await Folder.count()).toBe(1);
+		let folder2 = (await Folder.all())[0];
+		expect(folder2.id).not.toBe(folder1.id);
+		expect(folder2.title).toBe(folder1.title);
+
+		await service.import({ path: filePath });
+
+		// As there was already a folder with the same title, check that the new one has been renamed
+
+		await Folder.delete(folder2.id);
+		let folder3 = (await Folder.all())[0];
+		expect(await Folder.count()).toBe(1);
+		expect(folder3.title).not.toBe(folder2.title);
+
+		let fieldNames = Folder.fieldNames();
+		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
+		fieldNames = ArrayUtils.removeElement(fieldNames, 'title');
+
+		fieldsEqual(folder3, folder1, fieldNames);
+	}));
+
+	it('should export and import folders and notes', 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() + '/test.jex';
+
+		await service.export({ path: filePath });
+
+		await Folder.delete(folder1.id);
+		await Note.delete(note1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(1);
+		let note2 = (await Note.all())[0];
+		let folder2 = (await Folder.all())[0];
+
+		expect(note1.parent_id).not.toBe(note2.parent_id);
+		expect(note1.id).not.toBe(note2.id);
+		expect(note2.parent_id).toBe(folder2.id);
+
+		let fieldNames = Note.fieldNames();
+		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
+		fieldNames = ArrayUtils.removeElement(fieldNames, 'parent_id');
+
+		fieldsEqual(note1, note2, fieldNames);
+
+		await service.import({ path: filePath });
+
+		note2 = (await Note.all())[0];
+		let note3 = (await Note.all())[1];
+
+		expect(note2.id).not.toBe(note3.id);
+		expect(note2.parent_id).not.toBe(note3.parent_id);
+
+		fieldsEqual(note2, note3, fieldNames);
+	}));
+
+	it('should export and import notes to specific folder', 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() + '/test.jex';
+
+		await service.export({ path: filePath });
+
+		await Note.delete(note1.id);
+
+		await service.import({ path: filePath, destinationFolderId: folder1.id });
+
+		expect(await Note.count()).toBe(1);
+		expect(await Folder.count()).toBe(1);
+
+		expect(await checkThrowAsync(async () => await service.import({ path: filePath, destinationFolderId: 'oops' }))).toBe(true);
+	}));
+
+	it('should export and import tags', asyncTest(async () => {
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let tag1 = await Tag.save({ title: 'mon tag' });
+		tag1 = await Tag.load(tag1.id);
+		await Tag.addNote(tag1.id, note1.id);
+
+		await service.export({ path: filePath });
+
+		await Folder.delete(folder1.id);
+		await Note.delete(note1.id);
+		await Tag.delete(tag1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Tag.count()).toBe(1);
+		let tag2 = (await Tag.all())[0];
+		let note2 = (await Note.all())[0];
+		expect(tag1.id).not.toBe(tag2.id);
+
+		let fieldNames = Note.fieldNames();
+		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
+		fieldsEqual(tag1, tag2, fieldNames);
+
+		let noteIds = await Tag.noteIds(tag2.id);
+		expect(noteIds.length).toBe(1);
+		expect(noteIds[0]).toBe(note2.id);
+
+		await service.import({ path: filePath });
+
+		// If importing again, no new tag should be created as one with
+		// the same name already existed. The newly imported note should
+		// however go under that already existing tag.
+		expect(await Tag.count()).toBe(1);
+		noteIds = await Tag.noteIds(tag2.id);
+		expect(noteIds.length).toBe(2);
+	}));
+
+	it('should export and import resources', asyncTest(async () => {
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		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');
+		note1 = await Note.load(note1.id);
+		let resourceIds = await Note.linkedResourceIds(note1.body);
+		let resource1 = await Resource.load(resourceIds[0]);
+
+		await service.export({ path: filePath });
+		
+		await Note.delete(note1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Resource.count()).toBe(2);
+
+		let note2 = (await Note.all())[0];
+		expect(note2.body).not.toBe(note1.body);
+		resourceIds = await Note.linkedResourceIds(note2.body);
+		expect(resourceIds.length).toBe(1);
+		let resource2 = await Resource.load(resourceIds[0]);
+		expect(resource2.id).not.toBe(resource1.id);
+
+		let fieldNames = Note.fieldNames();
+		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
+		fieldsEqual(resource1, resource2, fieldNames);
+
+		const resourcePath1 = Resource.fullPath(resource1);
+		const resourcePath2 = Resource.fullPath(resource2);
+
+		expect(resourcePath1).not.toBe(resourcePath2);
+		expect(fileContentEqual(resourcePath1, resourcePath2)).toBe(true);
+	}));
+
+	it('should export and import single notes', asyncTest(async () => {
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+
+		await service.export({ path: filePath, sourceNoteIds: [note1.id] });
+		
+		await Note.delete(note1.id);
+		await Folder.delete(folder1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(1);
+		expect(await Folder.count()).toBe(1);
+
+		let folder2 = (await Folder.all())[0];
+		expect(folder2.title).toBe('test');
+	}));
+
+	it('should export and import single folders', asyncTest(async () => {
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+
+		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
+		
+		await Note.delete(note1.id);
+		await Folder.delete(folder1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(1);
+		expect(await Folder.count()).toBe(1);
+
+		let folder2 = (await Folder.all())[0];
+		expect(folder2.title).toBe('folder1');
+	}));
+
+	it('should export and import folder and its sub-folders', asyncTest(async () => {
+		
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let folder2 = await Folder.save({ title: "folder2", parent_id: folder1.id });
+		let folder3 = await Folder.save({ title: "folder3", parent_id: folder2.id });
+		let folder4 = await Folder.save({ title: "folder4", parent_id: folder2.id });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder4.id });
+
+		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
+		
+		await Note.delete(note1.id);
+		await Folder.delete(folder1.id);
+		await Folder.delete(folder2.id);
+		await Folder.delete(folder3.id);
+		await Folder.delete(folder4.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(1);
+		expect(await Folder.count()).toBe(4);
+		
+		let folder1_2 = await Folder.loadByTitle('folder1');
+		let folder2_2 = await Folder.loadByTitle('folder2');
+		let folder3_2 = await Folder.loadByTitle('folder3');
+		let folder4_2 = await Folder.loadByTitle('folder4');
+		let note1_2 = await Note.loadByTitle('ma note');
+
+		expect(folder2_2.parent_id).toBe(folder1_2.id);
+		expect(folder3_2.parent_id).toBe(folder2_2.id);
+		expect(folder4_2.parent_id).toBe(folder2_2.id);
+		expect(note1_2.parent_id).toBe(folder4_2.id);
+	}));
+
+	it('should export and import links to notes', asyncTest(async () => {
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+
+		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
+		
+		await Note.delete(note1.id);
+		await Note.delete(note2.id);
+		await Folder.delete(folder1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(2);
+		expect(await Folder.count()).toBe(1);
+
+		let note1_2 = await Note.loadByTitle('ma note');
+		let note2_2 = await Note.loadByTitle('ma deuxième note');
+
+		expect(note2_2.body.indexOf(note1_2.id) >= 0).toBe(true);
+	}));
+
+});