Android release v1.0.119

Common EU Date format DD.MM.YYYY added, issue #405

.gitignore

@@ -35,4 +35,9 @@ _vieux/
 _mydocs
 .DS_Store
 Assets/DownloadBadges*.psd
-node_modules
+node_modules
+Tools/github_oauth_token.txt
+_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
 
 ```
@@ -32,6 +41,21 @@ 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.
+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

@@ -35,38 +35,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 +122,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 +287,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 +386,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 +426,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;
@@ -786,35 +748,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');
@@ -21,6 +22,7 @@ const os = require('os');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
 const EventEmitter = require('events');
+const Cache = require('lib/Cache');
 
 class Application extends BaseApplication {
 
@@ -34,6 +36,7 @@ class Application extends BaseApplication {
 		this.allCommandsLoaded_ = false;
 		this.showStackTraces_ = false;
 		this.gui_ = null;
+		this.cache_ = new Cache();
 	}
 
 	gui() {
@@ -223,12 +226,8 @@ class Application extends BaseApplication {
 	async commandMetadata() {
 		if (this.commandMetadata_) return this.commandMetadata_;
 
-		const osTmpdir = require('os-tmpdir');
-		const storage = require('node-persist');
-		await storage.init({ dir: osTmpdir() + '/commandMetadata', ttl: 1000 * 60 * 60 * 24 });
-
-		let output = await storage.getItem('metadata');
-		if (Setting.value('env') != 'dev' && output) {
+		let output = await this.cache_.getItem('metadata');
+		if (output) {
 			this.commandMetadata_ = output;
 			return Object.assign({}, this.commandMetadata_);
 		}
@@ -242,7 +241,7 @@ class Application extends BaseApplication {
 			output[n] = cmd.metadata();
 		}
 
-		await storage.setItem('metadata', output);
+		await this.cache_.setItem('metadata', output, 1000 * 60 * 60 * 24);
 
 		this.commandMetadata_ = output;
 		return Object.assign({}, this.commandMetadata_);
@@ -285,7 +284,7 @@ class Application extends BaseApplication {
 			exit: () => {},
 			showModalOverlay: (text) => {},
 			hideModalOverlay: () => {},
-			stdoutMaxWidth: () => { return 78; },
+			stdoutMaxWidth: () => { return 100; },
 			forceRender: () => {},
 			termSaveState: () => {},
 			termRestoreState: (state) => {},
@@ -294,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);
 
@@ -314,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);
 
@@ -332,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();
 
@@ -354,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
@@ -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,7 +23,11 @@ class Command extends BaseCommand {
 		const verbose = args.options.verbose;
 
 		const renderKeyValue = (name) => {
-			const value = Setting.value(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-edit.js

@@ -81,7 +81,9 @@ class Command extends BaseCommand {
 			const termState = app().gui().termSaveState();
 
 			const spawnSync	= require('child_process').spawnSync;
-			spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
+			const result = spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
+
+			if (result.error) this.stdout(_('Error opening note in editor: %s', result.error.message));
 
 			app().gui().termRestoreState(termState);
 			app().gui().hideModalOverlay();

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);
@@ -75,10 +76,10 @@ class Command extends BaseCommand {
 			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-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/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

@@ -3,6 +3,13 @@
 // Make it possible to require("/lib/...") without specifying full path
 require('app-module-path').addPath(__dirname);
 
+const compareVersion = require('compare-version');
+const nodeVersion = process && process.versions && process.versions.node ? process.versions.node : '0.0.0';
+if (compareVersion(nodeVersion, '8.0.0') < 0) {
+	console.error('Joplin requires Node 8+. Detected version ' + nodeVersion);
+	process.exit(1);
+}
+
 const { app } = require('./app.js');
 const Folder = require('lib/models/Folder.js');
 const Resource = require('lib/models/Resource.js');
@@ -16,12 +23,14 @@ const { Logger } = require('lib/logger.js');
 const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { shimInit } = require('lib/shim-init-node.js');
 const { _ } = require('lib/locale.js');
+const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
 const EncryptionService = require('lib/services/EncryptionService');
 
 const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;
 Resource.fsDriver_ = fsDriver;
 EncryptionService.fsDriver_ = fsDriver;
+FileApiDriverLocal.fsDriver_ = fsDriver;
 
 // That's not good, but it's to avoid circular dependency issues
 // in the BaseItem class.
@@ -57,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 ""
 
@@ -108,6 +57,9 @@ msgstr ""
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr ""
 
+msgid "Cannot change encrypted item"
+msgstr ""
+
 #, javascript-format
 msgid "Missing required argument: %s"
 msgstr ""
@@ -165,6 +117,35 @@ msgstr ""
 msgid "Note is not a to-do: \"%s\""
 msgstr ""
 
+msgid ""
+"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
+"`status` and `target-status`."
+msgstr ""
+
+msgid "Enter master password:"
+msgstr ""
+
+msgid "Operation cancelled"
+msgstr ""
+
+msgid ""
+"Starting decryption... Please wait as it may take several minutes depending "
+"on how much there is to decrypt."
+msgstr ""
+
+msgid "Completed decryption."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+#, javascript-format
+msgid "Encryption is: %s"
+msgstr ""
+
 msgid "Edit note."
 msgstr ""
 
@@ -182,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 ""
 
@@ -189,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 ""
 
@@ -205,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 ""
 
@@ -230,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 \":\""
@@ -240,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 ""
@@ -381,6 +368,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 ""
 
@@ -391,10 +396,6 @@ msgid ""
 "operation."
 msgstr ""
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -458,6 +459,9 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
+msgid "Type `joplin help` for usage information."
+msgstr ""
+
 msgid "Fatal error:"
 msgstr ""
 
@@ -488,6 +492,24 @@ msgid ""
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
 
+msgid ""
+"One or more items are currently encrypted and you may need to supply a "
+"master password. To do so please type `e2ee decrypt`. If you have already "
+"supplied the password, the encrypted items are being decrypted in the "
+"background and will be available soon."
+msgstr ""
+
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+msgid "PDF File"
+msgstr ""
+
 msgid "File"
 msgstr ""
 
@@ -500,10 +522,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"
@@ -524,13 +553,25 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr ""
 
 msgid "Synchronisation status"
 msgstr ""
 
-msgid "Options"
+msgid "Encryption options"
+msgstr ""
+
+msgid "General Options"
 msgstr ""
 
 msgid "Help"
@@ -539,6 +580,12 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Make a donation"
+msgstr ""
+
+msgid "Check for updates..."
+msgstr ""
+
 msgid "About Joplin"
 msgstr ""
 
@@ -546,12 +593,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 ""
@@ -559,6 +628,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 "
@@ -608,18 +680,26 @@ 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 ""
 
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Enabled"
-msgstr ""
-
-msgid "Disabled"
-msgstr ""
-
 msgid "Back"
 msgstr ""
 
@@ -631,15 +711,9 @@ msgstr ""
 msgid "Please create a notebook first."
 msgstr ""
 
-msgid "Note title:"
-msgstr ""
-
 msgid "Please create a notebook first"
 msgstr ""
 
-msgid "To-do title:"
-msgstr ""
-
 msgid "Notebook title:"
 msgstr ""
 
@@ -658,6 +732,9 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
+msgid "Search..."
+msgstr ""
+
 msgid "Some items cannot be synchronised."
 msgstr ""
 
@@ -689,6 +766,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Open..."
+msgstr ""
+
+msgid "Save as..."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -696,9 +779,28 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Set alarm"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "to-do"
+msgstr ""
+
+msgid "note"
+msgstr ""
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr ""
+
 msgid "Refresh"
 msgstr ""
 
@@ -708,7 +810,10 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Import"
+msgid "Dropbox Login"
+msgstr ""
+
+msgid "Options"
 msgstr ""
 
 msgid "Synchronisation Status"
@@ -732,12 +837,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
-msgid "Searches"
-msgstr ""
-
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -749,15 +848,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 ""
@@ -809,7 +917,11 @@ msgid "Deleted remote items: %d."
 msgstr ""
 
 #, javascript-format
-msgid "State: \"%s\"."
+msgid "Fetched items: %d/%d."
+msgstr ""
+
+#, javascript-format
+msgid "State: %s."
 msgstr ""
 
 msgid "Cancelling..."
@@ -819,10 +931,26 @@ 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 ""
 
+msgid "Encrypted"
+msgstr ""
+
+msgid "Encrypted items cannot be modified"
+msgstr ""
+
 msgid "Conflicts"
 msgstr ""
 
@@ -874,12 +1002,50 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Show uncompleted todos on top of the lists"
+msgid "Uncompleted to-dos on top"
+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 ""
+"The font name will not be checked. If incorrect or empty, it will default to "
+"a generic monospace font."
+msgstr ""
+
+msgid "Automatically update the application"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -895,9 +1061,6 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
-msgid "Automatically update the application"
-msgstr ""
-
 msgid "Show advanced options"
 msgstr ""
 
@@ -905,8 +1068,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)"
@@ -917,15 +1080,74 @@ 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 ""
 
 #, javascript-format
-msgid "\"%s\": \"%s\""
+msgid "%s (%s): %s"
+msgstr ""
+
+msgid ""
+"These items will remain on the device but will not be uploaded to the sync "
+"target. In order to find these items, either search for the title or the ID "
+"(which is displayed in brackets above)."
 msgstr ""
 
 msgid "Sync status (synced items / total items)"
@@ -973,6 +1195,9 @@ msgstr ""
 msgid "Export Debug Report"
 msgstr ""
 
+msgid "Encryption Config"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -983,6 +1208,9 @@ msgstr ""
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr ""
 
+msgid "Press to set the decryption password."
+msgstr ""
+
 msgid "Select date"
 msgstr ""
 
@@ -992,6 +1220,35 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+msgid "Login with Dropbox"
+msgstr ""
+
+#, javascript-format
+msgid "Master Key %s"
+msgstr ""
+
+#, javascript-format
+msgid "Created: %s"
+msgstr ""
+
+msgid "Password:"
+msgstr ""
+
+msgid "Password cannot be empty"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -999,6 +1256,12 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr ""
 
@@ -1039,6 +1302,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/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"
 
@@ -116,6 +59,9 @@ msgstr "Ne postoji naredba: %s"
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "Naredba \"%s\" postoji samo u inačici s grafičkim sučeljem"
 
+msgid "Cannot change encrypted item"
+msgstr ""
+
 #, javascript-format
 msgid "Missing required argument: %s"
 msgstr "Nedostaje obavezni argument: %s"
@@ -180,6 +126,36 @@ msgstr "Označava zadatak završenim."
 msgid "Note is not a to-do: \"%s\""
 msgstr "Bilješka nije zadatak: \"%s\""
 
+msgid ""
+"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
+"`status` and `target-status`."
+msgstr ""
+
+msgid "Enter master password:"
+msgstr ""
+
+msgid "Operation cancelled"
+msgstr ""
+
+msgid ""
+"Starting decryption... Please wait as it may take several minutes depending "
+"on how much there is to decrypt."
+msgstr ""
+
+msgid "Completed decryption."
+msgstr ""
+
+#, fuzzy
+msgid "Enabled"
+msgstr "Onemogućeno"
+
+msgid "Disabled"
+msgstr "Onemogućeno"
+
+#, javascript-format
+msgid "Encryption is: %s"
+msgstr ""
+
 msgid "Edit note."
 msgstr "Uredi bilješku."
 
@@ -202,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."
 
@@ -227,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."
 
@@ -261,7 +250,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 \":\""
@@ -270,29 +260,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."
@@ -433,6 +415,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."
 
@@ -444,12 +446,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)"
@@ -525,6 +521,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:"
 
@@ -566,6 +566,25 @@ msgstr ""
 "\n"
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 
+msgid ""
+"One or more items are currently encrypted and you may need to supply a "
+"master password. To do so please type `e2ee decrypt`. If you have already "
+"supplied the password, the encrypted items are being decrypted in the "
+"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"
 
@@ -578,11 +597,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"
@@ -602,13 +629,26 @@ 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"
 
 msgid "Synchronisation status"
 msgstr "Status sinkronizacije"
 
-msgid "Options"
+msgid "Encryption options"
+msgstr ""
+
+#, fuzzy
+msgid "General Options"
 msgstr "Opcije"
 
 msgid "Help"
@@ -617,6 +657,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"
 
@@ -624,12 +671,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"
@@ -637,6 +708,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 "
@@ -686,19 +760,26 @@ 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"
 
 msgid "Encryption is:"
 msgstr ""
 
-#, fuzzy
-msgid "Enabled"
-msgstr "Onemogućeno"
-
-msgid "Disabled"
-msgstr "Onemogućeno"
-
 msgid "Back"
 msgstr "Natrag"
 
@@ -712,15 +793,9 @@ msgstr ""
 msgid "Please create a notebook first."
 msgstr "Prvo stvori bilježnicu."
 
-msgid "Note title:"
-msgstr "Naslov bilješke:"
-
 msgid "Please create a notebook first"
 msgstr "Prvo stvori bilježnicu"
 
-msgid "To-do title:"
-msgstr "Naslov zadatka:"
-
 msgid "Notebook title:"
 msgstr "Naslov bilježnice:"
 
@@ -739,6 +814,10 @@ 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."
 
@@ -771,6 +850,13 @@ 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"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana poveznica ili poruka: %s"
@@ -778,9 +864,30 @@ msgstr "Nepodržana poveznica ili poruka: %s"
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
+msgid "Tags"
+msgstr "Oznake"
+
 msgid "Set alarm"
 msgstr "Postavi upozorenje"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+#, 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"
 
@@ -790,8 +897,11 @@ msgstr "Očisti"
 msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
-msgid "Import"
-msgstr "Uvoz"
+msgid "Dropbox Login"
+msgstr ""
+
+msgid "Options"
+msgstr "Opcije"
 
 msgid "Synchronisation Status"
 msgstr "Status Sinkronizacije"
@@ -814,12 +924,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"
 
@@ -831,15 +935,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"
@@ -896,8 +1009,12 @@ msgstr "Obrisane lokalne stavke: %d."
 msgid "Deleted remote items: %d."
 msgstr "Obrisane udaljene stavke: %d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "Fetched items: %d/%d."
+msgstr "Stvorene lokalne stavke: %d."
+
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "Stanje: \"%s\"."
 
 msgid "Cancelling..."
@@ -907,10 +1024,27 @@ 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"
 
+msgid "Encrypted"
+msgstr ""
+
+#, fuzzy
+msgid "Encrypted items cannot be modified"
+msgstr "Neke stavke se ne mogu sinkronizirati."
+
 msgid "Conflicts"
 msgstr "Sukobi"
 
@@ -964,12 +1098,55 @@ 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"
 
+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 ""
+"The font name will not be checked. If 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"
 
@@ -985,9 +1162,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"
 
@@ -995,11 +1169,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)"
@@ -1011,16 +1183,78 @@ 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"
 
-#, javascript-format
-msgid "\"%s\": \"%s\""
-msgstr "\"%s\": \"%s\""
+#, fuzzy, javascript-format
+msgid "%s (%s): %s"
+msgstr "%s %s (%s)"
+
+msgid ""
+"These items will remain on the device but will not be uploaded to the sync "
+"target. In order to find these items, either search for the title or the ID "
+"(which is displayed in brackets above)."
+msgstr ""
 
 msgid "Sync status (synced items / total items)"
 msgstr "Status (sinkronizirane stavke / ukupni broj stavki)"
@@ -1067,6 +1301,9 @@ msgstr "Log"
 msgid "Export Debug Report"
 msgstr "Izvezi Debug izvještaj"
 
+msgid "Encryption Config"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Konfiguracija"
 
@@ -1077,6 +1314,9 @@ msgstr "Premjesti u bilježnicu..."
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr "Premjesti %d bilješke u bilježnicu \"%s\"?"
 
+msgid "Press to set the decryption password."
+msgstr ""
+
 msgid "Select date"
 msgstr "Odaberi datum"
 
@@ -1086,6 +1326,37 @@ msgstr "Potvrdi"
 msgid "Cancel synchronisation"
 msgstr "Prekini sinkronizaciju"
 
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "Prijavi se u OneDrive"
+
+#, javascript-format
+msgid "Master Key %s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Created: %s"
+msgstr "Stvoreno: %d."
+
+msgid "Password:"
+msgstr ""
+
+msgid "Password cannot be empty"
+msgstr ""
+
+#, fuzzy
+msgid "Enable"
+msgstr "Onemogućeno"
+
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Bilježnicu nije moguće snimiti: %s"
@@ -1093,6 +1364,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:"
 
@@ -1133,6 +1410,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."
@@ -1145,3 +1425,98 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
 
 msgid "Welcome"
 msgstr "Dobro došli"
+
+#~ msgid "Searches"
+#~ msgstr "Pretraživanja"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Obriši bilješke?"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Uvozi Evernote bilježnicu (.enex datoteku)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "Datoteka \"%s\" će biti uvezena u postojeću bilježnicu \"%s\". Nastavi?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "Nova bilježnica \"%s\" će biti stvorena i datoteka \"%s\" će biti uvezena "
+#~ "u nju. Nastavi?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Uvezi Evernote bilješke"
+
+#~ msgid "Give focus to next pane"
+#~ msgstr "Fokusiraj sljedeće okno"
+
+#~ 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:"
+
+#~ msgid "\"%s\": \"%s\""
+#~ msgstr "\"%s\": \"%s\""

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"
 
@@ -112,6 +59,9 @@ msgstr "Nessun comando: %s"
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "Il comando \"%s\" è disponibile solo nella modalità grafica"
 
+msgid "Cannot change encrypted item"
+msgstr ""
+
 #, javascript-format
 msgid "Missing required argument: %s"
 msgstr "Argomento richiesto mancante: %s"
@@ -174,6 +124,36 @@ msgstr "Segna un'attività come completata."
 msgid "Note is not a to-do: \"%s\""
 msgstr "La nota non è un'attività: \"%s\""
 
+msgid ""
+"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
+"`status` and `target-status`."
+msgstr ""
+
+msgid "Enter master password:"
+msgstr ""
+
+msgid "Operation cancelled"
+msgstr ""
+
+msgid ""
+"Starting decryption... Please wait as it may take several minutes depending "
+"on how much there is to decrypt."
+msgstr ""
+
+msgid "Completed decryption."
+msgstr ""
+
+#, fuzzy
+msgid "Enabled"
+msgstr "Disabilitato"
+
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#, javascript-format
+msgid "Encryption is: %s"
+msgstr ""
+
 msgid "Edit note."
 msgstr "Modifica nota."
 
@@ -193,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."
 
@@ -219,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."
 
@@ -252,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 \":\""
@@ -261,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."
@@ -416,6 +402,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."
 
@@ -429,12 +435,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)"
@@ -507,6 +507,10 @@ msgstr "Predefinito: %s"
 msgid "Possible keys/values:"
 msgstr "Chiave/valore possibili:"
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "Mostra le informazioni di utilizzo."
+
 msgid "Fatal error:"
 msgstr "Errore fatale:"
 
@@ -544,6 +548,25 @@ msgid ""
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
 
+msgid ""
+"One or more items are currently encrypted and you may need to supply a "
+"master password. To do so please type `e2ee decrypt`. If you have already "
+"supplied the password, the encrypted items are being decrypted in the "
+"background and will be available soon."
+msgstr ""
+
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, fuzzy
+msgid "PDF File"
+msgstr "File"
+
 msgid "File"
 msgstr "File"
 
@@ -556,11 +579,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"
@@ -580,13 +611,26 @@ 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"
 
 msgid "Synchronisation status"
 msgstr "Stato di sincronizzazione"
 
-msgid "Options"
+msgid "Encryption options"
+msgstr ""
+
+#, fuzzy
+msgid "General Options"
 msgstr "Opzioni"
 
 msgid "Help"
@@ -595,6 +639,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"
 
@@ -602,12 +653,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 ""
@@ -615,6 +690,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 "
@@ -666,19 +744,26 @@ 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"
 
 msgid "Encryption is:"
 msgstr ""
 
-#, fuzzy
-msgid "Enabled"
-msgstr "Disabilitato"
-
-msgid "Disabled"
-msgstr "Disabilitato"
-
 msgid "Back"
 msgstr "Indietro"
 
@@ -690,15 +775,9 @@ msgstr "Il nuovo blocco note \"%s\" verrà creato e \"%s\" vi verrà importato"
 msgid "Please create a notebook first."
 msgstr "Per favore prima crea un blocco note."
 
-msgid "Note title:"
-msgstr "Titolo della Nota:"
-
 msgid "Please create a notebook first"
 msgstr "Per favore prima crea un blocco note"
 
-msgid "To-do title:"
-msgstr "Titolo dell'attività:"
-
 msgid "Notebook title:"
 msgstr "Titolo del blocco note:"
 
@@ -717,6 +796,10 @@ 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."
 
@@ -750,6 +833,13 @@ 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"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Collegamento o messaggio non supportato: %s"
@@ -757,9 +847,30 @@ msgstr "Collegamento o messaggio non supportato: %s"
 msgid "Attach file"
 msgstr "Allega file"
 
+msgid "Tags"
+msgstr "Etichette"
+
 msgid "Set alarm"
 msgstr "Imposta allarme"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+#, 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"
 
@@ -769,8 +880,11 @@ msgstr "Pulisci"
 msgid "OneDrive Login"
 msgstr "Login OneDrive"
 
-msgid "Import"
-msgstr "Importa"
+msgid "Dropbox Login"
+msgstr ""
+
+msgid "Options"
+msgstr "Opzioni"
 
 msgid "Synchronisation Status"
 msgstr "Stato della Sincronizzazione"
@@ -793,12 +907,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."
@@ -811,15 +919,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"
@@ -878,8 +995,12 @@ msgstr "Elementi locali eliminati: %d."
 msgid "Deleted remote items: %d."
 msgstr "Elementi remoti eliminati: %d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "Fetched items: %d/%d."
+msgstr "Elementi locali creati: %d."
+
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "Stato: \"%s\"."
 
 msgid "Cancelling..."
@@ -889,10 +1010,27 @@ 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"
 
+msgid "Encrypted"
+msgstr ""
+
+#, fuzzy
+msgid "Encrypted items cannot be modified"
+msgstr "Alcuni elementi non possono essere sincronizzati."
+
 msgid "Conflicts"
 msgstr "Conflitti"
 
@@ -946,12 +1084,55 @@ 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"
 
+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 ""
+"The font name will not be checked. If 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"
 
@@ -967,9 +1148,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"
 
@@ -977,12 +1155,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 ""
@@ -994,16 +1169,78 @@ 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"
 
-#, javascript-format
-msgid "\"%s\": \"%s\""
-msgstr "\"%s\": \"%s\""
+#, fuzzy, javascript-format
+msgid "%s (%s): %s"
+msgstr "%s %s (%s)"
+
+msgid ""
+"These items will remain on the device but will not be uploaded to the sync "
+"target. In order to find these items, either search for the title or the ID "
+"(which is displayed in brackets above)."
+msgstr ""
 
 msgid "Sync status (synced items / total items)"
 msgstr "Stato di sincronizzazione (Elementi sincronizzati / Elementi totali)"
@@ -1050,6 +1287,9 @@ msgstr "Log"
 msgid "Export Debug Report"
 msgstr "Esporta il Report di Debug"
 
+msgid "Encryption Config"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -1060,6 +1300,9 @@ msgstr "Sposta sul blocco note..."
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr "Spostare le note %d sul blocco note \"%s\"?"
 
+msgid "Press to set the decryption password."
+msgstr ""
+
 msgid "Select date"
 msgstr "Seleziona la data"
 
@@ -1069,6 +1312,37 @@ msgstr "Conferma"
 msgid "Cancel synchronisation"
 msgstr "Cancella la sincronizzazione"
 
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "Accedi a OneDrive"
+
+#, javascript-format
+msgid "Master Key %s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Created: %s"
+msgstr "Creato: %d."
+
+msgid "Password:"
+msgstr ""
+
+msgid "Password cannot be empty"
+msgstr ""
+
+#, fuzzy
+msgid "Enable"
+msgstr "Disabilitato"
+
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Il blocco note non può essere salvato: %s"
@@ -1076,6 +1350,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:"
 
@@ -1116,6 +1396,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."
@@ -1131,6 +1414,99 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvenuto"
 
+#~ msgid "Searches"
+#~ msgstr "Ricerche"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Eliminare le note?"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Importa un file blocco note di Evernote (.enex file)."
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "Il file \"%s\" sarà importato nel blocco note esistente \"%s\". "
+#~ "Continuare?"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "Un nuovo blocco note \"%s\" sarà creato e al suo interno verrà importato "
+#~ "il file \"%s\" . Continuare?"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Importa le note da Evernote"
+
+#~ msgid "Give focus to next pane"
+#~ msgstr "Pannello successivo"
+
+#~ 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à:"
+
+#~ msgid "\"%s\": \"%s\""
+#~ msgstr "\"%s\": \"%s\""
+
 #~ msgid "Delete notebook?"
 #~ msgstr "Eliminare il blocco note?"
 

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\"と入力してください"
 
@@ -110,6 +59,9 @@ msgstr "コマンドが違います：%s"
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "コマンド \"%s\"は、GUIのみで有効です。"
 
+msgid "Cannot change encrypted item"
+msgstr ""
+
 #, javascript-format
 msgid "Missing required argument: %s"
 msgstr "引数が足りません：%s"
@@ -171,6 +123,36 @@ msgstr "ToDoを完了として"
 msgid "Note is not a to-do: \"%s\""
 msgstr "ノートはToDoリストではありません：\"%s\""
 
+msgid ""
+"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
+"`status` and `target-status`."
+msgstr ""
+
+msgid "Enter master password:"
+msgstr ""
+
+msgid "Operation cancelled"
+msgstr ""
+
+msgid ""
+"Starting decryption... Please wait as it may take several minutes depending "
+"on how much there is to decrypt."
+msgstr ""
+
+msgid "Completed decryption."
+msgstr ""
+
+#, fuzzy
+msgid "Enabled"
+msgstr "無効"
+
+msgid "Disabled"
+msgstr "無効"
+
+#, javascript-format
+msgid "Encryption is: %s"
+msgstr ""
+
 msgid "Edit note."
 msgstr "ノートを編集する。"
 
@@ -190,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 "選択されたノートのみを出力する。"
 
@@ -215,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モードではショートカットは使用できません。"
 
@@ -245,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 \":\""
@@ -254,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"
@@ -413,6 +401,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 "同期はすでに実行中です。"
 
@@ -425,10 +431,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)"
@@ -501,6 +503,10 @@ msgstr "規定値: %s"
 msgid "Possible keys/values:"
 msgstr "取り得るキーバリュー: "
 
+#, fuzzy
+msgid "Type `joplin help` for usage information."
+msgstr "使い方を表示する。"
+
 msgid "Fatal error:"
 msgstr "致命的なエラー: "
 
@@ -543,6 +549,25 @@ msgstr ""
 "例えば、ノートブックの作成には`mb`で出来、ノートの作成は`mn`で行うことが出来"
 "ます。"
 
+msgid ""
+"One or more items are currently encrypted and you may need to supply a "
+"master password. To do so please type `e2ee decrypt`. If you have already "
+"supplied the password, the encrypted items are being decrypted in the "
+"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 "ファイル"
 
@@ -555,11 +580,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 "終了"
@@ -579,13 +612,26 @@ msgstr "貼り付け"
 msgid "Search in all the notes"
 msgstr "すべてのノートを検索"
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr "ツール"
 
 msgid "Synchronisation status"
 msgstr "同期状況"
 
-msgid "Options"
+msgid "Encryption options"
+msgstr ""
+
+#, fuzzy
+msgid "General Options"
 msgstr "オプション"
 
 msgid "Help"
@@ -594,6 +640,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について"
 
@@ -601,12 +654,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に保存されます。"
@@ -614,6 +690,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 "
@@ -667,19 +746,26 @@ 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 "状態"
 
 msgid "Encryption is:"
 msgstr ""
 
-#, fuzzy
-msgid "Enabled"
-msgstr "無効"
-
-msgid "Disabled"
-msgstr "無効"
-
 msgid "Back"
 msgstr "戻る"
 
@@ -693,15 +779,9 @@ msgstr ""
 msgid "Please create a notebook first."
 msgstr "ますはノートブックを作成して下さい。"
 
-msgid "Note title:"
-msgstr "ノートの題名："
-
 msgid "Please create a notebook first"
 msgstr "ますはノートブックを作成して下さい。"
 
-msgid "To-do title:"
-msgstr "ToDoの題名："
-
 msgid "Notebook title:"
 msgstr "ノートブックの題名："
 
@@ -720,6 +800,10 @@ msgstr "アラームをセット："
 msgid "Layout"
 msgstr "レイアウト"
 
+#, fuzzy
+msgid "Search..."
+msgstr "検索"
+
 msgid "Some items cannot be synchronised."
 msgstr "いくつかの項目は同期されませんでした。"
 
@@ -752,6 +836,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "ノートブックがありません。新しいノートブックを作成してください。"
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "変更を保存"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -759,9 +850,30 @@ msgstr ""
 msgid "Attach file"
 msgstr "ファイルを添付"
 
+msgid "Tags"
+msgstr "タグ"
+
 msgid "Set alarm"
 msgstr "アラームをセット"
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+#, fuzzy
+msgid "to-do"
+msgstr "新しいToDo"
+
+#, fuzzy
+msgid "note"
+msgstr "新しいノート"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "ノートのインポート…"
+
 msgid "Refresh"
 msgstr "更新"
 
@@ -771,8 +883,11 @@ msgstr "クリア"
 msgid "OneDrive Login"
 msgstr "OneDriveログイン"
 
-msgid "Import"
-msgstr "インポート"
+msgid "Dropbox Login"
+msgstr ""
+
+msgid "Options"
+msgstr "オプション"
 
 msgid "Synchronisation Status"
 msgstr "同期状況"
@@ -795,12 +910,6 @@ msgstr "同期"
 msgid "Notebooks"
 msgstr "ノートブック"
 
-msgid "Tags"
-msgstr "タグ"
-
-msgid "Searches"
-msgstr "検索"
-
 msgid "Please select where the sync status should be exported to"
 msgstr "同期状況の出力先を選択してください"
 
@@ -812,15 +921,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 ""
@@ -879,8 +997,12 @@ msgstr "ローカルアイテムの削除: %d."
 msgid "Deleted remote items: %d."
 msgstr "リモートアイテムの削除: %d."
 
-#, javascript-format
-msgid "State: \"%s\"."
+#, fuzzy, javascript-format
+msgid "Fetched items: %d/%d."
+msgstr "ローカルアイテムの作成: %d."
+
+#, fuzzy, javascript-format
+msgid "State: %s."
 msgstr "状態: \"%s\"。"
 
 msgid "Cancelling..."
@@ -890,10 +1012,27 @@ 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"
 
+msgid "Encrypted"
+msgstr ""
+
+#, fuzzy
+msgid "Encrypted items cannot be modified"
+msgstr "いくつかの項目は同期されませんでした。"
+
 msgid "Conflicts"
 msgstr "衝突"
 
@@ -949,12 +1088,55 @@ msgstr "明るい"
 msgid "Dark"
 msgstr "暗い"
 
-msgid "Show uncompleted todos on top of the lists"
+#, fuzzy
+msgid "Uncompleted to-dos on top"
 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 ""
+"The font name will not be checked. If incorrect or empty, it will default to "
+"a generic monospace font."
+msgstr ""
+
+msgid "Automatically update the application"
+msgstr "アプリケーションの自動更新"
+
 msgid "Synchronisation interval"
 msgstr "同期間隔"
 
@@ -970,9 +1152,6 @@ msgstr "%d 時間"
 msgid "%d hours"
 msgstr "%d 時間"
 
-msgid "Automatically update the application"
-msgstr "アプリケーションの自動更新"
-
 msgid "Show advanced options"
 msgstr "詳細な設定の表示"
 
@@ -980,11 +1159,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 "同期先のディレクトリ(絶対パス)"
@@ -996,15 +1173,77 @@ 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 "同期が出来なかったアイテム"
 
 #, javascript-format
-msgid "\"%s\": \"%s\""
+msgid "%s (%s): %s"
+msgstr ""
+
+msgid ""
+"These items will remain on the device but will not be uploaded to the sync "
+"target. In order to find these items, either search for the title or the ID "
+"(which is displayed in brackets above)."
 msgstr ""
 
 msgid "Sync status (synced items / total items)"
@@ -1052,6 +1291,9 @@ msgstr "ログ"
 msgid "Export Debug Report"
 msgstr "デバッグレポートの出力"
 
+msgid "Encryption Config"
+msgstr ""
+
 msgid "Configuration"
 msgstr "設定"
 
@@ -1062,6 +1304,9 @@ msgstr "ノートブックへ移動..."
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr "%d個のノートを\"%s\"に移動しますか？"
 
+msgid "Press to set the decryption password."
+msgstr ""
+
 msgid "Select date"
 msgstr "日付の選択"
 
@@ -1071,6 +1316,37 @@ msgstr "確認"
 msgid "Cancel synchronisation"
 msgstr "同期の中止"
 
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+#, fuzzy
+msgid "Login with Dropbox"
+msgstr "OneDriveログイン"
+
+#, javascript-format
+msgid "Master Key %s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Created: %s"
+msgstr "作成しました：%d"
+
+msgid "Password:"
+msgstr ""
+
+msgid "Password cannot be empty"
+msgstr ""
+
+#, fuzzy
+msgid "Enable"
+msgstr "無効"
+
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "ノートブックは保存できませんでした：%s"
@@ -1078,6 +1354,12 @@ msgstr "ノートブックは保存できませんでした：%s"
 msgid "Edit notebook"
 msgstr "ノートブックの編集"
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr "ノートは変更されています："
 
@@ -1118,6 +1400,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."
@@ -1132,3 +1417,89 @@ msgstr ""
 
 msgid "Welcome"
 msgstr "ようこそ"
+
+#~ msgid "Searches"
+#~ msgstr "検索"
+
+#, fuzzy
+#~ msgid ""
+#~ "Release notes:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "ノートを削除しますか？"
+
+#~ msgid "Imports an Evernote notebook file (.enex file)."
+#~ msgstr "Evernoteノートブックファイル(.enex)のインポート"
+
+#~ msgid ""
+#~ "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+#~ msgstr ""
+#~ "ファイル \"%s\" はノートブック \"%s\"に取り込まれます。よろしいですか？"
+
+#~ msgid ""
+#~ "New notebook \"%s\" will be created and file \"%s\" will be imported into "
+#~ "it. Continue?"
+#~ msgstr ""
+#~ "新しいノートブック\"%s\"が作成され、ファイル\"%s\"が取り込まれます。よろし"
+#~ "いですか？"
+
+#~ msgid "Import Evernote notes"
+#~ msgstr "Evernoteのインポート"
+
+#~ msgid "Give focus to next pane"
+#~ msgstr "次のペインへ"
+
+#~ 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 ""
 
@@ -108,6 +57,9 @@ msgstr ""
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr ""
 
+msgid "Cannot change encrypted item"
+msgstr ""
+
 #, javascript-format
 msgid "Missing required argument: %s"
 msgstr ""
@@ -165,6 +117,35 @@ msgstr ""
 msgid "Note is not a to-do: \"%s\""
 msgstr ""
 
+msgid ""
+"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
+"`status` and `target-status`."
+msgstr ""
+
+msgid "Enter master password:"
+msgstr ""
+
+msgid "Operation cancelled"
+msgstr ""
+
+msgid ""
+"Starting decryption... Please wait as it may take several minutes depending "
+"on how much there is to decrypt."
+msgstr ""
+
+msgid "Completed decryption."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+#, javascript-format
+msgid "Encryption is: %s"
+msgstr ""
+
 msgid "Edit note."
 msgstr ""
 
@@ -182,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 ""
 
@@ -189,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 ""
 
@@ -205,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 ""
 
@@ -230,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 \":\""
@@ -240,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 ""
@@ -381,6 +368,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 ""
 
@@ -391,10 +396,6 @@ msgid ""
 "operation."
 msgstr ""
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -458,6 +459,9 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
+msgid "Type `joplin help` for usage information."
+msgstr ""
+
 msgid "Fatal error:"
 msgstr ""
 
@@ -488,6 +492,24 @@ msgid ""
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
 
+msgid ""
+"One or more items are currently encrypted and you may need to supply a "
+"master password. To do so please type `e2ee decrypt`. If you have already "
+"supplied the password, the encrypted items are being decrypted in the "
+"background and will be available soon."
+msgstr ""
+
+#, javascript-format
+msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+#, javascript-format
+msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+msgstr ""
+
+msgid "PDF File"
+msgstr ""
+
 msgid "File"
 msgstr ""
 
@@ -500,10 +522,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"
@@ -524,13 +553,25 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "View"
+msgstr ""
+
+msgid "Toggle sidebar"
+msgstr ""
+
+msgid "Toggle editor layout"
+msgstr ""
+
 msgid "Tools"
 msgstr ""
 
 msgid "Synchronisation status"
 msgstr ""
 
-msgid "Options"
+msgid "Encryption options"
+msgstr ""
+
+msgid "General Options"
 msgstr ""
 
 msgid "Help"
@@ -539,6 +580,12 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Make a donation"
+msgstr ""
+
+msgid "Check for updates..."
+msgstr ""
+
 msgid "About Joplin"
 msgstr ""
 
@@ -546,12 +593,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 ""
@@ -559,6 +628,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 "
@@ -608,18 +680,26 @@ 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 ""
 
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Enabled"
-msgstr ""
-
-msgid "Disabled"
-msgstr ""
-
 msgid "Back"
 msgstr ""
 
@@ -631,15 +711,9 @@ msgstr ""
 msgid "Please create a notebook first."
 msgstr ""
 
-msgid "Note title:"
-msgstr ""
-
 msgid "Please create a notebook first"
 msgstr ""
 
-msgid "To-do title:"
-msgstr ""
-
 msgid "Notebook title:"
 msgstr ""
 
@@ -658,6 +732,9 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
+msgid "Search..."
+msgstr ""
+
 msgid "Some items cannot be synchronised."
 msgstr ""
 
@@ -689,6 +766,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Open..."
+msgstr ""
+
+msgid "Save as..."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -696,9 +779,28 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Set alarm"
 msgstr ""
 
+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "to-do"
+msgstr ""
+
+msgid "note"
+msgstr ""
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr ""
+
 msgid "Refresh"
 msgstr ""
 
@@ -708,7 +810,10 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Import"
+msgid "Dropbox Login"
+msgstr ""
+
+msgid "Options"
 msgstr ""
 
 msgid "Synchronisation Status"
@@ -732,12 +837,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
-msgid "Searches"
-msgstr ""
-
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -749,15 +848,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 ""
@@ -809,7 +917,11 @@ msgid "Deleted remote items: %d."
 msgstr ""
 
 #, javascript-format
-msgid "State: \"%s\"."
+msgid "Fetched items: %d/%d."
+msgstr ""
+
+#, javascript-format
+msgid "State: %s."
 msgstr ""
 
 msgid "Cancelling..."
@@ -819,10 +931,26 @@ 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 ""
 
+msgid "Encrypted"
+msgstr ""
+
+msgid "Encrypted items cannot be modified"
+msgstr ""
+
 msgid "Conflicts"
 msgstr ""
 
@@ -874,12 +1002,50 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Show uncompleted todos on top of the lists"
+msgid "Uncompleted to-dos on top"
+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 ""
+"The font name will not be checked. If incorrect or empty, it will default to "
+"a generic monospace font."
+msgstr ""
+
+msgid "Automatically update the application"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -895,9 +1061,6 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
-msgid "Automatically update the application"
-msgstr ""
-
 msgid "Show advanced options"
 msgstr ""
 
@@ -905,8 +1068,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)"
@@ -917,15 +1080,74 @@ 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 ""
 
 #, javascript-format
-msgid "\"%s\": \"%s\""
+msgid "%s (%s): %s"
+msgstr ""
+
+msgid ""
+"These items will remain on the device but will not be uploaded to the sync "
+"target. In order to find these items, either search for the title or the ID "
+"(which is displayed in brackets above)."
 msgstr ""
 
 msgid "Sync status (synced items / total items)"
@@ -973,6 +1195,9 @@ msgstr ""
 msgid "Export Debug Report"
 msgstr ""
 
+msgid "Encryption Config"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -983,6 +1208,9 @@ msgstr ""
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr ""
 
+msgid "Press to set the decryption password."
+msgstr ""
+
 msgid "Select date"
 msgstr ""
 
@@ -992,6 +1220,35 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
+msgid "New tags:"
+msgstr ""
+
+msgid "Type new tags or select from list"
+msgstr ""
+
+msgid "Joplin website"
+msgstr ""
+
+msgid "Login with Dropbox"
+msgstr ""
+
+#, javascript-format
+msgid "Master Key %s"
+msgstr ""
+
+#, javascript-format
+msgid "Created: %s"
+msgstr ""
+
+msgid "Password:"
+msgstr ""
+
+msgid "Password cannot be empty"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -999,6 +1256,12 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr ""
 
@@ -1039,6 +1302,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/package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "joplin",
-  "version": "0.10.85",
+  "version": "1.0.106",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "ajv": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
       "requires": {
         "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
@@ -64,6 +64,11 @@
         }
       }
     },
+    "async-mutex": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.3.tgz",
+      "integrity": "sha1-Cq0hEjaXlas/F+M3RFVtLs9UdWY="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -85,6 +90,11 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
+    "base-64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
+      "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
@@ -197,6 +207,11 @@
         "delayed-stream": "1.0.0"
       }
     },
+    "compare-version": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
+      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA="
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -420,6 +435,14 @@
         "universalify": "0.1.1"
       }
     },
+    "fs-minipass": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+      "requires": {
+        "minipass": "2.2.1"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -437,7 +460,7 @@
         "ndarray": "1.0.18",
         "ndarray-pack": "1.2.1",
         "node-bitmap": "0.0.1",
-        "omggif": "1.0.8",
+        "omggif": "1.0.9",
         "parse-data-uri": "0.2.0",
         "pngjs": "2.3.1",
         "request": "2.83.0",
@@ -489,7 +512,7 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "5.3.0",
+        "ajv": "5.5.2",
         "har-schema": "2.0.0"
       }
     },
@@ -843,9 +866,9 @@
       }
     },
     "minizlib": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz",
-      "integrity": "sha512-sN4U9tIJtBRwKbwgFh9qJfrPIQ/GGTRr1MGqkgOeMTLy8/lM0FcWU//FqlnZ3Vb7gJ+Mxh3FOg1EklibdajbaQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
+      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
       "requires": {
         "minipass": "2.2.1"
       }
@@ -948,9 +971,9 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "omggif": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.8.tgz",
-      "integrity": "sha1-F483sqsLPXtG7ToORr0HkLWNNTA="
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz",
+      "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8="
     },
     "once": {
       "version": "1.4.0",
@@ -960,11 +983,6 @@
         "wrappy": "1.0.2"
       }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
     "parse-data-uri": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz",
@@ -1045,6 +1063,11 @@
         "strict-uri-encode": "1.1.0"
       }
     },
+    "querystringify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
+      "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs="
+    },
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
@@ -1099,6 +1122,11 @@
         "uuid": "3.1.0"
       }
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
     "retry": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
@@ -1136,6 +1164,20 @@
         "semver": "5.4.1",
         "simple-get": "2.7.0",
         "tar": "3.2.1"
+      },
+      "dependencies": {
+        "tar": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-3.2.1.tgz",
+          "integrity": "sha512-ZSzds1E0IqutvMU8HxjMaU8eB7urw2fGwTq88ukDOVuUIh0656l7/P7LiVPxhO5kS4flcRJQk8USG+cghQbTUQ==",
+          "requires": {
+            "chownr": "1.0.1",
+            "minipass": "2.2.1",
+            "minizlib": "1.1.0",
+            "mkdirp": "0.5.1",
+            "yallist": "3.0.2"
+          }
+        }
       }
     },
     "simple-concat": {
@@ -1915,9 +1957,9 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
     "string-kit": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.3.tgz",
-      "integrity": "sha512-G2T92klsuE+S9mqdKQyWurFweNQV5X+FRzSKTqYHRdaVUN/4dL6urbYJJ+xb9ep/4XWm+4RNT8j3acncNhFRBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.4.tgz",
+      "integrity": "sha512-imrOojdsXlL6xzfERCxvc/iA9Zwpzbfs+qeP6VB0s0rQVnMc3Nwkyhge0e8Uoayph7PVAwPNmLpohox27G3fgA==",
       "requires": {
         "xregexp": "3.2.0"
       }
@@ -1980,13 +2022,14 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tar": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-3.2.1.tgz",
-      "integrity": "sha512-ZSzds1E0IqutvMU8HxjMaU8eB7urw2fGwTq88ukDOVuUIh0656l7/P7LiVPxhO5kS4flcRJQk8USG+cghQbTUQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz",
+      "integrity": "sha512-gJlTiiErwo96K904FnoYWl+5+FBgS+FimU6GMh66XLdLa55al8+d4jeDfPoGwSNHdtWI5FJP6xurmVqhBuGJpQ==",
       "requires": {
         "chownr": "1.0.1",
+        "fs-minipass": "1.2.5",
         "minipass": "2.2.1",
-        "minizlib": "1.0.4",
+        "minizlib": "1.1.0",
         "mkdirp": "0.5.1",
         "yallist": "3.0.2"
       }
@@ -2014,15 +2057,15 @@
       }
     },
     "terminal-kit": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.14.0.tgz",
-      "integrity": "sha512-ir0I2QtcBDSg2w0UvohlqdDpGlS3S2UYBG4NnYKnK/4VywgnbfxgdpXN3el0uCH3OeH6fG38luW7RmDM96FqUw==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.14.3.tgz",
+      "integrity": "sha512-ZHtuElnBhK0IXOYNvQ7eYgaArwEoOv7saQc4Q0Z9p02JeC7iajC20/odV77BKB3jw/Qthvf9mpASf8gNDYv7xQ==",
       "requires": {
         "async-kit": "2.2.3",
         "get-pixels": "3.3.0",
         "ndarray": "1.0.18",
         "nextgen-events": "0.10.2",
-        "string-kit": "0.6.3",
+        "string-kit": "0.6.4",
         "tree-kit": "0.5.26"
       }
     },
@@ -2032,16 +2075,16 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "tkwidgets": {
-      "version": "0.5.20",
-      "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.20.tgz",
-      "integrity": "sha512-9wGsMrrFJvE/6TKUc0dEFFhwxvZLeNsYOxnpy1JCwyk/hYCEF70nuvk7VvJeG4TPaQBaGKPj6c7pCgdREvz4Jw==",
+      "version": "0.5.25",
+      "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.25.tgz",
+      "integrity": "sha512-f+12QbxNCLg9Jou5JoPJxATGLmzpDAQeM7QRTXvuqdEB/QvPD9+UlPUL7eYJP1QJv2zzT6EIWWbdpDkXPEtzCQ==",
       "requires": {
         "chalk": "2.3.0",
         "emphasize": "1.5.0",
         "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5",
         "slice-ansi": "1.0.0",
         "string-width": "2.1.1",
-        "terminal-kit": "1.14.0",
+        "terminal-kit": "1.14.3",
         "wrap-ansi": "3.0.1"
       },
       "dependencies": {
@@ -2095,6 +2138,15 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
       "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
     },
+    "url-parse": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
+      "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==",
+      "requires": {
+        "querystringify": "1.0.0",
+        "requires-port": "1.0.0"
+      }
+    },
     "url-to-options": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
@@ -2139,6 +2191,20 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "xml2js": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "requires": {
+        "sax": "1.2.4",
+        "xmlbuilder": "9.0.4"
+      }
+    },
+    "xmlbuilder": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
+      "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
+    },
     "xregexp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz",

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "0.10.85",
+  "version": "1.0.106",
   "bin": {
     "joplin": "./main.js"
   },
@@ -28,6 +28,9 @@
   },
   "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",
@@ -41,7 +44,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",
@@ -54,10 +56,13 @@
     "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.20",
+    "tkwidgets": "^0.5.25",
+    "url-parse": "^1.2.0",
     "uuid": "^3.0.1",
     "word-wrap": "^1.2.3",
+    "xml2js": "^0.4.19",
     "yargs-parser": "^7.0.0"
   },
   "devDependencies": {

CliClient/publish.sh

@@ -9,4 +9,10 @@ bash $SCRIPT_DIR/build.sh
 cp "$SCRIPT_DIR/package.json" build/
 cp "$SCRIPT_DIR/../README.md" build/
 cd "$SCRIPT_DIR/build"
-npm publish
+npm publish
+
+NEW_VERSION=$(cat package.json | jq -r .version)
+git add -A
+git commit -m "CLI v$NEW_VERSION"
+git tag "cli-v$NEW_VERSION"
+git push && git push --tags

CliClient/run_test.sh

@@ -9,9 +9,7 @@ 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)
+	(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js tests-build/encryption.js tests-build/ArrayUtils.js tests-build/models_Setting.js tests-build/services_InteropService.js)
 else
 	(cd "$ROOT_DIR" && npm test tests-build/$TEST_FILE.js)
 fi

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,19 @@ 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();
+	});
+
 });

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,252 @@
+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 = 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 = 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');
+	}));
+
+});

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();
@@ -268,7 +272,7 @@ describe('Synchronizer', function() {
 		expect(deletedItems.length).toBe(0);
 	}));
 
-	it('should delete local notes', asyncTest(async () => {
+	it('should not created deleted_items entries for items deleted via sync', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -276,17 +280,42 @@ describe('Synchronizer', function() {
 		await switchClient(2);
 
 		await synchronizer().start();
-		await Note.delete(note1.id);
+		await Folder.delete(folder1.id);
 		await synchronizer().start();
 
 		await switchClient(1);
 
 		await synchronizer().start();
-		let items = await allItems();
-		expect(items.length).toBe(1);
 		let deletedItems = await BaseItem.deletedItems(syncTargetId());
 		expect(deletedItems.length).toBe(0);
-			}));
+	}));
+
+	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 });
+		let note2 = await Note.save({ title: "deux", parent_id: folder1.id });
+		let context1 = await synchronizer().start();
+
+		await switchClient(2);
+
+		let context2 = await synchronizer().start();
+		await Note.delete(note1.id);
+		context2 = await synchronizer().start({ context: context2 });
+
+		await switchClient(1);
+
+		context1 = await synchronizer().start({ context: context1 });
+		let items = await allItems();
+		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" });
@@ -304,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" });
@@ -348,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" });
@@ -370,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
@@ -409,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" });
@@ -441,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" });
@@ -471,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" });
@@ -518,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);
@@ -536,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" });
@@ -665,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);
@@ -684,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);
@@ -830,6 +856,8 @@ describe('Synchronizer', function() {
 	}));
 
 	it('should sync 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');
@@ -850,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();
@@ -963,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_ = [];
@@ -38,6 +45,7 @@ const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;
 Resource.fsDriver_ = fsDriver;
 EncryptionService.fsDriver_ = fsDriver;
+FileApiDriverLocal.fsDriver_ = fsDriver;
 
 const logDir = __dirname + '/../tests/logs';
 fs.mkdirpSync(logDir, 0o755);
@@ -45,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);
@@ -67,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_;
 }
@@ -108,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',
 	];
@@ -142,25 +161,6 @@ async function setupDatabase(id = null) {
 
 	BaseModel.db_ = databases_[id];
 	await Setting.load();
-	//return setupDatabase(id);
-
-
-
-	// return databases_[id].open({ name: filePath }).then(() => {
-	// 	BaseModel.db_ = databases_[id];
-	// 	return setupDatabase(id);
-	// });
-
-
-	// return fs.unlink(filePath).catch(() => {
-	// 	// Don't care if the file doesn't exist
-	// }).then(() => {
-	// 	databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
-	// 	return databases_[id].open({ name: filePath }).then(() => {
-	// 		BaseModel.db_ = databases_[id];
-	// 		return setupDatabase(id);
-	// 	});
-	// });
 }
 
 function resourceDir(id = null) {
@@ -192,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) {
@@ -248,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_;
 }
 
@@ -305,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
@@ -59,14 +69,30 @@ class ElectronAppWrapper {
 		}))
 
 		// Uncomment this to view errors if the application does not start
-		if (this.env_ === 'dev') this.win_.webContents.openDevTools();
+		// if (this.env_ === 'dev') this.win_.webContents.openDevTools();
 
 		this.win_.on('close', (event) => {
-			if (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);
@@ -136,8 +155,16 @@ class Application extends BaseApplication {
 			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(5, { syncSteps: ["update_remote", "delete_remote"] });
 		}
 
 		if (['EVENT_NOTE_ALARM_FIELD_CHANGE', 'NOTE_DELETE'].indexOf(action.type) >= 0) {
@@ -155,6 +182,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 +198,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 +318,7 @@ class Application extends BaseApplication {
 					}
 				}, {
 					label: _('New notebook'),
+					accelerator: 'CommandOrControl+B',
 					screens: ['Main'],
 					click: () => {
 						this.dispatch({
@@ -202,46 +329,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 +384,60 @@ 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: _('Tools'),
 				submenu: [{
@@ -281,6 +461,7 @@ class Application extends BaseApplication {
 					}
 				},{
 					label: _('General Options'),
+					accelerator: 'CommandOrControl+,',
 					click: () => {
 						this.dispatch({
 							type: 'NAV_GO',
@@ -293,7 +474,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 +496,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,10 +513,13 @@ 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);
@@ -340,7 +535,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 }));
@@ -385,21 +618,26 @@ class Application extends BaseApplication {
 		// 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 +660,4 @@ function app() {
 	return application_;
 }
 
-module.exports = { app };
+module.exports = { app };

ElectronClient/app/bridge.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,12 +86,12 @@ 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;
 	}
 
@@ -108,21 +111,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,110 @@
+const { dialog } = require('electron')
+const { Logger } = require('lib/logger.js');
+const { _ } = require('lib/locale.js');
+const fetch = require('node-fetch');
+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;
+		if (platform === 'win32' && asset.name.indexOf('.exe') >= 0) {
+			found = true;
+		} else if (platform === 'darwin' && asset.name.indexOf('.dmg') >= 0) {
+			found = true;
+		} else if (platform === 'linux' && asset.name.indexOf('.AppImage') >= 0) {
+			found = true;
+		}
+
+		if (found) {
+			downloadUrl = asset.browser_download_url;
+			break;
+		}
+	}
+
+	if (!downloadUrl) throw new Error('Cannot find download Url: ' + JSON.stringify(json).substr(0,500));
+
+	return {
+		version: version,
+		downloadUrl: downloadUrl,
+		notes: json.body,
+	};
+}
+
+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 => {
+		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);
+		}
+	}).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;
 
@@ -44,16 +54,14 @@ class MainScreenComponent extends React.Component {
 			const folderId = Setting.value('activeFolderId');
 			if (!folderId) return;
 
-			const note = await Note.save({
-				title: title,
+			const newNote = {
 				parent_id: folderId,
 				is_todo: isTodo ? 1 : 0,
-			});
-			Note.updateGeolocation(note.id);
+			};
 
 			this.props.dispatch({
-				type: 'NOTE_SELECT',
-				id: note.id,
+				type: 'NOTE_SET_NEW_ONE',
+				item: newNote,
 			});
 		}
 
@@ -65,30 +73,14 @@ class MainScreenComponent extends React.Component {
 				return;
 			}
 
-			this.setState({
-				promptOptions: {
-					label: _('Note title:'),
-					onClose: async (answer) => {
-						if (answer) await createNewNote(answer, false);
-						this.setState({ promptOptions: null });
-					}
-				},
-			});
+			await createNewNote(null, false);
 		} else if (command.name === 'newTodo') {
 			if (!this.props.folders.length) {
 				bridge().showErrorMessageBox(_('Please create a notebook first'));
 				return;
 			}
 
-			this.setState({
-				promptOptions: {
-					label: _('To-do title:'),
-					onClose: async (answer) => {
-						if (answer) await createNewNote(answer, true);
-						this.setState({ promptOptions: null });
-					}
-				},
-			});
+			await createNewNote(null, true);
 		} else if (command.name === 'newNotebook') {
 			this.setState({
 				promptOptions: {
@@ -97,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);
 							}
@@ -154,33 +146,35 @@ class MainScreenComponent extends React.Component {
 				},
 			});
 		} else if (command.name === 'search') {
-			this.setState({
-				promptOptions: {
-					label: _('Search:'),
-					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,
-								},
-							});
+			if (!this.searchId_) this.searchId_ = uuid.create();
 
-							this.props.dispatch({
-								type: 'SEARCH_SELECT',
-								id: searchId,
-							});
-						}
-						this.setState({ promptOptions: null });
-					}
+			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);
 
@@ -217,7 +211,7 @@ class MainScreenComponent extends React.Component {
 						this.setState({ promptOptions: null });
 					}
 				},
-			});	
+			});
 		} else {
 			commandProcessed = false;
 		}
@@ -230,8 +224,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);
@@ -260,7 +254,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)),
@@ -281,6 +280,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_;
 	}
 
@@ -290,44 +300,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_) {
@@ -369,8 +388,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 : ''}
@@ -382,7 +405,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} />
@@ -398,13 +421,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 {
 
@@ -54,7 +58,16 @@ class NoteListComponent extends React.Component {
 	}
 
 	itemContextMenu(event) {
-		const noteIds = this.props.selectedNoteIds;
+		const currentItemId = event.currentTarget.getAttribute('data-id');
+		if (!currentItemId) return;
+
+		let noteIds = [];
+		if (this.props.selectedNoteIds.indexOf(currentItemId) < 0) {
+			noteIds = [currentItemId];
+		} else {
+			noteIds = this.props.selectedNoteIds;
+		}
+
 		if (!noteIds.length) return;
 
 		const notes = noteIds.map((id) => BaseModel.byId(this.props.notes, id));
@@ -82,6 +95,23 @@ class NoteListComponent extends React.Component {
 					eventManager.emit('noteTypeToggle', { noteId: note.id });
 				}
 			}}));
+
+			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 () => {
@@ -136,8 +166,17 @@ 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) style = Object.assign(style, this.style().listItemSelected);
+
+		if (this.props.selectedNoteIds.indexOf(item.id) >= 0) {
+			style = Object.assign(style, this.style().listItemSelected);
+		}
 
 		// Setting marginBottom = 1 because it makes the checkbox looks more centered, at least on Windows
 		// but don't know how it will look in other OSes.
@@ -151,8 +190,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
@@ -163,8 +224,9 @@ class NoteListComponent extends React.Component {
 				style={listItemTitleStyle}
 				onClick={(event) => { onTitleClick(event, item) }}
 				onDragStart={(event) => onDragStart(event) }
+				data-id={item.id}
 			>
-			{Note.displayTitle(item)}
+			{titleComp}
 			</a>
 		</div>
 	}
@@ -172,8 +234,9 @@ class NoteListComponent extends React.Component {
 	render() {
 		const theme = themeStyle(this.props.theme);
 		const style = this.props.style;
+		let notes = this.props.notes.slice();
 
-		if (!this.props.notes.length) {
+		if (!notes.length) {
 			const padding = 10;
 			const emptyDivStyle = Object.assign({
 				padding: padding + 'px',
@@ -192,7 +255,7 @@ class NoteListComponent extends React.Component {
 				itemHeight={this.style().listItem.height}
 				style={style}
 				className={"note-list"}
-				items={this.props.notes}
+				items={notes}
 				itemRenderer={ (item) => { return this.itemRenderer(item, theme, style.width) } }
 			></ItemList>
 		);
@@ -206,7 +269,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,7 @@
 const React = require('react');
 const Note = require('lib/models/Note.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 +18,7 @@ const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
 const { shim } = require('lib/shim.js');
 const eventManager = require('../eventManager');
+const fs = require('fs-extra');
 
 require('brace/mode/markdown');
 // https://ace.c9.io/build/kitchen-sink.html
@@ -36,7 +39,13 @@ class NoteTextComponent extends React.Component {
 			isLoading: true,
 			webviewReady: false,
 			scrollHeight: null,
-			editorScrollTop: 0
+			editorScrollTop: 0,
+			newNote: null,
+
+			// If the current note was just created, and the title has never been
+			// changed by the user, this variable contains that note ID. Used
+			// to automatically set the title.
+			newAndNoTitleChangeNoteId: null,
 		};
 
 		this.lastLoadedNoteId_ = null;
@@ -75,7 +84,10 @@ class NoteTextComponent extends React.Component {
 
 	async componentWillMount() {
 		let note = null;
-		if (this.props.noteId) {
+
+		if (this.props.newNote) {
+			note = Object.assign({}, this.props.newNote);
+		} else if (this.props.noteId) {
 			note = await Note.load(this.props.noteId);
 		}
 
@@ -106,15 +118,26 @@ 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);
 	}
 
 	async saveOneProperty(name, value) {
-		await shared.saveOneProperty(this, name, value);
+		if (this.state.note && !this.state.note.id) {
+			const note = Object.assign({}, this.state.note);
+			note[name] = value;
+			this.setState({ note: note });
+			this.scheduleSave();
+		} else {
+			await shared.saveOneProperty(this, name, value);
+		}
 	}
 
 	scheduleSave() {
@@ -128,17 +151,32 @@ class NoteTextComponent extends React.Component {
 		if (!options) options = {};
 		if (!('noReloadIfLocalChanges' in options)) options.noReloadIfLocalChanges = false;
 
-		const noteId = props.noteId;
-		this.lastLoadedNoteId_ = noteId;
-		const note = noteId ? await Note.load(noteId) : null;
-		if (noteId !== this.lastLoadedNoteId_) return; // Race condition - current note was changed while this one was loading
-		if (!options.noReloadIfLocalChanges && this.isModified()) return;
+		await this.saveIfNeeded();
 
-		// If the note hasn't been changed, exit now
-		if (this.state.note && note) {
-			let diff = Note.diffObjects(this.state.note, note);
-			delete diff.type_;
-			if (!Object.getOwnPropertyNames(diff).length) return;
+		const previousNote = this.state.note ? Object.assign({}, this.state.note) : null;
+
+		const stateNoteId = this.state.note ? this.state.note.id : null;
+		let noteId = null;
+		let note = null;
+		let loadingNewNote = true;
+
+		if (props.newNote) {
+			note = Object.assign({}, props.newNote);
+			this.lastLoadedNoteId_ = null;
+		} else {
+			noteId = props.noteId;
+			loadingNewNote = stateNoteId !== noteId;
+			this.lastLoadedNoteId_ = noteId;
+			note = noteId ? await Note.load(noteId) : null;
+			if (noteId !== this.lastLoadedNoteId_) return; // Race condition - current note was changed while this one was loading
+			if (options.noReloadIfLocalChanges && this.isModified()) return;
+
+			// If the note hasn't been changed, exit now
+			if (this.state.note && note) {
+				let diff = Note.diffObjects(this.state.note, note);
+				delete diff.type_;
+				if (!Object.getOwnPropertyNames(diff).length) return;
+			}
 		}
 
 		this.mdToHtml_ = null;
@@ -146,38 +184,70 @@ class NoteTextComponent extends React.Component {
 		// If we are loading nothing (noteId == null), make sure to
 		// set webviewReady to false too because the webview component
 		// is going to be removed in render().
-		const webviewReady = this.webview_ && this.state.webviewReady && noteId;
+		const webviewReady = this.webview_ && this.state.webviewReady && (noteId || props.newNote);
 
-		this.editorMaxScrollTop_ = 0;
+		// Scroll back to top when loading new note
+		if (loadingNewNote) {
+			this.editorMaxScrollTop_ = 0;
 
-		// HACK: To go around a bug in Ace editor, we first set the scroll position to 1
-		// and then (in the renderer callback) to the value we actually need. The first
-		// operation helps clear the scroll position cache. See:
-		// https://github.com/ajaxorg/ace/issues/2195
-		this.editorSetScrollTop(1);
-		this.restoreScrollTop_ = 0;
+			// HACK: To go around a bug in Ace editor, we first set the scroll position to 1
+			// and then (in the renderer callback) to the value we actually need. The first
+			// operation helps clear the scroll position cache. See:
+			// https://github.com/ajaxorg/ace/issues/2195
+			this.editorSetScrollTop(1);
+			this.restoreScrollTop_ = 0;
 
-		this.setState({
-			note: note,
-			lastSavedNote: Object.assign({}, note),
-			webviewReady: webviewReady,
-		});
-	}
+			// 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';
 
-	async componentWillReceiveProps(nextProps) {
-		if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) {
-			await this.reloadNote(nextProps);
-			if(this.editor_){
+				if (Setting.value(focusSettingName) === 'title') {
+					if (this.titleField_) this.titleField_.focus();
+				} else {
+					if (this.editor_) this.editor_.editor.focus();
+				}
+			}
+
+			if (this.editor_) {
 				const session = this.editor_.editor.getSession();
 				const undoManager = session.getUndoManager();
 				undoManager.reset();
 				session.setUndoManager(undoManager);
+				this.editor_.editor.clearSelection();
+				this.editor_.editor.moveCursorTo(0,0);
 			}
 		}
 
+		let newState = {
+			note: note,
+			lastSavedNote: Object.assign({}, note),
+			webviewReady: webviewReady,
+		};
+
+		if (!note) {
+			newState.newAndNoTitleChangeNoteId = null;
+		} else if (note.id !== this.state.newAndNoTitleChangeNoteId) {
+			newState.newAndNoTitleChangeNoteId = null;
+		}
+
+		this.setState(newState);
+	}
+
+	async componentWillReceiveProps(nextProps) {
+		if (nextProps.newNote) {
+			await this.reloadNote(nextProps);
+		} else if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) {
+			await this.reloadNote(nextProps);
+		}
+
 		if ('syncStarted' in nextProps && !nextProps.syncStarted && !this.isModified()) {
 			await this.reloadNote(nextProps, { noReloadIfLocalChanges: true });
 		}
+
+		if (nextProps.windowCommand) {
+			this.doCommand(nextProps.windowCommand);
+		}
 	}
 
 	isModified() {
@@ -190,6 +260,7 @@ class NoteTextComponent extends React.Component {
 
 	title_changeText(event) {
 		shared.noteComponent_change(this, 'title', event.target.value);
+		this.setState({ newAndNoTitleChangeNoteId: null });
 		this.scheduleSave();
 	}
 
@@ -202,7 +273,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;
@@ -224,6 +295,32 @@ 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);
+				}}));
+			} 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) => {
@@ -231,10 +328,7 @@ class NoteTextComponent extends React.Component {
 				bridge().openItem(filePath);
 			});
 		} else {
-			bridge().showMessageBox({
-				type: 'error',
-				message: _('Unsupported link or message: %s', msg),
-			});
+			bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
 		}
 	}
 
@@ -303,6 +397,18 @@ class NoteTextComponent extends React.Component {
 
 		if (this.editor_) {
 			this.editor_.editor.renderer.on('afterRender', this.onAfterEditorRender_);
+
+			const cancelledKeys = ['Ctrl+F', 'Ctrl+T', 'Ctrl+P', 'Ctrl+Q', 'Ctrl+L', 'Ctrl+,'];
+			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);
+				});
+			}
 		}
 	}
 
@@ -340,18 +446,47 @@ class NoteTextComponent extends React.Component {
 		this.scheduleSave();
 	}
 
+	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() {
-		const noteId = this.props.noteId;
-		if (!noteId) return;
-
 		const filePaths = bridge().showOpenDialog({
 			properties: ['openFile', 'createDirectory', 'multiSelections'],
 		});
 		if (!filePaths || !filePaths.length) return;
 
-		await this.saveIfNeeded();
-		let note = await Note.load(noteId);
+		await this.saveIfNeeded(true);
+		let note = await Note.load(this.state.note.id);
 
 		for (let i = 0; i < filePaths.length; i++) {
 			const filePath = filePaths[i];
@@ -369,20 +504,29 @@ class NoteTextComponent extends React.Component {
 		}
 	}
 
-	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()
 
@@ -390,29 +534,26 @@ 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());
 	}
 
-	// shouldComponentUpdate(nextProps, nextState) {
-	// 	//console.info('NEXT PROPS', JSON.stringify(nextProps));
-	// 	console.info('NEXT STATE ====================');
-	// 	for (var n in nextProps) {
-	// 		if (!nextProps.hasOwnProperty(n)) continue;
-	// 		console.info(n + ' = ' + (nextProps[n] === this.props[n]));
-	// 	}
-	// 	return true;
-	// }
-
 	render() {
 		const style = this.props.style;
 		const note = this.state.note;
-		const body = note ? note.body : '';
+		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;
 
@@ -441,6 +582,7 @@ class NoteTextComponent extends React.Component {
 			marginBottom: 0,
 			display: 'flex',
 			flexDirection: 'row',
+			alignItems: 'center',
 		};
 
 		const titleEditorStyle = {
@@ -508,8 +650,19 @@ class NoteTextComponent extends React.Component {
 				},
 				postMessageSyntax: 'ipcRenderer.sendToHost',
 			};
-			const html = this.mdToHtml().render(body, theme, mdOptions);
+
+			let bodyToRender = body;
+			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')) + '*';
+			}
+
+			const html = this.mdToHtml().render(bodyToRender, theme, mdOptions);
 			this.webview_.send('setHtml', html);
+
+			const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
+			const keywords = search ? Search.keywords(search.query_pattern) : [];
+			this.webview_.send('setMarkers', keywords);
 		}
 
 		const toolbarItems = [];
@@ -520,6 +673,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'),
@@ -536,15 +695,19 @@ class NoteTextComponent extends React.Component {
 
 		const titleEditor = <input
 			type="text"
+			ref={(elem) => { this.titleField_ = elem; } }
 			style={titleEditorStyle}
-			value={note ? note.title : ''}
+			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 titleBarDate = <span style={Object.assign({}, theme.textStyle, {color: theme.colorFaded})}>{time.formatMsToLocal(note.user_updated_time)}</span>
+
 		const viewer = <webview
 			style={viewerStyle}
 			nodeintegration="1"
@@ -552,6 +715,24 @@ class NoteTextComponent extends React.Component {
 			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;
@@ -578,14 +759,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={titleBarStyle}>
 					{ titleEditor }
-					{ titleBarMenuButton }
+					{ titleBarDate }
+					{ false ? titleBarMenuButton : null }
 				</div>
 				{ toolbar }
 				{ editor }
@@ -605,6 +787,11 @@ const mapStateToProps = (state) => {
 		theme: state.settings.theme,
 		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;

ElectronClient/app/gui/PromptDialog.jsx

@@ -42,17 +42,20 @@ class PromptDialog extends React.Component {
 
 		this.styles_ = {};
 
+		const paddingTop = 20;
+
 		this.styles_.modalLayer = {
 			zIndex: 9999,
 			position: 'absolute',
 			top: 0,
 			left: 0,
 			width: width,
-			height: height,
+			height: height - paddingTop,
 			backgroundColor: 'rgba(0,0,0,0.6)',
 			display: visible ? 'flex' : 'none',
-    		alignItems: 'center',
+    		alignItems: 'flex-start',
     		justifyContent: 'center',
+    		paddingTop: paddingTop + 'px',
 		};
 
 		this.styles_.promptDialog = {
@@ -88,24 +91,6 @@ class PromptDialog extends React.Component {
 		return this.styles_;
 	}
 
-	// shouldComponentUpdate(nextProps, nextState) {
-	// 	console.info(JSON.stringify(nextProps)+JSON.stringify(nextState));
-
-	// 	console.info('NEXT PROPS ====================');
-	// 	for (var n in nextProps) {
-	// 		if (!nextProps.hasOwnProperty(n)) continue;
-	// 		console.info(n + ' = ' + (nextProps[n] === this.props[n]));
-	// 	}
-
-	// 	console.info('NEXT STATE ====================');
-	// 	for (var n in nextState) {
-	// 		if (!nextState.hasOwnProperty(n)) continue;
-	// 		console.info(n + ' = ' + (nextState[n] === this.state[n]));
-	// 	}
-
-	// 	return true;
-	// }
-
 	render() {
 		const style = this.props.style;
 		const theme = themeStyle(this.props.theme);

ElectronClient/app/gui/Root.jsx

@@ -8,6 +8,7 @@ const Setting = require('lib/models/Setting.js');
 
 const { MainScreen } = require('./MainScreen.min.js');
 const { OneDriveLoginScreen } = require('./OneDriveLoginScreen.min.js');
+const { DropboxLoginScreen } = require('./DropboxLoginScreen.min.js');
 const { StatusScreen } = require('./StatusScreen.min.js');
 const { ImportScreen } = require('./ImportScreen.min.js');
 const { ConfigScreen } = require('./ConfigScreen.min.js');
@@ -46,6 +47,11 @@ async function initialize(dispatch) {
 		type: 'NOTE_VISIBLE_PANES_SET',
 		panes: Setting.value('noteVisiblePanes'),
 	});
+
+	store.dispatch({
+		type: 'SIDEBAR_VISIBILITY_SET',
+		visibility: Setting.value('sidebarVisibility')
+	});
 }
 
 class RootComponent extends React.Component {
@@ -75,6 +81,7 @@ class RootComponent extends React.Component {
 		const screens = {
 			Main: { screen: MainScreen },
 			OneDriveLogin: { screen: OneDriveLoginScreen, title: () => _('OneDrive Login') },
+			DropboxLogin: { screen: DropboxLoginScreen, title: () => _('Dropbox Login') },
 			Import: { screen: ImportScreen, title: () => _('Import') },
 			Config: { screen: ConfigScreen, title: () => _('Options') },
 			Status: { screen: StatusScreen, title: () => _('Synchronisation Status') },

ElectronClient/app/gui/SideBar.jsx

@@ -1,19 +1,19 @@
-const React = require('react');
-const { connect } = require('react-redux');
-const shared = require('lib/components/shared/side-menu-shared.js');
-const { Synchronizer } = require('lib/synchronizer.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const { _ } = require('lib/locale.js');
-const { themeStyle } = require('../theme.js');
-const { bridge } = require('electron').remote.require('./bridge');
+const React = require("react");
+const { connect } = require("react-redux");
+const shared = require("lib/components/shared/side-menu-shared.js");
+const { Synchronizer } = require("lib/synchronizer.js");
+const BaseModel = require("lib/BaseModel.js");
+const Folder = require("lib/models/Folder.js");
+const Note = require("lib/models/Note.js");
+const Tag = require("lib/models/Tag.js");
+const { _ } = require("lib/locale.js");
+const { themeStyle } = require("../theme.js");
+const { bridge } = require("electron").remote.require("./bridge");
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
+const InteropServiceHelper = require("../InteropServiceHelper.js");
 
 class SideBarComponent extends React.Component {
-
 	style() {
 		const theme = themeStyle(this.props.theme);
 
@@ -27,62 +27,65 @@ class SideBarComponent extends React.Component {
 				height: itemHeight,
 				fontFamily: theme.fontFamily,
 				fontSize: theme.fontSize,
-				textDecoration: 'none',
-				boxSizing: 'border-box',
+				textDecoration: "none",
+				boxSizing: "border-box",
 				color: theme.color2,
 				paddingLeft: 14,
-				display: 'flex',
-				alignItems: 'center',
-				cursor: 'default',
+				display: "flex",
+				alignItems: "center",
+				cursor: "default",
 				opacity: 0.8,
+				whiteSpace: "nowrap",
 			},
 			listItemSelected: {
 				backgroundColor: theme.selectedColor2,
 			},
 			conflictFolder: {
 				color: theme.colorError2,
-				fontWeight: 'bold',
+				fontWeight: "bold",
 			},
 			header: {
 				height: itemHeight * 1.8,
 				fontFamily: theme.fontFamily,
 				fontSize: theme.fontSize * 1.3,
-				textDecoration: 'none',
-				boxSizing: 'border-box',
+				textDecoration: "none",
+				boxSizing: "border-box",
 				color: theme.color2,
 				paddingLeft: 8,
-				display: 'flex',
-				alignItems: 'center',
+				display: "flex",
+				alignItems: "center",
 			},
 			button: {
 				padding: 6,
 				fontFamily: theme.fontFamily,
 				fontSize: theme.fontSize,
-				textDecoration: 'none',
-				boxSizing: 'border-box',
+				textDecoration: "none",
+				boxSizing: "border-box",
 				color: theme.color2,
-				display: 'flex',
-				alignItems: 'center',
-				justifyContent: 'center',
+				display: "flex",
+				alignItems: "center",
+				justifyContent: "center",
 				border: "1px solid rgba(255,255,255,0.2)",
 				marginTop: 10,
 				marginLeft: 5,
 				marginRight: 5,
-				cursor: 'default',
+				cursor: "default",
 			},
 			syncReport: {
 				fontFamily: theme.fontFamily,
-				fontSize: Math.round(theme.fontSize * .9),
+				fontSize: Math.round(theme.fontSize * 0.9),
 				color: theme.color2,
-				opacity: .5,
-				display: 'flex',
-				alignItems: 'left',
-				justifyContent: 'top',
-				flexDirection: 'column',
+				opacity: 0.5,
+				display: "flex",
+				alignItems: "left",
+				justifyContent: "top",
+				flexDirection: "column",
 				marginTop: 10,
 				marginLeft: 5,
 				marginRight: 5,
 				minHeight: 70,
+				wordWrap: "break-word",
+				width: "100%",
 			},
 		};
 
@@ -90,19 +93,19 @@ class SideBarComponent extends React.Component {
 	}
 
 	itemContextMenu(event) {
-		const itemId = event.target.getAttribute('data-id');
+		const itemId = event.target.getAttribute("data-id");
 		if (itemId === Folder.conflictFolderId()) return;
-		
-		const itemType = Number(event.target.getAttribute('data-type'));
-		if (!itemId || !itemType) throw new Error('No data on element');
 
-		let deleteMessage = '';
+		const itemType = Number(event.target.getAttribute("data-type"));
+		if (!itemId || !itemType) throw new Error("No data on element");
+
+		let deleteMessage = "";
 		if (itemType === BaseModel.TYPE_FOLDER) {
-			deleteMessage = _('Delete notebook? All notes within this notebook will also be deleted.');
+			deleteMessage = _("Delete notebook? All notes within this notebook will also be deleted.");
 		} else if (itemType === BaseModel.TYPE_TAG) {
-			deleteMessage = _('Remove this tag from all the notes?');
+			deleteMessage = _("Remove this tag from all the notes?");
 		} else if (itemType === BaseModel.TYPE_SEARCH) {
-			deleteMessage = _('Remove this search from the sidebar?');
+			deleteMessage = _("Remove this search from the sidebar?");
 		}
 
 		const menu = new Menu();
@@ -112,30 +115,55 @@ class SideBarComponent extends React.Component {
 			item = BaseModel.byId(this.props.folders, itemId);
 		}
 
-		menu.append(new MenuItem({label: _('Delete'), click: async () => {
-			const ok = bridge().showConfirmMessageBox(deleteMessage);
-			if (!ok) return;
+		menu.append(
+			new MenuItem({
+				label: _("Delete"),
+				click: async () => {
+					const ok = bridge().showConfirmMessageBox(deleteMessage);
+					if (!ok) return;
 
-			if (itemType === BaseModel.TYPE_FOLDER) {
-				await Folder.delete(itemId);
-			} else if (itemType === BaseModel.TYPE_TAG) {
-				await Tag.untagAll(itemId);
-			} else if (itemType === BaseModel.TYPE_SEARCH) {
-				this.props.dispatch({
-					type: 'SEARCH_DELETE',
-					id: itemId,
-				});
-			}
-		}}))
+					if (itemType === BaseModel.TYPE_FOLDER) {
+						await Folder.delete(itemId);
+					} else if (itemType === BaseModel.TYPE_TAG) {
+						await Tag.untagAll(itemId);
+					} else if (itemType === BaseModel.TYPE_SEARCH) {
+						this.props.dispatch({
+							type: "SEARCH_DELETE",
+							id: itemId,
+						});
+					}
+				},
+			})
+		);
 
 		if (itemType === BaseModel.TYPE_FOLDER && !item.encryption_applied) {
-			menu.append(new MenuItem({label: _('Rename'), click: async () => {
-				this.props.dispatch({
-					type: 'WINDOW_COMMAND',
-					name: 'renameFolder',
-					id: itemId,
-				});
-			}}))
+			menu.append(
+				new MenuItem({
+					label: _("Rename"),
+					click: async () => {
+						this.props.dispatch({
+							type: "WINDOW_COMMAND",
+							name: "renameFolder",
+							id: itemId,
+						});
+					},
+				})
+			);
+
+			menu.append(new MenuItem({ type: "separator" }));
+
+			const InteropService = require("lib/services/InteropService.js");
+
+			menu.append(
+				new MenuItem({
+					label: _("Export"),
+					click: async () => {
+						const ioService = new InteropService();
+						const module = ioService.moduleByFormat_("exporter", "jex");
+						await InteropServiceHelper.export(this.props.dispatch.bind(this), module, { sourceFolderIds: [itemId] });
+					},
+				})
+			);
 		}
 
 		menu.popup(bridge().window());
@@ -143,21 +171,21 @@ class SideBarComponent extends React.Component {
 
 	folderItem_click(folder) {
 		this.props.dispatch({
-			type: 'FOLDER_SELECT',
+			type: "FOLDER_SELECT",
 			id: folder ? folder.id : null,
 		});
 	}
 
 	tagItem_click(tag) {
 		this.props.dispatch({
-			type: 'TAG_SELECT',
+			type: "TAG_SELECT",
 			id: tag ? tag.id : null,
 		});
 	}
 
 	searchItem_click(search) {
 		this.props.dispatch({
-			type: 'SEARCH_SELECT',
+			type: "SEARCH_SELECT",
 			id: search ? search.id : null,
 		});
 	}
@@ -172,105 +200,180 @@ class SideBarComponent extends React.Component {
 		if (folder.id === Folder.conflictFolderId()) style = Object.assign(style, this.style().conflictFolder);
 
 		const onDragOver = (event, folder) => {
-			if (event.dataTransfer.types.indexOf('text/x-jop-note-ids') >= 0) event.preventDefault();
-		}
+			if (event.dataTransfer.types.indexOf("text/x-jop-note-ids") >= 0) event.preventDefault();
+		};
 
 		const onDrop = async (event, folder) => {
-			if (event.dataTransfer.types.indexOf('text/x-jop-note-ids') < 0) return;
+			if (event.dataTransfer.types.indexOf("text/x-jop-note-ids") < 0) return;
 			event.preventDefault();
 
-			const noteIds = JSON.parse(event.dataTransfer.getData('text/x-jop-note-ids'));
+			const noteIds = JSON.parse(event.dataTransfer.getData("text/x-jop-note-ids"));
 			for (let i = 0; i < noteIds.length; i++) {
 				await Note.moveToFolder(noteIds[i], folder.id);
 			}
-		}
+		};
 
 		const itemTitle = Folder.displayTitle(folder);
 
-		return <a
-			className="list-item"
-			onDragOver={(event) => { onDragOver(event, folder) } }
-			onDrop={(event) => { onDrop(event, folder) } }
-			href="#"
-			data-id={folder.id}
-			data-type={BaseModel.TYPE_FOLDER}
-			onContextMenu={(event) => this.itemContextMenu(event)}
-			key={folder.id}
-			style={style} onClick={() => {this.folderItem_click(folder)}}>{itemTitle}
-		</a>
+		return (
+			<a
+				className="list-item"
+				onDragOver={event => {
+					onDragOver(event, folder);
+				}}
+				onDrop={event => {
+					onDrop(event, folder);
+				}}
+				href="#"
+				data-id={folder.id}
+				data-type={BaseModel.TYPE_FOLDER}
+				onContextMenu={event => this.itemContextMenu(event)}
+				key={folder.id}
+				style={style}
+				onClick={() => {
+					this.folderItem_click(folder);
+				}}
+			>
+				{itemTitle}
+			</a>
+		);
 	}
 
 	tagItem(tag, selected) {
 		let style = Object.assign({}, this.style().listItem);
 		if (selected) style = Object.assign(style, this.style().listItemSelected);
-		return <a className="list-item" href="#" data-id={tag.id} data-type={BaseModel.TYPE_TAG} onContextMenu={(event) => this.itemContextMenu(event)} key={tag.id} style={style} onClick={() => {this.tagItem_click(tag)}}>{Tag.displayTitle(tag)}</a>
+		return (
+			<a
+				className="list-item"
+				href="#"
+				data-id={tag.id}
+				data-type={BaseModel.TYPE_TAG}
+				onContextMenu={event => this.itemContextMenu(event)}
+				key={tag.id}
+				style={style}
+				onClick={() => {
+					this.tagItem_click(tag);
+				}}
+			>
+				{Tag.displayTitle(tag)}
+			</a>
+		);
 	}
 
 	searchItem(search, selected) {
 		let style = Object.assign({}, this.style().listItem);
 		if (selected) style = Object.assign(style, this.style().listItemSelected);
-		return <a className="list-item" href="#" data-id={search.id} data-type={BaseModel.TYPE_SEARCH} onContextMenu={(event) => this.itemContextMenu(event)} key={search.id} style={style} onClick={() => {this.searchItem_click(search)}}>{search.title}</a>
+		return (
+			<a
+				className="list-item"
+				href="#"
+				data-id={search.id}
+				data-type={BaseModel.TYPE_SEARCH}
+				onContextMenu={event => this.itemContextMenu(event)}
+				key={search.id}
+				style={style}
+				onClick={() => {
+					this.searchItem_click(search);
+				}}
+			>
+				{search.title}
+			</a>
+		);
 	}
 
 	makeDivider(key) {
-		return <div style={{height:2, backgroundColor:'blue' }} key={key}></div>
+		return <div style={{ height: 2, backgroundColor: "blue" }} key={key} />;
 	}
 
 	makeHeader(key, label, iconName) {
 		const style = this.style().header;
-		const icon = <i style={{fontSize: style.fontSize * 1.2, marginRight: 5}} className={"fa " + iconName}></i>
-		return <div style={style} key={key}>{icon}{label}</div>
+		const icon = <i style={{ fontSize: style.fontSize * 1.2, marginRight: 5 }} className={"fa " + iconName} />;
+		return (
+			<div style={style} key={key}>
+				{icon}
+				{label}
+			</div>
+		);
 	}
 
 	synchronizeButton(type) {
 		const style = this.style().button;
-		const iconName = type === 'sync' ? 'fa-refresh' : 'fa-times';
-		const label = type === 'sync' ? _('Synchronise') : _('Cancel');
-		const icon = <i style={{fontSize: style.fontSize, marginRight: 5}} className={"fa " + iconName}></i>
-		return <a className="synchronize-button" style={style} href="#" key="sync_button" onClick={() => {this.sync_click()}}>{icon}{label}</a>
+		const iconName = type === "sync" ? "fa-refresh" : "fa-times";
+		const label = type === "sync" ? _("Synchronise") : _("Cancel");
+		const icon = <i style={{ fontSize: style.fontSize, marginRight: 5 }} className={"fa " + iconName} />;
+		return (
+			<a
+				className="synchronize-button"
+				style={style}
+				href="#"
+				key="sync_button"
+				onClick={() => {
+					this.sync_click();
+				}}
+			>
+				{icon}
+				{label}
+			</a>
+		);
 	}
 
 	render() {
 		const theme = themeStyle(this.props.theme);
 		const style = Object.assign({}, this.style().root, this.props.style, {
-			overflowX: 'hidden',
-			overflowY: 'auto',
+			overflowX: "hidden",
+			overflowY: "auto",
 		});
 
 		let items = [];
 
-		items.push(this.makeHeader('folderHeader', _('Notebooks'), 'fa-folder-o'));
+		items.push(this.makeHeader("folderHeader", _("Notebooks"), "fa-folder-o"));
 
 		if (this.props.folders.length) {
 			const folderItems = shared.renderFolders(this.props, this.folderItem.bind(this));
 			items = items.concat(folderItems);
 		}
 
-		items.push(this.makeHeader('tagHeader', _('Tags'), 'fa-tags'));
+		items.push(this.makeHeader("tagHeader", _("Tags"), "fa-tags"));
 
 		if (this.props.tags.length) {
 			const tagItems = shared.renderTags(this.props, this.tagItem.bind(this));
 
-			items.push(<div className="tags" key="tag_items">{tagItems}</div>);
+			items.push(
+				<div className="tags" key="tag_items">
+					{tagItems}
+				</div>
+			);
 		}
 
-		if (this.props.searches.length) {
-			items.push(this.makeHeader('searchHeader', _('Searches'), 'fa-search'));
+		// if (this.props.searches.length) {
+		// 	items.push(this.makeHeader("searchHeader", _("Searches"), "fa-search"));
 
-			const searchItems = shared.renderSearches(this.props, this.searchItem.bind(this));
+		// 	const searchItems = shared.renderSearches(this.props, this.searchItem.bind(this));
 
-			items.push(<div className="searches" key="search_items">{searchItems}</div>);
-		}
+		// 	items.push(
+		// 		<div className="searches" key="search_items">
+		// 			{searchItems}
+		// 		</div>
+		// 	);
+		// }
 
 		let lines = Synchronizer.reportToLines(this.props.syncReport);
 		const syncReportText = [];
 		for (let i = 0; i < lines.length; i++) {
-			syncReportText.push(<div key={i}>{lines[i]}</div>);
+			syncReportText.push(
+				<div key={i} style={{ wordWrap: "break-word", width: "100%" }}>
+					{lines[i]}
+				</div>
+			);
 		}
 
-		items.push(this.synchronizeButton(this.props.syncStarted ? 'cancel' : 'sync'));
+		items.push(this.synchronizeButton(this.props.syncStarted ? "cancel" : "sync"));
 
-		items.push(<div style={this.style().syncReport} key='sync_report'>{syncReportText}</div>);
+		items.push(
+			<div style={this.style().syncReport} key="sync_report">
+				{syncReportText}
+			</div>
+		);
 
 		return (
 			<div className="side-bar" style={style}>
@@ -278,10 +381,9 @@ class SideBarComponent extends React.Component {
 			</div>
 		);
 	}
-
 }
 
-const mapStateToProps = (state) => {
+const mapStateToProps = state => {
 	return {
 		folders: state.folders,
 		tags: state.tags,
@@ -299,4 +401,4 @@ const mapStateToProps = (state) => {
 
 const SideBar = connect(mapStateToProps)(SideBarComponent);
 
-module.exports = { SideBar };
+module.exports = { SideBar };

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

@@ -1,179 +1,257 @@
-<style>
-body {
-	overflow: hidden;
-}
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
 
-#content {
-	overflow-y: auto;
-	height: 100%;
-	padding-left: 10px;
-	padding-right: 10px;
-}
-</style>
-
-<div id="hlScriptContainer"></div>
-<div id="content" ondragstart="return false;" ondrop="return false;"></div>
-
-<script>
-const { ipcRenderer } = require('electron');
-const contentElement = document.getElementById('content');
-
-
-// ----------------------------------------------------------------------
-// Handle dynamically loading HLJS when a code element is present
-// ----------------------------------------------------------------------
-
-let hljsScriptAdded = false;
-let hljsLoaded = false;
-
-function loadHljs(callback) {
-	hljsScriptAdded = true;
-
-	const script = document.createElement('script');
-	script.onload = function () {
-		hljsLoaded = true;
-    	applyHljs();
-	};
-	script.src = 'highlight/highlight.pack.js';
-	document.getElementById('hlScriptContainer').appendChild(script);
-
-	const link = document.createElement('link');
-	link.rel = 'stylesheet';
-	// https://ace.c9.io/build/kitchen-sink.html
-	// https://highlightjs.org/static/demo/
-	link.href = 'highlight/styles/atom-one-light.css';
-	document.getElementById('hlScriptContainer').appendChild(link);
-}
-
-function loadAndApplyHljs() {
-	var codeElements = document.getElementsByClassName('code');
-	if (!codeElements.length) return;
-
-	if (!hljsScriptAdded) {
-		this.loadHljs();
-		return;
-	}
-
-	// If HLJS is not loaded yet, no need to do anything. When it loads
-	// it will automatically apply the style to all the code elements.
-	if (hljsLoaded) applyHljs(codeElements);
-}
-
-function applyHljs(codeElements) {
-	if (typeof codeElements === 'undefined') codeElements = document.getElementsByClassName('code');
-
-	for (var i = 0; i < codeElements.length; i++) {
-		hljs.highlightBlock(codeElements[i]);
-	}
-}
-
-// ----------------------------------------------------------------------
-// / Handle dynamically loading HLJS when a code element is present
-// ----------------------------------------------------------------------
-
-// Note: the scroll position source of truth is "percentScroll_". This is easier to manage than scrollTop because
-// the scrollTop value depends on the images being loaded or not. For example, if the scrollTop is saved while
-// images are being displayed then restored while images are being reloaded, the new scrollTop might be changed
-// so that it is not greater than contentHeight. On the other hand, with percentScroll it is possible to restore
-// it at any time knowing that it's not going to be changed because the content height has changed.
-// To restore percentScroll the "checkScrollIID" interval is used. It constantly resets the scroll position during
-// one second after the content has been updated.
-//
-// ignoreNextScroll is used to differentiate between scroll event from the users and those that are the result
-// of programmatically changing scrollTop. We only want to respond to events initiated by the user.
-
-let percentScroll_ = 0;
-let checkScrollIID_ = null;
-
-function setPercentScroll(percent) {
-	percentScroll_ = percent;
-	contentElement.scrollTop = percentScroll_ * maxScrollTop();
-}
-
-function percentScroll() {
-	return percentScroll_;
-}
-
-function restorePercentScroll() {
-	setPercentScroll(percentScroll_);
-}
-
-ipcRenderer.on('setHtml', (event, html) => {
-	contentElement.innerHTML = html;
-
-	loadAndApplyHljs();
-
-	// Remove the bullet from "ul" for checkbox lists and extra padding
-	const checkboxes = document.getElementsByClassName('checkbox');
-	for (let i = 0; i < checkboxes.length; i++) {
-		const cb = checkboxes[i];
-		const ul = cb.parentElement.parentElement;
-		if (!ul) {
-			console.warn('Unexpected layout for checkbox');
-			continue;
+	<style>
+		body {
+			overflow: hidden;
 		}
-		ul.style.listStyleType = 'none';
-		ul.style.paddingLeft = 0;
+
+		#content {
+			overflow-y: auto;
+			height: 100%;
+			padding-left: 10px;
+			padding-right: 10px;
+		}
+
+		mark {
+			background: #CF3F00;
+			color: white;
+		}
+
+		.katex { font-size: 1.3em; } /* This controls the global Katex font size*/
+	</style>
+</head>
+
+<body id="body">
+	<div id="hlScriptContainer"></div>
+	<div id="markScriptContainer"></div>
+	<div id="content" ondragstart="return false;" ondrop="return false;"></div>
+
+	<script>
+	const { ipcRenderer } = require('electron');
+	const contentElement = document.getElementById('content');
+
+	// ----------------------------------------------------------------------
+	// Handle dynamically loading HLJS when a code element is present
+	// ----------------------------------------------------------------------
+
+	let hljsScriptAdded = false;
+	let hljsLoaded = false;
+
+	function loadHljs(callback) {
+		hljsScriptAdded = true;
+
+		const script = document.createElement('script');
+		script.onload = function () {
+			hljsLoaded = true;
+			applyHljs();
+		};
+		script.src = 'highlight/highlight.pack.js';
+		document.getElementById('hlScriptContainer').appendChild(script);
+
+		const link = document.createElement('link');
+		link.rel = 'stylesheet';
+		// https://ace.c9.io/build/kitchen-sink.html
+		// https://highlightjs.org/static/demo/
+		link.href = 'highlight/styles/atom-one-light.css';
+		document.getElementById('hlScriptContainer').appendChild(link);
 	}
 
-	let previousContentHeight = contentElement.scrollHeight;
-	let startTime = Date.now();
-	ignoreNextScrollEvent = true;
-	restorePercentScroll();
+	function loadAndApplyHljs() {
+		var codeElements = document.getElementsByClassName('code');
+		if (!codeElements.length) return;
 
-	if (!checkScrollIID_) {
-		checkScrollIID_ = setInterval(() => {
-			const h = contentElement.scrollHeight;
-			if (h !== previousContentHeight) {
-				previousContentHeight = h;
-				ignoreNextScrollEvent = true;
-				restorePercentScroll();
+		if (!hljsScriptAdded) {
+			this.loadHljs();
+			return;
+		}
+
+		// If HLJS is not loaded yet, no need to do anything. When it loads
+		// it will automatically apply the style to all the code elements.
+		if (hljsLoaded) applyHljs(codeElements);
+	}
+
+	function applyHljs(codeElements) {
+		if (typeof codeElements === 'undefined') codeElements = document.getElementsByClassName('code');
+
+		for (var i = 0; i < codeElements.length; i++) {
+			try {
+				hljs.highlightBlock(codeElements[i]);
+			} catch (error) {
+				console.warn('Cannot highlight code', error);
 			}
-			if (Date.now() - startTime >= 1000) {
-				clearInterval(checkScrollIID_);
-				checkScrollIID_ = null;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// / Handle dynamically loading HLJS when a code element is present
+	// ----------------------------------------------------------------------
+
+	// Note: the scroll position source of truth is "percentScroll_". This is easier to manage than scrollTop because
+	// the scrollTop value depends on the images being loaded or not. For example, if the scrollTop is saved while
+	// images are being displayed then restored while images are being reloaded, the new scrollTop might be changed
+	// so that it is not greater than contentHeight. On the other hand, with percentScroll it is possible to restore
+	// it at any time knowing that it's not going to be changed because the content height has changed.
+	// To restore percentScroll the "checkScrollIID" interval is used. It constantly resets the scroll position during
+	// one second after the content has been updated.
+	//
+	// ignoreNextScroll is used to differentiate between scroll event from the users and those that are the result
+	// of programmatically changing scrollTop. We only want to respond to events initiated by the user.
+
+	let percentScroll_ = 0;
+	let checkScrollIID_ = null;
+
+	function setPercentScroll(percent) {
+		percentScroll_ = percent;
+		contentElement.scrollTop = percentScroll_ * maxScrollTop();
+	}
+
+	function percentScroll() {
+		return percentScroll_;
+	}
+
+	function restorePercentScroll() {
+		setPercentScroll(percentScroll_);
+	}
+
+	ipcRenderer.on('setHtml', (event, html) => {
+		updateBodyHeight();
+
+		contentElement.innerHTML = html;
+
+		loadAndApplyHljs();
+
+		// Remove the bullet from "ul" for checkbox lists and extra padding
+		const checkboxes = document.getElementsByClassName('checkbox');
+		for (let i = 0; i < checkboxes.length; i++) {
+			const cb = checkboxes[i];
+			const ul = cb.parentElement.parentElement;
+			if (!ul) {
+				console.warn('Unexpected layout for checkbox');
+				continue;
 			}
-		}, 1);
-	}
-});
+			ul.style.listStyleType = 'none';
+			ul.style.paddingLeft = 0;
+		}
 
-let ignoreNextScrollEvent = false;
-ipcRenderer.on('setPercentScroll', (event, percent) => {
-	if (checkScrollIID_) {
-		clearInterval(checkScrollIID_);
-		checkScrollIID_ = null;
+		let previousContentHeight = contentElement.scrollHeight;
+		let startTime = Date.now();
+		ignoreNextScrollEvent = true;
+		restorePercentScroll();
+
+		if (!checkScrollIID_) {
+			checkScrollIID_ = setInterval(() => {
+				const h = contentElement.scrollHeight;
+				if (h !== previousContentHeight) {
+					previousContentHeight = h;
+					ignoreNextScrollEvent = true;
+					restorePercentScroll();
+				}
+				if (Date.now() - startTime >= 1000) {
+					clearInterval(checkScrollIID_);
+					checkScrollIID_ = null;
+				}
+			}, 1);
+		}
+	});
+
+	let ignoreNextScrollEvent = false;
+	ipcRenderer.on('setPercentScroll', (event, percent) => {
+		if (checkScrollIID_) {
+			clearInterval(checkScrollIID_);
+			checkScrollIID_ = null;
+		}
+
+		ignoreNextScrollEvent = true;
+		setPercentScroll(percent);
+	});
+
+	let mark_ = null;
+	function setMarkers(keywords) {
+		if (!mark_) {
+			mark_ = new Mark(document.getElementById('content'), {
+				exclude: ['img'],
+				acrossElements: true,
+			});
+		}
+
+		mark_.mark(keywords);
 	}
 
-	ignoreNextScrollEvent = true;
-	setPercentScroll(percent);
-});
+	let markLoaded_ = false;
+	ipcRenderer.on('setMarkers', (event, keywords) => {
+		if (!keywords.length && !markLoaded_) return;
 
-function maxScrollTop() {
-	return Math.max(0, contentElement.scrollHeight - contentElement.clientHeight);
-}
+		if (!markLoaded_) {
+			const script = document.createElement('script');
+			script.onload = function() {
+				setMarkers(keywords);
+			};
 
-contentElement.addEventListener('scroll', function(e) {
-	if (ignoreNextScrollEvent) {
-		ignoreNextScrollEvent = false;
-		return;
+			script.src = '../../node_modules/mark.js/dist/mark.min.js';
+			document.getElementById('markScriptContainer').appendChild(script);
+			markLoaded_ = true;
+		} else {
+			setMarkers(keywords);
+		}
+	});
+
+	function maxScrollTop() {
+		return Math.max(0, contentElement.scrollHeight - contentElement.clientHeight);
 	}
-	const m = maxScrollTop();
-	const percent = m ? contentElement.scrollTop / m : 0;
-	setPercentScroll(percent);
-	ipcRenderer.sendToHost('percentScroll', percent);
-});
 
-// Disable drag and drop otherwise it's possible to drop a URL
-// on it and it will open in the view as a website.
-document.addEventListener('drop', function(e) {
-	e.preventDefault();
-	e.stopPropagation();
-});
-document.addEventListener('dragover', function(e) {
-	e.preventDefault();
-	e.stopPropagation();
-});
-document.addEventListener('dragover', function(e) {
-	e.preventDefault();
-});
-</script>
+	// The body element needs to have a fixed height for the content to be scrollable
+	function updateBodyHeight() {
+		document.getElementById('body').style.height = window.innerHeight + 'px';
+	}
+
+	contentElement.addEventListener('scroll', function(e) {
+		if (ignoreNextScrollEvent) {
+			ignoreNextScrollEvent = false;
+			return;
+		}
+		const m = maxScrollTop();
+		const percent = m ? contentElement.scrollTop / m : 0;
+		setPercentScroll(percent);
+		ipcRenderer.sendToHost('percentScroll', percent);
+	});
+
+	document.addEventListener('contextmenu', function(event) {
+		let element = event.target;
+
+		// To handle right clicks on resource icons
+		if (element && !element.getAttribute('data-resource-id')) element = element.parentElement;
+
+		if (element && element.getAttribute('data-resource-id')) {
+			ipcRenderer.sendToHost('contextMenu', {
+				type: element.getAttribute('src') ? 'image' : 'link',
+				resourceId: element.getAttribute('data-resource-id'),
+			});
+		}
+	});
+
+	// Disable drag and drop otherwise it's possible to drop a URL
+	// on it and it will open in the view as a website.
+	document.addEventListener('drop', function(e) {
+		e.preventDefault();
+		e.stopPropagation();
+	});
+	document.addEventListener('dragover', function(e) {
+		e.preventDefault();
+		e.stopPropagation();
+	});
+	document.addEventListener('dragover', function(e) {
+		e.preventDefault();
+	});
+
+	window.addEventListener('resize', function() {
+		updateBodyHeight();
+	});
+
+	updateBodyHeight();	
+	</script>
+
+</body>
+</html>

ElectronClient/app/index.html

@@ -17,6 +17,10 @@
 			.smalltalk .page {
 				max-width: 30em;
 			}
+			mark {
+				background: #CF3F00;
+				color: white;
+			}
 		</style>
 	</head>
 	<body>

ElectronClient/app/locales/index.js

@@ -1,12 +1,16 @@
 var locales = {};
 locales['en_GB'] = require('./en_GB.json');
+locales['cs_CZ'] = require('./cs_CZ.json');
+locales['da_DK'] = require('./da_DK.json');
 locales['de_DE'] = require('./de_DE.json');
-locales['es_CR'] = require('./es_CR.json');
 locales['es_ES'] = require('./es_ES.json');
+locales['eu'] = require('./eu.json');
 locales['fr_FR'] = require('./fr_FR.json');
+locales['gl_ES'] = require('./gl_ES.json');
 locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');
 locales['ja_JP'] = require('./ja_JP.json');
+locales['nl_BE'] = require('./nl_BE.json');
 locales['pt_BR'] = require('./pt_BR.json');
 locales['ru_RU'] = require('./ru_RU.json');
 locales['zh_CN'] = require('./zh_CN.json');

ElectronClient/app/main-html.js

@@ -3,6 +3,15 @@
 // Make it possible to require("/lib/...") without specifying full path
 require('app-module-path').addPath(__dirname);
 
+// Disable React message in console "Download the React DevTools for a better development experience"
+// https://stackoverflow.com/questions/42196819/disable-hide-download-the-react-devtools#42196820
+__REACT_DEVTOOLS_GLOBAL_HOOK__ = {
+	supportsFiber: true,
+	inject: function() {},
+	onCommitFiberRoot: function() {},
+	onCommitFiberUnmount: function() {},
+};
+
 const { app } = require('./app.js');
 const Folder = require('lib/models/Folder.js');
 const Resource = require('lib/models/Resource.js');
@@ -17,11 +26,13 @@ const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { shimInit } = require('lib/shim-init-node.js');
 const EncryptionService = require('lib/services/EncryptionService');
 const { bridge } = require('electron').remote.require('./bridge');
+const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
 
 const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;
 Resource.fsDriver_ = fsDriver;
 EncryptionService.fsDriver_ = fsDriver;
+FileApiDriverLocal.fsDriver_ = fsDriver;
 
 // That's not good, but it's to avoid circular dependency issues
 // in the BaseItem class.
@@ -53,11 +64,17 @@ document.addEventListener('click', (event) => event.preventDefault());
 app().start(bridge().processArgv()).then(() => {
 	require('./gui/Root.min.js');
 }).catch((error) => {
-	// If something goes wrong at this stage we don't have a console or a log file
-	// so display the error in a message box.
-	let msg = ['Fatal error:', error.message];
-	if (error.fileName) msg.push(error.fileName);
-	if (error.lineNumber) msg.push(error.lineNumber);
-	if (error.stack) msg.push(error.stack);
-	bridge().showErrorMessageBox(msg.join('\n'));
+	if (error.code == 'flagError') {
+		bridge().showErrorMessageBox(error.message);
+	} else {
+		// If something goes wrong at this stage we don't have a console or a log file
+		// so display the error in a message box.
+		let msg = ['Fatal error:', error.message];
+		if (error.fileName) msg.push(error.fileName);
+		if (error.lineNumber) msg.push(error.lineNumber);
+		if (error.stack) msg.push(error.stack);
+		bridge().showErrorMessageBox(msg.join('\n\n'));
+	}
+
+	bridge().electronApp().exit(1);
 });

ElectronClient/app/main.js

@@ -24,11 +24,22 @@ function envFromArgs(args) {
 	return 'prod';
 }
 
+// Likewise, we want to know if a profile is specified early, in particular
+// to save the window state data.
+function profileFromArgs(args) {
+	if (!args) return null;
+	const profileIndex = args.indexOf('--profile');
+	if (profileIndex <= 0 || profileIndex >= args.length - 1) return null;
+	const profileValue = args[profileIndex + 1];
+	return profileValue ? profileValue : null;
+}
+
 Logger.fsDriver_ = new FsDriverNode();
 
 const env = envFromArgs(process.argv);
+const profilePath = profileFromArgs(process.argv);
 
-const wrapper = new ElectronAppWrapper(electronApp, env);
+const wrapper = new ElectronAppWrapper(electronApp, env, profilePath);
 
 initBridge(wrapper);
 

ElectronClient/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "0.10.41",
+  "version": "1.0.83",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {
@@ -8,8 +8,8 @@
     "pack": "node_modules/.bin/electron-builder --dir",
     "dist": "node_modules/.bin/electron-builder",
     "publish": "build -p always",
-    "postinstall": "node compile-jsx.js && node compile-package-info.js",
-    "compile": "node compile-jsx.js && node compile-package-info.js"
+    "postinstall": "node compile-jsx.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts",
+    "compile": "node compile-jsx.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts"
   },
   "repository": {
     "type": "git",
@@ -22,8 +22,27 @@
   },
   "build": {
     "appId": "net.cozic.joplin-desktop",
+    "extraResources": [
+      "build/icons/*"
+    ],
     "win": {
-      "icon": "../../Assets/Joplin.ico"
+      "icon": "../../Assets/Joplin.ico",
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64",
+            "ia32"
+          ]
+        },
+        {
+          "target": "portable",
+          "arch": [
+            "x64",
+            "ia32"
+          ]
+        }
+      ]
     },
     "nsis": {
       "oneClick": false,
@@ -34,15 +53,18 @@
       "asar": false
     },
     "linux": {
-      "asar": false
+      "asar": false,
+      "category": "Office"
     }
   },
   "homepage": "https://github.com/laurent22/joplin#readme",
   "devDependencies": {
+    "ajv": "^6.2.0",
+    "app-builder-bin": "^1.5.0",
     "babel-cli": "^6.26.0",
     "babel-preset-react": "^6.24.1",
-    "electron": "^1.7.9",
-    "electron-builder": "^19.45.4"
+    "electron": "^1.7.11",
+    "electron-builder": "^20.10.0"
   },
   "optionalDependencies": {
     "7zip-bin-mac": "^1.0.1",
@@ -51,9 +73,11 @@
   },
   "dependencies": {
     "app-module-path": "^2.2.0",
+    "async-mutex": "^0.1.3",
+    "base-64": "^0.1.0",
+    "compare-versions": "^3.1.0",
     "electron-context-menu": "^0.9.1",
-    "electron-log": "^2.2.11",
-    "electron-updater": "^2.16.1",
+    "electron-is-dev": "^0.3.0",
     "electron-window-state": "^4.1.1",
     "follow-redirects": "^1.2.5",
     "form-data": "^2.3.1",
@@ -61,9 +85,12 @@
     "highlight.js": "^9.12.0",
     "html-entities": "^1.2.1",
     "jssha": "^2.3.1",
+    "katex": "^0.9.0-beta1",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
+    "mark.js": "^8.11.1",
     "markdown-it": "^8.4.0",
+    "markdown-it-katex": "^2.0.3",
     "md5": "^2.2.1",
     "mime": "^2.0.3",
     "moment": "^2.19.1",
@@ -77,13 +104,15 @@
     "react-dom": "^16.0.0",
     "react-redux": "^5.0.6",
     "redux": "^3.7.2",
-    "sharp": "^0.18.4",
     "smalltalk": "^2.5.1",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^3.1.13",
     "string-padding": "^1.0.2",
     "string-to-stream": "^1.1.0",
+    "tar": "^4.4.0",
     "tcp-port-used": "^0.1.2",
-    "uuid": "^3.1.0"
+    "url-parse": "^1.2.0",
+    "uuid": "^3.1.0",
+    "xml2js": "^0.4.19"
   }
 }

ElectronClient/app/style.css

@@ -36,12 +36,14 @@ table td, table th {
 
 .side-bar .list-item:hover,
 .side-bar .synchronize-button:hover {
-	background-color: #453E53;
+	/*background-color: #453E53;*/
+	background-color: #01427B;
 }
 
 .side-bar .list-item:active,
 .side-bar .synchronize-button:active {
-	background-color: #564B6C;
+	/*background-color: #564B6C;*/
+	background-color: #0465BB;
 }
 
 .editor-toolbar .button:not(.disabled):hover,

ElectronClient/app/theme.js

@@ -1,12 +1,13 @@
 const Setting = require('lib/models/Setting.js');
 
 const globalStyle = {
-	fontSize: 12,
+	fontSize: 12 * Setting.value('style.zoom') / 100,
 	fontFamily: 'sans-serif',
 	margin: 15, // No text and no interactive component should be within this margin
 	itemMarginTop: 10,
 	itemMarginBottom: 10,
 	backgroundColor: "#ffffff",
+	backgroundColorTransparent: 'rgba(255,255,255,0.9)',
 	oddBackgroundColor: "#dddddd",
 	color: "#222222", // For regular text
 	colorError: "red",
@@ -20,9 +21,11 @@ const globalStyle = {
 	buttonMinHeight: 30,
 	textAreaLineHeight: 17,
 
-	backgroundColor2: "#2B2634",
+	//backgroundColor2: "#2B2634",
+	backgroundColor2: "#162B3D",
 	color2: "#ffffff",
-	selectedColor2: "#5A4D70",
+	//selectedColor2: "#5A4D70",
+	selectedColor2: "#0269C2",
 	colorError2: "#ff6c6c",
 
 	warningBackgroundColor: "#FFD08D",
@@ -59,6 +62,7 @@ globalStyle.icon = {
 globalStyle.lineInput = {
 	color: globalStyle.color,
 	backgroundColor: globalStyle.backgroundColor,
+	fontFamily: globalStyle.fontFamily,
 };
 
 globalStyle.textStyle = {