Electron release v1.0.94

Adds functionality to allow for renaming of tags.

.gitignore

@@ -37,4 +37,7 @@ _mydocs
 Assets/DownloadBadges*.psd
 node_modules
 Tools/github_oauth_token.txt
-_releases
+_releases
+ReactNativeClient/lib/csstojs/
+ElectronClient/app/gui/note-viewer/fonts/
+Tools/commit_hook.txt

.travis.yml

@@ -1,5 +1,16 @@
+# Only build tags (Doesn't work - doesn't build anything)
+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
@@ -43,7 +54,8 @@ before_install:
 
 script:
   - |
-    cd ElectronClient/app
-    rsync -aP --delete ../../ReactNativeClient/lib/ lib/
+    cd Tools
     npm install
-    yarn dist
+    cd ../ElectronClient/app
+    rsync -aP --delete ../../ReactNativeClient/lib/ lib/
+    npm install && yarn dist

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
@@ -17,6 +17,15 @@ If you get a node-gyp related error you might need to manually install it: `npm
 - Install node v8.x (check with `node --version`) - https://nodejs.org/en/
 - If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp`
 
+# Building the tools
+
+Before building any of the applications, you need to build the tools:
+
+```
+cd Tools
+npm install
+```
+
 # Building the Electron application
 
 ```
@@ -28,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,6 +1,19 @@
-# 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.
+# User support
 
-# 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.
+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.
+
+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. "+1" comments are not tracked.
+
+# Adding new features
+
+If you want to add a new feature, consider asking about it before implementing it or checking existing discussions to make sure it is within the scope of the project. 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.

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');
@@ -35,38 +38,55 @@ const ConsoleWidget = require('./gui/ConsoleWidget.js');
 
 class AppGui {
 
-	constructor(app, store) {
-		this.app_ = app;
-		this.store_ = store;
+	constructor(app, store, keymap) {
+		try {
+			this.app_ = app;
+			this.store_ = store;
 
-		BaseWidget.setLogger(app.logger());
+			BaseWidget.setLogger(app.logger());
 
-		this.term_ = new TermWrapper(tk.terminal);
+			this.term_ = new TermWrapper(tk.terminal);
 
-		this.renderer_ = null;
-		this.logger_ = new Logger();
-		this.buildUi();
+			// Some keys are directly handled by the tkwidget framework
+			// so they need to be remapped in a different way.
+			this.tkWidgetKeys_ = {
+				'focus_next': 'TAB',
+				'focus_previous': 'SHIFT_TAB',
+				'move_up': 'UP',
+				'move_down': 'DOWN',
+				'page_down': 'PAGE_DOWN',
+				'page_up': 'PAGE_UP',
+			};
 
-		this.renderer_ = new Renderer(this.term(), this.rootWidget_);
+			this.renderer_ = null;
+			this.logger_ = new Logger();
+			this.buildUi();
 
-		this.app_.on('modelAction', async (event) => {
-			await this.handleModelAction(event.action);
-		});
+			this.renderer_ = new Renderer(this.term(), this.rootWidget_);
 
-		this.shortcuts_ = this.setupShortcuts();
+			this.app_.on('modelAction', async (event) => {
+				await this.handleModelAction(event.action);
+			});
 
-		this.inputMode_ = AppGui.INPUT_MODE_NORMAL;
+			this.keymap_ = this.setupKeymap(keymap);
 
-		this.commandCancelCalled_ = false;
+			this.inputMode_ = AppGui.INPUT_MODE_NORMAL;
 
-		this.currentShortcutKeys_ = [];
-		this.lastShortcutKeyTime_ = 0;
+			this.commandCancelCalled_ = false;
 
-		// Recurrent sync is setup only when the GUI is started. In
-		// a regular command it's not necessary since the process
-		// exits right away.
-		reg.setupRecurrentSync();
-		DecryptionWorker.instance().scheduleStart();
+			this.currentShortcutKeys_ = [];
+			this.lastShortcutKeyTime_ = 0;
+
+			// Recurrent sync is setup only when the GUI is started. In
+			// a regular command it's not necessary since the process
+			// exits right away.
+			reg.setupRecurrentSync();
+			DecryptionWorker.instance().scheduleStart();
+		} catch (error) {
+			this.fullScreen(false);
+			console.error(error);
+			process.exit(1);
+		}
 	}
 
 	store() {
@@ -105,6 +125,7 @@ class AppGui {
 	buildUi() {
 		this.rootWidget_ = new ReduxRootWidget(this.store_);
 		this.rootWidget_.name = 'root';
+		this.rootWidget_.autoShortcutsEnabled = false;
 
 		const folderList = new FolderListWidget();
 		folderList.style = {
@@ -269,155 +290,31 @@ 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));	
 	}
 
-	setupShortcuts() {
-		const shortcuts = {};
+	setupKeymap(keymap) {
+		const output = [];
 
-		shortcuts['TAB'] = {
-			friendlyName: 'Tab',
-			description: () => _('Give focus to next pane'),
-			isDocOnly: true,
-		}
+		for (let i = 0; i < keymap.length; i++) {
+			const item = Object.assign({}, keymap[i]);
 
-		shortcuts['SHIFT_TAB'] = {
-			friendlyName: 'Shift+Tab',
-			description: () => _('Give focus to previous pane'),
-			isDocOnly: true,
-		}
+			if (!item.command) throw new Error('Missing command for keymap item: ' + JSON.stringify(item));
 
-		shortcuts[':'] = {
-			description: () => _('Enter command line mode'),
-			action: async () => {
-				const cmd = await this.widget('statusBar').prompt();
-				if (!cmd) return;
-				this.addCommandToConsole(cmd);
-				await this.processCommand(cmd);
-			},
-		};
+			if (!('type' in item)) item.type = 'exec';
 
-		shortcuts['ESC'] = { // Built into terminal-kit inputField
-			description: () => _('Exit command line mode'),
-			isDocOnly: true,
-		};
-
-		shortcuts['ENTER'] = {
-			description: () => _('Edit the selected note'),
-			action: () => {
-				const w = this.widget('mainWindow').focusedWidget;
-				if (w.name === 'folderList') {
-					this.widget('noteList').focus();
-				} else if (w.name === 'noteList' || w.name === 'noteText') {
-					this.processCommand('edit $n');
-				}
-			},
-		}
-
-		shortcuts['CTRL_C'] = {
-			description: () => _('Cancel the current command.'),
-			friendlyName: 'Ctrl+C',
-			isDocOnly: true,
-		}
-
-		shortcuts['CTRL_D'] = {
-			description: () => _('Exit the application.'),
-			friendlyName: 'Ctrl+D',
-			isDocOnly: true,
-		}
-
-		shortcuts['DELETE'] = {
-			description: () => _('Delete the currently selected note or notebook.'),
-			action: async () => {
-				if (this.widget('folderList').hasFocus) {
-					const item = this.widget('folderList').selectedJoplinItem;
-
-					if (!item) return;
-
-					if (item.type_ === BaseModel.TYPE_FOLDER) {
-						await this.processCommand('rmbook ' + item.id);
-					} else if (item.type_ === BaseModel.TYPE_TAG) {
-						this.stdout(_('To delete a tag, untag the associated notes.'));
-					} else if (item.type_ === BaseModel.TYPE_SEARCH) {
-						this.store().dispatch({
-							type: 'SEARCH_DELETE',
-							id: item.id,
-						});
-					}
-				} else if (this.widget('noteList').hasFocus) {
-					await this.processCommand('rmnote $n');
-				} else {
-					this.stdout(_('Please select the note or notebook to be deleted first.'));
-				}
+			if (item.command in this.tkWidgetKeys_) {
+				item.type = 'tkwidgets';
 			}
-		};
 
-		shortcuts['BACKSPACE'] = {
-			alias: 'DELETE',
-		};
+			item.canRunAlongOtherCommands = item.type === 'function' && ['toggle_metadata', 'toggle_console'].indexOf(item.command) >= 0;
 
-		shortcuts[' '] = {
-			friendlyName: 'SPACE',
-			description: () => _('Set a to-do as completed / not completed'),
-			action: 'todo toggle $n',
+			output.push(item);
 		}
 
-		shortcuts['tc'] = {
-			description: () => _('[t]oggle [c]onsole between maximized/minimized/hidden/visible.'),
-			action: () => {
-				if (!this.consoleIsShown()) {
-					this.showConsole();
-					this.minimizeConsole();
-				} else {
-					if (this.consoleIsMaximized()) {
-						this.hideConsole();
-					} else {
-						this.maximizeConsole();
-					}
-				}
-			},
-			canRunAlongOtherCommands: true,
-		}
-
-		shortcuts['/'] = {
-			description: () => _('Search'),
-			action: { type: 'prompt', initialText: 'search ""', cursorPosition: -2 },
-		};
-
-		shortcuts['tm'] = {
-			description: () => _('[t]oggle note [m]etadata.'),
-			action: () => {
-				this.toggleNoteMetadata();
-			},
-			canRunAlongOtherCommands: true,
-		}
-
-		shortcuts['mn'] = {
-			description: () => _('[M]ake a new [n]ote'),
-			action: { type: 'prompt', initialText: 'mknote ""', cursorPosition: -2 },
-		}
-
-		shortcuts['mt'] = {
-			description: () => _('[M]ake a new [t]odo'),
-			action: { type: 'prompt', initialText: 'mktodo ""', cursorPosition: -2 },
-		}
-
-		shortcuts['mb'] = {
-			description: () => _('[M]ake a new note[b]ook'),
-			action: { type: 'prompt', initialText: 'mkbook ""', cursorPosition: -2 },
-		}
-
-		shortcuts['yn'] = {
-			description: () => _('Copy ([Y]ank) the [n]ote to a notebook.'),
-			action: { type: 'prompt', initialText: 'cp $n ""', cursorPosition: -2 },
-		}
-
-		shortcuts['dn'] = {
-			description: () => _('Move the note to a notebook.'),
-			action: { type: 'prompt', initialText: 'mv $n ""', cursorPosition: -2 },
-		}
-
-		return shortcuts;
+		return output;
 	}
 
 	toggleConsole() {
@@ -492,8 +389,16 @@ class AppGui {
 		return this.logger_;
 	}
 
-	shortcuts() {
-		return this.shortcuts_;
+	keymap() {
+		return this.keymap_;
+	}
+
+	keymapItemByKey(key) {
+		for (let i = 0; i < this.keymap_.length; i++) {
+			const item = this.keymap_[i];
+			if (item.keys.indexOf(key) >= 0) return item;
+		}
+		return null;
 	}
 
 	term() {
@@ -524,17 +429,77 @@ class AppGui {
 		}
 	}
 
-	async processCommand(cmd) {
+	async processFunctionCommand(cmd) {
+
+		if (cmd === 'activate') {
+
+			const w = this.widget('mainWindow').focusedWidget;
+			if (w.name === 'folderList') {
+				this.widget('noteList').focus();
+			} else if (w.name === 'noteList' || w.name === 'noteText') {
+				this.processPromptCommand('edit $n');
+			}
+
+		} else if (cmd === 'delete') {
+
+			if (this.widget('folderList').hasFocus) {
+				const item = this.widget('folderList').selectedJoplinItem;
+
+				if (!item) return;
+
+				if (item.type_ === BaseModel.TYPE_FOLDER) {
+					await this.processPromptCommand('rmbook ' + item.id);
+				} else if (item.type_ === BaseModel.TYPE_TAG) {
+					this.stdout(_('To delete a tag, untag the associated notes.'));
+				} else if (item.type_ === BaseModel.TYPE_SEARCH) {
+					this.store().dispatch({
+						type: 'SEARCH_DELETE',
+						id: item.id,
+					});
+				}
+			} else if (this.widget('noteList').hasFocus) {
+				await this.processPromptCommand('rmnote $n');
+			} else {
+				this.stdout(_('Please select the note or notebook to be deleted first.'));
+			}
+
+		} else if (cmd === 'toggle_console') {
+
+			if (!this.consoleIsShown()) {
+				this.showConsole();
+				this.minimizeConsole();
+			} else {
+				if (this.consoleIsMaximized()) {
+					this.hideConsole();
+				} else {
+					this.maximizeConsole();
+				}
+			}
+
+		} else if (cmd === 'toggle_metadata') {
+
+			this.toggleNoteMetadata();
+
+		} else if (cmd === 'enter_command_line_mode') {
+
+			const cmd = await this.widget('statusBar').prompt();
+			if (!cmd) return;
+			this.addCommandToConsole(cmd);
+			await this.processPromptCommand(cmd);			
+
+		} else {
+
+			throw new Error('Unknown command: ' + cmd);
+
+		}
+	}
+
+	async processPromptCommand(cmd) {
 		if (!cmd) return;
 		cmd = cmd.trim();
 		if (!cmd.length) return;
 
-		this.logger().info('Got command: ' + cmd);
-
-		if (cmd === 'q' || cmd === 'wq' || cmd === 'qa') { // Vim bonus
-			await this.app().exit();
-			return;
-		}	
+		// this.logger().debug('Got command: ' + cmd);
 
 		try {			
 			let note = this.widget('noteList').currentItem;
@@ -676,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;
 			}
 
@@ -697,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'])) {
@@ -786,35 +766,34 @@ class AppGui {
 				// -------------------------------------------------------------------------
 
 				const shortcutKey = this.currentShortcutKeys_.join('');
-				let cmd = shortcutKey in this.shortcuts_ ? this.shortcuts_[shortcutKey] : null;
+				let keymapItem = this.keymapItemByKey(shortcutKey);
 
 				// If this command is an alias to another command, resolve to the actual command
-				if (cmd && cmd.alias) cmd = this.shortcuts_[cmd.alias];
 
-				let processShortcutKeys = !this.app().currentCommand() && cmd;
-				if (cmd && cmd.canRunAlongOtherCommands) processShortcutKeys = true;
+				let processShortcutKeys = !this.app().currentCommand() && keymapItem;
+				if (keymapItem && keymapItem.canRunAlongOtherCommands) processShortcutKeys = true;
 				if (statusBar.promptActive) processShortcutKeys = false;
-				if (cmd && cmd.isDocOnly) processShortcutKeys = false;
 
 				if (processShortcutKeys) {
-					this.logger().info('Shortcut:', shortcutKey, cmd.description());
+					this.logger().debug('Shortcut:', shortcutKey, keymapItem);
 
 					this.currentShortcutKeys_ = [];
-					if (typeof cmd.action === 'function') {
-						await cmd.action();
-					} else if (typeof cmd.action === 'object') {
-						if (cmd.action.type === 'prompt') {
-							let promptOptions = {};
-							if ('cursorPosition' in cmd.action) promptOptions.cursorPosition = cmd.action.cursorPosition;
-							const commandString = await statusBar.prompt(cmd.action.initialText ? cmd.action.initialText : '', null, promptOptions);
-							this.addCommandToConsole(commandString);
-							await this.processCommand(commandString);
-						} else {
-							throw new Error('Unknown command: ' + JSON.stringify(cmd.action));
-						}
-					} else { // String
-						this.stdout(cmd.action);
-						await this.processCommand(cmd.action);
+
+					if (keymapItem.type === 'function') {
+						this.processFunctionCommand(keymapItem.command);
+					} else if (keymapItem.type === 'prompt') {
+						let promptOptions = {};
+						if ('cursorPosition' in keymapItem) promptOptions.cursorPosition = keymapItem.cursorPosition;
+						const commandString = await statusBar.prompt(keymapItem.command ? keymapItem.command : '', null, promptOptions);
+						this.addCommandToConsole(commandString);
+						await this.processPromptCommand(commandString);
+					} else if (keymapItem.type === 'exec') {
+						this.stdout(keymapItem.command);
+						await this.processPromptCommand(keymapItem.command);
+					} else if (keymapItem.type === 'tkwidgets') {
+						this.widget('root').handleKey(this.tkWidgetKeys_[keymapItem.command]);
+					} else {
+						throw new Error('Unknown command type: ' + JSON.stringify(keymapItem));
 					}
 				}
 

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);
 
@@ -312,6 +313,63 @@ class Application extends BaseApplication {
 		return this.activeCommand_;
 	}
 
+	async loadKeymaps() {
+		const defaultKeyMap = [
+			{ "keys": [":"], "type": "function", "command": "enter_command_line_mode" },
+			{ "keys": ["TAB"], "type": "function", "command": "focus_next" },
+			{ "keys": ["SHIFT_TAB"], "type": "function", "command": "focus_previous" },
+			{ "keys": ["UP"], "type": "function", "command": "move_up" },
+			{ "keys": ["DOWN"], "type": "function", "command": "move_down" },
+			{ "keys": ["PAGE_UP"], "type": "function", "command": "page_up" },
+			{ "keys": ["PAGE_DOWN"], "type": "function", "command": "page_down" },
+			{ "keys": ["ENTER"], "type": "function", "command": "activate" },
+			{ "keys": ["DELETE", "BACKSPACE"], "type": "function", "command": "delete" },
+			{ "keys": [" "], "command": "todo toggle $n" },
+			{ "keys": ["tc"], "type": "function", "command": "toggle_console" },
+			{ "keys": ["tm"], "type": "function", "command": "toggle_metadata" },
+			{ "keys": ["/"], "type": "prompt", "command": "search \"\"", "cursorPosition": -2 },
+			{ "keys": ["mn"], "type": "prompt", "command": "mknote \"\"", "cursorPosition": -2 },
+			{ "keys": ["mt"], "type": "prompt", "command": "mktodo \"\"", "cursorPosition": -2 },
+			{ "keys": ["mb"], "type": "prompt", "command": "mkbook \"\"", "cursorPosition": -2 },
+			{ "keys": ["yn"], "type": "prompt", "command": "cp $n \"\"", "cursorPosition": -2 },
+			{ "keys": ["dn"], "type": "prompt", "command": "mv $n \"\"", "cursorPosition": -2 }
+		];
+
+		// Filter the keymap item by command so that items in keymap.json can override
+		// the default ones.
+		const itemsByCommand = {};
+
+		for (let i = 0; i < defaultKeyMap.length; i++) {
+			itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i]
+		}
+
+		const filePath = Setting.value('profileDir') + '/keymap.json';
+		if (await fs.pathExists(filePath)) {
+			try {
+				let configString = await fs.readFile(filePath, 'utf-8');
+				configString = configString.replace(/^\s*\/\/.*/, ''); // Strip off comments
+				const keymap = JSON.parse(configString);
+				for (let keymapIndex = 0; keymapIndex < keymap.length; keymapIndex++) {
+					const item = keymap[keymapIndex];
+					itemsByCommand[item.command] = item;
+				}
+			} catch (error) {
+				let msg = error.message ? error.message : '';
+				msg = 'Could not load keymap ' + filePath + '\n' + msg;
+				error.message = msg;
+				throw error;
+			}
+		}
+
+		const output = [];
+		for (let n in itemsByCommand) {
+			if (!itemsByCommand.hasOwnProperty(n)) continue;
+			output.push(itemsByCommand[n]);
+		}
+
+		return output;
+	}
+
 	async start(argv) {
 		argv = await super.start(argv);
 
@@ -330,16 +388,19 @@ 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();
 
+			const keymap = await this.loadKeymaps();
+
 			const AppGui = require('./app-gui.js');
-			this.gui_ = new AppGui(this, this.store());
+			this.gui_ = new AppGui(this, this.store(), keymap);
 			this.gui_.setLogger(this.logger_);
 			await this.gui_.start();
 
@@ -352,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

@@ -4,6 +4,7 @@ var Folder = require('lib/models/Folder.js');
 var Tag = require('lib/models/Tag.js');
 var { cliUtils } = require('./cli-utils.js');
 var yargParser = require('yargs-parser');
+var fs = require('fs-extra');
 
 async function handleAutocompletionPromise(line) {
 	// Auto-complete the command name
@@ -35,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);
@@ -48,7 +49,7 @@ async function handleAutocompletionPromise(line) {
 			if (options.length > 1 && options[1].indexOf(next) === 0) {
 				l.push(options[1]);
 			} else if (options[0].indexOf(next) === 0) {
-				l.push(options[2]);
+				l.push(options[0]);
 			}
 		}
 		if (l.length === 0) {
@@ -71,8 +72,10 @@ async function handleAutocompletionPromise(line) {
 		let argName = cmdUsage[positionalArgs - 1];
 		argName = cliUtils.parseCommandArg(argName).name;
 
-		if (argName == 'note' || argName == 'note-pattern' && app().currentFolder()) {
-			const notes = await Note.previews(app().currentFolder().id, { titlePattern: next + '*' });
+		const currentFolder = app().currentFolder();
+
+		if (argName == 'note' || argName == 'note-pattern') {
+			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
 			l.push(...notes.map((n) => n.title));
 		}
 
@@ -81,11 +84,22 @@ async function handleAutocompletionPromise(line) {
 			l.push(...folders.map((n) => n.title));
 		}
 
+		if (argName == 'item') {
+			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
+			const folders = await Folder.search({ titlePattern: next + '*' });
+			l.push(...notes.map((n) => n.title), folders.map((n) => n.title));
+		}
+
 		if (argName == 'tag') {
 			let tags = await Tag.search({ titlePattern: next + '*' });
 			l.push(...tags.map((n) => n.title));
 		}
 
+		if (argName == 'file') {
+			let files = await fs.readdir('.');
+			l.push(...files);
+		}
+
 		if (argName == 'tag-command') {
 			let c = filterList(['add', 'remove', 'list'], next);
 			l.push(...c);

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

@@ -23,8 +23,11 @@ class Command extends BaseCommand {
 		const verbose = args.options.verbose;
 
 		const renderKeyValue = (name) => {
+			const md = Setting.settingMetadata(name);
 			let value = Setting.value(name);
 			if (typeof value === 'object' || Array.isArray(value)) value = JSON.stringify(value);
+			if (md.secure) value = '********';
+
 			if (Setting.isEnum(name)) {
 				return _('%s = %s (%s)', name, value, Setting.enumOptionsDoc(name));
 			} else {

CliClient/app/command-e2ee.js

@@ -131,7 +131,6 @@ class Command extends BaseCommand {
 				} else if (stat.isDirectory()) {
 					continue;
 				} else {
-					itemCount++;
 					const content = await fs.readFile(fullPath, 'utf8');
 					const item = await BaseItem.unserialize(content);
 					const ItemClass = BaseItem.itemClass(item);
@@ -141,6 +140,8 @@ class Command extends BaseCommand {
 						continue;
 					}
 
+					itemCount++;
+
 					const isEncrypted = await EncryptionService.instance().itemIsEncrypted(item);
 
 					if (isEncrypted) {

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

@@ -36,21 +36,22 @@ class Command extends BaseCommand {
 	async action(args) {
 		const stdoutWidth = app().commandStdoutMaxWidth();
 
-		if (args.command === 'shortcuts') {
+		if (args.command === 'shortcuts' || args.command === 'keymap') {
+			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()) {
 				throw new Error(_('Shortcuts are not available in CLI mode.'));
 			}
 
-			const shortcuts = app().gui().shortcuts();
+			const keymap = app().gui().keymap();
 
 			let rows = [];
 
-			for (let n in shortcuts) {
-				if (!shortcuts.hasOwnProperty(n)) continue;
-				const shortcut = shortcuts[n];
-				if (!shortcut.description) continue;
-				n = shortcut.friendlyName ? shortcut.friendlyName : n;
-				rows.push([n, shortcut.description()]);
+			for (let i = 0; i < keymap.length; i++) {
+				const item = keymap[i];
+				const keys = item.keys.map((k) => k === ' ' ? '(SPACE)' : k);
+				rows.push([keys.join(', '), item.command]);
 			}
 
 			cliUtils.printArray(this.stdout.bind(this), rows);
@@ -71,14 +72,14 @@ 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 complete list of available keyboard shortcuts, type `help shortcuts`'));
+			this.stdout(_('For the list of keyboard shortcuts and config options, type `help keymap`'));
 		}
 
 		app().gui().showConsole();

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,7 @@ 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 {
 
@@ -61,14 +61,44 @@ class Command extends BaseCommand {
 		});
 	}
 
-	async doAuth(syncTargetId) {
+	async doAuth() {
 		const syncTarget = reg.syncTarget(this.syncTargetId_);
-		this.oneDriveApiUtils_ = new OneDriveApiNodeUtils(syncTarget.api());
-		const auth = await this.oneDriveApiUtils_.oauthDance({
-			log: (...s) => { return this.stdout(...s); }
-		});
-		this.oneDriveApiUtils_ = null;
-		return auth;
+		const syncTargetMd = SyncTargetRegistry.idToMetadata(this.syncTargetId_);
+
+		if (this.syncTargetId_ === 3 || this.syncTargetId_ === 4) { // OneDrive
+			this.oneDriveApiUtils_ = new OneDriveApiNodeUtils(syncTarget.api());
+			const auth = await this.oneDriveApiUtils_.oauthDance({
+				log: (...s) => { return this.stdout(...s); }
+			});
+			this.oneDriveApiUtils_ = null;
+			
+			Setting.setValue('sync.' + this.syncTargetId_ + '.auth', auth ? JSON.stringify(auth) : null);
+			if (!auth) {
+				this.stdout(_('Authentication was not completed (did not receive an authentication token).'));
+				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.', syncTargetMd.label));
+		return false;
 	}
 
 	cancelAuth() {
@@ -86,7 +116,8 @@ class Command extends BaseCommand {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
-		const lockFilePath = osTmpdir() + '/synclock_' + md5(Setting.value('profileDir'));
+		// 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 {
@@ -116,16 +147,12 @@ class Command extends BaseCommand {
 
 			const syncTarget = reg.syncTarget(this.syncTargetId_);
 
-			if (!syncTarget.isAuthenticated()) {
+			if (!await syncTarget.isAuthenticated()) {
 				app().gui().showConsole();
 				app().gui().maximizeConsole();
 
-				const auth = await this.doAuth(this.syncTargetId_);
-				Setting.setValue('sync.' + this.syncTargetId_ + '.auth', auth ? JSON.stringify(auth) : null);
-				if (!auth) {
-					this.stdout(_('Authentication was not completed (did not receive an authentication token).'));
-					return cleanUp();
-				}
+				const authDone = await this.doAuth();
+				if (!authDone) return cleanUp();
 			}
 			
 			const sync = await syncTarget.synchronizer();
@@ -187,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,7 +66,34 @@ process.stdout.on('error', function( err ) {
 	}
 });
 
+
+
+
+
+// async function main() {
+// 	const InteropService = require('lib/services/InteropService');
+// 	const service = new InteropService();
+// 	console.info(service.moduleByFormat('importer', 'enex'));
+// 	//await service.modules();
+// }
+
+// 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

@@ -15,63 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "Give focus to next pane"
-msgstr ""
-
-msgid "Give focus to previous pane"
-msgstr ""
-
-msgid "Enter command line mode"
-msgstr ""
-
-msgid "Exit command line mode"
-msgstr ""
-
-msgid "Edit the selected note"
-msgstr ""
-
-msgid "Cancel the current command."
-msgstr ""
-
-msgid "Exit the application."
-msgstr ""
-
-msgid "Delete the currently selected note or notebook."
-msgstr ""
-
 msgid "To delete a tag, untag the associated notes."
 msgstr ""
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr ""
 
-msgid "Set a to-do as completed / not completed"
-msgstr ""
-
-msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-msgstr ""
-
-msgid "Search"
-msgstr ""
-
-msgid "[t]oggle note [m]etadata."
-msgstr ""
-
-msgid "[M]ake a new [n]ote"
-msgstr ""
-
-msgid "[M]ake a new [t]odo"
-msgstr ""
-
-msgid "[M]ake a new note[b]ook"
-msgstr ""
-
-msgid "Copy ([Y]ank) the [n]ote to a notebook."
-msgstr ""
-
-msgid "Move the note to a notebook."
-msgstr ""
-
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr ""
 
@@ -214,6 +163,10 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "Note has been saved."
 msgstr ""
 
@@ -221,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 ""
 
@@ -237,6 +194,10 @@ msgstr ""
 msgid "Displays usage information."
 msgstr ""
 
+#, javascript-format
+msgid "For information on how to customise the shortcuts please visit %s"
+msgstr ""
+
 msgid "Shortcuts are not available in CLI mode."
 msgstr ""
 
@@ -249,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 ""
@@ -262,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 \":\""
@@ -272,25 +233,19 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr ""
 
 msgid ""
-"For the complete list of available keyboard shortcuts, type `help shortcuts`"
+"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 ""
@@ -377,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>."
@@ -413,6 +370,24 @@ msgstr ""
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
+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 ""
+
 msgid "Synchronisation is already in progress."
 msgstr ""
 
@@ -423,10 +398,6 @@ msgid ""
 "operation."
 msgstr ""
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -490,6 +461,9 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
+msgid "Type `joplin help` for usage information."
+msgstr ""
+
 msgid "Fatal error:"
 msgstr ""
 
@@ -527,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 ""
 
@@ -539,10 +524,17 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import Evernote notes"
+msgid "Import"
 msgstr ""
 
-msgid "Evernote Export Files"
+msgid "Export"
+msgstr ""
+
+msgid "Print"
+msgstr ""
+
+#, javascript-format
+msgid "Hide %s"
 msgstr ""
 
 msgid "Quit"
@@ -563,6 +555,15 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr ""
 
@@ -581,6 +582,12 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Make a donation"
+msgstr ""
+
+msgid "Check for updates..."
+msgstr ""
+
 msgid "About Joplin"
 msgstr ""
 
@@ -588,12 +595,34 @@ msgstr ""
 msgid "%s %s (%s, %s)"
 msgstr ""
 
+#, javascript-format
+msgid "Open %s"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
+msgid "Current version is up-to-date."
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Check synchronisation configuration"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -601,6 +630,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 "
@@ -650,6 +682,20 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 
+msgid "Missing Master Keys"
+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 ""
+
+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 ""
 
@@ -682,12 +728,18 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""
 
+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""
 
 msgid "Layout"
 msgstr ""
 
+msgid "Search..."
+msgstr ""
+
 msgid "Some items cannot be synchronised."
 msgstr ""
 
@@ -706,6 +758,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -719,16 +774,44 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Open..."
+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 "Attach file"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Set alarm"
 msgstr ""
 
+msgid "to-do"
+msgstr ""
+
+msgid "note"
+msgstr ""
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr ""
+
 msgid "Refresh"
 msgstr ""
 
@@ -738,7 +821,7 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Import"
+msgid "Dropbox Login"
 msgstr ""
 
 msgid "Options"
@@ -765,12 +848,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
-msgid "Searches"
-msgstr ""
-
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -782,15 +859,24 @@ msgstr ""
 msgid "Unknown flag: %s"
 msgstr ""
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr ""
 
+msgid "Nextcloud"
+msgstr ""
+
 msgid "OneDrive"
 msgstr ""
 
 msgid "OneDrive Dev (For testing only)"
 msgstr ""
 
+msgid "WebDAV"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr ""
@@ -846,7 +932,7 @@ msgid "Fetched items: %d/%d."
 msgstr ""
 
 #, javascript-format
-msgid "State: \"%s\"."
+msgid "State: %s."
 msgstr ""
 
 msgid "Cancelling..."
@@ -856,6 +942,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 ""
@@ -869,6 +965,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 ""
@@ -917,12 +1016,53 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Show uncompleted todos 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"
 msgstr ""
 
+msgid "When creating a new to-do:"
+msgstr ""
+
+msgid "Focus title"
+msgstr ""
+
+msgid "Focus body"
+msgstr ""
+
+msgid "When creating a new note:"
+msgstr ""
+
+msgid "Show tray icon"
+msgstr ""
+
+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"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -938,9 +1078,6 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
-msgid "Automatically update the application"
-msgstr ""
-
 msgid "Show advanced options"
 msgstr ""
 
@@ -948,8 +1085,8 @@ msgid "Synchronisation target"
 msgstr ""
 
 msgid ""
-"The target to synchonise to. If synchronising with the file system, set "
-"`sync.2.path` to specify the target directory."
+"The target to synchonise to. Each sync target may have additional parameters "
+"which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
 
 msgid "Directory to synchronise with (absolute path)"
@@ -960,10 +1097,63 @@ msgid ""
 "See `sync.target`."
 msgstr ""
 
+msgid "Nextcloud WebDAV URL"
+msgstr ""
+
+msgid "Nextcloud username"
+msgstr ""
+
+msgid "Nextcloud password"
+msgstr ""
+
+msgid "WebDAV URL"
+msgstr ""
+
+msgid "WebDAV username"
+msgstr ""
+
+msgid "WebDAV password"
+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 ""
 
@@ -1047,6 +1237,34 @@ msgstr ""
 msgid "Cancel synchronisation"
 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 ""
@@ -1071,6 +1289,12 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr ""
 
@@ -1080,6 +1304,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 ""
@@ -1090,6 +1322,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""
 
@@ -1111,6 +1346,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/fr_FR.po

@@ -7,37 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
+"Last-Translator: Laurent Cozic\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.3\n"
-
-msgid "Give focus to next pane"
-msgstr "Activer le volet suivant"
-
-msgid "Give focus to previous pane"
-msgstr "Activer le volet précédent"
-
-msgid "Enter command line mode"
-msgstr "Démarrer le mode de ligne de commande"
-
-msgid "Exit command line mode"
-msgstr "Sortir du mode de ligne de commande"
-
-msgid "Edit the selected note"
-msgstr "Éditer la note sélectionnée"
-
-msgid "Cancel the current command."
-msgstr "Annuler la commande en cours."
-
-msgid "Exit the application."
-msgstr "Quitter le logiciel."
-
-msgid "Delete the currently selected note or notebook."
-msgstr "Supprimer la note ou carnet sélectionné."
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "Pour supprimer une vignette, enlever là des notes associées."
@@ -45,33 +23,6 @@ msgstr "Pour supprimer une vignette, enlever là des notes associées."
 msgid "Please select the note or notebook to be deleted first."
 msgstr "Veuillez d'abord sélectionner un carnet."
 
-msgid "Set a to-do as completed / not completed"
-msgstr "Marquer une tâches comme complétée / non-complétée"
-
-msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-msgstr "Maximiser, minimiser, cacher ou rendre visible la console."
-
-msgid "Search"
-msgstr "Chercher"
-
-msgid "[t]oggle note [m]etadata."
-msgstr "Afficher/Cacher les métadonnées des notes."
-
-msgid "[M]ake a new [n]ote"
-msgstr "Créer une nouvelle note"
-
-msgid "[M]ake a new [t]odo"
-msgstr "Créer une nouvelle tâche"
-
-msgid "[M]ake a new note[b]ook"
-msgstr "Créer un nouveau carnet"
-
-msgid "Copy ([Y]ank) the [n]ote to a notebook."
-msgstr "Copier la note dans un autre carnet."
-
-msgid "Move the note to a notebook."
-msgstr "Déplacer la note vers un carnet."
-
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "Appuyez sur Ctrl+D ou tapez \"exit\" pour sortir du logiciel"
 
@@ -146,8 +97,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."
@@ -228,6 +179,10 @@ msgstr ""
 "Édition de la note en cours. Fermez l'éditeur de texte pour retourner à "
 "l'invite de commande."
 
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Erreur lors de l'ouverture de la note dans l'éditeur de texte : %s"
+
 msgid "Note has been saved."
 msgstr "La note a été enregistrée."
 
@@ -235,12 +190,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."
@@ -254,6 +212,11 @@ msgstr "Afficher l'URL de l'emplacement de la note."
 msgid "Displays usage information."
 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."
 
@@ -268,7 +231,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 ""
@@ -287,8 +250,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 \":\""
@@ -297,29 +260,19 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr "Pour sortir du mode ligne de commande, pressez ECHAP"
 
 msgid ""
-"For the complete list of available keyboard shortcuts, type `help shortcuts`"
-msgstr ""
-"Pour la liste complète des raccourcis disponibles, tapez `help shortcuts`"
+"For the list of keyboard shortcuts and config options, type `help keymap`"
+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."
@@ -414,10 +367,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>."
@@ -458,6 +413,30 @@ msgstr ""
 "Synchroniser avec la cible donnée (par défaut, la valeur de configuration "
 "`sync.target`)."
 
+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 ""
+"Non-connecté à %s. Veuillez fournir les identifiants et mots de passe "
+"manquants."
+
 msgid "Synchronisation is already in progress."
 msgstr "La synchronisation est déjà en cours."
 
@@ -471,10 +450,6 @@ msgstr ""
 "correctement. Si vous savez qu'aucune autre synchronisation est en cours, "
 "vous pouvez supprimer le fichier \"%s\" pour reprendre l'opération."
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr "Impossible d'autoriser le logiciel (jeton d'identification non-reçu)."
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "Cible de la synchronisation : %s (%s)"
@@ -547,6 +522,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 :"
 
@@ -600,6 +578,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"
 
@@ -612,11 +601,18 @@ 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"
+msgstr "Cacher %s"
 
 msgid "Quit"
 msgstr "Quitter"
@@ -636,6 +632,15 @@ msgstr "Coller"
 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"
+
 msgid "Tools"
 msgstr "Outils"
 
@@ -654,6 +659,12 @@ 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..."
+
 msgid "About Joplin"
 msgstr "A propos de Joplin"
 
@@ -661,11 +672,34 @@ msgstr "A propos de Joplin"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
+#, javascript-format
+msgid "Open %s"
+msgstr "Ouvrir %s"
+
+msgid "Exit"
+msgstr "Quitter"
+
 msgid "OK"
 msgstr "OK"
 
 msgid "Cancel"
-msgstr "Annulation"
+msgstr "Annuler"
+
+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 ""
+"Une mise à jour est disponible, souhaitez vous la télécharger maintenant ?"
+
+msgid "Yes"
+msgstr "Oui"
+
+msgid "No"
+msgstr "Non"
+
+msgid "Check synchronisation configuration"
+msgstr "Vérifier config synchronisation"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -674,6 +708,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 "
@@ -731,10 +768,29 @@ 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."
 
+msgid "Missing Master Keys"
+msgstr "Clefs maître manquantes"
+
+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 ""
+"Les clefs maître avec ces identifiants sont utilisées pour crypter certains "
+"de vos objets, cependant le logiciel n'y a pour l'instant pas accès. Il est "
+"probable qu'elle vont être prochainement disponible via la synchronisation."
+
+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"
 
@@ -769,12 +825,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 "Layout"
 msgstr "Disposition"
 
+msgid "Search..."
+msgstr "Chercher..."
+
 msgid "Some items cannot be synchronised."
 msgstr "Certains objets ne peuvent être synchronisés."
 
@@ -793,6 +855,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"
 
@@ -809,16 +874,46 @@ msgstr ""
 "Il n'y a pour l'instant aucun carnet. Créez-en un en cliquant sur \"Nouveau "
 "carnet\"."
 
+msgid "Open..."
+msgstr "Ouvrir..."
+
+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 "Attach file"
 msgstr "Attacher un fichier"
 
+msgid "Tags"
+msgstr "Étiquettes"
+
 msgid "Set alarm"
 msgstr "Régler alarme"
 
+msgid "to-do"
+msgstr "tâche"
+
+msgid "note"
+msgstr "note"
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr "Création de %s..."
+
 msgid "Refresh"
 msgstr "Rafraîchir"
 
@@ -828,8 +923,8 @@ msgstr "Supprimer"
 msgid "OneDrive Login"
 msgstr "Connexion OneDrive"
 
-msgid "Import"
-msgstr "Importer"
+msgid "Dropbox Login"
+msgstr "Connection à Dropbox"
 
 msgid "Options"
 msgstr "Options"
@@ -855,12 +950,6 @@ msgstr "Synchroniser"
 msgid "Notebooks"
 msgstr "Carnets"
 
-msgid "Tags"
-msgstr "Étiquettes"
-
-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"
@@ -873,15 +962,24 @@ msgstr "Utilisation : %s"
 msgid "Unknown flag: %s"
 msgstr "Paramètre inconnu : %s"
 
+msgid "Dropbox"
+msgstr "Dropbox"
+
 msgid "File system"
 msgstr "Système de fichier"
 
+msgid "Nextcloud"
+msgstr "Nextcloud"
+
 msgid "OneDrive"
 msgstr "OneDrive"
 
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive Dév (Pour tester uniquement)"
 
+msgid "WebDAV"
+msgstr "WebDAV"
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr "Paramètre inconnu : %s"
@@ -945,8 +1043,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..."
@@ -955,6 +1053,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"
@@ -968,6 +1076,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\""
@@ -1018,12 +1129,56 @@ msgstr "Clair"
 msgid "Dark"
 msgstr "Sombre"
 
-msgid "Show uncompleted todos 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"
 
+msgid "When creating a new to-do:"
+msgstr "Lors de la création d'une tâche :"
+
+msgid "Focus title"
+msgstr "Curseur sur le titre"
+
+msgid "Focus body"
+msgstr "Curseur sur corps du message"
+
+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"
+
+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"
+
 msgid "Synchronisation interval"
 msgstr "Intervalle de synchronisation"
 
@@ -1039,9 +1194,6 @@ msgstr "%d heure"
 msgid "%d hours"
 msgstr "%d heures"
 
-msgid "Automatically update the application"
-msgstr "Mettre à jour le logiciel automatiquement"
-
 msgid "Show advanced options"
 msgstr "Montrer les options avancées"
 
@@ -1049,11 +1201,12 @@ msgid "Synchronisation target"
 msgstr "Cible de la synchronisation"
 
 msgid ""
-"The target to synchonise to. If synchronising with the file system, set "
-"`sync.2.path` to specify the target directory."
+"The target to synchonise to. Each sync target may have additional parameters "
+"which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
-"La cible avec laquelle synchroniser. Pour synchroniser avec le système de "
-"fichier, veuillez spécifier le répertoire avec `sync.2.path`."
+"La cible avec laquelle synchroniser. Chaque cible de synchronisation peut "
+"avoir des paramètres supplémentaires sous le nom `sync.NUM.NOM` (documentés "
+"ci-dessous)."
 
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Répertoire avec lequel synchroniser (chemin absolu)"
@@ -1065,10 +1218,65 @@ msgstr ""
 "Le chemin du répertoire avec lequel synchroniser lorsque la synchronisation "
 "par système de fichier est activée. Voir `sync.target`."
 
+msgid "Nextcloud WebDAV URL"
+msgstr "Nextcloud : URL WebDAV"
+
+msgid "Nextcloud username"
+msgstr "Nextcloud : Nom utilisateur"
+
+msgid "Nextcloud password"
+msgstr "Nextcloud : Mot de passe"
+
+msgid "WebDAV URL"
+msgstr "WebDAV : URL"
+
+msgid "WebDAV username"
+msgstr "WebDAV : Nom utilisateur"
+
+msgid "WebDAV password"
+msgstr "WebDAV : Mot de passe"
+
 #, 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"
 
@@ -1139,7 +1347,7 @@ msgid "Configuration"
 msgstr "Configuration"
 
 msgid "Move to notebook..."
-msgstr "Déplacer la note vers carnet..."
+msgstr "Déplacer vers..."
 
 #, javascript-format
 msgid "Move %d notes to notebook \"%s\"?"
@@ -1157,6 +1365,40 @@ msgstr "Confirmer"
 msgid "Cancel synchronisation"
 msgstr "Annuler synchronisation"
 
+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"
@@ -1181,6 +1423,12 @@ msgstr "Ce carnet n'a pas pu être sauvegardé : %s"
 msgid "Edit notebook"
 msgstr "Éditer le carnet"
 
+msgid "Show all"
+msgstr "Afficher tous"
+
+msgid "Errors only"
+msgstr "Erreurs seulement"
+
 msgid "This note has been modified:"
 msgstr "Cette note a été modifiée :"
 
@@ -1190,6 +1438,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"
@@ -1200,6 +1457,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"
 
@@ -1221,6 +1481,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."
@@ -1236,8 +1499,115 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#~ msgid "Note title:"
-#~ msgstr "Titre de la note :"
+#~ 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"
+
+#~ msgid "Give focus to previous pane"
+#~ msgstr "Activer le volet précédent"
+
+#~ msgid "Enter command line mode"
+#~ msgstr "Démarrer le mode de ligne de commande"
+
+#~ msgid "Exit command line mode"
+#~ msgstr "Sortir du mode de ligne de commande"
+
+#~ msgid "Edit the selected note"
+#~ msgstr "Éditer la note sélectionnée"
+
+#~ msgid "Cancel the current command."
+#~ msgstr "Annuler la commande en cours."
+
+#~ msgid "Exit the application."
+#~ msgstr "Quitter le logiciel."
+
+#~ msgid "Delete the currently selected note or notebook."
+#~ msgstr "Supprimer la note ou carnet sélectionné."
+
+#~ msgid "Set a to-do as completed / not completed"
+#~ msgstr "Marquer une tâches comme complétée / non-complétée"
+
+#~ msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+#~ msgstr "Maximiser, minimiser, cacher ou rendre visible la console."
+
+#~ msgid "[t]oggle note [m]etadata."
+#~ msgstr "Afficher/Cacher les métadonnées des notes."
+
+#~ msgid "[M]ake a new [n]ote"
+#~ msgstr "Créer une nouvelle note"
+
+#~ msgid "[M]ake a new [t]odo"
+#~ msgstr "Créer une nouvelle tâche"
+
+#~ msgid "[M]ake a new note[b]ook"
+#~ msgstr "Créer un nouveau carnet"
+
+#~ msgid "Copy ([Y]ank) the [n]ote to a notebook."
+#~ msgstr "Copier la note dans un autre carnet."
+
+#~ msgid "Move the note to a notebook."
+#~ msgstr "Déplacer la note vers un carnet."
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "WebDAV (Beta)"
+#~ msgstr "WebDAV (Bêta)"
+
+#~ msgid "Could not download the update: %s"
+#~ msgstr "Impossible de télécharger la mise à jour : %s"
+
+#~ msgid "New version downloaded - application will quit now and update..."
+#~ msgstr ""
+#~ "La nouvelle version a été téléchargée - le programme va se fermer et se "
+#~ "mettre à jour..."
+
+#~ msgid "Could not install the update: %s"
+#~ msgstr "Impossible d'installer la mise à jour : %s"
+
+#~ msgid ""
+#~ "The target to synchonise to. If synchronising with the file system, set "
+#~ "`sync.2.path` to specify the target directory."
+#~ msgstr ""
+#~ "La cible avec laquelle synchroniser. Pour synchroniser avec le système de "
+#~ "fichier, veuillez spécifier le répertoire avec `sync.2.path`."
 
 #~ msgid "To-do title:"
 #~ msgstr "Titre de la tâche :"
@@ -1303,9 +1673,6 @@ msgstr "Bienvenue"
 #~ msgid "Todo filter"
 #~ msgstr "Filtre des tâches"
 
-#~ msgid "Show all"
-#~ msgstr "Afficher tous"
-
 #~ msgid "Non-completed and recently completed ones"
 #~ msgstr "Tâches non-complétées et récentes"
 
@@ -1329,12 +1696,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

@@ -17,69 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-msgid "Give focus to next pane"
-msgstr "Fokusiraj sljedeće okno"
-
-msgid "Give focus to previous pane"
-msgstr "Fokusiraj prethodno okno"
-
-msgid "Enter command line mode"
-msgstr "Otvori naredbeni redak"
-
-msgid "Exit command line mode"
-msgstr "Napusti naredbeni redak"
-
-msgid "Edit the selected note"
-msgstr "Uredi odabranu bilješku"
-
-msgid "Cancel the current command."
-msgstr "Prekini trenutnu naredbu."
-
-msgid "Exit the application."
-msgstr "Izađi iz aplikacije."
-
-msgid "Delete the currently selected note or notebook."
-msgstr "Obriši odabranu bilješku ili bilježnicu."
-
 msgid "To delete a tag, untag the associated notes."
 msgstr "Da bi mogao obrisati oznaku, skini oznaku s povezanih bilješki."
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr "Odaberi bilješku ili bilježnicu za brisanje."
 
-msgid "Set a to-do as completed / not completed"
-msgstr "Postavi zadatak kao završen/nezavršen"
-
-#, fuzzy
-msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-msgstr "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-
-msgid "Search"
-msgstr "Traži"
-
-#, fuzzy
-msgid "[t]oggle note [m]etadata."
-msgstr "[t]oggle note [m]etadata."
-
-#, fuzzy
-msgid "[M]ake a new [n]ote"
-msgstr "[M]ake a new [n]ote"
-
-#, fuzzy
-msgid "[M]ake a new [t]odo"
-msgstr "[M]ake a new [t]odo"
-
-#, fuzzy
-msgid "[M]ake a new note[b]ook"
-msgstr "[M]ake a new note[b]ook"
-
-#, fuzzy
-msgid "Copy ([Y]ank) the [n]ote to a notebook."
-msgstr "Copy ([Y]ank) the [n]ote to a notebook."
-
-msgid "Move the note to a notebook."
-msgstr "Premjesti bilješku u bilježnicu."
-
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "Pritisni Ctrl+D ili napiši \"exit\" za izlazak iz aplikacije"
 
@@ -235,19 +178,28 @@ msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 "Počinjem uređivati bilješku. Za povratak u naredbeni redak, zatvori uređivač."
 
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "Note has been saved."
 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."
 
@@ -260,6 +212,10 @@ msgstr "Prikazuje geolokacijski URL bilješke."
 msgid "Displays usage information."
 msgstr "Prikazuje informacije o korištenju."
 
+#, javascript-format
+msgid "For information on how to customise the shortcuts please visit %s"
+msgstr ""
+
 msgid "Shortcuts are not available in CLI mode."
 msgstr "Prečaci nisu podržani u naredbenom retku."
 
@@ -273,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."
@@ -294,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 \":\""
@@ -303,29 +256,21 @@ msgstr "Za ulaz u naredbeni redak, pritisni \":\""
 msgid "To exit command line mode, press ESCAPE"
 msgstr "Za izlaz iz naredbenog retka, pritisni Esc"
 
+#, fuzzy
 msgid ""
-"For the complete list of available keyboard shortcuts, type `help shortcuts`"
+"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."
@@ -423,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."
 
@@ -466,6 +414,26 @@ msgstr "Sinkronizira sa udaljenom pohranom podataka."
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr "Sinkroniziraj sa metom (default je polje sync.target u konfiguraciji)"
 
+#, fuzzy
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+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 ""
+
 msgid "Synchronisation is already in progress."
 msgstr "Sinkronizacija je već u toku."
 
@@ -477,12 +445,6 @@ msgid ""
 msgstr ""
 "Ako sinkronizacija nije u toku, obriši lock datoteku u \"%s\" i nastavi..."
 
-#, fuzzy
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-"Ovjera nije dovršena (nije dobivena potvrda ovjere - authentication token)."
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "Meta sinkronizacije: %s (%s)"
@@ -558,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:"
 
@@ -606,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"
 
@@ -618,11 +596,19 @@ 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"
+msgstr ""
 
 msgid "Quit"
 msgstr "Izađi"
@@ -642,6 +628,15 @@ msgstr "Zalijepi"
 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 ""
+
 msgid "Tools"
 msgstr "Alati"
 
@@ -661,6 +656,13 @@ msgstr "Pomoć"
 msgid "Website and documentation"
 msgstr "Website i dokumentacija"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Website i dokumentacija"
+
+msgid "Check for updates..."
+msgstr ""
+
 msgid "About Joplin"
 msgstr "O Joplinu"
 
@@ -668,12 +670,36 @@ msgstr "O Joplinu"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
+#, fuzzy, javascript-format
+msgid "Open %s"
+msgstr "On %s: %s"
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr "U redu"
 
 msgid "Cancel"
 msgstr "Odustani"
 
+msgid "Current version is up-to-date."
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+#, fuzzy
+msgid "No"
+msgstr "N"
+
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Prekini sinkronizaciju"
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Bilješke i postavke su pohranjene u: %s"
@@ -681,6 +707,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 "
@@ -730,6 +759,20 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 
+msgid "Missing Master Keys"
+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 ""
+
+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"
 
@@ -764,12 +807,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 "Layout"
 msgstr "Izgled"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Traži"
+
 msgid "Some items cannot be synchronised."
 msgstr "Neke stavke se ne mogu sinkronizirati."
 
@@ -789,6 +840,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"
 
@@ -802,16 +856,47 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Ovdje nema bilježnica. Stvori novu pritiskom na \"Nova bilježnica\"."
 
+msgid "Open..."
+msgstr ""
+
+#, 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 "Attach file"
 msgstr "Priloži datoteku"
 
+msgid "Tags"
+msgstr "Oznake"
+
 msgid "Set alarm"
 msgstr "Postavi upozorenje"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Novi zadatak"
+
+#, fuzzy
+msgid "note"
+msgstr "Nova bilješka"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Uvozim bilješke..."
+
 msgid "Refresh"
 msgstr "Osvježi"
 
@@ -821,8 +906,8 @@ msgstr "Očisti"
 msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
-msgid "Import"
-msgstr "Uvoz"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Opcije"
@@ -848,12 +933,6 @@ msgstr "Sinkroniziraj"
 msgid "Notebooks"
 msgstr "Bilježnice"
 
-msgid "Tags"
-msgstr "Oznake"
-
-msgid "Searches"
-msgstr "Pretraživanja"
-
 msgid "Please select where the sync status should be exported to"
 msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
 
@@ -865,15 +944,24 @@ msgstr "Korištenje: %s"
 msgid "Unknown flag: %s"
 msgstr "Nepoznata zastavica: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "Datotečni sustav"
 
+msgid "Nextcloud"
+msgstr ""
+
 msgid "OneDrive"
 msgstr "OneDrive"
 
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive Dev (Samo za testiranje)"
 
+msgid "WebDAV"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr "Nepoznata razina logiranja: %s"
@@ -934,8 +1022,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..."
@@ -945,6 +1033,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"
@@ -959,6 +1057,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\""
@@ -1009,12 +1111,59 @@ msgstr "Svijetla"
 msgid "Dark"
 msgstr "Tamna"
 
-msgid "Show uncompleted todos on top of the lists"
+#, fuzzy
+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"
 
+#, fuzzy
+msgid "When creating a new to-do:"
+msgstr "Stvara novi zadatak."
+
+#, fuzzy
+msgid "Focus title"
+msgstr "Naslov bilješke:"
+
+msgid "Focus body"
+msgstr ""
+
+#, fuzzy
+msgid "When creating a new note:"
+msgstr "Stvara novu bilješku."
+
+msgid "Show tray icon"
+msgstr ""
+
+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"
+msgstr "Automatsko instaliranje nove verzije"
+
 msgid "Synchronisation interval"
 msgstr "Interval sinkronizacije"
 
@@ -1030,9 +1179,6 @@ msgstr "%d sat"
 msgid "%d hours"
 msgstr "%d sati"
 
-msgid "Automatically update the application"
-msgstr "Automatsko instaliranje nove verzije"
-
 msgid "Show advanced options"
 msgstr "Prikaži napredne opcije"
 
@@ -1040,11 +1186,9 @@ msgid "Synchronisation target"
 msgstr "Sinkroniziraj sa"
 
 msgid ""
-"The target to synchonise to. If synchronising with the file system, set "
-"`sync.2.path` to specify the target directory."
+"The target to synchonise to. Each sync target may have additional parameters "
+"which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
-"Meta sinkronizacije. U slučaju sinkroniziranja s vlastitim datotečnim "
-"sustavom, postavi `sync.2.path` na ciljani direktorij."
 
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Direktorij za sinkroniziranje (apsolutna putanja)"
@@ -1056,10 +1200,66 @@ msgstr ""
 "Putanja do direktorija za sinkronizaciju u slučaju kad je sinkronizacija sa "
 "datotečnim sustavom omogućena. Vidi `sync.target`."
 
+msgid "Nextcloud WebDAV URL"
+msgstr ""
+
+msgid "Nextcloud username"
+msgstr ""
+
+msgid "Nextcloud password"
+msgstr ""
+
+msgid "WebDAV URL"
+msgstr ""
+
+msgid "WebDAV username"
+msgstr ""
+
+msgid "WebDAV password"
+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"
 
@@ -1143,6 +1343,35 @@ msgstr "Potvrdi"
 msgid "Cancel synchronisation"
 msgstr "Prekini sinkronizaciju"
 
+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 ""
@@ -1168,6 +1397,12 @@ msgstr "Bilježnicu nije moguće snimiti: %s"
 msgid "Edit notebook"
 msgstr "Uredi bilježnicu"
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr "Bilješka je promijenjena:"
 
@@ -1177,6 +1412,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"
@@ -1187,6 +1430,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"
 
@@ -1208,6 +1454,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."
@@ -1221,8 +1470,94 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobro došli"
 
-#~ msgid "Note title:"
-#~ msgstr "Naslov bilješke:"
+#~ 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"
+
+#~ msgid "Give focus to previous pane"
+#~ msgstr "Fokusiraj prethodno okno"
+
+#~ msgid "Enter command line mode"
+#~ msgstr "Otvori naredbeni redak"
+
+#~ msgid "Exit command line mode"
+#~ msgstr "Napusti naredbeni redak"
+
+#~ msgid "Edit the selected note"
+#~ msgstr "Uredi odabranu bilješku"
+
+#~ msgid "Cancel the current command."
+#~ msgstr "Prekini trenutnu naredbu."
+
+#~ msgid "Exit the application."
+#~ msgstr "Izađi iz aplikacije."
+
+#~ msgid "Delete the currently selected note or notebook."
+#~ msgstr "Obriši odabranu bilješku ili bilježnicu."
+
+#~ msgid "Set a to-do as completed / not completed"
+#~ msgstr "Postavi zadatak kao završen/nezavršen"
+
+#, fuzzy
+#~ msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+#~ msgstr "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+
+#, fuzzy
+#~ msgid "[t]oggle note [m]etadata."
+#~ msgstr "[t]oggle note [m]etadata."
+
+#, fuzzy
+#~ msgid "[M]ake a new [n]ote"
+#~ msgstr "[M]ake a new [n]ote"
+
+#, fuzzy
+#~ msgid "[M]ake a new [t]odo"
+#~ msgstr "[M]ake a new [t]odo"
+
+#, fuzzy
+#~ msgid "[M]ake a new note[b]ook"
+#~ msgstr "[M]ake a new note[b]ook"
+
+#, fuzzy
+#~ msgid "Copy ([Y]ank) the [n]ote to a notebook."
+#~ msgstr "Copy ([Y]ank) the [n]ote to a notebook."
+
+#~ msgid "Move the note to a notebook."
+#~ msgstr "Premjesti bilješku u bilježnicu."
+
+#~ msgid ""
+#~ "The target to synchonise to. If synchronising with the file system, set "
+#~ "`sync.2.path` to specify the target directory."
+#~ msgstr ""
+#~ "Meta sinkronizacije. U slučaju sinkroniziranja s vlastitim datotečnim "
+#~ "sustavom, postavi `sync.2.path` na ciljani direktorij."
 
 #~ msgid "To-do title:"
 #~ msgstr "Naslov zadatka:"

CliClient/locales/it_IT.po

@@ -16,65 +16,12 @@ msgstr ""
 "X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Give focus to next pane"
-msgstr "Pannello successivo"
-
-msgid "Give focus to previous pane"
-msgstr "Pannello precedente"
-
-msgid "Enter command line mode"
-msgstr "Accedi alla modalità linea di comando"
-
-msgid "Exit command line mode"
-msgstr "Esci dalla modalità linea di comando"
-
-msgid "Edit the selected note"
-msgstr "Modifica la nota selezionata"
-
-msgid "Cancel the current command."
-msgstr "Cancella il comando corrente."
-
-msgid "Exit the application."
-msgstr "Esci dall'applicazione."
-
-msgid "Delete the currently selected note or notebook."
-msgstr "Elimina la nota o il blocco note selezionato."
-
 msgid "To delete a tag, untag the associated notes."
 msgstr "Elimina un'etichetta, togli l'etichetta associata alle note."
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr "Per favore seleziona la nota o il blocco note da eliminare."
 
-msgid "Set a to-do as completed / not completed"
-msgstr "Imposta un'attività come completata / non completata"
-
-msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-msgstr ""
-"Scegli lo  s[t]ato della [c]onsole: massimizzato/minimizzato/nascosto/"
-"visibile."
-
-msgid "Search"
-msgstr "Cerca"
-
-msgid "[t]oggle note [m]etadata."
-msgstr "mos[t]ra/nascondi i [m]etadata nelle note."
-
-msgid "[M]ake a new [n]ote"
-msgstr "Crea ([M]ake) una nuova [n]ota"
-
-msgid "[M]ake a new [t]odo"
-msgstr "Crea ([M]ake) una nuova at[t]ività"
-
-msgid "[M]ake a new note[b]ook"
-msgstr "Crea ([M]ake) un nuovo [b]locco note"
-
-msgid "Copy ([Y]ank) the [n]ote to a notebook."
-msgstr "Copia ([Y]) la [n]ota in un blocco note."
-
-msgid "Move the note to a notebook."
-msgstr "Sposta la nota in un blocco note."
-
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "Premi Ctrl+D o digita \"exit\" per uscire dall'applicazione"
 
@@ -226,20 +173,29 @@ msgstr "Non esiste la nota: \"%s\". Desideri crearla?"
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr "Comincia a modificare la nota. Chiudi l'editor per tornare al prompt."
 
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "Note has been saved."
 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."
 
@@ -252,6 +208,10 @@ msgstr "Mostra l'URL di geolocalizzazione per la nota."
 msgid "Displays usage information."
 msgstr "Mostra le informazioni di utilizzo."
 
+#, javascript-format
+msgid "For information on how to customise the shortcuts please visit %s"
+msgstr ""
+
 msgid "Shortcuts are not available in CLI mode."
 msgstr "Le scorciatoie non sono disponibili nella modalità CLI."
 
@@ -266,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 ""
@@ -285,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 \":\""
@@ -294,30 +255,22 @@ msgstr "Per entrare nella modalità command line, premi \":\""
 msgid "To exit command line mode, press ESCAPE"
 msgstr "Per uscire dalla modalità command line, premi ESC"
 
+#, fuzzy
 msgid ""
-"For the complete list of available keyboard shortcuts, type `help shortcuts`"
+"For the list of keyboard shortcuts and config options, type `help keymap`"
 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."
@@ -411,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>."
@@ -449,6 +404,26 @@ msgstr ""
 "Sincronizza con l'obiettivo fornito (come predefinito il valore di "
 "configurazione sync.target)"
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+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 ""
+
 msgid "Synchronisation is already in progress."
 msgstr "La sincronizzazione è in corso."
 
@@ -462,12 +437,6 @@ msgstr ""
 "sincronizzazione, è possibile eliminare il file di blocco in \"% s\" e "
 "riprendere l'operazione."
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-"Autenticazione non completata (non è stato ricevuto alcun token di "
-"autenticazione)."
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "Posizione di sincronizzazione: %s (%s)"
@@ -540,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:"
 
@@ -584,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"
 
@@ -596,11 +581,19 @@ 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"
+msgstr ""
 
 msgid "Quit"
 msgstr "Esci"
@@ -620,6 +613,15 @@ msgstr "Incolla"
 msgid "Search in all the notes"
 msgstr "Cerca in tutte le note"
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr "Strumenti"
 
@@ -639,6 +641,13 @@ 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 ""
+
 msgid "About Joplin"
 msgstr "Informazione si Joplin"
 
@@ -646,12 +655,36 @@ msgstr "Informazione si Joplin"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
+#, fuzzy, javascript-format
+msgid "Open %s"
+msgstr "Su %s: %s"
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr "OK"
 
 msgid "Cancel"
 msgstr "Cancella"
 
+msgid "Current version is up-to-date."
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+#, fuzzy
+msgid "No"
+msgstr "N"
+
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Cancella la sincronizzazione"
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -659,6 +692,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 "
@@ -710,6 +746,20 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 
+msgid "Missing Master Keys"
+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 ""
+
+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"
 
@@ -742,12 +792,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 "Layout"
 msgstr "Disposizione"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Cerca"
+
 msgid "Some items cannot be synchronised."
 msgstr "Alcuni elementi non possono essere sincronizzati."
 
@@ -767,6 +825,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"
 
@@ -781,16 +842,47 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
 
+msgid "Open..."
+msgstr ""
+
+#, 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 "Attach file"
 msgstr "Allega file"
 
+msgid "Tags"
+msgstr "Etichette"
+
 msgid "Set alarm"
 msgstr "Imposta allarme"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Nuova attività"
+
+#, fuzzy
+msgid "note"
+msgstr "Nuova nota"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Importazione delle note..."
+
 msgid "Refresh"
 msgstr "Aggiorna"
 
@@ -800,8 +892,8 @@ msgstr "Pulisci"
 msgid "OneDrive Login"
 msgstr "Login OneDrive"
 
-msgid "Import"
-msgstr "Importa"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Opzioni"
@@ -827,12 +919,6 @@ msgstr "Sincronizza"
 msgid "Notebooks"
 msgstr "Blocchi note"
 
-msgid "Tags"
-msgstr "Etichette"
-
-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."
@@ -845,15 +931,24 @@ msgstr "Uso: %s"
 msgid "Unknown flag: %s"
 msgstr "Etichetta sconosciuta: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "File system"
 
+msgid "Nextcloud"
+msgstr ""
+
 msgid "OneDrive"
 msgstr "OneDrive"
 
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive Dev (solo per test)"
 
+msgid "WebDAV"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr "Livello di log sconosciuto: %s"
@@ -916,8 +1011,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..."
@@ -927,6 +1022,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"
@@ -941,6 +1046,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\""
@@ -991,12 +1100,59 @@ msgstr "Chiaro"
 msgid "Dark"
 msgstr "Scuro"
 
-msgid "Show uncompleted todos on top of the lists"
+#, fuzzy
+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"
 
+#, fuzzy
+msgid "When creating a new to-do:"
+msgstr "Crea una nuova attività."
+
+#, fuzzy
+msgid "Focus title"
+msgstr "Titolo della Nota:"
+
+msgid "Focus body"
+msgstr ""
+
+#, fuzzy
+msgid "When creating a new note:"
+msgstr "Crea una nuova nota."
+
+msgid "Show tray icon"
+msgstr ""
+
+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"
+msgstr "Aggiorna automaticamente l'applicazione"
+
 msgid "Synchronisation interval"
 msgstr "Intervallo di sincronizzazione"
 
@@ -1012,9 +1168,6 @@ msgstr "%d ora"
 msgid "%d hours"
 msgstr "%d ore"
 
-msgid "Automatically update the application"
-msgstr "Aggiorna automaticamente l'applicazione"
-
 msgid "Show advanced options"
 msgstr "Mostra opzioni avanzate"
 
@@ -1022,12 +1175,9 @@ msgid "Synchronisation target"
 msgstr "Destinazione di sincronizzazione"
 
 msgid ""
-"The target to synchonise to. If synchronising with the file system, set "
-"`sync.2.path` to specify the target directory."
+"The target to synchonise to. Each sync target may have additional parameters "
+"which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
-"La destinazione della sincronizzazione. Se si sincronizza con il file "
-"system, impostare ' Sync. 2. Path ' per specificare la directory di "
-"destinazione."
 
 msgid "Directory to synchronise with (absolute path)"
 msgstr ""
@@ -1039,10 +1189,66 @@ msgstr ""
 "Il percorso di sincronizzazione quando la sincronizzazione è abilitata. Vedi "
 "`sync.target`."
 
+msgid "Nextcloud WebDAV URL"
+msgstr ""
+
+msgid "Nextcloud username"
+msgstr ""
+
+msgid "Nextcloud password"
+msgstr ""
+
+msgid "WebDAV URL"
+msgstr ""
+
+msgid "WebDAV username"
+msgstr ""
+
+msgid "WebDAV password"
+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"
 
@@ -1126,6 +1332,35 @@ msgstr "Conferma"
 msgid "Cancel synchronisation"
 msgstr "Cancella la sincronizzazione"
 
+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 ""
@@ -1151,6 +1386,12 @@ msgstr "Il blocco note non può essere salvato: %s"
 msgid "Edit notebook"
 msgstr "Modifica blocco note"
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr "Questa note è stata modificata:"
 
@@ -1160,6 +1401,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"
@@ -1170,6 +1419,9 @@ msgstr "Allega foto"
 msgid "Attach any file"
 msgstr "Allega qualsiasi file"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converti in nota"
 
@@ -1191,6 +1443,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."
@@ -1206,8 +1461,92 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvenuto"
 
-#~ msgid "Note title:"
-#~ msgstr "Titolo della Nota:"
+#~ 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"
+
+#~ msgid "Give focus to previous pane"
+#~ msgstr "Pannello precedente"
+
+#~ msgid "Enter command line mode"
+#~ msgstr "Accedi alla modalità linea di comando"
+
+#~ msgid "Exit command line mode"
+#~ msgstr "Esci dalla modalità linea di comando"
+
+#~ msgid "Edit the selected note"
+#~ msgstr "Modifica la nota selezionata"
+
+#~ msgid "Cancel the current command."
+#~ msgstr "Cancella il comando corrente."
+
+#~ msgid "Exit the application."
+#~ msgstr "Esci dall'applicazione."
+
+#~ msgid "Delete the currently selected note or notebook."
+#~ msgstr "Elimina la nota o il blocco note selezionato."
+
+#~ msgid "Set a to-do as completed / not completed"
+#~ msgstr "Imposta un'attività come completata / non completata"
+
+#~ msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+#~ msgstr ""
+#~ "Scegli lo  s[t]ato della [c]onsole: massimizzato/minimizzato/nascosto/"
+#~ "visibile."
+
+#~ msgid "[t]oggle note [m]etadata."
+#~ msgstr "mos[t]ra/nascondi i [m]etadata nelle note."
+
+#~ msgid "[M]ake a new [n]ote"
+#~ msgstr "Crea ([M]ake) una nuova [n]ota"
+
+#~ msgid "[M]ake a new [t]odo"
+#~ msgstr "Crea ([M]ake) una nuova at[t]ività"
+
+#~ msgid "[M]ake a new note[b]ook"
+#~ msgstr "Crea ([M]ake) un nuovo [b]locco note"
+
+#~ msgid "Copy ([Y]ank) the [n]ote to a notebook."
+#~ msgstr "Copia ([Y]) la [n]ota in un blocco note."
+
+#~ msgid "Move the note to a notebook."
+#~ msgstr "Sposta la nota in un blocco note."
+
+#~ msgid ""
+#~ "The target to synchonise to. If synchronising with the file system, set "
+#~ "`sync.2.path` to specify the target directory."
+#~ msgstr ""
+#~ "La destinazione della sincronizzazione. Se si sincronizza con il file "
+#~ "system, impostare ' Sync. 2. Path ' per specificare la directory di "
+#~ "destinazione."
 
 #~ msgid "To-do title:"
 #~ msgstr "Titolo dell'attività:"

CliClient/locales/ja_JP.po

@@ -16,63 +16,12 @@ msgstr ""
 "X-Generator: Poedit 2.0.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid "Give focus to next pane"
-msgstr "次のペインへ"
-
-msgid "Give focus to previous pane"
-msgstr "前のペインへ"
-
-msgid "Enter command line mode"
-msgstr "コマンドラインモードに入る"
-
-msgid "Exit command line mode"
-msgstr "コマンドラインモードの終了"
-
-msgid "Edit the selected note"
-msgstr "選択したノートを編集"
-
-msgid "Cancel the current command."
-msgstr "現在のコマンドをキャンセル"
-
-msgid "Exit the application."
-msgstr "アプリケーションを終了する"
-
-msgid "Delete the currently selected note or notebook."
-msgstr "選択中のノートまたはノートブックを削除"
-
 msgid "To delete a tag, untag the associated notes."
 msgstr "タグを削除するには、関連するノートからタグを外してください。"
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr "ます削除するノートかノートブックを選択してください。"
 
-msgid "Set a to-do as completed / not completed"
-msgstr "ToDoを完了/未完に設定"
-
-msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-msgstr "コンソールを最大表示/最小表示/非表示/可視で切り替える([t][c])"
-
-msgid "Search"
-msgstr "検索"
-
-msgid "[t]oggle note [m]etadata."
-msgstr "ノートのメタ情報を切り替える [tm]"
-
-msgid "[M]ake a new [n]ote"
-msgstr "新しいノートの作成 [mn]"
-
-msgid "[M]ake a new [t]odo"
-msgstr "新しいToDoの作成 [mt]"
-
-msgid "[M]ake a new note[b]ook"
-msgstr "新しいノートブックの作成 [mb]"
-
-msgid "Copy ([Y]ank) the [n]ote to a notebook."
-msgstr "ノートをノートブックにコピー [yn]"
-
-msgid "Move the note to a notebook."
-msgstr "ノートをノートブックに移動"
-
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "アプリケーションを終了するには、Ctrl+Dまたは\"exit\"と入力してください"
 
@@ -223,19 +172,28 @@ msgstr "\"%s\"というノートはありません。お作りいたしますか
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr "ノートの編集の開始。エディタを閉じると元の画面に戻ることが出来ます。"
 
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "Note has been saved."
 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 "選択されたノートのみを出力する。"
 
@@ -248,6 +206,10 @@ msgstr "ノートの位置情報URLを表示する。"
 msgid "Displays usage information."
 msgstr "使い方を表示する。"
 
+#, javascript-format
+msgid "For information on how to customise the shortcuts please visit %s"
+msgstr ""
+
 msgid "Shortcuts are not available in CLI mode."
 msgstr "CLIモードではショートカットは使用できません。"
 
@@ -262,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 ""
@@ -278,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 \":\""
@@ -287,31 +250,23 @@ msgstr "コマンドラインモードに入るには、\":\"を入力してく
 msgid "To exit command line mode, press ESCAPE"
 msgstr "コマンドラインモードを終了するには、ESCキーを押してください。"
 
+#, fuzzy
 msgid ""
-"For the complete list of available keyboard shortcuts, type `help shortcuts`"
+"For the list of keyboard shortcuts and config options, type `help keymap`"
 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"
@@ -406,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>."
@@ -446,6 +404,24 @@ msgstr "リモート保存領域と同期します。"
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr "指定のターゲットと同期します。(標準： sync.targetの設定値)"
 
+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 ""
+
 msgid "Synchronisation is already in progress."
 msgstr "同期はすでに実行中です。"
 
@@ -458,10 +434,6 @@ msgstr ""
 "ロックファイルがすでに保持されています。同期作業が行われていない場合は、\"%s"
 "\"にあるロックファイルを削除して、作業を再度行ってください。"
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr "認証は完了していません(認証トークンが得られませんでした)"
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "同期先: %s (%s)"
@@ -534,6 +506,10 @@ msgstr "規定値: %s"
 msgid "Possible keys/values:"
 msgstr "取り得るキーバリュー: "
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "使い方を表示する。"
+
 msgid "Fatal error:"
 msgstr "致命的なエラー: "
 
@@ -583,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 "ファイル"
 
@@ -595,11 +583,19 @@ 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"
+msgstr ""
 
 msgid "Quit"
 msgstr "終了"
@@ -619,6 +615,15 @@ msgstr "貼り付け"
 msgid "Search in all the notes"
 msgstr "すべてのノートを検索"
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr "ツール"
 
@@ -638,6 +643,13 @@ msgstr "ヘルプ"
 msgid "Website and documentation"
 msgstr "Webサイトとドキュメント"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Webサイトとドキュメント"
+
+msgid "Check for updates..."
+msgstr ""
+
 msgid "About Joplin"
 msgstr "Joplinについて"
 
@@ -645,12 +657,35 @@ msgstr "Joplinについて"
 msgid "%s %s (%s, %s)"
 msgstr ""
 
+#, javascript-format
+msgid "Open %s"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr ""
 
 msgid "Cancel"
 msgstr "キャンセル"
 
+msgid "Current version is up-to-date."
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "同期の中止"
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "ノートと設定は、%sに保存されます。"
@@ -658,6 +693,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 "
@@ -711,6 +749,20 @@ msgstr ""
 "注意：\"active\"に指定されたマスターキーのみが暗号化に使用されます。暗号化に"
 "使用されたキーの応じて、すべてのキーが暗号解除のために使用されます。"
 
+msgid "Missing Master Keys"
+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 ""
+
+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 "状態"
 
@@ -745,12 +797,20 @@ msgstr "それぞれのタグをカンマ(,)で区切ってください。"
 msgid "Rename notebook:"
 msgstr "ノートブックの名前を変更："
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "名前の変更"
+
 msgid "Set alarm:"
 msgstr "アラームをセット："
 
 msgid "Layout"
 msgstr "レイアウト"
 
+#, fuzzy
+msgid "Search..."
+msgstr "検索"
+
 msgid "Some items cannot be synchronised."
 msgstr "いくつかの項目は同期されませんでした。"
 
@@ -770,6 +830,9 @@ msgstr "タグの追加・削除"
 msgid "Switch between note and to-do type"
 msgstr "ノートとToDoを切り替え"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "削除"
 
@@ -783,16 +846,47 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "ノートブックがありません。新しいノートブックを作成してください。"
 
+msgid "Open..."
+msgstr ""
+
+#, 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 "Attach file"
 msgstr "ファイルを添付"
 
+msgid "Tags"
+msgstr "タグ"
+
 msgid "Set alarm"
 msgstr "アラームをセット"
 
+#, fuzzy
+msgid "to-do"
+msgstr "新しいToDo"
+
+#, fuzzy
+msgid "note"
+msgstr "新しいノート"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "ノートのインポート…"
+
 msgid "Refresh"
 msgstr "更新"
 
@@ -802,8 +896,8 @@ msgstr "クリア"
 msgid "OneDrive Login"
 msgstr "OneDriveログイン"
 
-msgid "Import"
-msgstr "インポート"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "オプション"
@@ -829,12 +923,6 @@ msgstr "同期"
 msgid "Notebooks"
 msgstr "ノートブック"
 
-msgid "Tags"
-msgstr "タグ"
-
-msgid "Searches"
-msgstr "検索"
-
 msgid "Please select where the sync status should be exported to"
 msgstr "同期状況の出力先を選択してください"
 
@@ -846,15 +934,24 @@ msgstr "使用方法: %s"
 msgid "Unknown flag: %s"
 msgstr "不明なフラグ: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "ファイルシステム"
 
+msgid "Nextcloud"
+msgstr ""
+
 msgid "OneDrive"
 msgstr ""
 
 msgid "OneDrive Dev (For testing only)"
 msgstr ""
 
+msgid "WebDAV"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr ""
@@ -917,8 +1014,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..."
@@ -928,6 +1025,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"
@@ -942,6 +1049,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,12 +1105,59 @@ msgstr "明るい"
 msgid "Dark"
 msgstr "暗い"
 
-msgid "Show uncompleted todos on top of the lists"
+#, fuzzy
+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 "ノートに位置情報を保存"
 
+#, fuzzy
+msgid "When creating a new to-do:"
+msgstr "新しいToDoを作成します。"
+
+#, fuzzy
+msgid "Focus title"
+msgstr "ノートの題名："
+
+msgid "Focus body"
+msgstr ""
+
+#, fuzzy
+msgid "When creating a new note:"
+msgstr "あたらしいノートを作成します。"
+
+msgid "Show tray icon"
+msgstr ""
+
+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"
+msgstr "アプリケーションの自動更新"
+
 msgid "Synchronisation interval"
 msgstr "同期間隔"
 
@@ -1015,9 +1173,6 @@ msgstr "%d 時間"
 msgid "%d hours"
 msgstr "%d 時間"
 
-msgid "Automatically update the application"
-msgstr "アプリケーションの自動更新"
-
 msgid "Show advanced options"
 msgstr "詳細な設定の表示"
 
@@ -1025,11 +1180,9 @@ msgid "Synchronisation target"
 msgstr "同期先"
 
 msgid ""
-"The target to synchonise to. If synchronising with the file system, set "
-"`sync.2.path` to specify the target directory."
+"The target to synchonise to. Each sync target may have additional parameters "
+"which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
-"同期先です。ローカルのファイルシステムと同期する場合は、`sync.2.path`を同期先"
-"のディレクトリに設定してください。"
 
 msgid "Directory to synchronise with (absolute path)"
 msgstr "同期先のディレクトリ(絶対パス)"
@@ -1041,10 +1194,66 @@ msgstr ""
 "ファイルシステム同期の有効時に同期を行うパスです。`sync.target`も参考にしてく"
 "ださい。"
 
+msgid "Nextcloud WebDAV URL"
+msgstr ""
+
+msgid "Nextcloud username"
+msgstr ""
+
+msgid "Nextcloud password"
+msgstr ""
+
+msgid "WebDAV URL"
+msgstr ""
+
+msgid "WebDAV username"
+msgstr ""
+
+msgid "WebDAV password"
+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 "同期が出来なかったアイテム"
 
@@ -1128,6 +1337,35 @@ msgstr "確認"
 msgid "Cancel synchronisation"
 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 ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "OneDriveログイン"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1153,6 +1391,12 @@ msgstr "ノートブックは保存できませんでした：%s"
 msgid "Edit notebook"
 msgstr "ノートブックの編集"
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr "ノートは変更されています："
 
@@ -1162,6 +1406,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."
@@ -1172,6 +1424,9 @@ msgstr "写真を添付"
 msgid "Attach any file"
 msgstr "ファイルを添付"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "ノートに変換"
 
@@ -1193,6 +1448,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."
@@ -1208,8 +1466,88 @@ msgstr ""
 msgid "Welcome"
 msgstr "ようこそ"
 
-#~ msgid "Note title:"
-#~ 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 "次のペインへ"
+
+#~ msgid "Give focus to previous pane"
+#~ msgstr "前のペインへ"
+
+#~ msgid "Enter command line mode"
+#~ msgstr "コマンドラインモードに入る"
+
+#~ msgid "Exit command line mode"
+#~ msgstr "コマンドラインモードの終了"
+
+#~ msgid "Edit the selected note"
+#~ msgstr "選択したノートを編集"
+
+#~ msgid "Cancel the current command."
+#~ msgstr "現在のコマンドをキャンセル"
+
+#~ msgid "Exit the application."
+#~ msgstr "アプリケーションを終了する"
+
+#~ msgid "Delete the currently selected note or notebook."
+#~ msgstr "選択中のノートまたはノートブックを削除"
+
+#~ msgid "Set a to-do as completed / not completed"
+#~ msgstr "ToDoを完了/未完に設定"
+
+#~ msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+#~ msgstr "コンソールを最大表示/最小表示/非表示/可視で切り替える([t][c])"
+
+#~ msgid "[t]oggle note [m]etadata."
+#~ msgstr "ノートのメタ情報を切り替える [tm]"
+
+#~ msgid "[M]ake a new [n]ote"
+#~ msgstr "新しいノートの作成 [mn]"
+
+#~ msgid "[M]ake a new [t]odo"
+#~ msgstr "新しいToDoの作成 [mt]"
+
+#~ msgid "[M]ake a new note[b]ook"
+#~ msgstr "新しいノートブックの作成 [mb]"
+
+#~ msgid "Copy ([Y]ank) the [n]ote to a notebook."
+#~ msgstr "ノートをノートブックにコピー [yn]"
+
+#~ msgid "Move the note to a notebook."
+#~ msgstr "ノートをノートブックに移動"
+
+#~ msgid ""
+#~ "The target to synchonise to. If synchronising with the file system, set "
+#~ "`sync.2.path` to specify the target directory."
+#~ msgstr ""
+#~ "同期先です。ローカルのファイルシステムと同期する場合は、`sync.2.path`を同"
+#~ "期先のディレクトリに設定してください。"
 
 #~ msgid "To-do title:"
 #~ msgstr "ToDoの題名："

CliClient/locales/joplin.pot

@@ -15,63 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "Give focus to next pane"
-msgstr ""
-
-msgid "Give focus to previous pane"
-msgstr ""
-
-msgid "Enter command line mode"
-msgstr ""
-
-msgid "Exit command line mode"
-msgstr ""
-
-msgid "Edit the selected note"
-msgstr ""
-
-msgid "Cancel the current command."
-msgstr ""
-
-msgid "Exit the application."
-msgstr ""
-
-msgid "Delete the currently selected note or notebook."
-msgstr ""
-
 msgid "To delete a tag, untag the associated notes."
 msgstr ""
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr ""
 
-msgid "Set a to-do as completed / not completed"
-msgstr ""
-
-msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-msgstr ""
-
-msgid "Search"
-msgstr ""
-
-msgid "[t]oggle note [m]etadata."
-msgstr ""
-
-msgid "[M]ake a new [n]ote"
-msgstr ""
-
-msgid "[M]ake a new [t]odo"
-msgstr ""
-
-msgid "[M]ake a new note[b]ook"
-msgstr ""
-
-msgid "Copy ([Y]ank) the [n]ote to a notebook."
-msgstr ""
-
-msgid "Move the note to a notebook."
-msgstr ""
-
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr ""
 
@@ -214,6 +163,10 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "Note has been saved."
 msgstr ""
 
@@ -221,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 ""
 
@@ -237,6 +194,10 @@ msgstr ""
 msgid "Displays usage information."
 msgstr ""
 
+#, javascript-format
+msgid "For information on how to customise the shortcuts please visit %s"
+msgstr ""
+
 msgid "Shortcuts are not available in CLI mode."
 msgstr ""
 
@@ -249,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 ""
@@ -262,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 \":\""
@@ -272,25 +233,19 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr ""
 
 msgid ""
-"For the complete list of available keyboard shortcuts, type `help shortcuts`"
+"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 ""
@@ -377,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>."
@@ -413,6 +370,24 @@ msgstr ""
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
+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 ""
+
 msgid "Synchronisation is already in progress."
 msgstr ""
 
@@ -423,10 +398,6 @@ msgid ""
 "operation."
 msgstr ""
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -490,6 +461,9 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
+msgid "Type `joplin help` for usage information."
+msgstr ""
+
 msgid "Fatal error:"
 msgstr ""
 
@@ -527,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 ""
 
@@ -539,10 +524,17 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import Evernote notes"
+msgid "Import"
 msgstr ""
 
-msgid "Evernote Export Files"
+msgid "Export"
+msgstr ""
+
+msgid "Print"
+msgstr ""
+
+#, javascript-format
+msgid "Hide %s"
 msgstr ""
 
 msgid "Quit"
@@ -563,6 +555,15 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr ""
 
@@ -581,6 +582,12 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Make a donation"
+msgstr ""
+
+msgid "Check for updates..."
+msgstr ""
+
 msgid "About Joplin"
 msgstr ""
 
@@ -588,12 +595,34 @@ msgstr ""
 msgid "%s %s (%s, %s)"
 msgstr ""
 
+#, javascript-format
+msgid "Open %s"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
+msgid "Current version is up-to-date."
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Check synchronisation configuration"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -601,6 +630,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 "
@@ -650,6 +682,20 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 
+msgid "Missing Master Keys"
+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 ""
+
+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 ""
 
@@ -682,12 +728,18 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""
 
+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""
 
 msgid "Layout"
 msgstr ""
 
+msgid "Search..."
+msgstr ""
+
 msgid "Some items cannot be synchronised."
 msgstr ""
 
@@ -706,6 +758,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -719,16 +774,44 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Open..."
+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 "Attach file"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Set alarm"
 msgstr ""
 
+msgid "to-do"
+msgstr ""
+
+msgid "note"
+msgstr ""
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr ""
+
 msgid "Refresh"
 msgstr ""
 
@@ -738,7 +821,7 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Import"
+msgid "Dropbox Login"
 msgstr ""
 
 msgid "Options"
@@ -765,12 +848,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
-msgid "Searches"
-msgstr ""
-
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -782,15 +859,24 @@ msgstr ""
 msgid "Unknown flag: %s"
 msgstr ""
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr ""
 
+msgid "Nextcloud"
+msgstr ""
+
 msgid "OneDrive"
 msgstr ""
 
 msgid "OneDrive Dev (For testing only)"
 msgstr ""
 
+msgid "WebDAV"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr ""
@@ -846,7 +932,7 @@ msgid "Fetched items: %d/%d."
 msgstr ""
 
 #, javascript-format
-msgid "State: \"%s\"."
+msgid "State: %s."
 msgstr ""
 
 msgid "Cancelling..."
@@ -856,6 +942,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 ""
@@ -869,6 +965,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 ""
@@ -917,12 +1016,53 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Show uncompleted todos 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"
 msgstr ""
 
+msgid "When creating a new to-do:"
+msgstr ""
+
+msgid "Focus title"
+msgstr ""
+
+msgid "Focus body"
+msgstr ""
+
+msgid "When creating a new note:"
+msgstr ""
+
+msgid "Show tray icon"
+msgstr ""
+
+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"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -938,9 +1078,6 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
-msgid "Automatically update the application"
-msgstr ""
-
 msgid "Show advanced options"
 msgstr ""
 
@@ -948,8 +1085,8 @@ msgid "Synchronisation target"
 msgstr ""
 
 msgid ""
-"The target to synchonise to. If synchronising with the file system, set "
-"`sync.2.path` to specify the target directory."
+"The target to synchonise to. Each sync target may have additional parameters "
+"which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
 
 msgid "Directory to synchronise with (absolute path)"
@@ -960,10 +1097,63 @@ msgid ""
 "See `sync.target`."
 msgstr ""
 
+msgid "Nextcloud WebDAV URL"
+msgstr ""
+
+msgid "Nextcloud username"
+msgstr ""
+
+msgid "Nextcloud password"
+msgstr ""
+
+msgid "WebDAV URL"
+msgstr ""
+
+msgid "WebDAV username"
+msgstr ""
+
+msgid "WebDAV password"
+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 ""
 
@@ -1047,6 +1237,34 @@ msgstr ""
 msgid "Cancel synchronisation"
 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 ""
@@ -1071,6 +1289,12 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr ""
 
@@ -1080,6 +1304,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 ""
@@ -1090,6 +1322,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""
 
@@ -1111,6 +1346,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

@@ -16,64 +16,12 @@ msgstr ""
 "X-Generator: Poedit 2.0.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Give focus to next pane"
-msgstr "Focus op het volgende paneel"
-
-msgid "Give focus to previous pane"
-msgstr "Focus op het vorige paneel"
-
-msgid "Enter command line mode"
-msgstr "Ga naar command line modus"
-
-msgid "Exit command line mode"
-msgstr "Ga uit command line modus"
-
-msgid "Edit the selected note"
-msgstr "Pas de geselecteerde notitie aan"
-
-msgid "Cancel the current command."
-msgstr "Annuleer het huidige commando."
-
-msgid "Exit the application."
-msgstr "Sluit de applicatie."
-
-msgid "Delete the currently selected note or notebook."
-msgstr "Verwijder de geselecteerde notitie of het geselecteerde notitieboek."
-
 msgid "To delete a tag, untag the associated notes."
 msgstr "Untag de geassocieerde notities om een tag te verwijderen."
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr "Selecteer eerst het notitieboek of de notitie om te verwijderen."
 
-msgid "Set a to-do as completed / not completed"
-msgstr "Zet een to-do als voltooid / niet voltooid"
-
-msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-msgstr ""
-"Wissel de console tussen gemaximaliseerd/geminimaliseerd/verborgen/zichtbaar."
-
-msgid "Search"
-msgstr "Zoeken"
-
-msgid "[t]oggle note [m]etadata."
-msgstr "Ac[t]iveer notitie [m]etadata."
-
-msgid "[M]ake a new [n]ote"
-msgstr "[M]aak een nieuwe [n]otitie"
-
-msgid "[M]ake a new [t]odo"
-msgstr "[M]aak een nieuwe [t]o-do"
-
-msgid "[M]ake a new note[b]ook"
-msgstr "[M]aak een nieuw notitie[b]oek"
-
-msgid "Copy ([Y]ank) the [n]ote to a notebook."
-msgstr "Kopieer [Y] de [n]otirie in een notitieboek."
-
-msgid "Move the note to a notebook."
-msgstr "Verplaats de notitie naar een notitieboek."
-
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "Typ Ctrl+D of \"exit\" om de applicatie te sluiten"
 
@@ -229,20 +177,29 @@ msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 "Bewerken notitie gestart. Sluit de editor om terug naar de prompt te gaan."
 
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "Note has been saved."
 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."
 
@@ -255,6 +212,10 @@ msgstr "Toont een geolocatie link voor de notitie."
 msgid "Displays usage information."
 msgstr "Toont gebruiksinformatie."
 
+#, javascript-format
+msgid "For information on how to customise the shortcuts please visit %s"
+msgstr ""
+
 msgid "Shortcuts are not available in CLI mode."
 msgstr "Shortcuts zijn niet beschikbaar in command line modus."
 
@@ -269,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 ""
@@ -288,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 \":\""
@@ -297,31 +259,22 @@ msgstr "Om command line modus te gebruiken, duw \":\""
 msgid "To exit command line mode, press ESCAPE"
 msgstr "Om command line modus te verlaten, duw ESCAPE"
 
+#, fuzzy
 msgid ""
-"For the complete list of available keyboard shortcuts, type `help shortcuts`"
+"For the list of keyboard shortcuts and config options, type `help keymap`"
 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."
@@ -416,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."
@@ -459,6 +415,24 @@ msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 "Synchroniseer naar opgegeven doel (standaard sync.target configuratie optie)"
 
+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 ""
+
 msgid "Synchronisation is already in progress."
 msgstr "Synchronisatie reeds bezig."
 
@@ -472,10 +446,6 @@ msgstr ""
 "is, kan de lock file verwijderd worden op \"%s\" en verder gegaan worden met "
 "de synchronisatie. "
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr "Authenticatie was niet voltooid (geen authenticatietoken ontvangen)."
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "Synchronisatiedoel: %s (%s)"
@@ -549,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:"
 
@@ -602,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"
 
@@ -614,11 +600,19 @@ 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"
+msgstr ""
 
 msgid "Quit"
 msgstr "Stop"
@@ -638,6 +632,15 @@ msgstr "Plak"
 msgid "Search in all the notes"
 msgstr "Zoek in alle notities"
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr "Tools"
 
@@ -656,6 +659,13 @@ msgstr "Help"
 msgid "Website and documentation"
 msgstr "Website en documentatie"
 
+#, fuzzy
+msgid "Make a donation"
+msgstr "Website en documentatie"
+
+msgid "Check for updates..."
+msgstr ""
+
 msgid "About Joplin"
 msgstr "Over Joplin"
 
@@ -663,12 +673,36 @@ msgstr "Over Joplin"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
+#, fuzzy, javascript-format
+msgid "Open %s"
+msgstr "Op %s: %s"
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr "OK"
 
 msgid "Cancel"
 msgstr "Annuleer"
 
+msgid "Current version is up-to-date."
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+#, fuzzy
+msgid "No"
+msgstr "N"
+
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Annuleer synchronisatie"
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen zijn opgeslaan in %s"
@@ -676,6 +710,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 "
@@ -736,6 +773,21 @@ msgstr ""
 "(aangeduid met \"active\"). Alle sleutels kunnen gebruikt worden voor "
 "decodering, afhankelijk van hoe de notitieboeken initieel versleuteld zijn."
 
+#, fuzzy
+msgid "Missing Master Keys"
+msgstr "Hoofdsleutels"
+
+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 ""
+
+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"
 
@@ -770,12 +822,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 "Layout"
 msgstr "Layout"
 
+#, fuzzy
+msgid "Search..."
+msgstr "Zoeken"
+
 msgid "Some items cannot be synchronised."
 msgstr "Sommige items kunnen niet gesynchroniseerd worden."
 
@@ -794,6 +854,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"
 
@@ -809,16 +872,47 @@ msgstr ""
 "U heeft momenteel geen notitieboek. Maak een notitieboek door op \"Nieuw "
 "notitieboek\" te klikken."
 
+msgid "Open..."
+msgstr ""
+
+#, 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 "Attach file"
 msgstr "Voeg bestand toe"
 
+msgid "Tags"
+msgstr "Tags"
+
 msgid "Set alarm"
 msgstr "Zet melding"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Nieuwe to-do"
+
+#, fuzzy
+msgid "note"
+msgstr "Nieuwe notitie"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Notities importeren..."
+
 msgid "Refresh"
 msgstr "Vernieuwen"
 
@@ -828,8 +922,8 @@ msgstr "Vrijmaken"
 msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
-msgid "Import"
-msgstr "Importeer"
+msgid "Dropbox Login"
+msgstr ""
 
 msgid "Options"
 msgstr "Opties"
@@ -855,12 +949,6 @@ msgstr "Synchroniseer"
 msgid "Notebooks"
 msgstr "Notitieboeken"
 
-msgid "Tags"
-msgstr "Tags"
-
-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"
 
@@ -872,15 +960,25 @@ msgstr "Gebruik: %s"
 msgid "Unknown flag: %s"
 msgstr "Onbekende optie: %s"
 
+msgid "Dropbox"
+msgstr ""
+
 msgid "File system"
 msgstr "Bestandssysteem"
 
+#, fuzzy
+msgid "Nextcloud"
+msgstr "Stel wachtwoord in"
+
 msgid "OneDrive"
 msgstr "OneDrive"
 
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive Dev (Alleen voor testen)"
 
+msgid "WebDAV"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr "Onbekend log level: %s"
@@ -943,8 +1041,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..."
@@ -954,6 +1052,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"
@@ -967,6 +1075,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"
@@ -1020,12 +1132,58 @@ msgstr "Licht"
 msgid "Dark"
 msgstr "Donker"
 
-msgid "Show uncompleted todos on top of the lists"
+#, fuzzy
+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"
 
+#, fuzzy
+msgid "When creating a new to-do:"
+msgstr "Maakt nieuwe to-do aan."
+
+msgid "Focus title"
+msgstr ""
+
+msgid "Focus body"
+msgstr ""
+
+#, fuzzy
+msgid "When creating a new note:"
+msgstr "Maakt een nieuwe notitie aan."
+
+msgid "Show tray icon"
+msgstr ""
+
+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"
+msgstr "Update de applicatie automatisch"
+
 msgid "Synchronisation interval"
 msgstr "Synchronisatie interval"
 
@@ -1041,9 +1199,6 @@ msgstr "%d uur"
 msgid "%d hours"
 msgstr "%d uren"
 
-msgid "Automatically update the application"
-msgstr "Update de applicatie automatisch"
-
 msgid "Show advanced options"
 msgstr "Toon geavanceerde opties"
 
@@ -1051,11 +1206,9 @@ msgid "Synchronisation target"
 msgstr "Synchronisatiedoel"
 
 msgid ""
-"The target to synchonise to. If synchronising with the file system, set "
-"`sync.2.path` to specify the target directory."
+"The target to synchonise to. Each sync target may have additional parameters "
+"which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
-"Het doel om mee te synchroniseren. Indien synchroniseren met het "
-"bestandssysteem, zet `sync.2.path` om de doelfolder in te stellen."
 
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Folder om mee te synchroniseren (absolute pad)"
@@ -1067,10 +1220,68 @@ msgstr ""
 "Het pad om mee te synchroniseren als bestandssysteem synchronisatie is "
 "ingeschakeld. Zie `sync.target`."
 
+msgid "Nextcloud WebDAV URL"
+msgstr ""
+
+msgid "Nextcloud username"
+msgstr ""
+
+#, fuzzy
+msgid "Nextcloud password"
+msgstr "Stel wachtwoord in"
+
+msgid "WebDAV URL"
+msgstr ""
+
+msgid "WebDAV username"
+msgstr ""
+
+#, fuzzy
+msgid "WebDAV password"
+msgstr "Stel wachtwoord in"
+
 #, 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"
 
@@ -1158,6 +1369,35 @@ msgstr "Bevestig"
 msgid "Cancel synchronisation"
 msgstr "Annuleer synchronisatie"
 
+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"
@@ -1182,6 +1422,12 @@ msgstr "Het notitieboek kon niet opgeslaan worden: %s"
 msgid "Edit notebook"
 msgstr "Bewerk notitieboek"
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr "Deze notitie werd aangepast:"
 
@@ -1191,6 +1437,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"
@@ -1201,6 +1455,9 @@ msgstr "Voeg foto toe"
 msgid "Attach any file"
 msgstr "Voeg bestand toe"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converteer naar notitie"
 
@@ -1222,6 +1479,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."
@@ -1236,3 +1496,90 @@ 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"
+
+#~ msgid "Give focus to previous pane"
+#~ msgstr "Focus op het vorige paneel"
+
+#~ msgid "Enter command line mode"
+#~ msgstr "Ga naar command line modus"
+
+#~ msgid "Exit command line mode"
+#~ msgstr "Ga uit command line modus"
+
+#~ msgid "Edit the selected note"
+#~ msgstr "Pas de geselecteerde notitie aan"
+
+#~ msgid "Cancel the current command."
+#~ msgstr "Annuleer het huidige commando."
+
+#~ msgid "Exit the application."
+#~ msgstr "Sluit de applicatie."
+
+#~ msgid "Delete the currently selected note or notebook."
+#~ msgstr ""
+#~ "Verwijder de geselecteerde notitie of het geselecteerde notitieboek."
+
+#~ msgid "Set a to-do as completed / not completed"
+#~ msgstr "Zet een to-do als voltooid / niet voltooid"
+
+#~ msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+#~ msgstr ""
+#~ "Wissel de console tussen gemaximaliseerd/geminimaliseerd/verborgen/"
+#~ "zichtbaar."
+
+#~ msgid "[t]oggle note [m]etadata."
+#~ msgstr "Ac[t]iveer notitie [m]etadata."
+
+#~ msgid "[M]ake a new [n]ote"
+#~ msgstr "[M]aak een nieuwe [n]otitie"
+
+#~ msgid "[M]ake a new [t]odo"
+#~ msgstr "[M]aak een nieuwe [t]o-do"
+
+#~ msgid "[M]ake a new note[b]ook"
+#~ msgstr "[M]aak een nieuw notitie[b]oek"
+
+#~ msgid "Copy ([Y]ank) the [n]ote to a notebook."
+#~ msgstr "Kopieer [Y] de [n]otirie in een notitieboek."
+
+#~ msgid "Move the note to a notebook."
+#~ msgstr "Verplaats de notitie naar een notitieboek."
+
+#~ msgid ""
+#~ "The target to synchonise to. If synchronising with the file system, set "
+#~ "`sync.2.path` to specify the target directory."
+#~ msgstr ""
+#~ "Het doel om mee te synchroniseren. Indien synchroniseren met het "
+#~ "bestandssysteem, zet `sync.2.path` om de doelfolder in te stellen."

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "0.10.88",
+  "version": "1.0.107",
   "bin": {
     "joplin": "./main.js"
   },
@@ -28,11 +28,14 @@
   },
   "dependencies": {
     "app-module-path": "^2.2.0",
+    "async-mutex": "^0.1.3",
+    "base-64": "^0.1.0",
     "compare-version": "^0.1.2",
     "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",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
@@ -42,7 +45,6 @@
     "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",
@@ -55,10 +57,14 @@
     "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.21",
+    "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"
   },
   "devDependencies": {

CliClient/publish.sh

@@ -11,7 +11,7 @@ cp "$SCRIPT_DIR/../README.md" build/
 cd "$SCRIPT_DIR/build"
 npm publish
 
-NEW_VERSION=$("cat package.json | jq -r .version")
+NEW_VERSION=$(cat package.json | jq -r .version)
 git add -A
 git commit -m "CLI v$NEW_VERSION"
 git tag "cli-v$NEW_VERSION"

CliClient/run_test.sh

@@ -8,10 +8,16 @@ 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)
-	(cd "$ROOT_DIR" && npm test tests-build/encryption.js)
-	(cd "$ROOT_DIR" && npm test tests-build/ArrayUtils.js)
-else
+if [[ $TEST_FILE != "" ]]; then
 	(cd "$ROOT_DIR" && npm test tests-build/$TEST_FILE.js)
-fi
+	exit
+fi
+
+(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js)
+(cd "$ROOT_DIR" && npm test tests-build/encryption.js)
+(cd "$ROOT_DIR" && npm test tests-build/ArrayUtils.js)
+(cd "$ROOT_DIR" && npm test tests-build/models_Setting.js)
+(cd "$ROOT_DIR" && npm test tests-build/models_Note.js)
+(cd "$ROOT_DIR" && npm test tests-build/models_Folder.js)
+(cd "$ROOT_DIR" && npm test tests-build/services_InteropService.js)
+(cd "$ROOT_DIR" && npm test tests-build/HtmlToMd.js)

CliClient/tests/ArrayUtils.js

@@ -8,7 +8,7 @@ process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
 
-describe('Encryption', function() {
+describe('ArrayUtils', function() {
 
 	beforeEach(async (done) => {
 		done();
@@ -29,4 +29,28 @@ describe('Encryption', function() {
 		done();
 	});
 
+	it('should find items using binary search', async (done) => {
+		let items = ['aaa', 'ccc', 'bbb'];
+		expect(ArrayUtils.binarySearch(items, 'bbb')).toBe(-1); // Array not sorted!
+		items.sort();
+		expect(ArrayUtils.binarySearch(items, 'bbb')).toBe(1);
+		expect(ArrayUtils.binarySearch(items, 'ccc')).toBe(2);
+		expect(ArrayUtils.binarySearch(items, 'oops')).toBe(-1);
+		expect(ArrayUtils.binarySearch(items, 'aaa')).toBe(0);
+
+		items = [];
+		expect(ArrayUtils.binarySearch(items, 'aaa')).toBe(-1);
+
+		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/HtmlToMd.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('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);
+		
+		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/html_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/html_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/html_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/html_to_md/code2.md

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

CliClient/tests/html_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/html_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/html_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/html_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/html_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/html_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/html_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/html_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/html_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/html_to_md/list.md

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

CliClient/tests/html_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/html_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/html_to_md/list3.html

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

CliClient/tests/html_to_md/list3.md

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

CliClient/tests/html_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/html_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/html_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/html_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/html_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/html_to_md/tableWithNewLines.md

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

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

@@ -0,0 +1,32 @@
+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 Setting = require('lib/models/Setting.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('models_Setting', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should return only sub-values', asyncTest(async () => {
+		const settings = {
+			'sync.5.path': 'http://example.com',
+			'sync.5.username': 'testing',
+		}
+
+		let output = Setting.subValues('sync.5', settings);
+		expect(output['path']).toBe('http://example.com');
+		expect(output['username']).toBe('testing');
+
+		output = Setting.subValues('sync.4', settings);
+		expect('path' in output).toBe(false);
+		expect('username' in output).toBe(false);
+	}));
+
+});

CliClient/tests/services_InteropService.js

@@ -0,0 +1,276 @@
+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');
+
+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 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);
+	}));
+
+});

CliClient/tests/services_ResourceService.js

@@ -0,0 +1,99 @@
+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 NoteResource = require('lib/models/NoteResource.js');
+const ResourceService = require('lib/services/ResourceService.js');
+const fs = require('fs-extra');
+const ArrayUtils = require('lib/ArrayUtils');
+const ObjectUtils = require('lib/ObjectUtils');
+const { shim } = require('lib/shim.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+
+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_ResourceService', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should delete orphaned resources', asyncTest(async () => {
+		const service = new ResourceService();
+
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+		const resourcePath = Resource.fullPath(resource1);
+
+		await service.indexNoteResources();
+		await service.deleteOrphanResources(0);
+
+		expect(!!(await Resource.load(resource1.id))).toBe(true);
+
+		await Note.delete(note1.id);
+		await service.deleteOrphanResources(0);
+
+		expect(!!(await Resource.load(resource1.id))).toBe(true);
+
+		await service.indexNoteResources();
+		await service.deleteOrphanResources(1000 * 60);
+
+		expect(!!(await Resource.load(resource1.id))).toBe(true);
+
+		await service.deleteOrphanResources(0);
+
+		expect(!!(await Resource.load(resource1.id))).toBe(false);
+		expect(await shim.fsDriver().exists(resourcePath)).toBe(false);
+		expect(!(await NoteResource.all()).length).toBe(true);
+	}));
+
+	it('should not delete resource if still associated with at least one note', asyncTest(async () => {
+		const service = new ResourceService();
+
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', parent_id: folder1.id });
+		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+		const resourcePath = Resource.fullPath(resource1);
+
+		await service.indexNoteResources();
+
+		await Note.delete(note1.id);
+		
+		await service.indexNoteResources();
+		
+		await Note.save({ id: note2.id, body: Resource.markdownTag(resource1) });
+
+		await service.indexNoteResources();
+
+		await service.deleteOrphanResources(0);
+
+		expect(!!(await Resource.load(resource1.id))).toBe(true);
+	}));
+
+});

CliClient/tests/synchronizer.js

@@ -19,7 +19,7 @@ process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000; // The first test is slow because the database needs to be built
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000 + 30000; // The first test is slow because the database needs to be built
 
 async function allItems() {
 	let folders = await Folder.all();
@@ -60,6 +60,7 @@ async function allSyncTargetItemsEncrypted() {
 }
 
 async function localItemsSameAsRemote(locals, expect) {
+	let error = null;
 	try {
 		let files = await fileApi().list();
 		files = files.items;
@@ -74,19 +75,22 @@ async function localItemsSameAsRemote(locals, expect) {
 			expect(!!remote).toBe(true);
 			if (!remote) continue;
 
-			if (syncTargetId() == SyncTargetRegistry.nameToId('filesystem')) {
-				expect(remote.updated_time).toBe(Math.floor(dbItem.updated_time / 1000) * 1000);
-			} else {
-				expect(remote.updated_time).toBe(dbItem.updated_time);
-			}
+			// if (syncTargetId() == SyncTargetRegistry.nameToId('filesystem')) {
+			// 	expect(remote.updated_time).toBe(Math.floor(dbItem.updated_time / 1000) * 1000);
+			// } else {
+			// 	expect(remote.updated_time).toBe(dbItem.updated_time);
+			// }
 
 			let remoteContent = await fileApi().get(path);
+
 			remoteContent = dbItem.type_ == BaseModel.TYPE_NOTE ? await Note.unserialize(remoteContent) : await Folder.unserialize(remoteContent);
 			expect(remoteContent.title).toBe(dbItem.title);
 		}
-	} catch (error) {
-		console.error(error);
+	} catch (e) {
+		error = e;
 	}
+
+	expect(error).toBe(null);
 }
 
 let insideBeforeEach = false;
@@ -115,7 +119,7 @@ describe('Synchronizer', function() {
 		await localItemsSameAsRemote(all, expect);
 	}));
 
-	it('should update remote item', asyncTest(async () => {
+	it('should update remote items', asyncTest(async () => {
 		let folder = await Folder.save({ title: "folder1" });
 		let note = await Note.save({ title: "un", parent_id: folder.id });
 		await synchronizer().start();
@@ -287,24 +291,31 @@ describe('Synchronizer', function() {
 	}));
 
 	it('should delete local notes', asyncTest(async () => {
+		// For these tests we pass the context around for each user. This is to make sure that the "deletedItemsProcessed"
+		// property of the basicDelta() function is cleared properly at the end of a sync operation. If it is not cleared
+		// it means items will no longer be deleted locally via sync.
+
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
-		await synchronizer().start();
+		let note2 = await Note.save({ title: "deux", parent_id: folder1.id });
+		let context1 = await synchronizer().start();
 
 		await switchClient(2);
 
-		await synchronizer().start();
+		let context2 = await synchronizer().start();
 		await Note.delete(note1.id);
-		await synchronizer().start();
+		context2 = await synchronizer().start({ context: context2 });
 
 		await switchClient(1);
 
-		await synchronizer().start();
+		context1 = await synchronizer().start({ context: context1 });
 		let items = await allItems();
-		expect(items.length).toBe(1);
+		expect(items.length).toBe(2);
 		let deletedItems = await BaseItem.deletedItems(syncTargetId());
 		expect(deletedItems.length).toBe(0);
-			}));
+		await Note.delete(note2.id);
+		context1 = await synchronizer().start({ context: context1 });
+	}));
 
 	it('should delete remote folder', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: "folder1" });
@@ -322,31 +333,26 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		let all = await allItems();
-		localItemsSameAsRemote(all, expect);
-			}));
+		await localItemsSameAsRemote(all, expect);
+	}));
 
 	it('should delete local folder', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let folder2 = await Folder.save({ title: "folder2" });
-		await synchronizer().start();
+		let context1 = await synchronizer().start();
 
 		await switchClient(2);
 
-		await synchronizer().start();
-
-		await sleep(0.1);
-
+		let context2 = await synchronizer().start();
 		await Folder.delete(folder2.id);
-
-		await synchronizer().start();
+		await synchronizer().start({ context: context2 });
 
 		await switchClient(1);
 
-		await synchronizer().start();
-
+		await synchronizer().start({ context: context1 });
 		let items = await allItems();
-		localItemsSameAsRemote(items, expect);
-			}));
+		await localItemsSameAsRemote(items, expect);
+	}));
 
 	it('should resolve conflict if remote folder has been deleted, but note has been added to folder locally', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: "folder1" });
@@ -366,7 +372,7 @@ describe('Synchronizer', function() {
 		expect(items.length).toBe(1);
 		expect(items[0].title).toBe('note1');
 		expect(items[0].is_conflict).toBe(1);
-			}));
+	}));
 
 	it('should resolve conflict if note has been deleted remotely and locally', asyncTest(async () => {
 		let folder = await Folder.save({ title: "folder" });
@@ -388,8 +394,8 @@ describe('Synchronizer', function() {
 		expect(items.length).toBe(1);
 		expect(items[0].title).toBe('folder');
 
-		localItemsSameAsRemote(items, expect);
-			}));
+		await localItemsSameAsRemote(items, expect);
+	}));
 
 	it('should cross delete all folders', asyncTest(async () => {
 		// If client1 and 2 have two folders, client 1 deletes item 1 and client
@@ -427,7 +433,7 @@ describe('Synchronizer', function() {
 
 		expect(items1.length).toBe(0);
 		expect(items1.length).toBe(items2.length);
-			}));
+	}));
 
 	it('should handle conflict when remote note is deleted then local note is modified', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: "folder1" });
@@ -459,7 +465,7 @@ describe('Synchronizer', function() {
 		let unconflictedNotes = await Note.unconflictedNotes();
 
 		expect(unconflictedNotes.length).toBe(0);
-			}));
+	}));
 
 	it('should handle conflict when remote folder is deleted then local folder is renamed', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: "folder1" });
@@ -489,7 +495,7 @@ describe('Synchronizer', function() {
 		let items = await allItems();
 
 		expect(items.length).toBe(1);
-			}));
+	}));
 
 	it('should allow duplicate folder titles', asyncTest(async () => {
 		let localF1 = await Folder.save({ title: "folder" });
@@ -536,11 +542,11 @@ describe('Synchronizer', function() {
 		let n1 = await Note.save({ title: "mynote" });
 		let n2 = await Note.save({ title: "mynote2" });
 		let tag = await Tag.save({ title: 'mytag' });
-		await synchronizer().start();
+		let context1 = await synchronizer().start();
 
 		await switchClient(2);
 
-		await synchronizer().start();
+		let context2 = await synchronizer().start();
 		if (withEncryption) {
 			const masterKey_2 = await MasterKey.load(masterKey.id);
 			await encryptionService().loadMasterKey(masterKey_2, '123456', true);
@@ -554,31 +560,33 @@ describe('Synchronizer', function() {
 		await Tag.addNote(remoteTag.id, n2.id);
 		let noteIds = await Tag.noteIds(tag.id);
 		expect(noteIds.length).toBe(2);
-		await synchronizer().start();
+		context2 = await synchronizer().start({ context: context2 });
 
 		await switchClient(1);
 
-		await synchronizer().start();
+		context1 = await synchronizer().start({ context: context1 });
 		let remoteNoteIds = await Tag.noteIds(tag.id);
 		expect(remoteNoteIds.length).toBe(2);
 		await Tag.removeNote(tag.id, n1.id);
 		remoteNoteIds = await Tag.noteIds(tag.id);
 		expect(remoteNoteIds.length).toBe(1);
-		await synchronizer().start();
+		context1 = await synchronizer().start({ context: context1 });
 
 		await switchClient(2);
 
-		await synchronizer().start();
+		context2 = await synchronizer().start({ context: context2 });
 		noteIds = await Tag.noteIds(tag.id);
 		expect(noteIds.length).toBe(1);
 		expect(remoteNoteIds[0]).toBe(noteIds[0]);
 	}
 
 	it('should sync tags', asyncTest(async () => {
-		await shoudSyncTagTest(false);	}));
+		await shoudSyncTagTest(false);
+	}));
 
 	it('should sync encrypted tags', asyncTest(async () => {
-		await shoudSyncTagTest(true);	}));
+		await shoudSyncTagTest(true);
+	}));
 
 	it('should not sync notes with conflicts', asyncTest(async () => {
 		let f1 = await Folder.save({ title: "folder" });
@@ -683,12 +691,12 @@ describe('Synchronizer', function() {
 
 		await switchClient(2);
 
-		synchronizer().debugFlags_ = ['cancelDeltaLoop2'];		
+		synchronizer().testingHooks_ = ['cancelDeltaLoop2'];		
 		let context = await synchronizer().start();
 		let notes = await Note.all();
 		expect(notes.length).toBe(0);
 
-		synchronizer().debugFlags_ = [];
+		synchronizer().testingHooks_ = [];
 		await synchronizer().start({ context: context });
 		notes = await Note.all();
 		expect(notes.length).toBe(1);
@@ -702,9 +710,9 @@ describe('Synchronizer', function() {
 		let disabledItems = await BaseItem.syncDisabledItems(syncTargetId());
 		expect(disabledItems.length).toBe(0);
 		await Note.save({ id: noteId, title: "un mod", });
-		synchronizer().debugFlags_ = ['rejectedByTarget'];
+		synchronizer().testingHooks_ = ['rejectedByTarget'];
 		await synchronizer().start();
-		synchronizer().debugFlags_ = [];
+		synchronizer().testingHooks_ = [];
 		await synchronizer().start(); // Another sync to check that this item is now excluded from sync
 
 		await switchClient(2);
@@ -848,7 +856,7 @@ describe('Synchronizer', function() {
 	}));
 
 	it('should sync resources', asyncTest(async () => {
-		while (insideBeforeEach) await time.msleep(100);
+		while (insideBeforeEach) await time.msleep(500);
 
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
@@ -870,6 +878,37 @@ describe('Synchronizer', function() {
 		expect(fileContentEqual(resourcePath1, resourcePath1_2)).toBe(true);
 	}));
 
+	it('should delete resources', asyncTest(async () => {
+		while (insideBeforeEach) await time.msleep(500);
+
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+		let resourcePath1 = Resource.fullPath(resource1);
+		await synchronizer().start();
+
+		await switchClient(2);
+
+		await synchronizer().start();
+		let allResources = await Resource.all();
+		expect(allResources.length).toBe(1);
+		let all = await fileApi().list();
+		expect(all.items.length).toBe(3);
+		await Resource.delete(resource1.id);
+		await synchronizer().start();
+		all = await fileApi().list();
+		expect(all.items.length).toBe(2);
+
+		await switchClient(1);
+
+		expect(await shim.fsDriver().exists(resourcePath1)).toBe(true);
+		await synchronizer().start();
+		allResources = await Resource.all();
+		expect(allResources.length).toBe(0);
+		expect(await shim.fsDriver().exists(resourcePath1)).toBe(false);
+	}));
+
 	it('should encryt resources', asyncTest(async () => {
 		Setting.setValue('encryption.enabled', true);
 		const masterKey = await loadEncryptionMasterKey();
@@ -983,4 +1022,39 @@ describe('Synchronizer', function() {
 		expect(resource1.encryption_blob_encrypted).toBe(0);
 	}));
 
-});
+	it('should create remote items with UTF-8 content', asyncTest(async () => {
+		let folder = await Folder.save({ title: "Fahrräder" });
+		await Note.save({ title: "Fahrräder", body: "Fahrräder", parent_id: folder.id });
+		let all = await allItems();
+
+		await synchronizer().start();
+
+		await localItemsSameAsRemote(all, expect);
+	}));
+
+	it("should update remote items but not pull remote changes", asyncTest(async () => {
+		let folder = await Folder.save({ title: "folder1" });
+		let note = await Note.save({ title: "un", parent_id: folder.id });
+		await synchronizer().start();
+
+		await switchClient(2);
+
+		await synchronizer().start();
+		await Note.save({ title: "deux", parent_id: folder.id });
+		await synchronizer().start();
+
+		await switchClient(1);
+
+		await Note.save({ title: "un UPDATE", id: note.id });
+		await synchronizer().start({ syncSteps: ["update_remote"] });
+		let all = await allItems();
+		expect(all.length).toBe(2);
+
+		await switchClient(2);
+
+		await synchronizer().start();
+		let note2 = await Note.load(note.id);
+		expect(note2.title).toBe("un UPDATE");
+	}));
+
+});

CliClient/tests/test-utils.js

@@ -15,6 +15,9 @@ const { Synchronizer } = require('lib/synchronizer.js');
 const { FileApi } = require('lib/file-api.js');
 const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');
 const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
+const { FileApiDriverWebDav } = require('lib/file-api-driver-webdav.js');
+const { FileApiDriverDropbox } = require('lib/file-api-driver-dropbox.js');
+const BaseService = require('lib/services/BaseService.js');
 const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { time } = require('lib/time-utils.js');
 const { shimInit } = require('lib/shim-init-node.js');
@@ -22,8 +25,12 @@ const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
 const SyncTargetMemory = require('lib/SyncTargetMemory.js');
 const SyncTargetFilesystem = require('lib/SyncTargetFilesystem.js');
 const SyncTargetOneDrive = require('lib/SyncTargetOneDrive.js');
+const SyncTargetNextcloud = require('lib/SyncTargetNextcloud.js');
+const SyncTargetDropbox = require('lib/SyncTargetDropbox.js');
 const EncryptionService = require('lib/services/EncryptionService.js');
 const DecryptionWorker = require('lib/services/DecryptionWorker.js');
+const WebDavApi = require('lib/WebDavApi');
+const DropboxApi = require('lib/DropboxApi');
 
 let databases_ = [];
 let synchronizers_ = [];
@@ -46,17 +53,23 @@ fs.mkdirpSync(logDir, 0o755);
 SyncTargetRegistry.addClass(SyncTargetMemory);
 SyncTargetRegistry.addClass(SyncTargetFilesystem);
 SyncTargetRegistry.addClass(SyncTargetOneDrive);
+SyncTargetRegistry.addClass(SyncTargetNextcloud);
+SyncTargetRegistry.addClass(SyncTargetDropbox);
 
-//const syncTargetId_ = SyncTargetRegistry.nameToId('memory');
-const syncTargetId_ = SyncTargetRegistry.nameToId('filesystem');
+const syncTargetId_ = SyncTargetRegistry.nameToId("nextcloud");
+// const syncTargetId_ = SyncTargetRegistry.nameToId("memory");
+//const syncTargetId_ = SyncTargetRegistry.nameToId('filesystem');
+// const syncTargetId_ = SyncTargetRegistry.nameToId('dropbox');
 const syncDir = __dirname + '/../tests/sync';
 
-const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 400;
+const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 100;//400;
+
+console.info('Testing with sync target: ' + SyncTargetRegistry.idToName(syncTargetId_));
 
 const logger = new Logger();
 logger.addTarget('console');
 logger.addTarget('file', { path: logDir + '/log.txt' });
-logger.setLevel(Logger.LEVEL_WARN); // Set to INFO to display sync process in console
+logger.setLevel(Logger.LEVEL_WARN); // Set to DEBUG to display sync process in console
 
 BaseItem.loadClass('Note', Note);
 BaseItem.loadClass('Folder', Folder);
@@ -68,6 +81,10 @@ BaseItem.loadClass('MasterKey', MasterKey);
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
 
+BaseService.logger_ = logger;
+
+Setting.autoSaveEnabled = false;
+
 function syncTargetId() {
 	return syncTargetId_;
 }
@@ -109,8 +126,9 @@ async function clearDatabase(id = null) {
 		'DELETE FROM tags',
 		'DELETE FROM note_tags',
 		'DELETE FROM master_keys',
-		'DELETE FROM settings',
-		
+		'DELETE FROM item_changes',
+		'DELETE FROM note_resources',
+		'DELETE FROM settings',		
 		'DELETE FROM deleted_items',
 		'DELETE FROM sync_items',
 	];
@@ -174,12 +192,7 @@ async function setupDatabaseAndSynchronizer(id = null) {
 	decryptionWorkers_[id] = new DecryptionWorker();
 	decryptionWorkers_[id].setEncryptionService(encryptionServices_[id]);
 
-	if (syncTargetId_ == SyncTargetRegistry.nameToId('filesystem')) {
-		fs.removeSync(syncDir)
-		fs.mkdirpSync(syncDir, 0o755);
-	} else {
-		await fileApi().format();
-	}
+	await fileApi().clearRoot();
 }
 
 function db(id = null) {
@@ -230,26 +243,27 @@ function fileApi() {
 		fileApi_ = new FileApi(syncDir, new FileApiDriverLocal());
 	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('memory')) {
 		fileApi_ = new FileApi('/root', new FileApiDriverMemory());
-	}
-	// } else if (syncTargetId == Setting.SYNC_TARGET_ONEDRIVE) {
-	// 	let auth = require('./onedrive-auth.json');
-	// 	if (!auth) {
-	// 		const oneDriveApiUtils = new OneDriveApiNodeUtils(oneDriveApi);
-	// 		auth = await oneDriveApiUtils.oauthDance();
-	// 		fs.writeFileSync('./onedrive-auth.json', JSON.stringify(auth));
-	// 		process.exit(1);
-	// 	} else {
-	// 		auth = JSON.parse(auth);
-	// 	}
+	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('nextcloud')) {
+		const options = {
+			baseUrl: () => 'http://nextcloud.local/remote.php/dav/files/admin/JoplinTest',
+			username: () => 'admin',
+			password: () => '123456',
+		};
 
-	// 	// const oneDriveApiUtils = new OneDriveApiNodeUtils(reg.oneDriveApi());
-	// 	// const auth = await oneDriveApiUtils.oauthDance(this);
-	// 	// Setting.setValue('sync.3.auth', auth ? JSON.stringify(auth) : null);
-	// 	// if (!auth) return;
-	// }
+		const api = new WebDavApi(options);
+		fileApi_ = new FileApi('', new FileApiDriverWebDav(api));
+	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('dropbox')) {
+		const api = new DropboxApi();
+		const authTokenPath = __dirname + '/support/dropbox-auth.txt';
+		const authToken = fs.readFileSync(authTokenPath, 'utf8');
+		if (!authToken) throw new Error('Dropbox auth token missing in ' + authTokenPath);
+		api.setAuthToken(authToken);
+		fileApi_ = new FileApi('', new FileApiDriverDropbox(api));
+	}
 
 	fileApi_.setLogger(logger);
 	fileApi_.setSyncTargetId(syncTargetId_);
+	fileApi_.requestRepeatCount_ = 0;
 	return fileApi_;
 }
 
@@ -287,8 +301,9 @@ function asyncTest(callback) {
 			await callback();
 		} catch (error) {
 			console.error(error);
+		} finally {
+			done();
 		}
-		done();
 	}
 }
 

ElectronClient/app/ElectronAppWrapper.js

@@ -1,17 +1,22 @@
 const { _ } = require('lib/locale.js');
-const { BrowserWindow } = require('electron');
+const { BrowserWindow, Menu, Tray } = require('electron');
 const { shim } = require('lib/shim');
 const url = require('url')
 const path = require('path')
 const urlUtils = require('lib/urlUtils.js');
+const { dirname, basename } = require('lib/path-utils');
+const fs = require('fs-extra');
 
 class ElectronAppWrapper {
 
-	constructor(electronApp, env) {
+	constructor(electronApp, env, profilePath) {
 		this.electronApp_ = electronApp;
 		this.env_ = env;
+		this.profilePath_ = profilePath;
 		this.win_ = null;
 		this.willQuitApp_ = false;
+		this.tray_ = null;
+		this.buildDir_ = null;
 	}
 
 	electronApp() {
@@ -33,17 +38,22 @@ class ElectronAppWrapper {
 	createWindow() {
 		const windowStateKeeper = require('electron-window-state');
 
-		// Load the previous state with fallback to defaults
-		const windowState = windowStateKeeper({
+		const stateOptions = {
 			defaultWidth: 800,
 			defaultHeight: 600,
-		});
+			file: 'window-state-' + this.env_ + '.json',
+		}
+
+		if (this.profilePath_) stateOptions.path = this.profilePath_;
+
+		// Load the previous state with fallback to defaults
+		const windowState = windowStateKeeper(stateOptions);
 
 		const windowOptions = {
-			'x': windowState.x,
-			'y': windowState.y,
-			'width': windowState.width,
-			'height': windowState.height,
+			x: windowState.x,
+			y: windowState.y,
+			width: windowState.width,
+			height: windowState.height,
 		};
 
 		// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098
@@ -62,11 +72,27 @@ class ElectronAppWrapper {
 		if (this.env_ === 'dev') this.win_.webContents.openDevTools();
 
 		this.win_.on('close', (event) => {
-			if (this.willQuitApp_ || process.platform !== 'darwin') {
-				this.win_ = null;
+			// If it's on macOS, the app is completely closed only if the user chooses to close the app (willQuitApp_ will be true)
+			// otherwise the window is simply hidden, and will be re-open once the app is "activated" (which happens when the
+			// user clicks on the icon in the task bar).
+
+			// On Windows and Linux, the app is closed when the window is closed *except* if the tray icon is used. In which
+			// case the app must be explicitely closed with Ctrl+Q or by right-clicking on the tray icon and selecting "Exit".
+
+			if (process.platform === 'darwin') {
+				if (this.willQuitApp_) {
+					this.win_ = null;
+				} else {
+					event.preventDefault();
+					this.hide();
+				}
 			} else {
-				event.preventDefault();
-				this.win_.hide();
+				if (this.trayShown() && !this.willQuitApp_) {
+					event.preventDefault();
+					this.win_.hide();
+				} else {
+					this.win_ = null;
+				}
 			}
 		})
 
@@ -89,15 +115,97 @@ class ElectronAppWrapper {
 		});
 	}
 
-	async exit() {
+	async quit() {
 		this.electronApp_.quit();
 	}
 
+	exit(errorCode = 0) {
+		this.electronApp_.exit(errorCode);
+	}
+
+	trayShown() {
+		return !!this.tray_;
+	}
+
+	// This method is used in macOS only to hide the whole app (and not just the main window)
+	// including the menu bar. This follows the macOS way of hidding an app.
+	hide() {
+		this.electronApp_.hide();
+	}
+
+	buildDir() {
+		if (this.buildDir_) return this.buildDir_;
+		let dir = __dirname + '/build';
+		if (!fs.pathExistsSync(dir)) {
+			dir = dirname(__dirname) + '/build';
+			if (!fs.pathExistsSync(dir)) throw new Error('Cannot find build dir');
+		}
+
+		this.buildDir_ = dir;
+		return dir;
+	}
+
+	trayIconFilename_() {
+		let output = '';
+
+		if (process.platform === 'darwin') {
+			output = 'macos-16x16Template.png'; // Electron Template Image format
+		} else {
+			output = '16x16.png';
+		}
+
+		if (this.env_ === 'dev') output = '16x16-dev.png'
+
+		return output;
+	}
+
+	// Note: this must be called only after the "ready" event of the app has been dispatched
+	createTray(contextMenu) {
+		try {
+			this.tray_ = new Tray(this.buildDir() + '/icons/' + this.trayIconFilename_())
+			this.tray_.setToolTip(this.electronApp_.getName())
+			this.tray_.setContextMenu(contextMenu)
+
+			this.tray_.on('click', () => {
+				this.window().show();
+			});
+		} catch (error) {
+			console.error("Cannot create tray", error);
+		}
+	}
+
+	destroyTray() {
+		if (!this.tray_) return;
+		this.tray_.destroy();
+		this.tray_ = null;
+	}
+
+	ensureSingleInstance() {
+		if (this.env_ === 'dev') return false;
+
+		return new Promise((resolve, reject) => {
+			const alreadyRunning = this.electronApp_.makeSingleInstance((commandLine, workingDirectory) => {
+				const win = this.window();
+				if (!win) return;
+				if (win.isMinimized()) win.restore();
+				win.show();
+				win.focus();
+			});
+
+			if (alreadyRunning) this.electronApp_.quit();
+
+			resolve(alreadyRunning);
+		});
+	}
+
 	async start() {
 		// Since we are doing other async things before creating the window, we might miss
 		// the "ready" event. So we use the function below to make sure that the app is ready.
 		await this.waitForElectronAppReady();
 
+		const alreadyRunning = await this.ensureSingleInstance();
+		if (alreadyRunning) return;
+
 		this.createWindow();
 
 		this.electronApp_.on('before-quit', () => {

ElectronClient/app/InteropServiceHelper.js

@@ -0,0 +1,51 @@
+const { _ } = require('lib/locale');
+const { bridge } = require('electron').remote.require('./bridge');
+const InteropService = require('lib/services/InteropService');
+
+class InteropServiceHelper {
+
+	static async export(dispatch, module, options = null) {
+		if (!options) options = {};
+
+		let path = null;
+
+		if (module.target === 'file') {
+			path = bridge().showSaveDialog({
+				filters: [{ name: module.description, extensions: [module.fileExtension]}]
+			});
+		} else {
+			path = bridge().showOpenDialog({
+				properties: ['openDirectory', 'createDirectory'],
+			});
+		}
+
+		if (!path || (Array.isArray(path) && !path.length)) return;
+
+		if (Array.isArray(path)) path = path[0];
+
+		dispatch({
+			type: 'WINDOW_COMMAND',
+			name: 'showModalMessage',
+			message: _('Exporting to "%s" as "%s" format. Please wait...', path, module.format),
+		});
+
+		const exportOptions = {};
+		exportOptions.path = path;
+		exportOptions.format = module.format;
+		if (options.sourceFolderIds) exportOptions.sourceFolderIds = options.sourceFolderIds;
+		if (options.sourceNoteIds) exportOptions.sourceNoteIds = options.sourceNoteIds;
+
+		const service = new InteropService();
+		const result = await service.export(exportOptions);
+
+		console.info('Export result: ', result);
+
+		dispatch({
+			type: 'WINDOW_COMMAND',
+			name: 'hideModalMessage',
+		});
+	}
+
+}
+
+module.exports = InteropServiceHelper;

ElectronClient/app/app.js

@@ -20,6 +20,9 @@ const packageInfo = require('./packageInfo.js');
 const AlarmService = require('lib/services/AlarmService.js');
 const AlarmServiceDriverNode = require('lib/services/AlarmServiceDriverNode');
 const DecryptionWorker = require('lib/services/DecryptionWorker');
+const InteropService = require('lib/services/InteropService');
+const InteropServiceHelper = require('./InteropServiceHelper.js');
+const ResourceService = require('lib/services/ResourceService');
 
 const { bridge } = require('electron').remote.require('./bridge');
 const Menu = bridge().Menu;
@@ -35,6 +38,7 @@ const appDefaultState = Object.assign({}, defaultState, {
 	fileToImport: null,
 	windowCommand: null,
 	noteVisiblePanes: ['editor', 'viewer'],
+	sidebarVisibility: true,
 	windowContentSize: bridge().windowContentSize(),
 });
 
@@ -49,6 +53,10 @@ class Application extends BaseApplication {
 		return true;
 	}
 
+	checkForUpdateLoggerPath() {
+		return Setting.value('profileDir') + '/log-autoupdater.txt';
+	}
+
 	reducer(state = appDefaultState, action) {
 		let newState = state;
 
@@ -78,7 +86,7 @@ class Application extends BaseApplication {
 
 						action = newAction;
 					}
-					
+
 					if (!goingBack) newNavHistory.push(currentRoute);
 					newState.navHistory = newNavHistory
 					newState.route = action;
@@ -116,11 +124,22 @@ class Application extends BaseApplication {
 					break;
 
 				case 'NOTE_VISIBLE_PANES_SET':
-				
+
 					newState = Object.assign({}, state);
 					newState.noteVisiblePanes = action.panes;
 					break;
 
+				case 'SIDEBAR_VISIBILITY_TOGGLE':
+
+					newState = Object.assign({}, state);
+					newState.sidebarVisibility = !state.sidebarVisibility;
+					break;
+
+				case 'SIDEBAR_VISIBILITY_SET':
+					newState = Object.assign({}, state);
+					newState.sidebarVisibility = action.visibility;
+					break;
+
 			}
 		} catch (error) {
 			error.message = 'In reducer: ' + error.message + ' Action: ' + JSON.stringify(action);
@@ -133,11 +152,22 @@ class Application extends BaseApplication {
 	async generalMiddleware(store, next, action) {
 		if (action.type == 'SETTING_UPDATE_ONE' && action.key == 'locale' || action.type == 'SETTING_UPDATE_ALL') {
 			setLocale(Setting.value('locale'));
+			// The bridge runs within the main process, with its own instance of locale.js
+			// so it needs to be set too here. 
+			bridge().setLocale(Setting.value('locale'));
 			this.refreshMenu();
 		}
 
-		if (['NOTE_UPDATE_ONE', 'NOTE_DELETE', 'FOLDER_UPDATE_ONE', 'FOLDER_DELETE'].indexOf(action.type) >= 0) {
-			if (!await reg.syncTarget().syncStarted()) reg.scheduleSync();
+		if (action.type == 'SETTING_UPDATE_ONE' && action.key == 'showTrayIcon' || action.type == 'SETTING_UPDATE_ALL') {
+			this.updateTray();
+		}
+
+		if (action.type == 'SETTING_UPDATE_ONE' && action.key == 'style.editor.fontFamily' || action.type == 'SETTING_UPDATE_ALL') {
+			this.updateEditorFont();
+		}
+
+		if (["NOTE_UPDATE_ONE", "NOTE_DELETE", "FOLDER_UPDATE_ONE", "FOLDER_DELETE"].indexOf(action.type) >= 0) {
+			if (!await reg.syncTarget().syncStarted()) reg.scheduleSync(30 * 1000, { syncSteps: ["update_remote", "delete_remote"] });
 		}
 
 		if (['EVENT_NOTE_ALARM_FIELD_CHANGE', 'NOTE_DELETE'].indexOf(action.type) >= 0) {
@@ -155,6 +185,10 @@ class Application extends BaseApplication {
 			Setting.setValue('noteVisiblePanes', newState.noteVisiblePanes);
 		}
 
+		if (['SIDEBAR_VISIBILITY_TOGGLE', 'SIDEBAR_VISIBILITY_SET'].indexOf(action.type) >= 0) {
+			Setting.setValue('sidebarVisibility', newState.sidebarVisibility);
+		}
+
 		return result;
 	}
 
@@ -167,6 +201,101 @@ class Application extends BaseApplication {
 	updateMenu(screen) {
 		if (this.lastMenuScreen_ === screen) return;
 
+		const sortNoteItems = [];
+		const sortNoteOptions = Setting.enumOptions('notes.sortOrder.field');
+		for (let field in sortNoteOptions) {
+			if (!sortNoteOptions.hasOwnProperty(field)) continue;
+			sortNoteItems.push({
+				label: sortNoteOptions[field],
+				screens: ['Main'],
+				type: 'checkbox',
+				checked: Setting.value('notes.sortOrder.field') === field,
+				click: () => {
+					Setting.setValue('notes.sortOrder.field', field);
+					this.refreshMenu();
+				}
+			});
+		}
+
+		const importItems = [];
+		const exportItems = [];
+		const ioService = new InteropService();
+		const ioModules = ioService.modules();
+		for (let i = 0; i < ioModules.length; i++) {
+			const module = ioModules[i];
+			if (module.type === 'exporter') {
+				exportItems.push({
+					label: module.fullLabel(),
+					screens: ['Main'],
+					click: async () => {
+						await InteropServiceHelper.export(this.dispatch.bind(this), module);
+					}
+				});
+			} else {
+				for (let j = 0; j < module.sources.length; j++) {
+					const moduleSource = module.sources[j];
+					importItems.push({
+						label: module.fullLabel(moduleSource),
+						screens: ['Main'],
+						click: async () => {
+							let path = null;
+
+							const selectedFolderId = this.store().getState().selectedFolderId;
+
+							if (moduleSource === 'file') {
+								path = bridge().showOpenDialog({
+									filters: [{ name: module.description, extensions: [module.fileExtension]}]
+								});
+							} else {
+								path = bridge().showOpenDialog({
+									properties: ['openDirectory', 'createDirectory'],
+								});
+							}
+
+							if (!path || (Array.isArray(path) && !path.length)) return;
+
+							if (Array.isArray(path)) path = path[0];
+
+							this.dispatch({
+								type: 'WINDOW_COMMAND',
+								name: 'showModalMessage',
+								message: _('Importing from "%s" as "%s" format. Please wait...', path, module.format),
+							});
+
+							const importOptions = {};
+							importOptions.path = path;
+							importOptions.format = module.format;
+							importOptions.destinationFolderId = !module.isNoteArchive && moduleSource === 'file' ? selectedFolderId : null;
+
+							const service = new InteropService();
+							try {
+								const result = await service.import(importOptions);
+								console.info('Import result: ', result);
+							} catch (error) {
+								bridge().showErrorMessageBox(error.message);
+							}
+
+							this.dispatch({
+								type: 'WINDOW_COMMAND',
+								name: 'hideModalMessage',
+							});
+						}
+					});
+				}
+			}
+		}
+
+		exportItems.push({
+			label: 'PDF - ' + _('PDF File'),
+			screens: ['Main'],
+			click: async () => {
+				this.dispatch({
+					type: 'WINDOW_COMMAND',
+					name: 'exportPdf',
+				});
+			}
+		});
+
 		const template = [
 			{
 				label: _('File'),
@@ -192,6 +321,7 @@ class Application extends BaseApplication {
 					}
 				}, {
 					label: _('New notebook'),
+					accelerator: 'CommandOrControl+B',
 					screens: ['Main'],
 					click: () => {
 						this.dispatch({
@@ -202,46 +332,53 @@ class Application extends BaseApplication {
 				}, {
 					type: 'separator',
 				}, {
-					label: _('Import Evernote notes'),
+					label: _('Import'),
+					submenu: importItems,
+				}, {
+					label: _('Export'),
+					submenu: exportItems,
+				}, {
+					type: 'separator',
+				}, {
+					label: _('Print'),
+					accelerator: 'CommandOrControl+P',
+					screens: ['Main'],
 					click: () => {
-						const filePaths = bridge().showOpenDialog({
-							properties: ['openFile', 'createDirectory'],
-							filters: [
-								{ name: _('Evernote Export Files'), extensions: ['enex'] },
-							]
-						});
-						if (!filePaths || !filePaths.length) return;
-
 						this.dispatch({
-							type: 'NAV_GO',
-							routeName: 'Import',
-							props: {
-								filePath: filePaths[0],
-							},
+							type: 'WINDOW_COMMAND',
+							name: 'print',
 						});
 					}
+				}, {
+					type: 'separator',
+					platforms: ['darwin'],
+				}, {
+					label: _('Hide %s', 'Joplin'),
+					platforms: ['darwin'],
+					accelerator: 'CommandOrControl+H',
+					click: () => { bridge().electronApp().hide() }
 				}, {
 					type: 'separator',
 				}, {
 					label: _('Quit'),
 					accelerator: 'CommandOrControl+Q',
-					click: () => { bridge().electronApp().exit() }
+					click: () => { bridge().electronApp().quit() }
 				}]
 			}, {
 				label: _('Edit'),
 				submenu: [{
 					label: _('Copy'),
-					screens: ['Main', 'OneDriveLogin'],
+					//screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
 					role: 'copy',
 					accelerator: 'CommandOrControl+C',
 				}, {
 					label: _('Cut'),
-					screens: ['Main', 'OneDriveLogin'],
+					//screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
 					role: 'cut',
 					accelerator: 'CommandOrControl+X',
 				}, {
 					label: _('Paste'),
-					screens: ['Main', 'OneDriveLogin'],
+					//screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
 					role: 'paste',
 					accelerator: 'CommandOrControl+V',
 				}, {
@@ -250,14 +387,68 @@ class Application extends BaseApplication {
 				}, {
 					label: _('Search in all the notes'),
 					screens: ['Main'],
-					accelerator: 'F6',
+					accelerator: 'CommandOrControl+F',
 					click: () => {
 						this.dispatch({
 							type: 'WINDOW_COMMAND',
-							name: 'search',
+							name: 'focus_search',
 						});
 					},
 				}],
+			}, {
+				label: _('View'),
+				submenu: [{
+					label: _('Toggle sidebar'),
+					screens: ['Main'],
+					accelerator: 'F10',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'toggleSidebar',
+						});
+					}
+				}, {
+					label: _('Toggle editor layout'),
+					screens: ['Main'],
+					accelerator: 'CommandOrControl+L',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'toggleVisiblePanes',
+						});
+					}
+				}, {
+					type: 'separator',
+					screens: ['Main'],
+				}, {
+					label: Setting.settingMetadata('notes.sortOrder.field').label(),
+					screens: ['Main'],
+					submenu: sortNoteItems,
+				}, {
+					label: Setting.settingMetadata('notes.sortOrder.reverse').label(),
+					type: 'checkbox',
+					checked: Setting.value('notes.sortOrder.reverse'),
+					screens: ['Main'],
+					click: () => {
+						Setting.setValue('notes.sortOrder.reverse', !Setting.value('notes.sortOrder.reverse'));
+					},
+				}, {
+					label: Setting.settingMetadata('uncompletedTodosOnTop').label(),
+					type: 'checkbox',
+					checked: Setting.value('uncompletedTodosOnTop'),
+					screens: ['Main'],
+					click: () => {
+						Setting.setValue('uncompletedTodosOnTop', !Setting.value('uncompletedTodosOnTop'));
+					},
+				}, {
+					label: Setting.settingMetadata('showCompletedTodos').label(),
+					type: 'checkbox',
+					checked: Setting.value('showCompletedTodos'),
+					screens: ['Main'],
+					click: () => {
+						Setting.setValue('showCompletedTodos', !Setting.value('showCompletedTodos'));
+					},
+				}],
 			}, {
 				label: _('Tools'),
 				submenu: [{
@@ -281,6 +472,7 @@ class Application extends BaseApplication {
 					}
 				},{
 					label: _('General Options'),
+					accelerator: 'CommandOrControl+,',
 					click: () => {
 						this.dispatch({
 							type: 'NAV_GO',
@@ -293,7 +485,18 @@ class Application extends BaseApplication {
 				submenu: [{
 					label: _('Website and documentation'),
 					accelerator: 'F1',
-					click () { bridge().openExternal('http://joplin.cozic.net') }
+					click () { bridge().openExternal('https://joplin.cozic.net') }
+				}, {
+					label: _('Make a donation'),
+					click () { bridge().openExternal('https://joplin.cozic.net/donate') }
+				}, {
+					label: _('Check for updates...'),
+					click: () => {
+						bridge().checkForUpdates(false, bridge().window(), this.checkForUpdateLoggerPath());
+					}
+				}, {
+					type: 'separator',
+					screens: ['Main'],
 				}, {
 					label: _('About Joplin'),
 					click: () => {
@@ -304,8 +507,8 @@ class Application extends BaseApplication {
 							'Copyright © 2016-2018 Laurent Cozic',
 							_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
 						];
-						bridge().showMessageBox({
-							message: message.join('\n'),
+						bridge().showInfoMessageBox(message.join('\n'), {
+							icon: bridge().electronApp().buildDir() + '/icons/32x32.png',
 						});
 					}
 				}]
@@ -321,14 +524,32 @@ class Application extends BaseApplication {
 		}
 
 		function removeUnwantedItems(template, screen) {
+			const platform = shim.platformName();
+
 			let output = [];
 			for (let i = 0; i < template.length; i++) {
 				const t = Object.assign({}, template[i]);
 				if (t.screens && t.screens.indexOf(screen) < 0) continue;
+				if (t.platforms && t.platforms.indexOf(platform) < 0) continue;
 				if (t.submenu) t.submenu = removeUnwantedItems(t.submenu, screen);
 				if (('submenu' in t) && isEmptyMenu(t.submenu)) continue;
 				output.push(t);
 			}
+
+			// Remove empty separator for now empty sections
+			let temp = [];
+			let previous = null;
+			for (let i = 0; i < output.length; i++) {
+				const t = Object.assign({}, output[i]);
+				if (t.type === 'separator') {
+					if (!previous) continue;
+					if (previous.type === 'separator') continue;
+				}
+				temp.push(t);
+				previous = t;
+			}
+			output = temp;
+
 			return output;
 		}
 
@@ -340,7 +561,45 @@ class Application extends BaseApplication {
 		this.lastMenuScreen_ = screen;
 	}
 
+	updateTray() {
+		const app = bridge().electronApp();
+
+		if (app.trayShown() === Setting.value('showTrayIcon')) return;
+
+		if (!Setting.value('showTrayIcon')) {
+			app.destroyTray();
+		} else {
+			const contextMenu = Menu.buildFromTemplate([
+				{ label: _('Open %s', app.electronApp().getName()), click: () => { app.window().show(); } },
+				{ type: 'separator' },
+				{ label: _('Exit'), click: () => { app.quit() } },
+			])
+			app.createTray(contextMenu);
+		}
+	}
+
+	updateEditorFont() {
+		const fontFamilies = [];
+		if (Setting.value('style.editor.fontFamily')) fontFamilies.push('"' + Setting.value('style.editor.fontFamily') + '"');
+		fontFamilies.push('monospace');
+
+		// The '*' and '!important' parts are necessary to make sure Russian text is displayed properly
+		// https://github.com/laurent22/joplin/issues/155
+
+		const css = '.ace_editor * { font-family: ' + fontFamilies.join(', ') + ' !important; }';
+		const styleTag = document.createElement('style');
+		styleTag.type = 'text/css';
+		styleTag.appendChild(document.createTextNode(css));
+		document.head.appendChild(styleTag);
+	}
+
 	async start(argv) {
+		const electronIsDev = require('electron-is-dev');
+
+		// If running inside a package, the command line, instead of being "node.exe <path> <flags>" is "joplin.exe <flags>" so
+		// insert an extra argument so that they can be processed in a consistent way everywhere.
+		if (!electronIsDev) argv.splice(1, 0, '.');
+
 		argv = await super.start(argv);
 
 		AlarmService.setDriver(new AlarmServiceDriverNode({ appName: packageInfo.build.appId }));
@@ -382,24 +641,34 @@ class Application extends BaseApplication {
 			id: Setting.value('activeFolderId'),
 		});
 
+		this.store().dispatch({
+			type: 'FOLDER_SET_COLLAPSED_ALL',
+			ids: Setting.value('collapsedFolderIds'),
+		});
+
 		// Note: Auto-update currently doesn't work in Linux: it downloads the update
 		// but then doesn't install it on exit.
 		if (shim.isWindows() || shim.isMac()) {
-			const runAutoUpdateCheck = function() {
+			const runAutoUpdateCheck = () => {
 				if (Setting.value('autoUpdateEnabled')) {
-					bridge().checkForUpdatesAndNotify(Setting.value('profileDir') + '/log-autoupdater.txt');
+					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath());
 				}
 			}
-			
+
+			// Initial check on startup
 			setTimeout(() => { runAutoUpdateCheck() }, 5000);
-			// For those who leave the app always open
-			setInterval(() => { runAutoUpdateCheck() }, 2 * 60 * 60 * 1000);
+			// Then every x hours
+			setInterval(() => { runAutoUpdateCheck() }, 12 * 60 * 60 * 1000);
 		}
 
+		this.updateTray();
+
 		setTimeout(() => {
 			AlarmService.garbageCollect();
 		}, 1000 * 60 * 60);
 
+		ResourceService.runInBackground();
+
 		if (Setting.value('env') === 'dev') {
 			AlarmService.updateAllNotifications();
 		} else {
@@ -422,4 +691,4 @@ function app() {
 	return application_;
 }
 
-module.exports = { app };
+module.exports = { app };

ElectronClient/app/bridge.js

@@ -1,4 +1,4 @@
-const { _ } = require('lib/locale.js');
+const { _, setLocale } = require('lib/locale.js');
 const { dirname } = require('lib/path-utils.js');
 const { Logger } = require('lib/logger.js');
 
@@ -43,7 +43,7 @@ class Bridge {
 		const {dialog} = require('electron');
 		if (!options) options = {};
 		if (!('defaultPath' in options) && this.lastSelectedPath_) options.defaultPath = this.lastSelectedPath_;
-		const filePath = dialog.showSaveDialog(options);
+		const filePath = dialog.showSaveDialog(this.window(), options);
 		if (filePath) {
 			this.lastSelectedPath_ = filePath;
 		}
@@ -55,27 +55,30 @@ class Bridge {
 		if (!options) options = {};
 		if (!('defaultPath' in options) && this.lastSelectedPath_) options.defaultPath = this.lastSelectedPath_;
 		if (!('createDirectory' in options)) options.createDirectory = true;
-		const filePaths = dialog.showOpenDialog(options);
+		const filePaths = dialog.showOpenDialog(this.window(), options);
 		if (filePaths && filePaths.length) {
 			this.lastSelectedPath_ = dirname(filePaths[0]);
 		}
 		return filePaths;
 	}
 
-	showMessageBox(options) {
+	// Don't use this directly - call one of the showXxxxxxxMessageBox() instead
+	showMessageBox_(window, options) {
 		const {dialog} = require('electron');
-		return dialog.showMessageBox(options);
+		const nativeImage = require('electron').nativeImage
+		if (!window) window = this.window();
+		return dialog.showMessageBox(window, options);
 	}
 
 	showErrorMessageBox(message) {
-		return this.showMessageBox({
+		return this.showMessageBox_(this.window(), {
 			type: 'error',
 			message: message,
 		});
 	}
 
 	showConfirmMessageBox(message) {
-		const result = this.showMessageBox({
+		const result = this.showMessageBox_(this.window(), {
 			type: 'question',
 			message: message,
 			buttons: [_('OK'), _('Cancel')],
@@ -83,15 +86,19 @@ class Bridge {
 		return result === 0;
 	}
 
-	showInfoMessageBox(message) {
-		const result = this.showMessageBox({
+	showInfoMessageBox(message, options = {}) {
+		const result = this.showMessageBox_(this.window(), Object.assign({}, {
 			type: 'info',
 			message: message,
 			buttons: [_('OK')],
-		});
+		}, options));
 		return result === 0;
 	}
 
+	setLocale(locale) {
+		setLocale(locale);
+	}
+
 	get Menu() {
 		return require('electron').Menu;
 	}
@@ -108,21 +115,9 @@ class Bridge {
 		return require('electron').shell.openItem(fullPath)
 	}
 
-	async checkForUpdatesAndNotify(logFilePath) {
-		if (!this.autoUpdater_) {
-			this.autoUpdateLogger_ = new Logger();
-			this.autoUpdateLogger_.addTarget('file', { path: logFilePath });
-			this.autoUpdateLogger_.setLevel(Logger.LEVEL_DEBUG);
-			this.autoUpdateLogger_.info('checkForUpdatesAndNotify: Initializing...');
-			this.autoUpdater_ = require("electron-updater").autoUpdater;
-			this.autoUpdater_.logger = this.autoUpdateLogger_;
-		}
-
-		try {
-			await this.autoUpdater_.checkForUpdatesAndNotify();
-		} catch (error) {
-			this.autoUpdateLogger_.error(error);
-		}
+	checkForUpdates(inBackground, window, logFilePath) {
+		const { checkForUpdates } = require('./checkForUpdates.js');
+		checkForUpdates(inBackground, window, logFilePath);
 	}
 
 }

ElectronClient/app/checkForUpdates.js

@@ -0,0 +1,119 @@
+const { dialog } = require('electron')
+const { shim } = require('lib/shim');
+const { Logger } = require('lib/logger.js');
+const { _ } = require('lib/locale.js');
+const fetch = require('node-fetch');
+const { fileExtension } = require('lib/path-utils.js');
+const packageInfo = require('./packageInfo.js');
+const compareVersions = require('compare-versions');
+
+let autoUpdateLogger_ = new Logger();
+let checkInBackground_ = false;
+let isCheckingForUpdate_ = false;
+let parentWindow_ = null;
+
+function showErrorMessageBox(message) {
+	return dialog.showMessageBox(parentWindow_, {
+		type: 'error',
+		message: message,
+	});
+}
+
+function onCheckStarted() {
+	autoUpdateLogger_.info('checkForUpdates: Starting...');
+	isCheckingForUpdate_ = true;
+}
+
+function onCheckEnded() {
+	autoUpdateLogger_.info('checkForUpdates: Done.');
+	isCheckingForUpdate_ = false;
+}
+
+async function fetchLatestRelease() {
+	const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases/latest');
+
+	if (!response.ok) {
+		const responseText = await response.text();
+		throw new Error('Cannot get latest release info: ' + responseText.substr(0,500));
+	}
+
+	const json = await response.json();
+	
+	const version = json.tag_name.substr(1);
+	let downloadUrl = null;
+	const platform = process.platform;
+	for (let i = 0; i < json.assets.length; i++) {
+		const asset = json.assets[i];
+		let found = false;
+		const ext = fileExtension(asset.name);
+		if (platform === 'win32' && ext === 'exe') {
+			if (shim.isPortable()) {
+				found = asset.name == 'JoplinPortable.exe';
+			} else {
+				found = !!asset.name.match(/^Joplin-Setup-[\d.]+\.exe$/);
+			}
+		} else if (platform === 'darwin' && ext === 'dmg') {
+			found = true;
+		} else if (platform === 'linux' && ext === '.AppImage') {
+			found = true;
+		}
+
+		if (found) {
+			downloadUrl = asset.browser_download_url;
+			break;
+		}
+	}
+
+	return {
+		version: version,
+		downloadUrl: downloadUrl,
+		notes: json.body,
+		pageUrl: json.html_url,
+	};
+}
+
+function checkForUpdates(inBackground, window, logFilePath) {
+	if (isCheckingForUpdate_) {
+		autoUpdateLogger_.info('checkForUpdates: Skipping check because it is already running');
+		return;
+	}
+
+	parentWindow_ = window;
+
+	onCheckStarted();
+
+	if (logFilePath && !autoUpdateLogger_.targets().length) {
+		autoUpdateLogger_ = new Logger();
+		autoUpdateLogger_.addTarget('file', { path: logFilePath });
+		autoUpdateLogger_.setLevel(Logger.LEVEL_DEBUG);
+		autoUpdateLogger_.info('checkForUpdates: Initializing...');
+	}
+
+	checkInBackground_ = inBackground;
+
+	fetchLatestRelease().then(release => {
+		autoUpdateLogger_.info('Current version: ' + packageInfo.version);
+		autoUpdateLogger_.info('Latest version: ' + release.version);
+
+		if (compareVersions(release.version, packageInfo.version) <= 0) {
+			if (!checkInBackground_) dialog.showMessageBox({ message: _('Current version is up-to-date.') })
+		} else {
+			const releaseNotes = release.notes.trim() ? "\n\n" + release.notes.trim() : '';
+
+			const buttonIndex = dialog.showMessageBox(parentWindow_, {
+				type: 'info',
+				message: _('An update is available, do you want to download it now?' + releaseNotes),
+				buttons: [_('Yes'), _('No')]
+			});
+
+			if (buttonIndex === 0) require('electron').shell.openExternal(release.downloadUrl ? release.downloadUrl : release.pageUrl);
+		}
+	}).catch(error => {
+		autoUpdateLogger_.error(error);
+		if (!checkInBackground_) showErrorMessageBox(error.message);
+	}).then(() => {
+		onCheckEnded();
+	});
+}
+
+module.exports.checkForUpdates = checkForUpdates

ElectronClient/app/dev-app-update.yml-FORTESTING

@@ -0,0 +1,3 @@
+owner: laurent22
+repo: joplin
+provider: github

ElectronClient/app/gui/ConfigScreen.jsx

@@ -7,14 +7,22 @@ const { Header } = require('./Header.min.js');
 const { themeStyle } = require('../theme.js');
 const pathUtils = require('lib/path-utils.js');
 const { _ } = require('lib/locale.js');
+const SyncTargetRegistry = require('lib/SyncTargetRegistry');
+const shared = require('lib/components/shared/config-shared.js');
 
 class ConfigScreenComponent extends React.Component {
 
 	constructor() {
 		super();
 
-		this.state = {
-			settings: {},
+		shared.init(this);
+
+		this.checkSyncConfig_ = async () => {
+			await shared.checkSyncConfig(this, this.state.settings);
+		}
+
+		this.rowStyle_ = {
+			marginBottom: 10,
 		};
 	}
 
@@ -32,10 +40,6 @@ class ConfigScreenComponent extends React.Component {
 			});
 		}
 
-		output.sort((a, b) => {
-			return a.label.toLowerCase() < b.label.toLowerCase() ? -1 : +1;
-		});
-
 		return output;
 	}
 
@@ -44,9 +48,7 @@ class ConfigScreenComponent extends React.Component {
 
 		let output = null;
 
-		const rowStyle = {
-			marginBottom: 10,
-		};
+		const rowStyle = this.rowStyle_;
 
 		const labelStyle = Object.assign({}, theme.textStyle, {
 			display: 'inline-block',
@@ -57,16 +59,27 @@ class ConfigScreenComponent extends React.Component {
 			display: 'inline-block',
 		};
 
+		const descriptionStyle = Object.assign({}, theme.textStyle, {
+			color: theme.colorFaded,
+			marginTop: 5,
+			fontStyle: 'italic',
+		});
+
 		const updateSettingValue = (key, value) => {
-			const settings = Object.assign({}, this.state.settings);
-			settings[key] = value;
-			this.setState({ settings: settings });
+			return shared.updateSettingValue(this, key, value);
 		}
 
 		// Component key needs to be key+value otherwise it doesn't update when the settings change.
 
 		const md = Setting.settingMetadata(key);
 
+		const descriptionText = Setting.keyDescription(key, 'desktop');
+		const descriptionComp = descriptionText ? (
+			<div style={descriptionStyle}>
+				{descriptionText}
+			</div>
+		) : null;
+
 		if (md.isEnum) {
 			let items = [];
 			const settingOptions = md.options();
@@ -82,6 +95,7 @@ class ConfigScreenComponent extends React.Component {
 					<select value={value} style={controlStyle} onChange={(event) => { updateSettingValue(key, event.target.value) }}>
 						{items}
 					</select>
+					{ descriptionComp }
 				</div>
 			);
 		} else if (md.type === Setting.TYPE_BOOL) {
@@ -89,24 +103,42 @@ class ConfigScreenComponent extends React.Component {
 				updateSettingValue(key, !value)
 			}
 
+			// Hack: The {key+value.toString()} is needed as otherwise the checkbox doesn't update when the state changes.
+			// There's probably a better way to do this but can't figure it out.
+
 			return (
-				<div key={key} style={rowStyle}>
+				<div key={key+value.toString()} style={rowStyle}>
 					<div style={controlStyle}>
-						<input id={'setting_checkbox_' + key} type="checkbox" checked={!!value} onChange={(event) => { onCheckboxClick(event) }}/><label onClick={(event) => { onCheckboxClick(event) }} style={labelStyle} htmlFor={'setting_checkbox_' + key}>{md.label()}</label>
+						<input id={'setting_checkbox_' + key} type="checkbox" checked={!!value} onChange={(event) => { onCheckboxClick(event) }}/><label onClick={(event) => { onCheckboxClick(event) }} style={labelStyle} htmlFor={'setting_checkbox_' + key}>{md.label()}</label>						
+						{ descriptionComp }
 					</div>
 				</div>
 			);
 		} else if (md.type === Setting.TYPE_STRING) {
 			const onTextChange = (event) => {
-				const settings = Object.assign({}, this.state.settings);
-				settings[key] = event.target.value;
-				this.setState({ settings: settings });
+				updateSettingValue(key, event.target.value);
 			}
 
+			const inputStyle = Object.assign({}, controlStyle, { width: '50%', minWidth: '20em' });
+			const inputType = md.secure === true ? 'password' : 'text';
+
 			return (
 				<div key={key} style={rowStyle}>
 					<div style={labelStyle}><label>{md.label()}</label></div>
-					<input type="text" style={controlStyle} value={this.state.settings[key]} onChange={(event) => {onTextChange(event)}} />
+					<input type={inputType} style={inputStyle} value={this.state.settings[key]} onChange={(event) => {onTextChange(event)}} />
+					{ descriptionComp }
+				</div>
+			);
+		} else if (md.type === Setting.TYPE_INT) {
+			const onNumChange = (event) => {
+				updateSettingValue(key, event.target.value);
+			};
+
+			return (
+				<div key={key} style={rowStyle}>
+					<div style={labelStyle}><label>{md.label()}</label></div>
+					<input type="number" style={controlStyle} value={this.state.settings[key]} onChange={(event) => {onNumChange(event)}} min={md.minimum} max={md.maximum} step={md.step}/>
+					{ descriptionComp }
 				</div>
 			);
 		} else {
@@ -117,10 +149,7 @@ class ConfigScreenComponent extends React.Component {
 	}
 
 	onSaveClick() {
-		for (let n in this.state.settings) {
-			if (!this.state.settings.hasOwnProperty(n)) continue;
-			Setting.setValue(n, this.state.settings[n]);
-		}
+		shared.saveSettings(this);
 		this.props.dispatch({ type: 'NAV_BACK' });
 	}
 
@@ -130,7 +159,7 @@ class ConfigScreenComponent extends React.Component {
 
 	render() {
 		const theme = themeStyle(this.props.theme);
-		const style = this.props.style;
+		const style = Object.assign({}, this.props.style, { overflow: 'auto' });
 		const settings = this.state.settings;
 
 		const headerStyle = {
@@ -142,23 +171,28 @@ class ConfigScreenComponent extends React.Component {
 		};
 
 		const buttonStyle = {
-			display: this.state.settings === this.props.settings ? 'none' : 'inline-block',
+			display: this.state.changedSettingKeys.length ? 'inline-block' : 'none',
 			marginRight: 10,
 		}
 
-		let settingComps = [];
-		let keys = Setting.keys(true, 'desktop');
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			if (!(key in settings)) {
-				console.warn('Missing setting: ' + key);
-				continue;
-			}
-			const md = Setting.settingMetadata(key);
-			if (md.show && !md.show(settings)) continue;
-			const comp = this.settingToComponent(key, settings[key]);
-			if (!comp) continue;
-			settingComps.push(comp);
+		const settingComps = shared.settingsToComponents(this, 'desktop', settings);
+
+		const syncTargetMd = SyncTargetRegistry.idToMetadata(settings['sync.target']);
+
+		if (syncTargetMd.supportsConfigCheck) {
+			const messages = shared.checkSyncConfigMessages(this);
+			const statusStyle = Object.assign({}, theme.textStyle, { marginTop: 10 });
+			const statusComp = !messages.length ? null : (
+				<div style={statusStyle}>
+					{messages[0]}
+					{messages.length >= 1 ? (<p>{messages[1]}</p>) : null}
+				</div>);
+
+			settingComps.push(
+				<div key="check_sync_config_button" style={this.rowStyle_}>
+					<button disabled={this.state.checkSyncConfigResult === 'checking'} onClick={this.checkSyncConfig_}>{_('Check synchronisation configuration')}</button>
+					{ statusComp }
+				</div>);
 		}
 
 		return (

ElectronClient/app/gui/DropboxLoginScreen.jsx

@@ -0,0 +1,62 @@
+const React = require('react');
+const { connect } = require('react-redux');
+const { reg } = require('lib/registry.js');
+const { bridge } = require('electron').remote.require('./bridge');
+const { Header } = require('./Header.min.js');
+const { themeStyle } = require('../theme.js');
+const SyncTargetRegistry = require('lib/SyncTargetRegistry');
+const { _ } = require('lib/locale.js');
+const Shared = require('lib/components/shared/dropbox-login-shared');
+
+class DropboxLoginScreenComponent extends React.Component {
+
+	constructor() {
+		super();
+
+		this.shared_ = new Shared(
+			this,
+			(msg) => bridge().showInfoMessageBox(msg), 
+			(msg) => bridge().showErrorMessageBox(msg)
+		);
+	}
+
+	componentWillMount() {
+		this.shared_.refreshUrl();
+	}
+
+	render() {
+		const style = this.props.style;
+		const theme = themeStyle(this.props.theme);
+
+		const headerStyle = {
+			width: style.width,
+		};
+
+		const inputStyle = Object.assign({}, theme.inputStyle, { width: 500 });
+
+		return (
+			<div>
+				<Header style={headerStyle} />
+				<div style={{padding: theme.margin}}>
+					<p style={theme.textStyle}>{_('To allow Joplin to synchronise with Dropbox, please follow the steps below:')}</p>
+					<p style={theme.textStyle}>{_('Step 1: Open this URL in your browser to authorise the application:')}</p>
+					<a style={theme.textStyle} href="#" onClick={this.shared_.loginUrl_click}>{this.state.loginUrl}</a>
+					<p style={theme.textStyle}>{_('Step 2: Enter the code provided by Dropbox:')}</p>
+					<p><input type="text" value={this.state.authCode} onChange={this.shared_.authCodeInput_change} style={inputStyle}/></p>
+					<button disabled={this.state.checkingAuthToken} onClick={this.shared_.submit_click}>{_('Submit')}</button>
+				</div>
+			</div>
+		);
+	}
+
+}
+
+const mapStateToProps = (state) => {
+	return {
+		theme: state.settings.theme,
+	};
+};
+
+const DropboxLoginScreen = connect(mapStateToProps)(DropboxLoginScreenComponent);
+
+module.exports = { DropboxLoginScreen };

ElectronClient/app/gui/EncryptionConfigScreen.jsx

@@ -92,10 +92,14 @@ class EncryptionConfigScreenComponent extends React.Component {
 		};
 
 		const mkComps = [];
+		let nonExistingMasterKeyIds = this.props.notLoadedMasterKeys.slice();
 
 		for (let i = 0; i < masterKeys.length; i++) {
 			const mk = masterKeys[i];
 			mkComps.push(this.renderMasterKey(mk));
+
+			const idx = nonExistingMasterKeyIds.indexOf(mk.id);
+			if (idx >= 0) nonExistingMasterKeyIds.splice(idx, 1);
 		}
 
 		const onToggleButtonClick = async () => {
@@ -121,7 +125,7 @@ class EncryptionConfigScreenComponent extends React.Component {
 			}
 		}
 
-		const decryptedItemsInfo = this.props.encryptionEnabled ? <p style={theme.textStyle}>{shared.decryptedStatText(this)}</p> : null;
+		const decryptedItemsInfo = <p style={theme.textStyle}>{shared.decryptedStatText(this)}</p>;
 		const toggleButton = <button onClick={() => { onToggleButtonClick() }}>{this.props.encryptionEnabled ? _('Disable encryption') : _('Enable encryption')}</button>
 
 		let masterKeySection = null;
@@ -149,26 +153,46 @@ class EncryptionConfigScreenComponent extends React.Component {
 			);
 		}
 
+		let nonExistingMasterKeySection = null;
+
+		if (nonExistingMasterKeyIds.length) {
+			const rows = [];
+			for (let i = 0; i < nonExistingMasterKeyIds.length; i++) {
+				const id = nonExistingMasterKeyIds[i];
+				rows.push(<tr key={id}><td style={theme.textStyle}>{id}</td></tr>);
+			}
+
+			nonExistingMasterKeySection = (
+				<div>
+					<h1 style={theme.h1Style}>{_('Missing Master Keys')}</h1>
+					<p style={theme.textStyle}>{_('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.')}</p>
+					<table>
+						<tbody>
+							<tr>
+								<th style={theme.textStyle}>{_('ID')}</th>
+							</tr>
+							{ rows }
+						</tbody>
+					</table>
+				</div>
+			);
+		}
+
 		return (
 			<div>
 				<Header style={headerStyle} />
 				<div style={containerStyle}>
-					<div style={{backgroundColor: theme.warningBackgroundColor, paddingLeft: 10, paddingRight: 10, paddingTop: 2, paddingBottom: 2 }}>
+					{<div style={{backgroundColor: theme.warningBackgroundColor, paddingLeft: 10, paddingRight: 10, paddingTop: 2, paddingBottom: 2 }}>
 						<p style={theme.textStyle}>
-							Important: This is a <b>beta</b> feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain.
+							<span>{_('For more information about End-To-End Encryption (E2EE) and advices on how to enable it please check the documentation:')}</span> <a onClick={() => {bridge().openExternal('https://joplin.cozic.net/e2ee')}} href="#">https://joplin.cozic.net/e2ee</a>
 						</p>
-						<p style={theme.textStyle}>
-							If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup <b>{pathUtils.toSystemSlashes(Setting.value('profileDir'), process.platform)}</b>
-						</p>
-						<p style={theme.textStyle}>
-							For more information about End-To-End Encryption (E2EE) and how it is going to work, please check the documentation: <a onClick={() => {bridge().openExternal('http://joplin.cozic.net/help/e2ee.html')}} href="#">http://joplin.cozic.net/help/e2ee.html</a>
-						</p>
-					</div>
+					</div>}
 					<h1 style={theme.h1Style}>{_('Status')}</h1>
 					<p style={theme.textStyle}>{_('Encryption is:')} <strong>{this.props.encryptionEnabled ? _('Enabled') : _('Disabled')}</strong></p>
 					{decryptedItemsInfo}
 					{toggleButton}
 					{masterKeySection}
+					{nonExistingMasterKeySection}
 				</div>
 			</div>
 		);
@@ -183,6 +207,7 @@ const mapStateToProps = (state) => {
 		passwords: state.settings['encryption.passwordCache'],
 		encryptionEnabled: state.settings['encryption.enabled'],
 		activeMasterKeyId: state.settings['encryption.activeMasterKeyId'],
+		notLoadedMasterKeys: state.notLoadedMasterKeys,
 	};
 };
 

ElectronClient/app/gui/Header.jsx

@@ -6,6 +6,63 @@ const { _ } = require('lib/locale.js');
 
 class HeaderComponent extends React.Component {
 
+	constructor() {
+		super();
+		this.state = {
+			searchQuery: '',
+		};
+
+		this.scheduleSearchChangeEventIid_ = null;
+		this.searchOnQuery_ = null;
+		this.searchElement_ = null;
+
+		const triggerOnQuery = (query) => {
+			clearTimeout(this.scheduleSearchChangeEventIid_);
+			if (this.searchOnQuery_) this.searchOnQuery_(query);
+			this.scheduleSearchChangeEventIid_ = null;
+		}
+
+		this.search_onChange = (event) => {
+			this.setState({ searchQuery: event.target.value });
+
+			if (this.scheduleSearchChangeEventIid_) clearTimeout(this.scheduleSearchChangeEventIid_);
+
+			this.scheduleSearchChangeEventIid_ = setTimeout(() => {
+				triggerOnQuery(this.state.searchQuery);
+			}, 500);
+		};
+
+		this.search_onClear = (event) => {
+			this.setState({ searchQuery: '' });
+			triggerOnQuery('');
+		}
+	}
+
+	async componentWillReceiveProps(nextProps) {
+		if (nextProps.windowCommand) {
+			this.doCommand(nextProps.windowCommand);
+		}
+	}
+
+	async doCommand(command) {
+		if (!command) return;
+
+		let commandProcessed = true;
+
+		if (command.name === 'focus_search' && this.searchElement_) {
+			this.searchElement_.focus();
+		} else {
+			commandProcessed = false;
+		}
+
+		if (commandProcessed) {
+			this.props.dispatch({
+				type: 'WINDOW_COMMAND',
+				name: null,
+			});
+		}
+	}
+
 	back_click() {
 		this.props.dispatch({ type: 'NAV_BACK' });
 	}
@@ -15,9 +72,10 @@ class HeaderComponent extends React.Component {
 		if (options.iconName) {
 			const iconStyle = {
 				fontSize: Math.round(style.fontSize * 1.4),
-				color: style.color
+				color: style.color,
 			};
 			if (options.title) iconStyle.marginRight = 5;
+			if (options.iconRotation) iconStyle.transform = 'rotate(' + options.iconRotation + 'deg)';
 			icon = <i style={iconStyle} className={"fa " + options.iconName}></i>
 		}
 
@@ -40,6 +98,59 @@ class HeaderComponent extends React.Component {
 		</a>
 	}
 
+	makeSearch(key, style, options, state) {
+		const inputStyle = {
+			display: 'flex',
+			flex: 1,
+			paddingLeft: 4,
+			paddingRight: 4,
+			color: style.color,
+			fontSize: style.fontSize,
+			fontFamily: style.fontFamily,
+		};
+
+		const searchButton = {
+			paddingLeft: 4,
+			paddingRight: 4,
+			paddingTop: 2,
+			paddingBottom: 2,
+			textDecoration: 'none',
+		};
+
+		const iconStyle = {
+			display: 'flex',
+			fontSize: Math.round(style.fontSize) * 1.2,
+			color: style.color,
+		};
+
+		const containerStyle = {
+			display: 'flex',
+			flexDirection: 'row',
+			alignItems: 'center',
+		};
+
+		const iconName = state.searchQuery ? 'fa-times' : 'fa-search';
+		const icon = <i style={iconStyle} className={"fa " + iconName}></i>
+		if (options.onQuery) this.searchOnQuery_ = options.onQuery;
+
+		return (
+			<div key={key} style={containerStyle}>
+				<input
+					type="text"
+					style={inputStyle}
+					placeholder={options.title}
+					value={state.searchQuery}
+					onChange={this.search_onChange}
+					ref={elem => this.searchElement_ = elem}
+				/>
+				<a
+					href="#"
+					style={searchButton}
+					onClick={this.search_onClear}
+				>{icon}</a>
+			</div>);
+	}
+
 	render() {
 		const style = Object.assign({}, this.props.style);
 		const theme = themeStyle(this.props.theme);
@@ -50,9 +161,9 @@ class HeaderComponent extends React.Component {
 		style.borderBottom = '1px solid ' + theme.dividerColor;
 		style.boxSizing = 'border-box';
 
-		const buttons = [];
+		const items = [];
 
-		const buttonStyle = {
+		const itemStyle = {
 			height: theme.headerHeight,
 			display: 'flex',
 			alignItems: 'center',
@@ -67,19 +178,24 @@ class HeaderComponent extends React.Component {
 		};
 
 		if (showBackButton) {
-			buttons.push(this.makeButton('back', buttonStyle, { title: _('Back'), onClick: () => this.back_click(), iconName: 'fa-chevron-left ' }));
+			items.push(this.makeButton('back', itemStyle, { title: _('Back'), onClick: () => this.back_click(), iconName: 'fa-chevron-left ' }));
 		}
 
-		if (this.props.buttons) {
-			for (let i = 0; i < this.props.buttons.length; i++) {
-				const o = this.props.buttons[i];
-				buttons.push(this.makeButton('btn_' + i + '_' + o.title, buttonStyle, o));
+		if (this.props.items) {
+			for (let i = 0; i < this.props.items.length; i++) {
+				const item = this.props.items[i];
+
+				if (item.type === 'search') {
+					items.push(this.makeSearch('item_' + i + '_search', itemStyle, item, this.state));
+				} else {
+					items.push(this.makeButton('item_' + i + '_' + item.title, itemStyle, item));
+				}
 			}
 		}
 
 		return (
 			<div className="header" style={style}>
-				{ buttons }
+				{ items }
 			</div>
 		);
 	}
@@ -87,7 +203,10 @@ class HeaderComponent extends React.Component {
 }
 
 const mapStateToProps = (state) => {
-	return { theme: state.settings.theme };
+	return {
+		theme: state.settings.theme,
+		windowCommand: state.windowCommand,
+	};
 };
 
 const Header = connect(mapStateToProps)(HeaderComponent);

ElectronClient/app/gui/ImportScreen.jsx

@@ -25,9 +25,7 @@ class ImportScreenComponent extends React.Component {
 				doImport: true,
 				filePath: newProps.filePath,
 				messages: [],
-			});
-
-			this.doImport();
+			}, () => { this.doImport() });
 		}
 	}
 

ElectronClient/app/gui/MainScreen.jsx

@@ -22,6 +22,10 @@ class MainScreenComponent extends React.Component {
 	componentWillMount() {
 		this.setState({
 			promptOptions: null,
+			modalLayer: {
+				visible: false,
+				message: '',
+			}
 		});
 	}
 
@@ -37,6 +41,12 @@ class MainScreenComponent extends React.Component {
 		});
 	}
 
+	toggleSidebar() {
+		this.props.dispatch({
+			type: 'SIDEBAR_VISIBILITY_TOGGLE',
+		});
+	}
+
 	async doCommand(command) {
 		if (!command) return;
 
@@ -79,7 +89,7 @@ class MainScreenComponent extends React.Component {
 						if (answer) {
 							let folder = null;
 							try {
-								folder = await Folder.save({ title: answer }, { userSideValidation: true });		
+								folder = await Folder.save({ title: answer }, { userSideValidation: true });
 							} catch (error) {
 								bridge().showErrorMessageBox(error.message);
 							}
@@ -135,34 +145,58 @@ class MainScreenComponent extends React.Component {
 					}
 				},
 			});
-		} else if (command.name === 'search') {
+		} else if (command.name === 'renameTag') {
+			const tag = await Tag.load(command.id);			
+			if(!tag) return;
+
 			this.setState({
 				promptOptions: {
-					label: _('Search:'),
+					label: _('Rename tag:'),
+					value: tag.title,
 					onClose: async (answer) => {
 						if (answer !== null) {
-							const searchId = uuid.create();
-
-							this.props.dispatch({
-								type: 'SEARCH_ADD',
-								search: {
-									id: searchId,
-									title: answer,
-									query_pattern: answer,
-									query_folder_id: null,
-									type_: BaseModel.TYPE_SEARCH,
-								},
-							});
-
-							this.props.dispatch({
-								type: 'SEARCH_SELECT',
-								id: searchId,
-							});
-						}
-						this.setState({ promptOptions: null });
+							try {
+								tag.title = answer;
+								await Tag.save(tag, { fields: ['title'], userSideValidation: true });
+							} catch (error) {
+								bridge().showErrorMessageBox(error.message);
+							}
+						}						
+						this.setState({promptOptions: null });
 					}
+				}
+			})
+		
+		} else if (command.name === 'search') {
+
+			if (!this.searchId_) this.searchId_ = uuid.create();
+
+			this.props.dispatch({
+				type: 'SEARCH_UPDATE',
+				search: {
+					id: this.searchId_,
+					title: command.query,
+					query_pattern: command.query,
+					query_folder_id: null,
+					type_: BaseModel.TYPE_SEARCH,
 				},
 			});
+
+			if (command.query) {
+				this.props.dispatch({
+					type: 'SEARCH_SELECT',
+					id: this.searchId_,
+				});
+			}
+
+		} else if (command.name === 'toggleVisiblePanes') {
+			this.toggleVisiblePanes();
+		} else if (command.name === 'toggleSidebar') {
+			this.toggleSidebar();
+		} else if (command.name === 'showModalMessage') {
+			this.setState({ modalLayer: { visible: true, message: command.message } });
+		} else if (command.name === 'hideModalMessage') {
+			this.setState({ modalLayer: { visible: false, message: '' } });
 		} else if (command.name === 'editAlarm') {
 			const note = await Note.load(command.noteId);
 
@@ -199,7 +233,7 @@ class MainScreenComponent extends React.Component {
 						this.setState({ promptOptions: null });
 					}
 				},
-			});	
+			});
 		} else {
 			commandProcessed = false;
 		}
@@ -212,8 +246,8 @@ class MainScreenComponent extends React.Component {
 		}
 	}
 
-	styles(themeId, width, height, messageBoxVisible) {
-		const styleKey = themeId + '_' + width + '_' + height + '_' + messageBoxVisible;
+	styles(themeId, width, height, messageBoxVisible, isSidebarVisible) {
+		const styleKey = themeId + '_' + width + '_' + height + '_' + messageBoxVisible + '_' + (+isSidebarVisible);
 		if (styleKey === this.styleKey_) return this.styles_;
 
 		const theme = themeStyle(themeId);
@@ -242,7 +276,12 @@ class MainScreenComponent extends React.Component {
 			height: rowHeight,
 			display: 'inline-block',
 			verticalAlign: 'top',
-		};
+    };
+
+		if (isSidebarVisible === false) {
+			this.styles_.sideBar.width = 0;
+			this.styles_.sideBar.display = 'none';
+		}
 
 		this.styles_.noteList = {
 			width: Math.floor(layoutUtils.size(width * .2, 150, 300)),
@@ -263,6 +302,17 @@ class MainScreenComponent extends React.Component {
 			height: height,
 		};
 
+		this.styles_.modalLayer = Object.assign({}, theme.textStyle, {
+			zIndex: 10000,
+			position: 'absolute',
+			top: 0,
+			left: 0,
+			backgroundColor: theme.backgroundColor,
+			width: width - 20,
+			height: height - 20,
+			padding: 10,
+		});
+
 		return this.styles_;
 	}
 
@@ -272,44 +322,53 @@ class MainScreenComponent extends React.Component {
 		const folders = this.props.folders;
 		const notes = this.props.notes;
 		const messageBoxVisible = this.props.hasDisabledSyncItems || this.props.showMissingMasterKeyMessage;
-		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible);
+		const sidebarVisibility = this.props.sidebarVisibility;
+		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible, sidebarVisibility);
 		const theme = themeStyle(this.props.theme);
+		const selectedFolderId = this.props.selectedFolderId;
+		const onConflictFolder = this.props.selectedFolderId === Folder.conflictFolderId();
 
-		const headerButtons = [];
+		const headerItems = [];
 
-		headerButtons.push({
+		headerItems.push({
+			title: _('Toggle sidebar'),
+			iconName: 'fa-bars',
+			iconRotation: this.props.sidebarVisibility ? 0 : 90,
+			onClick: () => { this.doCommand({ name: 'toggleSidebar'}) }
+		});
+
+		headerItems.push({
 			title: _('New note'),
 			iconName: 'fa-file-o',
-			enabled: !!folders.length,
+			enabled: !!folders.length && !onConflictFolder,
 			onClick: () => { this.doCommand({ name: 'newNote' }) },
 		});
-				
-		headerButtons.push({
+
+		headerItems.push({
 			title: _('New to-do'),
 			iconName: 'fa-check-square-o',
-			enabled: !!folders.length,
+			enabled: !!folders.length && !onConflictFolder,
 			onClick: () => { this.doCommand({ name: 'newTodo' }) },
 		});
 
-		headerButtons.push({
+		headerItems.push({
 			title: _('New notebook'),
 			iconName: 'fa-folder-o',
 			onClick: () => { this.doCommand({ name: 'newNotebook' }) },
 		});
 
-		headerButtons.push({
-			title: _('Search'),
-			iconName: 'fa-search',
-			onClick: () => { this.doCommand({ name: 'search' }) },
-		});
-
-		headerButtons.push({
+		headerItems.push({
 			title: _('Layout'),
 			iconName: 'fa-columns',
 			enabled: !!notes.length,
-			onClick: () => {
-				this.toggleVisiblePanes();
-			},
+			onClick: () => { this.doCommand({ name: 'toggleVisiblePanes' }) },
+		});
+
+		headerItems.push({
+			title: _('Search...'),
+			iconName: 'fa-search',
+			onQuery: (query) => { this.doCommand({ name: 'search', query: query }) },
+			type: 'search',
 		});
 
 		if (!this.promptOnClose_) {
@@ -351,8 +410,12 @@ class MainScreenComponent extends React.Component {
 			);
 		}
 
+		const modalLayerStyle = Object.assign({}, styles.modalLayer, { display: this.state.modalLayer.visible ? 'block' : 'none' });
+
 		return (
 			<div style={style}>
+				<div style={modalLayerStyle}>{this.state.modalLayer.message}</div>
+
 				<PromptDialog
 					autocomplete={promptOptions && ('autocomplete' in promptOptions) ? promptOptions.autocomplete : null}
 					defaultValue={promptOptions && promptOptions.value ? promptOptions.value : ''}
@@ -364,7 +427,7 @@ class MainScreenComponent extends React.Component {
 					visible={!!this.state.promptOptions}
 					buttons={promptOptions && ('buttons' in promptOptions) ? promptOptions.buttons : null}
 					inputType={promptOptions && ('inputType' in promptOptions) ? promptOptions.inputType : null} />
-				<Header style={styles.header} showBackButton={false} buttons={headerButtons} />
+				<Header style={styles.header} showBackButton={false} items={headerItems} />
 				{messageComp}
 				<SideBar style={styles.sideBar} />
 				<NoteList style={styles.noteList} />
@@ -380,13 +443,16 @@ const mapStateToProps = (state) => {
 		theme: state.settings.theme,
 		windowCommand: state.windowCommand,
 		noteVisiblePanes: state.noteVisiblePanes,
+		sidebarVisibility: state.sidebarVisibility,
 		folders: state.folders,
 		notes: state.notes,
 		hasDisabledSyncItems: state.hasDisabledSyncItems,
 		showMissingMasterKeyMessage: state.notLoadedMasterKeys.length && state.masterKeys.length,
+		selectedFolderId: state.selectedFolderId,
+		sidebarVisibility: state.sidebarVisibility,
 	};
 };
 
 const MainScreen = connect(mapStateToProps)(MainScreenComponent);
 
-module.exports = { MainScreen };
+module.exports = { MainScreen };

ElectronClient/app/gui/NoteList.jsx

@@ -9,6 +9,10 @@ const { bridge } = require('electron').remote.require('./bridge');
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
 const eventManager = require('../eventManager');
+const InteropService = require('lib/services/InteropService');
+const InteropServiceHelper = require('../InteropServiceHelper.js');
+const Search = require('lib/models/Search');
+const Mark = require('mark.js/dist/mark.min.js');
 
 class NoteListComponent extends React.Component {
 
@@ -91,6 +95,33 @@ class NoteListComponent extends React.Component {
 					eventManager.emit('noteTypeToggle', { noteId: note.id });
 				}
 			}}));
+
+			menu.append(new MenuItem({label: _('Copy Markdown link'), click: async () => {
+				const { clipboard } = require('electron');
+				const links = [];
+				for (let i = 0; i < noteIds.length; i++) {
+					const note = await Note.load(noteIds[i]);
+					links.push(Note.markdownTag(note));
+				}
+				clipboard.writeText(links.join(' '));
+			}}));
+
+			const exportMenu = new Menu();
+
+			const ioService = new InteropService();
+			const ioModules = ioService.modules();
+			for (let i = 0; i < ioModules.length; i++) {
+				const module = ioModules[i];
+				if (module.type !== 'exporter') continue;
+
+				exportMenu.append(new MenuItem({ label: module.fullLabel() , click: async () => {
+					await InteropServiceHelper.export(this.props.dispatch.bind(this), module, { sourceNoteIds: noteIds });
+				}}));
+			}
+
+			const exportMenuItem = new MenuItem({label: _('Export'), submenu: exportMenu});
+
+			menu.append(exportMenuItem);
 		}
 
 		menu.append(new MenuItem({label: _('Delete'), click: async () => {
@@ -145,6 +176,12 @@ class NoteListComponent extends React.Component {
 
 		const hPadding = 10;
 
+		let highlightedWords = [];
+		if (this.props.notesParentType === 'Search') {
+			const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
+			highlightedWords = search ? Search.keywords(search.query_pattern) : [];
+		}
+
 		let style = Object.assign({ width: width }, this.style().listItem);
 
 		if (this.props.selectedNoteIds.indexOf(item.id) >= 0) {
@@ -163,8 +200,30 @@ class NoteListComponent extends React.Component {
 		listItemTitleStyle.paddingLeft = !checkbox ? hPadding : 4;
 		if (item.is_todo && !!item.todo_completed) listItemTitleStyle = Object.assign(listItemTitleStyle, this.style().listItemTitleCompleted);
 
+		let displayTitle = Note.displayTitle(item);
+		let titleComp = null;
+
+		if (highlightedWords.length) {
+			const titleElement = document.createElement('span');
+			titleElement.textContent = displayTitle;
+			const mark = new Mark(titleElement, {
+				exclude: ['img'],
+				acrossElements: true,
+			});
+			mark.mark(highlightedWords);
+
+			// Note: in this case it is safe to use dangerouslySetInnerHTML because titleElement
+			// is a span tag that we created and that contains data that's been inserted as plain text
+			// with `textContent` so it cannot contain any XSS attacks. We use this feature because
+			// mark.js can only deal with DOM elements.
+			// https://reactjs.org/docs/dom-elements.html#dangerouslysetinnerhtml
+			titleComp = <span dangerouslySetInnerHTML={{ __html: titleElement.outerHTML }}></span>
+		} else {
+			titleComp = <span>{displayTitle}</span>
+		}
+
 		// Need to include "todo_completed" in key so that checkbox is updated when
-		// item is changed via sync.
+		// item is changed via sync.		
 		return <div key={item.id + '_' + item.todo_completed} style={style}>
 			{checkbox}
 			<a
@@ -177,7 +236,7 @@ class NoteListComponent extends React.Component {
 				onDragStart={(event) => onDragStart(event) }
 				data-id={item.id}
 			>
-			{Note.displayTitle(item)}
+			{titleComp}
 			</a>
 		</div>
 	}
@@ -220,7 +279,9 @@ const mapStateToProps = (state) => {
 		folders: state.folders,
 		selectedNoteIds: state.selectedNoteIds,
 		theme: state.settings.theme,
-		// uncompletedTodosOnTop: state.settings.uncompletedTodosOnTop,
+		notesParentType: state.notesParentType,
+		searches: state.searches,
+		selectedSearchId: state.selectedSearchId,
 	};
 };
 

ElectronClient/app/gui/NoteStatusBar.jsx

@@ -0,0 +1,47 @@
+const React = require('react');
+const { connect } = require('react-redux');
+const { time } = require('lib/time-utils.js');
+const { themeStyle } = require('../theme.js');
+const { _ } = require('lib/locale.js');
+
+class NoteStatusBarComponent extends React.Component {
+
+	style() {
+		const theme = themeStyle(this.props.theme);
+
+		const itemHeight = 34;
+
+		let style = {
+			root: Object.assign({}, theme.textStyle, {
+				backgroundColor: theme.backgroundColor,
+				color: theme.colorFaded,
+			}),
+		};
+
+		return style;
+	}
+
+	render() {
+		const theme = themeStyle(this.props.theme);
+		const style = this.props.style;
+		const note = this.props.note;
+
+		return (
+			<div style={this.style().root}>{time.formatMsToLocal(note.user_updated_time)}</div>
+		);
+	}
+
+}
+
+const mapStateToProps = (state) => {
+	return {
+		// notes: state.notes,
+		// folders: state.folders,
+		// selectedNoteIds: state.selectedNoteIds,
+		theme: state.settings.theme,
+	};
+};
+
+const NoteStatusBar = connect(mapStateToProps)(NoteStatusBarComponent);
+
+module.exports = { NoteStatusBar };

ElectronClient/app/gui/NoteText.jsx

@@ -1,5 +1,8 @@
 const React = require('react');
 const Note = require('lib/models/Note.js');
+const BaseItem = require('lib/models/BaseItem.js');
+const BaseModel = require('lib/BaseModel.js');
+const Search = require('lib/models/Search.js');
 const { time } = require('lib/time-utils.js');
 const Setting = require('lib/models/Setting.js');
 const { IconButton } = require('./IconButton.min.js');
@@ -16,6 +19,11 @@ const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
 const { shim } = require('lib/shim.js');
 const eventManager = require('../eventManager');
+const fs = require('fs-extra');
+const {clipboard} = require('electron')
+const md5 = require('md5');
+const mimeUtils = require('lib/mime-utils.js').mime;
+const ArrayUtils = require('lib/ArrayUtils');
 
 require('brace/mode/markdown');
 // https://ace.c9.io/build/kitchen-sink.html
@@ -43,6 +51,7 @@ class NoteTextComponent extends React.Component {
 			// changed by the user, this variable contains that note ID. Used
 			// to automatically set the title.
 			newAndNoTitleChangeNoteId: null,
+			bodyHtml: '',
 		};
 
 		this.lastLoadedNoteId_ = null;
@@ -51,6 +60,8 @@ class NoteTextComponent extends React.Component {
 		this.ignoreNextEditorScroll_ = false;
 		this.scheduleSaveTimeout_ = null;
 		this.restoreScrollTop_ = null;
+		this.lastSetHtml_ = '';
+		this.lastSetMarkers_ = [];
 
 		// Complicated but reliable method to get editor content height
 		// https://github.com/ajaxorg/ace/issues/2046
@@ -68,12 +79,67 @@ class NoteTextComponent extends React.Component {
 		this.onAlarmChange_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); }
 		this.onNoteTypeToggle_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); }
 		this.onTodoToggle_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); }
+
+		this.onEditorPaste_ = async (event) => {
+			const formats = clipboard.availableFormats();
+			for (let i = 0; i < formats.length; i++) {
+				const format = formats[i].toLowerCase();
+				const formatType = format.split('/')[0]
+				if (formatType === 'image') {
+					event.preventDefault();
+
+					const image = clipboard.readImage();
+
+					const fileExt = mimeUtils.toFileExtension(format);
+					const filePath = Setting.value('tempDir') + '/' + md5(Date.now()) + '.' + fileExt;
+
+					await shim.writeImageToFile(image, format, filePath);
+					await this.commandAttachFile([filePath]);
+					await shim.fsDriver().remove(filePath);
+				}
+			}
+		}
+
+		this.onDrop_ = async (event) => {
+			const files = event.dataTransfer.files;
+			if (!files || !files.length) return;
+
+			const filesToAttach = [];
+
+			for (let i = 0; i < files.length; i++) {
+				const file = files[i];
+				if (!file.path) continue;
+				filesToAttach.push(file.path);
+			}
+
+			await this.commandAttachFile(filesToAttach);
+		}
+	}
+
+	cursorPosition() {
+		if (!this.editor_ || !this.editor_.editor || !this.state.note || !this.state.note.body) return 0;
+
+		const cursorPos = this.editor_.editor.getCursorPosition();
+		const noteLines = this.state.note.body.split('\n');
+
+		let pos = 0;
+		for (let i = 0; i < noteLines.length; i++) {
+			if (i > 0) pos++; // Need to add the newline that's been removed in the split() call above
+
+			if (i === cursorPos.row) {
+				pos += cursorPos.column;
+				break;
+			} else {
+				pos += noteLines[i].length;
+			}
+		}
+
+		return pos;
 	}
 
 	mdToHtml() {
 		if (this.mdToHtml_) return this.mdToHtml_;
 		this.mdToHtml_ = new MdToHtml({
-			supportsResourceLinks: true,
 			resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
 		});
 		return this.mdToHtml_;
@@ -99,6 +165,8 @@ class NoteTextComponent extends React.Component {
 
 		this.lastLoadedNoteId_ = note ? note.id : null;
 
+		this.updateHtml(note && note.body ? note.body : '');
+
 		eventManager.on('alarmChange', this.onAlarmChange_);
 		eventManager.on('noteTypeToggle', this.onNoteTypeToggle_);
 		eventManager.on('todoToggle', this.onTodoToggle_);
@@ -115,10 +183,14 @@ class NoteTextComponent extends React.Component {
 		eventManager.removeListener('todoToggle', this.onTodoToggle_);
 	}
 
-	async saveIfNeeded() {
+	async saveIfNeeded(saveIfNewNote = false) {
+		const forceSave = saveIfNewNote && (this.state.note && !this.state.note.id);
+
 		if (this.scheduleSaveTimeout_) clearTimeout(this.scheduleSaveTimeout_);
 		this.scheduleSaveTimeout_ = null;
-		if (!shared.isModified(this)) return;
+		if (!forceSave) {
+			if (!shared.isModified(this)) return;
+		}
 		await shared.saveNoteButton_press(this);
 	}
 
@@ -190,13 +262,35 @@ class NoteTextComponent extends React.Component {
 			this.editorSetScrollTop(1);
 			this.restoreScrollTop_ = 0;
 
-			if (this.editor_) {
-				const session = this.editor_.editor.getSession();
-				const undoManager = session.getUndoManager();
-				undoManager.reset();
-				session.setUndoManager(undoManager);
+			// If a search is in progress we don't focus any field otherwise it will
+			// take the focus out of the search box.
+			if (note && this.props.notesParentType !== 'Search') {
+				const focusSettingName = !!note.is_todo ? 'newTodoFocus' : 'newNoteFocus';
 
-				this.editor_.editor.focus();
+				if (Setting.value(focusSettingName) === 'title') {
+					if (this.titleField_) this.titleField_.focus();
+				} else {
+					if (this.editor_) this.editor_.editor.focus();
+				}
+			}
+
+			if (this.editor_) {
+				// Calling setValue here does two things:
+				// 1. It sets the initial value as recorded by the undo manager. If we were to set it instead to "" and wait for the render
+				//    phase to set the value, the initial value would still be "", which means pressing "undo" on a note that has just loaded
+				//    would clear it.
+				// 2. It resets the undo manager - fixes https://github.com/laurent22/joplin/issues/355
+				// Note: calling undoManager.reset() doesn't work
+				try {
+					this.editor_.editor.getSession().setValue(note ? note.body : '');
+				} catch (error) {
+					if (error.message === "Cannot read property 'match' of undefined") {
+						// The internals of Ace Editor throws an exception when creating a new note,
+						// but that can be ignored.
+					} else {
+						console.error(error);
+					}
+				}
 				this.editor_.editor.clearSelection();
 				this.editor_.editor.moveCursorTo(0,0);
 			}
@@ -214,7 +308,12 @@ class NoteTextComponent extends React.Component {
 			newState.newAndNoTitleChangeNoteId = null;
 		}
 
+		this.lastSetHtml_ = '';
+		this.lastSetMarkers_ = [];
+
 		this.setState(newState);
+
+		this.updateHtml(newState.note ? newState.note.body : '');
 	}
 
 	async componentWillReceiveProps(nextProps) {
@@ -227,6 +326,10 @@ class NoteTextComponent extends React.Component {
 		if ('syncStarted' in nextProps && !nextProps.syncStarted && !this.isModified()) {
 			await this.reloadNote(nextProps, { noReloadIfLocalChanges: true });
 		}
+
+		if (nextProps.windowCommand) {
+			this.doCommand(nextProps.windowCommand);
+		}
 	}
 
 	isModified() {
@@ -252,7 +355,7 @@ class NoteTextComponent extends React.Component {
 		shared.showMetadata_onPress(this);
 	}
 
-	webview_ipcMessage(event) {
+	async webview_ipcMessage(event) {
 		const msg = event.channel ? event.channel : '';
 		const args = event.args;
 		const arg0 = args && args.length >= 1 ? args[0] : null;
@@ -274,17 +377,64 @@ class NoteTextComponent extends React.Component {
 		} else if (msg === 'percentScroll') {
 			this.ignoreNextEditorScroll_ = true;
 			this.setEditorPercentScroll(arg0);
+		} else if (msg === 'contextMenu') {
+			const itemType = arg0 && arg0.type;
+
+			const menu = new Menu()
+
+			if (itemType === "image" || itemType === "link") {
+				const resource = await Resource.load(arg0.resourceId);
+				const resourcePath = Resource.fullPath(resource);
+
+				menu.append(new MenuItem({label: _('Open...'), click: async () => {
+					bridge().openExternal(resourcePath);
+				}}));
+
+				menu.append(new MenuItem({label: _('Save as...'), click: async () => {
+					const filePath = bridge().showSaveDialog({
+						defaultPath: resource.filename ? resource.filename : resource.title,
+					});
+					if (!filePath) return;
+					await fs.copy(resourcePath, filePath);
+				}}));
+
+				menu.append(new MenuItem({label: _('Copy path to clipboard'), click: async () => {
+					const { clipboard } = require('electron');
+					const { toSystemSlashes } = require('lib/path-utils.js');
+					clipboard.writeText(toSystemSlashes(resourcePath));
+				}}));
+			} else {
+				reg.logger().error('Unhandled item type: ' + itemType);
+				return;
+			}
+
+			menu.popup(bridge().window());
 		} else if (msg.indexOf('joplin://') === 0) {
-			const resourceId = msg.substr('joplin://'.length);
-			Resource.load(resourceId).then((resource) => {
-				const filePath = Resource.fullPath(resource);
+			const itemId = msg.substr('joplin://'.length);
+			const item = await BaseItem.loadItemById(itemId);
+
+			if (!item) throw new Error('No item with ID ' + itemId);
+
+			if (item.type_ === BaseModel.TYPE_RESOURCE) {
+				const filePath = Resource.fullPath(item);
 				bridge().openItem(filePath);
-			});
+			} else if (item.type_ === BaseModel.TYPE_NOTE) {
+				this.props.dispatch({
+					type: "FOLDER_SELECT",
+					id: item.parent_id,
+				});
+
+				setTimeout(() => {
+					this.props.dispatch({
+						type: 'NOTE_SELECT',
+						id: item.id,
+					});
+				}, 10);
+			} else {
+				throw new Error('Unsupported item type: ' + item.type_);
+			}
 		} else {
-			bridge().showMessageBox({
-				type: 'error',
-				message: _('Unsupported link or message: %s', msg),
-			});
+			bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
 		}
 	}
 
@@ -347,12 +497,34 @@ class NoteTextComponent extends React.Component {
 
 		if (this.editor_) {
 			this.editor_.editor.renderer.off('afterRender', this.onAfterEditorRender_);
+			document.querySelector('#note-editor').removeEventListener('paste', this.onEditorPaste_, true);
 		}
 
 		this.editor_ = element;
 
 		if (this.editor_) {
 			this.editor_.editor.renderer.on('afterRender', this.onAfterEditorRender_);
+
+			const cancelledKeys = [];
+			const letters = ['F', 'T', 'P', 'Q', 'L', ','];
+			for (let i = 0; i < letters.length; i++) {
+				const l = letters[i];
+				cancelledKeys.push('Ctrl+' + l); 
+				cancelledKeys.push('Command+' + l); 
+			}
+
+			for (let i = 0; i < cancelledKeys.length; i++) {
+				const k = cancelledKeys[i];
+				this.editor_.editor.commands.bindKey(k, () => {
+					// HACK: Ace doesn't seem to provide a way to override its shortcuts, but throwing
+					// an exception from this undocumented function seems to cancel it without any
+					// side effect.
+					// https://stackoverflow.com/questions/36075846
+					throw new Error('HACK: Overriding Ace Editor shortcut: ' + k);
+				});
+			}
+
+			document.querySelector('#note-editor').addEventListener('paste', this.onEditorPaste_, true);
 		}
 	}
 
@@ -387,52 +559,140 @@ class NoteTextComponent extends React.Component {
 
 	aceEditor_change(body) {
 		shared.noteComponent_change(this, 'body', body);
+		this.scheduleHtmlUpdate();
 		this.scheduleSave();
 	}
 
+	scheduleHtmlUpdate(timeout = 500) {
+		if (this.scheduleHtmlUpdateIID_) {
+			clearTimeout(this.scheduleHtmlUpdateIID_);
+			this.scheduleHtmlUpdateIID_ = null;
+		}
 
-	async commandAttachFile() {
-		const noteId = this.props.noteId;
-		if (!noteId) return;
+		if (timeout) {
+			this.scheduleHtmlUpdateIID_ = setTimeout(() => {
+				this.updateHtml();
+			}, timeout);
+		} else {
+			this.updateHtml();
+		}
+	}
 
-		const filePaths = bridge().showOpenDialog({
-			properties: ['openFile', 'createDirectory', 'multiSelections'],
-		});
-		if (!filePaths || !filePaths.length) return;
+	updateHtml(body = null) {
+		const mdOptions = {
+			onResourceLoaded: () => {
+				this.updateHtml();
+				this.forceUpdate();
+			},
+			postMessageSyntax: 'ipcRenderer.sendToHost',
+		};
 
-		await this.saveIfNeeded();
-		let note = await Note.load(noteId);
+		const theme = themeStyle(this.props.theme);
+
+		let bodyToRender = body;
+		if (bodyToRender === null) bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+		let bodyHtml = '';
+
+		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
+
+		if (!bodyToRender.trim() && visiblePanes.indexOf('viewer') >= 0 && visiblePanes.indexOf('editor') < 0) {
+			// Fixes https://github.com/laurent22/joplin/issues/217
+			bodyToRender = '*' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '*';
+		}
+
+		bodyHtml = this.mdToHtml().render(bodyToRender, theme, mdOptions);
+
+		this.setState({ bodyHtml: bodyHtml });
+	}
+
+	async doCommand(command) {
+		if (!command) return;
+
+		let commandProcessed = true;
+
+		if (command.name === 'exportPdf' && this.webview_) {
+			const path = bridge().showSaveDialog({
+				filters: [{ name: _('PDF File'), extensions: ['pdf']}]
+			});
+
+			if (path) {
+				this.webview_.printToPDF({}, (error, data) => {
+					if (error) {
+						bridge().showErrorMessageBox(error.message);
+					} else {
+						shim.fsDriver().writeFile(path, data, 'buffer');
+					}
+				});
+			}
+		} else if (command.name === 'print' && this.webview_) {
+			this.webview_.print();
+		} else {
+			commandProcessed = false;
+		}
+
+		if (commandProcessed) {
+			this.props.dispatch({
+				type: 'WINDOW_COMMAND',
+				name: null,
+			});
+		}
+	}
+
+	async commandAttachFile(filePaths = null) {
+		if (!filePaths) {
+			filePaths = bridge().showOpenDialog({
+				properties: ['openFile', 'createDirectory', 'multiSelections'],
+			});
+			if (!filePaths || !filePaths.length) return;
+		}
+
+		await this.saveIfNeeded(true);
+		let note = await Note.load(this.state.note.id);
+
+		const position = this.cursorPosition();
 
 		for (let i = 0; i < filePaths.length; i++) {
 			const filePath = filePaths[i];
 			try {
 				reg.logger().info('Attaching ' + filePath);
-				note = await shim.attachFileToNote(note, filePath);
+				note = await shim.attachFileToNote(note, filePath, position);
 				reg.logger().info('File was attached.');
 				this.setState({
 					note: Object.assign({}, note),
 					lastSavedNote: Object.assign({}, note),
 				});
+
+				this.updateHtml(note.body);
 			} catch (error) {
 				reg.logger().error(error);
+				bridge().showErrorMessageBox(error.message);
 			}
 		}
 	}
 
-	commandSetAlarm() {
-		const noteId = this.props.noteId;
-		if (!noteId) return;
+	async commandSetAlarm() {
+		await this.saveIfNeeded(true);
 
 		this.props.dispatch({
 			type: 'WINDOW_COMMAND',
 			name: 'editAlarm',
-			noteId: noteId,
+			noteId: this.state.note.id,
+		});
+	}
+
+	async commandSetTags() {
+		await this.saveIfNeeded(true);
+
+		this.props.dispatch({
+			type: 'WINDOW_COMMAND',
+			name: 'setTags',
+			noteId: this.state.note.id,
 		});
 	}
 
 	itemContextMenu(event) {
-		const noteId = this.props.noteId;
-		if (!noteId) return;
+		const note = this.state.note;
+		if (!note) return;
 
 		const menu = new Menu()
 
@@ -440,10 +700,16 @@ class NoteTextComponent extends React.Component {
 			return this.commandAttachFile();
 		}}));
 
-		menu.append(new MenuItem({label: _('Set alarm'), click: async () => {
-			return this.commandSetAlarm();
+		menu.append(new MenuItem({label: _('Tags'), click: async () => {
+			return this.commandSetTags();
 		}}));
 
+		if (!!note.is_todo) {
+			menu.append(new MenuItem({label: _('Set alarm'), click: async () => {
+				return this.commandSetAlarm();
+			}}));
+		}
+
 		menu.popup(bridge().window());
 	}
 
@@ -453,6 +719,7 @@ class NoteTextComponent extends React.Component {
 		const body = note && note.body ? note.body : '';
 		const theme = themeStyle(this.props.theme);
 		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
+		const isTodo = note && !!note.is_todo;
 
 		const borderWidth = 1;
 
@@ -481,6 +748,7 @@ class NoteTextComponent extends React.Component {
 			marginBottom: 0,
 			display: 'flex',
 			flexDirection: 'row',
+			alignItems: 'center',
 		};
 
 		const titleEditorStyle = {
@@ -542,14 +810,21 @@ class NoteTextComponent extends React.Component {
 		}
 
 		if (this.state.webviewReady) {
-			const mdOptions = {
-				onResourceLoaded: () => {
-					this.forceUpdate();
-				},
-				postMessageSyntax: 'ipcRenderer.sendToHost',
-			};
-			const html = this.mdToHtml().render(body, theme, mdOptions);
-			this.webview_.send('setHtml', html);
+			let html = this.state.bodyHtml;
+
+			const htmlHasChanged = this.lastSetHtml_ !== html;
+			 if (htmlHasChanged) {
+				this.webview_.send('setHtml', html);
+				this.lastSetHtml_ = html;
+			}
+
+			const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
+			const keywords = search ? Search.keywords(search.query_pattern) : [];
+
+			if (htmlHasChanged || !ArrayUtils.contentEquals(this.lastSetMarkers_, keywords)) {
+				this.lastSetMarkers_ = [];
+				this.webview_.send('setMarkers', keywords);
+			}
 		}
 
 		const toolbarItems = [];
@@ -560,6 +835,12 @@ class NoteTextComponent extends React.Component {
 			onClick: () => { return this.commandAttachFile(); },
 		});
 
+		toolbarItems.push({
+			title: _('Tags'),
+			iconName: 'fa-tags',
+			onClick: () => { return this.commandSetTags(); },
+		});
+
 		if (note.is_todo) {
 			toolbarItems.push({
 				title: Note.needAlarm(note) ? time.formatMsToLocal(note.todo_due) : _('Set alarm'),
@@ -576,22 +857,44 @@ class NoteTextComponent extends React.Component {
 
 		const titleEditor = <input
 			type="text"
+			ref={(elem) => { this.titleField_ = elem; } }
 			style={titleEditorStyle}
 			value={note && note.title ? note.title : ''}
 			onChange={(event) => { this.title_changeText(event); }}
+			placeholder={ this.props.newNote ? _('Creating new %s...', isTodo ? _('to-do') : _('note')) : '' }
 		/>
 
 		const titleBarMenuButton = <IconButton style={{
 			display: 'flex',
 		}} iconName="fa-caret-down" theme={this.props.theme} onClick={() => { this.itemContextMenu() }} />
 
-		const viewer = <webview
+		const titleBarDate = <span style={Object.assign({}, theme.textStyle, {color: theme.colorFaded})}>{time.formatMsToLocal(note.user_updated_time)}</span>
+
+		const viewer =  <webview
 			style={viewerStyle}
 			nodeintegration="1"
 			src="gui/note-viewer/index.html"
 			ref={(elem) => { this.webview_ref(elem); } }
 		/>
 
+		// const markers = [{
+		// 	startRow: 2,
+		// 	startCol: 3,
+		// 	endRow: 2,
+		// 	endCol: 6,
+		// 	type: 'text',
+		// 	className: 'test-marker'
+		// }];
+
+		// markers={markers}
+		// editorProps={{$useWorker: false}}
+
+		// #note-editor .test-marker {
+		// 	background-color: red;
+		// 	color: yellow;
+		// 	position: absolute;
+		// }
+
 		const editorRootStyle = Object.assign({}, editorStyle);
 		delete editorRootStyle.width;
 		delete editorRootStyle.height;
@@ -618,14 +921,15 @@ class NoteTextComponent extends React.Component {
 			editorProps={{$blockScrolling: true}}
 
 			// This is buggy (gets outside the container)
-			highlightActiveLine={false}
+			highlightActiveLine={false}			
 		/>
 
 		return (
-			<div style={rootStyle}>
+			<div style={rootStyle} onDrop={this.onDrop_}>
 				<div style={titleBarStyle}>
 					{ titleEditor }
-					{ titleBarMenuButton }
+					{ titleBarDate }
+					{ false ? titleBarMenuButton : null }
 				</div>
 				{ toolbar }
 				{ editor }
@@ -646,6 +950,10 @@ const mapStateToProps = (state) => {
 		showAdvancedOptions: state.settings.showAdvancedOptions,
 		syncStarted: state.syncStarted,
 		newNote: state.newNote,
+		windowCommand: state.windowCommand,
+		notesParentType: state.notesParentType,
+		searches: state.searches,
+		selectedSearchId: state.selectedSearchId,
 	};
 };
 

ElectronClient/app/gui/OneDriveLoginScreen.jsx

@@ -54,10 +54,7 @@ class OneDriveLoginScreenComponent extends React.Component {
 				this.props.dispatch({ type: 'NAV_BACK' });
 				reg.scheduleSync(0);
 			} catch (error) {
-				bridge().showMessageBox({
-					type: 'error',
-					message: 'Could not login to OneDrive. Please try again.\n\n' + error.message + "\n\n" + url.match(/.{1,64}/g).join('\n'),
-				});
+				bridge().showErrorMessageBox('Could not login to OneDrive. Please try again.\n\n' + error.message + "\n\n" + url.match(/.{1,64}/g).join('\n'));
 			}
 
 			this.authCode_ = null;