Electron release v0.10.40

Improved german translation

.gitignore

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

.travis.yml

@@ -1,6 +1,3 @@
-# Only build tags (Doesn't work - doesn't build anything)
-if: tag IS present
-
 rvm: 2.3.3
 
 matrix:
@@ -46,8 +43,7 @@ before_install:
 
 script:
   - |
-    cd Tools
+    cd ElectronClient/app
+    rsync -aP ../../ReactNativeClient/lib/ lib/
     npm install
-    cd ../ElectronClient/app
-    rsync -aP --delete ../../ReactNativeClient/lib/ lib/
-    npm install && yarn dist
+    yarn dist

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,43 +17,21 @@ 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
 
 ```
 cd ElectronClient/app
-rsync --delete -a ../../ReactNativeClient/lib/ lib/
+rsync -a ../../ReactNativeClient/lib/ lib/
 npm install
 yarn dist
 ```
 
 If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
 
-For node-gyp to work, you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
-
 That will create the executable file in the `dist` directory.
 
 From `/ElectronClient` you can also run `run.sh` to run the app for testing.
 
-## Building Electron application on Windows
-
-```
-cd Tools
-npm install
-cd ..\ElectronClient\app
-xcopy /C /I /H /R /Y /S ..\..\ReactNativeClient\lib lib
-npm install
-yarn dist
-```
-
 # 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.
@@ -66,7 +44,7 @@ Then, from `/ReactNativeClient`, run `npm install`, then `react-native run-ios`
 cd CliClient
 npm install
 ./build.sh
-rsync --delete -aP ../ReactNativeClient/locales/ build/locales/
+rsync -aP ../ReactNativeClient/locales/ build/locales/
 ```
 
 Run `run.sh` to start the application for testing.

CONTRIBUTING.md

@@ -1,19 +0,0 @@
-# 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. Adding a "+1" comment does nothing.
-
-# 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.
-
-Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
-
-# Coding style
-
-See the [prettier config](https://github.com/laurent22/joplin/blob/master/prettier.config.js).

CliClient/app/ResourceServer.js

@@ -1,6 +1,6 @@
 const { _ } = require('lib/locale.js');
 const { Logger } = require('lib/logger.js');
-const Resource = require('lib/models/Resource.js');
+const { Resource } = require('lib/models/resource.js');
 const { netUtils } = require('lib/net-utils.js');
 
 const http = require("http");

CliClient/app/app-gui.js

@@ -1,9 +1,9 @@
 const { Logger } = require('lib/logger.js');
-const Folder = require('lib/models/Folder.js');
-const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
-const Note = require('lib/models/Note.js');
-const Resource = require('lib/models/Resource.js');
+const { Folder } = require('lib/models/folder.js');
+const { Tag } = require('lib/models/tag.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
 const { cliUtils } = require('./cli-utils.js');
 const { reducer, defaultState } = require('lib/reducer.js');
 const { splitCommandString } = require('lib/string-utils.js');
@@ -14,7 +14,6 @@ const chalk = require('chalk');
 const tk = require('terminal-kit');
 const TermWrapper = require('tkwidgets/framework/TermWrapper.js');
 const Renderer = require('tkwidgets/framework/Renderer.js');
-const DecryptionWorker = require('lib/services/DecryptionWorker');
 
 const BaseWidget = require('tkwidgets/BaseWidget.js');
 const ListWidget = require('tkwidgets/ListWidget.js');
@@ -35,55 +34,37 @@ const ConsoleWidget = require('./gui/ConsoleWidget.js');
 
 class AppGui {
 
-	constructor(app, store, keymap) {
-		try {
-			this.app_ = app;
-			this.store_ = store;
+	constructor(app, store) {
+		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);
 
-			// 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_ = null;
+		this.logger_ = new Logger();
+		this.buildUi();
 
-			this.renderer_ = null;
-			this.logger_ = new Logger();
-			this.buildUi();
+		this.renderer_ = new Renderer(this.term(), this.rootWidget_);
 
-			this.renderer_ = new Renderer(this.term(), this.rootWidget_);
+		this.app_.on('modelAction', async (event) => {
+			await this.handleModelAction(event.action);
+		});
 
-			this.app_.on('modelAction', async (event) => {
-				await this.handleModelAction(event.action);
-			});
+		this.shortcuts_ = this.setupShortcuts();
 
-			this.keymap_ = this.setupKeymap(keymap);
+		this.inputMode_ = AppGui.INPUT_MODE_NORMAL;
 
-			this.inputMode_ = AppGui.INPUT_MODE_NORMAL;
+		this.commandCancelCalled_ = false;
 
-			this.commandCancelCalled_ = false;
+		this.currentShortcutKeys_ = [];
+		this.lastShortcutKeyTime_ = 0;
 
-			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);
-		}
+		// 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();
 	}
 
 	store() {
@@ -107,8 +88,8 @@ class AppGui {
 		return this.term().restoreState(state);
 	}
 
-	prompt(initialText = '', promptString = ':', options = null) {
-		return this.widget('statusBar').prompt(initialText, promptString, options);
+	prompt(initialText = '', promptString = ':') {
+		return this.widget('statusBar').prompt(initialText, promptString);
 	}
 
 	stdoutMaxWidth() {
@@ -122,7 +103,6 @@ class AppGui {
 	buildUi() {
 		this.rootWidget_ = new ReduxRootWidget(this.store_);
 		this.rootWidget_.name = 'root';
-		this.rootWidget_.autoShortcutsEnabled = false;
 
 		const folderList = new FolderListWidget();
 		folderList.style = {
@@ -287,31 +267,155 @@ 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));	
 	}
 
-	setupKeymap(keymap) {
-		const output = [];
+	setupShortcuts() {
+		const shortcuts = {};
 
-		for (let i = 0; i < keymap.length; i++) {
-			const item = Object.assign({}, keymap[i]);
-
-			if (!item.command) throw new Error('Missing command for keymap item: ' + JSON.stringify(item));
-
-			if (!('type' in item)) item.type = 'exec';
-
-			if (item.command in this.tkWidgetKeys_) {
-				item.type = 'tkwidgets';
-			}
-
-			item.canRunAlongOtherCommands = item.type === 'function' && ['toggle_metadata', 'toggle_console'].indexOf(item.command) >= 0;
-
-			output.push(item);
+		shortcuts['TAB'] = {
+			friendlyName: 'Tab',
+			description: () => _('Give focus to next pane'),
+			isDocOnly: true,
 		}
 
-		return output;
+		shortcuts['SHIFT_TAB'] = {
+			friendlyName: 'Shift+Tab',
+			description: () => _('Give focus to previous pane'),
+			isDocOnly: true,
+		}
+
+		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);
+			},
+		};
+
+		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.'));
+				}
+			}
+		};
+
+		shortcuts['BACKSPACE'] = {
+			alias: 'DELETE',
+		};
+
+		shortcuts[' '] = {
+			friendlyName: 'SPACE',
+			description: () => _('Set a to-do as completed / not completed'),
+			action: 'todo toggle $n',
+		}
+
+		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;
 	}
 
 	toggleConsole() {
@@ -386,16 +490,8 @@ class AppGui {
 		return this.logger_;
 	}
 
-	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;
+	shortcuts() {
+		return this.shortcuts_;
 	}
 
 	term() {
@@ -426,77 +522,17 @@ class AppGui {
 		}
 	}
 
-	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) {
+	async processCommand(cmd) {
 		if (!cmd) return;
 		cmd = cmd.trim();
 		if (!cmd.length) return;
 
-		// this.logger().debug('Got command: ' + cmd);
+		this.logger().info('Got command: ' + cmd);
+
+		if (cmd === 'q' || cmd === 'wq' || cmd === 'qa') { // Vim bonus
+			await this.app().exit();
+			return;
+		}	
 
 		try {			
 			let note = this.widget('noteList').currentItem;
@@ -748,34 +784,35 @@ class AppGui {
 				// -------------------------------------------------------------------------
 
 				const shortcutKey = this.currentShortcutKeys_.join('');
-				let keymapItem = this.keymapItemByKey(shortcutKey);
+				let cmd = shortcutKey in this.shortcuts_ ? this.shortcuts_[shortcutKey] : null;
 
 				// 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() && keymapItem;
-				if (keymapItem && keymapItem.canRunAlongOtherCommands) processShortcutKeys = true;
+				let processShortcutKeys = !this.app().currentCommand() && cmd;
+				if (cmd && cmd.canRunAlongOtherCommands) processShortcutKeys = true;
 				if (statusBar.promptActive) processShortcutKeys = false;
+				if (cmd && cmd.isDocOnly) processShortcutKeys = false;
 
 				if (processShortcutKeys) {
-					this.logger().debug('Shortcut:', shortcutKey, keymapItem);
+					this.logger().info('Shortcut:', shortcutKey, cmd.description());
 
 					this.currentShortcutKeys_ = [];
-
-					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));
+					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);
 					}
 				}
 

CliClient/app/app.js

@@ -5,12 +5,12 @@ 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 BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const Setting = require('lib/models/Setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { Setting } = require('lib/models/setting.js');
 const { Logger } = require('lib/logger.js');
 const { sprintf } = require('sprintf-js');
 const { reg } = require('lib/registry.js');
@@ -21,7 +21,6 @@ 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 {
 
@@ -35,7 +34,6 @@ class Application extends BaseApplication {
 		this.allCommandsLoaded_ = false;
 		this.showStackTraces_ = false;
 		this.gui_ = null;
-		this.cache_ = new Cache();
 	}
 
 	gui() {
@@ -146,15 +144,13 @@ class Application extends BaseApplication {
 				message += ' (' + options.answers.join('/') + ')';
 			}
 
-			let answer = await this.gui().prompt('', message + ' ', options);
+			let answer = await this.gui().prompt('', message + ' ');
 
 			if (options.type === 'boolean') {
 				if (answer === null) return false; // Pressed ESCAPE
 				if (!answer) answer = options.answers[0];
 				let positiveIndex = options.booleanAnswerDefault == 'y' ? 0 : 1;
 				return answer.toLowerCase() === options.answers[positiveIndex].toLowerCase();
-			} else {
-				return answer;
 			}
 		});
 
@@ -225,8 +221,12 @@ class Application extends BaseApplication {
 	async commandMetadata() {
 		if (this.commandMetadata_) return this.commandMetadata_;
 
-		let output = await this.cache_.getItem('metadata');
-		if (output) {
+		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) {
 			this.commandMetadata_ = output;
 			return Object.assign({}, this.commandMetadata_);
 		}
@@ -240,7 +240,7 @@ class Application extends BaseApplication {
 			output[n] = cmd.metadata();
 		}
 
-		await this.cache_.setItem('metadata', output, 1000 * 60 * 60 * 24);
+		await storage.setItem('metadata', output);
 
 		this.commandMetadata_ = output;
 		return Object.assign({}, this.commandMetadata_);
@@ -275,7 +275,7 @@ class Application extends BaseApplication {
 	dummyGui() {
 		return {
 			isDummy: () => { return true; },
-			prompt: (initialText = '', promptString = '', options = null) => { return cliUtils.prompt(initialText, promptString, options); },
+			prompt: (initialText = '', promptString = '') => { return cliUtils.prompt(initialText, promptString); },
 			showConsole: () => {},
 			maximizeConsole: () => {},
 			stdout: (text) => { console.info(text); },
@@ -283,7 +283,7 @@ class Application extends BaseApplication {
 			exit: () => {},
 			showModalOverlay: (text) => {},
 			hideModalOverlay: () => {},
-			stdoutMaxWidth: () => { return 100; },
+			stdoutMaxWidth: () => { return 78; },
 			forceRender: () => {},
 			termSaveState: () => {},
 			termRestoreState: (state) => {},
@@ -292,7 +292,7 @@ class Application extends BaseApplication {
 
 	async execCommand(argv) {
 		if (!argv.length) return this.execCommand(['help']);
-		// reg.logger().debug('execCommand()', argv);
+		reg.logger().info('execCommand()', argv);
 		const commandName = argv[0];
 		this.activeCommand_ = this.findCommandByName(commandName);
 
@@ -312,63 +312,6 @@ 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);
 
@@ -387,19 +330,16 @@ class Application extends BaseApplication {
 				await this.execCommand(argv);
 			} catch (error) {
 				if (this.showStackTraces_) {
-					console.error(error);
+					console.info(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(), keymap);
+			this.gui_ = new AppGui(this, this.store());
 			this.gui_.setLogger(this.logger_);
 			await this.gui_.start();
 
@@ -414,7 +354,7 @@ class Application extends BaseApplication {
 
 			this.dispatch({
 				type: 'TAG_UPDATE_ALL',
-				items: tags,
+				tags: tags,
 			});
 
 			this.store().dispatch({

CliClient/app/autocompletion.js

@@ -1,10 +1,9 @@
 var { app } = require('./app.js');
-var Note = require('lib/models/Note.js');
-var Folder = require('lib/models/Folder.js');
-var Tag = require('lib/models/Tag.js');
+var { Note } = require('lib/models/note.js');
+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
@@ -49,7 +48,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[0]);
+				l.push(options[2]);
 			}
 		}
 		if (l.length === 0) {
@@ -72,10 +71,8 @@ async function handleAutocompletionPromise(line) {
 		let argName = cmdUsage[positionalArgs - 1];
 		argName = cliUtils.parseCommandArg(argName).name;
 
-		const currentFolder = app().currentFolder();
-
-		if (argName == 'note' || argName == 'note-pattern') {
-			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
+		if (argName == 'note' || argName == 'note-pattern' && app().currentFolder()) {
+			const notes = await Note.previews(app().currentFolder().id, { titlePattern: next + '*' });
 			l.push(...notes.map((n) => n.title));
 		}
 
@@ -84,22 +81,11 @@ 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

@@ -12,10 +12,6 @@ class BaseCommand {
 		throw new Error('Usage not defined');
 	}
 
-	encryptionCheck(item) {
-		if (item && item.encryption_applied) throw new Error(_('Cannot change encrypted item'));
-	}
-
 	description() {
 		throw new Error('Description not defined');
 	}
@@ -32,6 +28,10 @@ class BaseCommand {
 		return this.compatibleUis().indexOf(ui) >= 0;
 	}
 
+	aliases() {
+		return [];
+	}
+
 	options() {
 		return [];
 	}

CliClient/app/cli-integration-tests.js

@@ -5,10 +5,10 @@ const { Logger } = require('lib/logger.js');
 const { dirname } = require('lib/path-utils.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const { JoplinDatabase } = require('lib/joplin-database.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Setting = require('lib/models/Setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
 const { sprintf } = require('sprintf-js');
 const exec = require('child_process').exec
 

CliClient/app/cli-utils.js

@@ -178,39 +178,38 @@ cliUtils.promptConfirm = function(message, answers = null) {
 	});
 }
 
-// Note: initialText is there to have the same signature as statusBar.prompt() so that
-// it can be a drop-in replacement, however initialText is not used (and cannot be
-// with readline.question?).
-cliUtils.prompt = function(initialText = '', promptString = ':', options = null) {
-	if (!options) options = {};
-
+cliUtils.promptInput = function(message) {
 	const readline = require('readline');
-	const Writable = require('stream').Writable;
-
-	const mutableStdout = new Writable({
-		write: function(chunk, encoding, callback) {
-			if (!this.muted)
-			process.stdout.write(chunk, encoding);
-			callback();
-		}
-	});
 
 	const rl = readline.createInterface({
 		input: process.stdin,
-		output: mutableStdout,
-		terminal: true,
+		output: process.stdout
 	});
 
 	return new Promise((resolve, reject) => {
-		mutableStdout.muted = false;
-
-		rl.question(promptString, (answer) => {
+		rl.question(message + ' ', (answer) => {
 			rl.close();
-			if (!!options.secure) this.stdout_('');
 			resolve(answer);
 		});
+	});
+}
 
-		mutableStdout.muted = !!options.secure;
+// Note: initialText is there to have the same signature as statusBar.prompt() so that
+// it can be a drop-in replacement, however initialText is not used (and cannot be
+// with readline.question?).
+cliUtils.prompt = function(initialText = '', promptString = ':') {
+	const readline = require('readline');
+
+	const rl = readline.createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+
+	return new Promise((resolve, reject) => {
+		rl.question(promptString, (answer) => {
+			rl.close();
+			resolve(answer);
+		});
 	});
 }
 

CliClient/app/command-attach.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
+const { BaseModel } = require('lib/base-model.js');
 const { shim } = require('lib/shim.js');
 const fs = require('fs-extra');
 
@@ -19,7 +19,6 @@ class Command extends BaseCommand {
 		let title = args['note'];
 
 		let note = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
-		this.encryptionCheck(note);
 		if (!note) throw new Error(_('Cannot find "%s".', title));
 
 		const localFilePath = args['file'];

CliClient/app/command-cat.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 
@@ -21,6 +21,10 @@ class Command extends BaseCommand {
 		];
 	}
 
+	enabled() {
+		return false;
+	}
+
 	async action(args) {
 		let title = args['note'];
 
@@ -29,9 +33,6 @@ class Command extends BaseCommand {
 
 		const content = args.options.verbose ? await Note.serialize(item) : await Note.serializeForEdit(item);
 		this.stdout(content);
-
-		app().gui().showConsole();
-		app().gui().maximizeConsole();
 	}
 
 }

CliClient/app/command-config.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { _, setLocale } = require('lib/locale.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 
 class Command extends BaseCommand {
 
@@ -23,11 +23,7 @@ class Command extends BaseCommand {
 		const verbose = args.options.verbose;
 
 		const renderKeyValue = (name) => {
-			const md = Setting.settingMetadata(name);
-			let value = Setting.value(name);
-			if (typeof value === 'object' || Array.isArray(value)) value = JSON.stringify(value);
-			if (md.secure) value = '********';
-
+			const value = Setting.value(name);
 			if (Setting.isEnum(name)) {
 				return _('%s = %s (%s)', name, value, Setting.enumOptionsDoc(name));
 			} else {

CliClient/app/command-cp.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-done.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
@@ -16,9 +16,8 @@ class Command extends BaseCommand {
 		return _('Marks a to-do as done.');
 	}
 
-	static async handleAction(commandInstance, args, isCompleted) {
+	static async handleAction(args, isCompleted) {
 		const note = await app().loadItem(BaseModel.TYPE_NOTE, args.note);
-		commandInstance.encryptionCheck(note);
 		if (!note) throw new Error(_('Cannot find "%s".', args.note));
 		if (!note.is_todo) throw new Error(_('Note is not a to-do: "%s"', args.note));
 
@@ -33,7 +32,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		await Command.handleAction(this, args, true);
+		await Command.handleAction(args, true);
 	}
 
 }

CliClient/app/command-dump.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-e2ee.js

@@ -1,184 +0,0 @@
-const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale.js');
-const { cliUtils } = require('./cli-utils.js');
-const EncryptionService = require('lib/services/EncryptionService');
-const DecryptionWorker = require('lib/services/DecryptionWorker');
-const MasterKey = require('lib/models/MasterKey');
-const BaseItem = require('lib/models/BaseItem');
-const Setting = require('lib/models/Setting.js');
-
-class Command extends BaseCommand {
-
-	usage() {
-		return 'e2ee <command> [path]';
-	}
-
-	description() {
-		return _('Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status` and `target-status`.');
-	}
-
-	options() {
-		return [
-			// This is here mostly for testing - shouldn't be used
-			['-p, --password <password>', 'Use this password as master password (For security reasons, it is not recommended to use this option).'],
-			['-v, --verbose', 'More verbose output for the `target-status` command'],
-		];
-	}
-
-	async action(args) {
-		// change-password
-
-		const options = args.options;
-
-		if (args.command === 'enable') {
-			const password = options.password ? options.password.toString() : await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
-			if (!password) {
-				this.stdout(_('Operation cancelled'));
-				return;
-			}
-
-			await EncryptionService.instance().generateMasterKeyAndEnableEncryption(password);
-			return;
-		}
-
-		if (args.command === 'disable') {
-			await EncryptionService.instance().disableEncryption();
-			return;
-		}
-
-		if (args.command === 'decrypt') {
-			this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
-
-			while (true) {
-				try {
-					await DecryptionWorker.instance().start();
-					break;
-				} catch (error) {
-					if (error.code === 'masterKeyNotLoaded') {
-						const masterKeyId = error.masterKeyId;
-						const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
-						if (!password) {
-							this.stdout(_('Operation cancelled'));
-							return;
-						}
-						Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
-						await EncryptionService.instance().loadMasterKeysFromSettings();
-						continue;
-					}
-
-					throw error;
-				}
-			}
-
-			this.stdout(_('Completed decryption.'));
-
-			return;
-		}
-
-		if (args.command === 'status') {
-			this.stdout(_('Encryption is: %s', Setting.value('encryption.enabled') ? _('Enabled') : _('Disabled')));
-			return;
-		}
-
-		if (args.command === 'target-status') {
-			const fs = require('fs-extra');
-			const pathUtils = require('lib/path-utils.js');
-			const fsDriver = new (require('lib/fs-driver-node.js').FsDriverNode)();
-
-			const targetPath = args.path;
-			if (!targetPath) throw new Error('Please specify the sync target path.');
-
-			const dirPaths = function(targetPath) {
-				let paths = [];
-				fs.readdirSync(targetPath).forEach((path) => {
-					paths.push(path);
-				});
-				return paths;
-			}
-
-			let itemCount = 0;
-			let resourceCount = 0;
-			let encryptedItemCount = 0;
-			let encryptedResourceCount = 0;
-			let otherItemCount = 0;
-
-			let encryptedPaths = [];
-			let decryptedPaths = [];
-
-			let paths = dirPaths(targetPath);
-
-			for (let i = 0; i < paths.length; i++) {
-				const path = paths[i];
-				const fullPath = targetPath + '/' + path;
-				const stat = await fs.stat(fullPath);
-
-				// this.stdout(fullPath);
-
-				if (path === '.resource') {
-					let resourcePaths = dirPaths(fullPath);
-					for (let j = 0; j < resourcePaths.length; j++) {
-						const resourcePath = resourcePaths[j];
-						resourceCount++;
-						const fullResourcePath = fullPath + '/' + resourcePath;
-						const isEncrypted = await EncryptionService.instance().fileIsEncrypted(fullResourcePath);
-						if (isEncrypted) {
-							encryptedResourceCount++;
-							encryptedPaths.push(fullResourcePath);
-						} else {
-							decryptedPaths.push(fullResourcePath);
-						}
-					}
-				} else if (stat.isDirectory()) {
-					continue;
-				} else {
-					const content = await fs.readFile(fullPath, 'utf8');
-					const item = await BaseItem.unserialize(content);
-					const ItemClass = BaseItem.itemClass(item);
-
-					if (!ItemClass.encryptionSupported()) {
-						otherItemCount++;
-						continue;
-					}
-
-					itemCount++;
-
-					const isEncrypted = await EncryptionService.instance().itemIsEncrypted(item);
-
-					if (isEncrypted) {
-						encryptedItemCount++;
-						encryptedPaths.push(fullPath);
-					} else {
-						decryptedPaths.push(fullPath);
-					}
-				}
-			}
-
-			this.stdout('Encrypted items: ' + encryptedItemCount + '/' + itemCount);
-			this.stdout('Encrypted resources: ' + encryptedResourceCount + '/' + resourceCount);
-			this.stdout('Other items (never encrypted): ' + otherItemCount);
-
-			if (options.verbose) {
-				this.stdout('');
-				this.stdout('# Encrypted paths');
-				this.stdout('');
-				for (let i = 0; i < encryptedPaths.length; i++) {
-					const path = encryptedPaths[i];
-					this.stdout(path);
-				}
-
-				this.stdout('');
-				this.stdout('# Decrypted paths');
-				this.stdout('');
-				for (let i = 0; i < decryptedPaths.length; i++) {
-					const path = decryptedPaths[i];
-					this.stdout(path);
-				}
-			}
-
-			return;
-		}
-	}
-
-}
-
-module.exports = Command;

CliClient/app/command-edit.js

@@ -3,10 +3,10 @@ const { BaseCommand } = require('./base-command.js');
 const { uuid } = require('lib/uuid.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Setting = require('lib/models/Setting.js');
-const BaseModel = require('lib/BaseModel.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseModel } = require('lib/base-model.js');
 const { cliUtils } = require('./cli-utils.js');
 const { time } = require('lib/time-utils.js');
 
@@ -44,8 +44,6 @@ class Command extends BaseCommand {
 			if (!app().currentFolder()) throw new Error(_('No active notebook.'));
 			let note = await app().loadItem(BaseModel.TYPE_NOTE, title);
 
-			this.encryptionCheck(note);
-
 			if (!note) {
 				const ok = await this.prompt(_('Note does not exist: "%s". Create it?', title));
 				if (!ok) return;
@@ -81,9 +79,7 @@ class Command extends BaseCommand {
 			const termState = app().gui().termSaveState();
 
 			const spawnSync	= require('child_process').spawnSync;
-			const result = spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
-
-			if (result.error) this.stdout(_('Error opening note in editor: %s', result.error.message));
+			spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
 
 			app().gui().termRestoreState(termState);
 			app().gui().hideModalOverlay();

CliClient/app/command-export-sync-status.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { Database } = require('lib/database.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { _ } = require('lib/locale.js');
 const { ReportService } = require('lib/services/report.js');
 const fs = require('fs-extra');

CliClient/app/command-export.js

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

CliClient/app/command-geoloc.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-help.js

@@ -2,7 +2,7 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { renderCommandHelp } = require('./help-utils.js');
 const { Database } = require('lib/database.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { wrap } = require('lib/string-utils.js');
 const { _ } = require('lib/locale.js');
 const { cliUtils } = require('./cli-utils.js');
@@ -36,22 +36,21 @@ class Command extends BaseCommand {
 	async action(args) {
 		const stdoutWidth = app().commandStdoutMaxWidth();
 
-		if (args.command === 'shortcuts' || args.command === 'keymap') {
-			this.stdout(_('For information on how to customise the shortcuts please visit %s', 'http://joplin.cozic.net/terminal/#shortcuts'));
-			this.stdout('');
-
+		if (args.command === 'shortcuts') {
 			if (app().gui().isDummy()) {
 				throw new Error(_('Shortcuts are not available in CLI mode.'));
 			}
 
-			const keymap = app().gui().keymap();
+			const shortcuts = app().gui().shortcuts();
 
 			let rows = [];
 
-			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]);
+			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()]);
 			}
 
 			cliUtils.printArray(this.stdout.bind(this), rows);
@@ -79,7 +78,7 @@ class Command extends BaseCommand {
 			this.stdout(_('To maximise/minimise the console, press "TC".'));
 			this.stdout(_('To enter command line mode, press ":"'));
 			this.stdout(_('To exit command line mode, press ESCAPE'));
-			this.stdout(_('For the list of keyboard shortcuts and config options, type `help keymap`'));
+			this.stdout(_('For the complete list of available keyboard shortcuts, type `help shortcuts`'));
 		}
 
 		app().gui().showConsole();

CliClient/app/command-import-enex.js

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

@@ -1,75 +0,0 @@
-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-ls.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Setting = require('lib/models/Setting.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Setting } = require('lib/models/setting.js');
+const { Note } = require('lib/models/note.js');
 const { sprintf } = require('sprintf-js');
 const { time } = require('lib/time-utils.js');
 const { cliUtils } = require('./cli-utils.js');

CliClient/app/command-mkbook.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
+const { Folder } = require('lib/models/folder.js');
 const { reg } = require('lib/registry.js');
 
 class Command extends BaseCommand {
@@ -14,6 +14,10 @@ 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-mknote.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Note = require('lib/models/Note.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mktodo.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Note = require('lib/models/Note.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mv.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-ren.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 
@@ -20,7 +20,6 @@ class Command extends BaseCommand {
 		const name = args['name'];
 
 		const item = await app().loadItem('folderOrNote', pattern);
-		this.encryptionCheck(item);
 		if (!item) throw new Error(_('Cannot find "%s".', pattern));
 
 		const newItem = {

CliClient/app/command-rmbook.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const BaseModel = require('lib/BaseModel.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseModel } = require('lib/base-model.js');
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {

CliClient/app/command-rmnote.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const BaseModel = require('lib/BaseModel.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseModel } = require('lib/base-model.js');
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {

CliClient/app/command-search.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { sprintf } = require('sprintf-js');
 const { time } = require('lib/time-utils.js');
 const { uuid } = require('lib/uuid.js');

CliClient/app/command-set.js

@@ -1,11 +1,11 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
+const { BaseModel } = require('lib/base-model.js');
 const { Database } = require('lib/database.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const BaseItem = require('lib/models/BaseItem.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseItem } = require('lib/models/base-item.js');
 
 class Command extends BaseCommand {
 
@@ -35,8 +35,6 @@ class Command extends BaseCommand {
 		if (!notes.length) throw new Error(_('Cannot find "%s".', title));
 
 		for (let i = 0; i < notes.length; i++) {
-			this.encryptionCheck(notes[i]);
-
 			let newNote = {
 				id: notes[i].id,
 				type_: notes[i].type_,

CliClient/app/command-status.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { Database } = require('lib/database.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { _ } = require('lib/locale.js');
 const { ReportService } = require('lib/services/report.js');
 

CliClient/app/command-sync.js

@@ -2,15 +2,15 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const { OneDriveApiNodeUtils } = require('./onedrive-api-node-utils.js');
-const Setting = require('lib/models/Setting.js');
-const BaseItem = require('lib/models/BaseItem.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
 const { Synchronizer } = require('lib/synchronizer.js');
 const { reg } = require('lib/registry.js');
 const { cliUtils } = require('./cli-utils.js');
 const md5 = require('md5');
 const locker = require('proper-lockfile');
 const fs = require('fs-extra');
-const SyncTargetRegistry = require('lib/SyncTargetRegistry');
+const osTmpdir = require('os-tmpdir');
 
 class Command extends BaseCommand {
 
@@ -61,28 +61,14 @@ class Command extends BaseCommand {
 		});
 	}
 
-	async doAuth() {
+	async doAuth(syncTargetId) {
 		const syncTarget = reg.syncTarget(this.syncTargetId_);
-		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;
-		}
-
-		this.stdout(_('Not authentified with %s. Please provide any missing credentials.', syncTarget.label()));
-		return false;
+		this.oneDriveApiUtils_ = new OneDriveApiNodeUtils(syncTarget.api());
+		const auth = await this.oneDriveApiUtils_.oauthDance({
+			log: (...s) => { return this.stdout(...s); }
+		});
+		this.oneDriveApiUtils_ = null;
+		return auth;
 	}
 
 	cancelAuth() {
@@ -100,7 +86,7 @@ class Command extends BaseCommand {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
-		const lockFilePath = require('os').tmpdir() + '/synclock_' + md5(escape(Setting.value('profileDir'))); // https://github.com/pvorb/node-md5/issues/41
+		const lockFilePath = osTmpdir() + '/synclock_' + md5(Setting.value('profileDir'));
 		if (!await fs.pathExists(lockFilePath)) await fs.writeFile(lockFilePath, 'synclock');
 
 		try {
@@ -134,8 +120,12 @@ class Command extends BaseCommand {
 				app().gui().showConsole();
 				app().gui().maximizeConsole();
 
-				const authDone = await this.doAuth();
-				if (!authDone) return cleanUp();
+				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 sync = await syncTarget.synchronizer();

CliClient/app/command-tag.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
+const { Tag } = require('lib/models/tag.js');
+const { BaseModel } = require('lib/base-model.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-todo.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
@@ -25,8 +25,6 @@ class Command extends BaseCommand {
 		for (let i = 0; i < notes.length; i++) {
 			const note = notes[i];
 
-			this.encryptionCheck(note);
-
 			let toSave = {
 				id: note.id,
 			};

CliClient/app/command-undone.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { time } = require('lib/time-utils.js');
 
 const CommandDone = require('./command-done.js');
@@ -19,7 +19,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		await CommandDone.handleAction(this, args, false);
+		await CommandDone.handleAction(args, false);
 	}
 
 }

CliClient/app/command-use.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-version.js

@@ -1,5 +1,5 @@
 const { BaseCommand } = require('./base-command.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {

CliClient/app/fuzzing.js

@@ -2,7 +2,7 @@
 
 const { time } = require('lib/time-utils.js');
 const { Logger } = require('lib/logger.js');
-const Resource = require('lib/models/Resource.js');
+const { Resource } = require('lib/models/resource.js');
 const { dirname } = require('lib/path-utils.js');
 const { FsDriverNode } = require('./fs-driver-node.js');
 const lodash = require('lodash');

CliClient/app/gui/FolderListWidget.js

@@ -1,6 +1,6 @@
-const Folder = require('lib/models/Folder.js');
-const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
+const Folder = require('lib/models/folder.js').Folder;
+const Tag = require('lib/models/tag.js').Tag;
+const BaseModel = require('lib/base-model.js').BaseModel;
 const ListWidget = require('tkwidgets/ListWidget.js');
 const _ = require('lib/locale.js')._;
 
@@ -24,9 +24,9 @@ class FolderListWidget extends ListWidget {
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
-				output.push(Folder.displayTitle(item));
+				output.push(item.title);
 			} else if (item.type_ === Tag.modelType()) {
-				output.push('[' + Folder.displayTitle(item) + ']');
+				output.push('[' + item.title + ']');
 			} else if (item.type_ === BaseModel.TYPE_SEARCH) {
 				output.push(_('Search:'));
 				output.push(item.title);

CliClient/app/gui/NoteListWidget.js

@@ -1,4 +1,4 @@
-const Note = require('lib/models/Note.js');
+const Note = require('lib/models/note.js').Note;
 const ListWidget = require('tkwidgets/ListWidget.js');
 
 class NoteListWidget extends ListWidget {
@@ -10,7 +10,7 @@ class NoteListWidget extends ListWidget {
 		this.updateIndexFromSelectedNoteId_ = false;
 
 		this.itemRenderer = (note) => {
-			let label = Note.displayTitle(note); // + ' ' + note.id;
+			let label = note.title; // + ' ' + note.id;
 			if (note.is_todo) {
 				label = '[' + (note.todo_completed ? 'X' : ' ') + '] ' + label;
 			}

CliClient/app/gui/NoteMetadataWidget.js

@@ -1,4 +1,4 @@
-const Note = require('lib/models/Note.js');
+const Note = require('lib/models/note.js').Note;
 const TextWidget = require('tkwidgets/TextWidget.js');
 
 class NoteMetadataWidget extends TextWidget {

CliClient/app/gui/NoteWidget.js

@@ -1,4 +1,4 @@
-const Note = require('lib/models/Note.js');
+const Note = require('lib/models/note.js').Note;
 const TextWidget = require('tkwidgets/TextWidget.js');
 const { _ } = require('lib/locale.js');
 
@@ -44,13 +44,7 @@ class NoteWidget extends TextWidget {
 		} else if (this.noteId_) {
 			this.doAsync('loadNote', async () => {
 				this.note_ = await Note.load(this.noteId_);
-				
-				if (this.note_ && this.note_.encryption_applied) {
-					this.text = _('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.');
-				} else {
-					this.text = this.note_ ? this.note_.title + "\n\n" + this.note_.body : '';
-				}
-
+				this.text = this.note_ ? this.note_.title + "\n\n" + this.note_.body : '';
 				if (this.lastLoadedNoteId_ !== this.noteId_) this.scrollTop = 0;
 				this.lastLoadedNoteId_ = this.noteId_;
 			});

CliClient/app/gui/StatusBarWidget.js

@@ -42,7 +42,6 @@ class StatusBarWidget extends BaseWidget {
 		};
 
 		if ('cursorPosition' in options) this.promptState_.cursorPosition = options.cursorPosition;
-		if ('secure' in options) this.promptState_.secure = options.secure;
 
 		this.promptState_.promise = new Promise((resolve, reject) => {
 			this.promptState_.resolve = resolve;
@@ -106,8 +105,6 @@ class StatusBarWidget extends BaseWidget {
 
 			this.term.showCursor(true);
 
-			const isSecurePrompt = !!this.promptState_.secure;
-
 			let options = {
 				cancelable: true,
 				history: this.history,
@@ -118,7 +115,6 @@ class StatusBarWidget extends BaseWidget {
 			};
 
 			if ('cursorPosition' in this.promptState_) options.cursorPosition = this.promptState_.cursorPosition;
-			if (isSecurePrompt) options.echoChar = true;
 
 			this.inputEventEmitter_ = this.term.inputField(options, (error, input) => {
 				let resolveResult = null;
@@ -133,8 +129,7 @@ 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.
-						const isConfigPassword = input.indexOf('config ') >= 0 && input.indexOf('password') >= 0;
-						if (!isSecurePrompt && input && input.length > 1 && !isConfigPassword) this.history_.push(input);
+						if (input && input.length > 1) this.history_.push(input);
 					}
 				}
 

CliClient/app/help-utils.js

@@ -1,6 +1,6 @@
 const fs = require('fs-extra');
 const { wrap } = require('lib/string-utils.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { fileExtension, basename, dirname } = require('lib/path-utils.js');
 const { _, setLocale, languageCode } = require('lib/locale.js');
 
@@ -53,8 +53,9 @@ function renderCommandHelp(cmd, width = null) {
 				desc.push(label);
 			}
 
-			const description = Setting.keyDescription(md.key, 'cli');
-			if (description) desc.push(description);
+			if (md.description) {
+				desc.push(md.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

@@ -1,36 +1,26 @@
 #!/usr/bin/env node
 
-// Make it possible to require("/lib/...") without specifying full path
+// Loading time: 20170803: 1.5s with no commands
+
 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');
-const BaseItem = require('lib/models/BaseItem.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const NoteTag = require('lib/models/NoteTag.js');
-const MasterKey = require('lib/models/MasterKey');
-const Setting = require('lib/models/Setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Resource } = require('lib/models/resource.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { NoteTag } = require('lib/models/note-tag.js');
+const { Setting } = require('lib/models/setting.js');
 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.
@@ -39,7 +29,6 @@ BaseItem.loadClass('Folder', Folder);
 BaseItem.loadClass('Resource', Resource);
 BaseItem.loadClass('Tag', Tag);
 BaseItem.loadClass('NoteTag', NoteTag);
-BaseItem.loadClass('MasterKey', MasterKey);
 
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
@@ -66,34 +55,7 @@ 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) => {
-	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);
+	console.error(_('Fatal error:'));
+	console.error(error);
 });

CliClient/build.sh

@@ -4,6 +4,6 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$ROOT_DIR/build"
 
 rsync -a --exclude "node_modules/" "$ROOT_DIR/app/" "$BUILD_DIR/"
-rsync -a --delete "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
+rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
 cp "$ROOT_DIR/package.json" "$BUILD_DIR"
 chmod 755 "$BUILD_DIR/main.js"

CliClient/locales/en_GB.po

@@ -15,12 +15,63 @@ 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 ""
 
@@ -57,9 +108,6 @@ 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 ""
@@ -117,35 +165,6 @@ 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 ""
 
@@ -163,10 +182,6 @@ 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 ""
 
@@ -174,14 +189,10 @@ msgid "Exits the application."
 msgstr ""
 
 msgid ""
-"Exports Joplin data to the given path. By default, it will export the "
+"Exports Joplin data to the given directory. 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 ""
 
@@ -194,10 +205,6 @@ 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 ""
 
@@ -233,19 +240,25 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr ""
 
 msgid ""
-"For the list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr ""
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, javascript-format
-msgid "Source format: %s"
+msgid "Imports an Evernote notebook file (.enex file)."
 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 ""
@@ -368,14 +381,6 @@ 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 ""
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-
 msgid "Synchronisation is already in progress."
 msgstr ""
 
@@ -386,6 +391,10 @@ msgid ""
 "operation."
 msgstr ""
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -449,9 +458,6 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
-msgid "Type `joplin help` for usage information."
-msgstr ""
-
 msgid "Fatal error:"
 msgstr ""
 
@@ -482,24 +488,6 @@ 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 ""
 
@@ -512,17 +500,10 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import"
+msgid "Import Evernote notes"
 msgstr ""
 
-msgid "Export"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
+msgid "Evernote Export Files"
 msgstr ""
 
 msgid "Quit"
@@ -543,22 +524,13 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr ""
 
 msgid "Synchronisation status"
 msgstr ""
 
-msgid "Encryption options"
-msgstr ""
-
-msgid "General Options"
+msgid "Options"
 msgstr ""
 
 msgid "Help"
@@ -567,12 +539,6 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
-msgid "Make a donation"
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "About Joplin"
 msgstr ""
 
@@ -580,34 +546,12 @@ 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 ""
@@ -664,21 +608,18 @@ 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 "Status"
 msgstr ""
 
 msgid "Encryption is:"
 msgstr ""
 
+msgid "Enabled"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
 msgid "Back"
 msgstr ""
 
@@ -690,9 +631,15 @@ 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 ""
 
@@ -708,9 +655,6 @@ msgstr ""
 msgid "Set alarm:"
 msgstr ""
 
-msgid "Search"
-msgstr ""
-
 msgid "Layout"
 msgstr ""
 
@@ -745,12 +689,6 @@ 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 ""
@@ -758,28 +696,9 @@ 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 ""
 
@@ -789,7 +708,7 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Options"
+msgid "Import"
 msgstr ""
 
 msgid "Synchronisation Status"
@@ -813,6 +732,9 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Searches"
 msgstr ""
 
@@ -830,18 +752,12 @@ 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 ""
@@ -892,10 +808,6 @@ msgstr ""
 msgid "Deleted remote items: %d."
 msgstr ""
 
-#, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr ""
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr ""
@@ -907,26 +819,10 @@ 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 ""
 
@@ -978,47 +874,12 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Uncompleted to-dos on top"
-msgstr ""
-
-msgid "Sort notes by"
-msgstr ""
-
-msgid "Reverse sort order"
+msgid "Show uncompleted todos on top of the lists"
 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 "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 ""
 
@@ -1034,6 +895,9 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
+msgid "Automatically update the application"
+msgstr ""
+
 msgid "Show advanced options"
 msgstr ""
 
@@ -1041,8 +905,8 @@ msgid "Synchronisation target"
 msgstr ""
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
+"The target to synchonise to. If synchronising with the file system, set "
+"`sync.2.path` to specify the target directory."
 msgstr ""
 
 msgid "Directory to synchronise with (absolute path)"
@@ -1053,74 +917,15 @@ 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): %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)."
+msgid "\"%s\": \"%s\""
 msgstr ""
 
 msgid "Sync status (synced items / total items)"
@@ -1168,9 +973,6 @@ msgstr ""
 msgid "Export Debug Report"
 msgstr ""
 
-msgid "Encryption Config"
-msgstr ""
-
 msgid "Configuration"
 msgstr ""
 
@@ -1181,9 +983,6 @@ msgstr ""
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr ""
 
-msgid "Press to set the decryption password."
-msgstr ""
-
 msgid "Select date"
 msgstr ""
 
@@ -1193,26 +992,6 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
-msgid "Joplin website"
-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 ""
@@ -1220,12 +999,6 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
-msgid "Show all"
-msgstr ""
-
-msgid "Errors only"
-msgstr ""
-
 msgid "This note has been modified:"
 msgstr ""
 

CliClient/locales/hr_HR.po

@@ -17,12 +17,69 @@ 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"
 
@@ -59,9 +116,6 @@ 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"
@@ -126,36 +180,6 @@ 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."
 
@@ -178,28 +202,19 @@ 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 path. By default, it will export the "
+"Exports Joplin data to the given directory. 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."
 
@@ -212,10 +227,6 @@ 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."
 
@@ -259,21 +270,29 @@ 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 list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr "Za potpunu listu mogućih prečaca, upiši `help shortcuts`"
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Source format: %s"
-msgstr "Ne postoji naredba: %s"
+msgid "Imports an Evernote notebook file (.enex file)."
+msgstr "Uvozi Evernote bilježnicu (.enex datoteku)."
 
 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."
@@ -414,16 +433,6 @@ 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)."
-
-#, 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."
 
@@ -435,6 +444,12 @@ 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)"
@@ -510,10 +525,6 @@ 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:"
 
@@ -555,25 +566,6 @@ 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"
 
@@ -586,19 +578,11 @@ msgstr "Novi zadatak"
 msgid "New notebook"
 msgstr "Nova bilježnica"
 
-msgid "Import"
-msgstr "Uvoz"
+msgid "Import Evernote notes"
+msgstr "Uvezi Evernote bilješke"
 
-#, fuzzy
-msgid "Export"
-msgstr "Uvoz"
-
-msgid "Print"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
-msgstr ""
+msgid "Evernote Export Files"
+msgstr "Evernote izvozne datoteke"
 
 msgid "Quit"
 msgstr "Izađi"
@@ -618,23 +602,13 @@ msgstr "Zalijepi"
 msgid "Search in all the notes"
 msgstr "Pretraži u svim bilješkama"
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr "Alati"
 
 msgid "Synchronisation status"
 msgstr "Status sinkronizacije"
 
-msgid "Encryption options"
-msgstr ""
-
-#, fuzzy
-msgid "General Options"
+msgid "Options"
 msgstr "Opcije"
 
 msgid "Help"
@@ -643,13 +617,6 @@ 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"
 
@@ -657,36 +624,12 @@ 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"
@@ -743,21 +686,19 @@ 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 "Status"
 msgstr "Status"
 
 msgid "Encryption is:"
 msgstr ""
 
+#, fuzzy
+msgid "Enabled"
+msgstr "Onemogućeno"
+
+msgid "Disabled"
+msgstr "Onemogućeno"
+
 msgid "Back"
 msgstr "Natrag"
 
@@ -771,9 +712,15 @@ 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:"
 
@@ -789,9 +736,6 @@ msgstr "Preimenuj bilježnicu:"
 msgid "Set alarm:"
 msgstr "Postavi upozorenje:"
 
-msgid "Search"
-msgstr "Traži"
-
 msgid "Layout"
 msgstr "Izgled"
 
@@ -827,13 +771,6 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Ovdje nema bilježnica. Stvori novu pritiskom na \"Nova bilježnica\"."
 
-msgid "Open..."
-msgstr ""
-
-#, fuzzy
-msgid "Save as..."
-msgstr "Spremi promjene"
-
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana poveznica ili poruka: %s"
@@ -841,30 +778,9 @@ 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"
 
@@ -874,8 +790,8 @@ msgstr "Očisti"
 msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
-msgid "Options"
-msgstr "Opcije"
+msgid "Import"
+msgstr "Uvoz"
 
 msgid "Synchronisation Status"
 msgstr "Status Sinkronizacije"
@@ -898,6 +814,9 @@ msgstr "Sinkroniziraj"
 msgid "Notebooks"
 msgstr "Bilježnice"
 
+msgid "Tags"
+msgstr "Oznake"
+
 msgid "Searches"
 msgstr "Pretraživanja"
 
@@ -915,18 +834,12 @@ msgstr "Nepoznata zastavica: %s"
 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"
@@ -983,10 +896,6 @@ msgstr "Obrisane lokalne stavke: %d."
 msgid "Deleted remote items: %d."
 msgstr "Obrisane udaljene stavke: %d."
 
-#, fuzzy, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr "Stvorene lokalne stavke: %d."
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr "Stanje: \"%s\"."
@@ -998,27 +907,10 @@ 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"
 
@@ -1072,52 +964,12 @@ msgstr "Svijetla"
 msgid "Dark"
 msgstr "Tamna"
 
-#, fuzzy
-msgid "Uncompleted to-dos on top"
+msgid "Show uncompleted todos on top of the lists"
 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 "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"
 
@@ -1133,6 +985,9 @@ 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"
 
@@ -1140,9 +995,11 @@ msgid "Synchronisation target"
 msgstr "Sinkroniziraj sa"
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
+"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 "Directory to synchronise with (absolute path)"
 msgstr "Direktorij za sinkroniziranje (apsolutna putanja)"
@@ -1154,78 +1011,16 @@ 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"
 
-#, 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 ""
+#, javascript-format
+msgid "\"%s\": \"%s\""
+msgstr "\"%s\": \"%s\""
 
 msgid "Sync status (synced items / total items)"
 msgstr "Status (sinkronizirane stavke / ukupni broj stavki)"
@@ -1272,9 +1067,6 @@ msgstr "Log"
 msgid "Export Debug Report"
 msgstr "Izvezi Debug izvještaj"
 
-msgid "Encryption Config"
-msgstr ""
-
 msgid "Configuration"
 msgstr "Konfiguracija"
 
@@ -1285,9 +1077,6 @@ 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"
 
@@ -1297,27 +1086,6 @@ msgstr "Potvrdi"
 msgid "Cancel synchronisation"
 msgstr "Prekini sinkronizaciju"
 
-msgid "Joplin website"
-msgstr ""
-
-#, 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"
@@ -1325,12 +1093,6 @@ 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:"
 
@@ -1383,95 +1145,3 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
 
 msgid "Welcome"
 msgstr "Dobro došli"
-
-#, 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,12 +16,65 @@ 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"
 
@@ -59,9 +112,6 @@ 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"
@@ -124,36 +174,6 @@ 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."
 
@@ -173,29 +193,20 @@ 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 path. By default, it will export the "
+"Exports Joplin data to the given directory. 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."
 
@@ -208,10 +219,6 @@ 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."
 
@@ -254,22 +261,30 @@ 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 list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr ""
 "Per la lista completa delle scorciatoie disponibili, digita `help shortcuts`"
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Source format: %s"
-msgstr "Nessun comando: %s"
+msgid "Imports an Evernote notebook file (.enex file)."
+msgstr "Importa un file blocco note di Evernote (.enex file)."
 
 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."
@@ -401,16 +416,6 @@ 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)."
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-
 msgid "Synchronisation is already in progress."
 msgstr "La sincronizzazione è in corso."
 
@@ -424,6 +429,12 @@ 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)"
@@ -496,10 +507,6 @@ 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:"
 
@@ -537,25 +544,6 @@ 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"
 
@@ -568,19 +556,11 @@ msgstr "Nuova attività"
 msgid "New notebook"
 msgstr "Nuovo blocco note"
 
-msgid "Import"
-msgstr "Importa"
+msgid "Import Evernote notes"
+msgstr "Importa le note da Evernote"
 
-#, fuzzy
-msgid "Export"
-msgstr "Importa"
-
-msgid "Print"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
-msgstr ""
+msgid "Evernote Export Files"
+msgstr "Esposta i files di Evernote"
 
 msgid "Quit"
 msgstr "Esci"
@@ -600,23 +580,13 @@ msgstr "Incolla"
 msgid "Search in all the notes"
 msgstr "Cerca in tutte le note"
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr "Strumenti"
 
 msgid "Synchronisation status"
 msgstr "Stato di sincronizzazione"
 
-msgid "Encryption options"
-msgstr ""
-
-#, fuzzy
-msgid "General Options"
+msgid "Options"
 msgstr "Opzioni"
 
 msgid "Help"
@@ -625,13 +595,6 @@ 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"
 
@@ -639,36 +602,12 @@ 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 ""
@@ -727,21 +666,19 @@ 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 "Status"
 msgstr "Stato"
 
 msgid "Encryption is:"
 msgstr ""
 
+#, fuzzy
+msgid "Enabled"
+msgstr "Disabilitato"
+
+msgid "Disabled"
+msgstr "Disabilitato"
+
 msgid "Back"
 msgstr "Indietro"
 
@@ -753,9 +690,15 @@ 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:"
 
@@ -771,9 +714,6 @@ msgstr "Rinomina il blocco note:"
 msgid "Set alarm:"
 msgstr "Imposta allarme:"
 
-msgid "Search"
-msgstr "Cerca"
-
 msgid "Layout"
 msgstr "Disposizione"
 
@@ -810,13 +750,6 @@ 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"
@@ -824,30 +757,9 @@ 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"
 
@@ -857,8 +769,8 @@ msgstr "Pulisci"
 msgid "OneDrive Login"
 msgstr "Login OneDrive"
 
-msgid "Options"
-msgstr "Opzioni"
+msgid "Import"
+msgstr "Importa"
 
 msgid "Synchronisation Status"
 msgstr "Stato della Sincronizzazione"
@@ -881,6 +793,9 @@ msgstr "Sincronizza"
 msgid "Notebooks"
 msgstr "Blocchi note"
 
+msgid "Tags"
+msgstr "Etichette"
+
 msgid "Searches"
 msgstr "Ricerche"
 
@@ -899,18 +814,12 @@ msgstr "Etichetta sconosciuta: %s"
 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"
@@ -969,10 +878,6 @@ msgstr "Elementi locali eliminati: %d."
 msgid "Deleted remote items: %d."
 msgstr "Elementi remoti eliminati: %d."
 
-#, fuzzy, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr "Elementi locali creati: %d."
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr "Stato: \"%s\"."
@@ -984,27 +889,10 @@ 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"
 
@@ -1058,52 +946,12 @@ msgstr "Chiaro"
 msgid "Dark"
 msgstr "Scuro"
 
-#, fuzzy
-msgid "Uncompleted to-dos on top"
+msgid "Show uncompleted todos on top of the lists"
 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 "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"
 
@@ -1119,6 +967,9 @@ 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"
 
@@ -1126,9 +977,12 @@ msgid "Synchronisation target"
 msgstr "Destinazione di sincronizzazione"
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
+"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 "Directory to synchronise with (absolute path)"
 msgstr ""
@@ -1140,78 +994,16 @@ 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"
 
-#, 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 ""
+#, javascript-format
+msgid "\"%s\": \"%s\""
+msgstr "\"%s\": \"%s\""
 
 msgid "Sync status (synced items / total items)"
 msgstr "Stato di sincronizzazione (Elementi sincronizzati / Elementi totali)"
@@ -1258,9 +1050,6 @@ msgstr "Log"
 msgid "Export Debug Report"
 msgstr "Esporta il Report di Debug"
 
-msgid "Encryption Config"
-msgstr ""
-
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -1271,9 +1060,6 @@ 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"
 
@@ -1283,27 +1069,6 @@ msgstr "Conferma"
 msgid "Cancel synchronisation"
 msgstr "Cancella la sincronizzazione"
 
-msgid "Joplin website"
-msgstr ""
-
-#, 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"
@@ -1311,12 +1076,6 @@ 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:"
 
@@ -1372,96 +1131,6 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvenuto"
 
-#, 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,12 +16,63 @@ 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\"と入力してください"
 
@@ -59,9 +110,6 @@ 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"
@@ -123,36 +171,6 @@ 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 "ノートを編集する。"
 
@@ -172,28 +190,19 @@ 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 path. By default, it will export the "
+"Exports Joplin data to the given directory. 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 "選択されたノートのみを出力する。"
 
@@ -206,10 +215,6 @@ 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モードではショートカットは使用できません。"
 
@@ -249,23 +254,31 @@ msgstr "コマンドラインモードに入るには、\":\"を入力してく
 msgid "To exit command line mode, press ESCAPE"
 msgstr "コマンドラインモードを終了するには、ESCキーを押してください。"
 
-#, fuzzy
 msgid ""
-"For the list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr ""
 "有効なすべてのキーボードショートカットを表示するには、`help shortcuts`と入力"
 "してください。"
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Source format: %s"
-msgstr "コマンドが違います：%s"
+msgid "Imports an Evernote notebook file (.enex file)."
+msgstr "Evernoteノートブックファイル(.enex)のインポート"
 
 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"
@@ -400,14 +413,6 @@ 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 "認証は完了していません(認証トークンが得られませんでした)"
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-
 msgid "Synchronisation is already in progress."
 msgstr "同期はすでに実行中です。"
 
@@ -420,6 +425,10 @@ msgstr ""
 "ロックファイルがすでに保持されています。同期作業が行われていない場合は、\"%s"
 "\"にあるロックファイルを削除して、作業を再度行ってください。"
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+msgstr "認証は完了していません(認証トークンが得られませんでした)"
+
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "同期先: %s (%s)"
@@ -492,10 +501,6 @@ msgstr "規定値: %s"
 msgid "Possible keys/values:"
 msgstr "取り得るキーバリュー: "
 
-#, fuzzy
-msgid "Type `joplin help` for usage information."
-msgstr "使い方を表示する。"
-
 msgid "Fatal error:"
 msgstr "致命的なエラー: "
 
@@ -538,25 +543,6 @@ 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 "ファイル"
 
@@ -569,19 +555,11 @@ msgstr "新しいToDo"
 msgid "New notebook"
 msgstr "新しいノートブック"
 
-msgid "Import"
-msgstr "インポート"
+msgid "Import Evernote notes"
+msgstr "Evernoteのインポート"
 
-#, fuzzy
-msgid "Export"
-msgstr "インポート"
-
-msgid "Print"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
-msgstr ""
+msgid "Evernote Export Files"
+msgstr "Evernote Exportファイル"
 
 msgid "Quit"
 msgstr "終了"
@@ -601,23 +579,13 @@ msgstr "貼り付け"
 msgid "Search in all the notes"
 msgstr "すべてのノートを検索"
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr "ツール"
 
 msgid "Synchronisation status"
 msgstr "同期状況"
 
-msgid "Encryption options"
-msgstr ""
-
-#, fuzzy
-msgid "General Options"
+msgid "Options"
 msgstr "オプション"
 
 msgid "Help"
@@ -626,13 +594,6 @@ msgstr "ヘルプ"
 msgid "Website and documentation"
 msgstr "Webサイトとドキュメント"
 
-#, fuzzy
-msgid "Make a donation"
-msgstr "Webサイトとドキュメント"
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "About Joplin"
 msgstr "Joplinについて"
 
@@ -640,35 +601,12 @@ 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に保存されます。"
@@ -729,21 +667,19 @@ 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 "Status"
 msgstr "状態"
 
 msgid "Encryption is:"
 msgstr ""
 
+#, fuzzy
+msgid "Enabled"
+msgstr "無効"
+
+msgid "Disabled"
+msgstr "無効"
+
 msgid "Back"
 msgstr "戻る"
 
@@ -757,9 +693,15 @@ 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 "ノートブックの題名："
 
@@ -775,9 +717,6 @@ msgstr "ノートブックの名前を変更："
 msgid "Set alarm:"
 msgstr "アラームをセット："
 
-msgid "Search"
-msgstr "検索"
-
 msgid "Layout"
 msgstr "レイアウト"
 
@@ -813,13 +752,6 @@ 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 ""
@@ -827,30 +759,9 @@ 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 "更新"
 
@@ -860,8 +771,8 @@ msgstr "クリア"
 msgid "OneDrive Login"
 msgstr "OneDriveログイン"
 
-msgid "Options"
-msgstr "オプション"
+msgid "Import"
+msgstr "インポート"
 
 msgid "Synchronisation Status"
 msgstr "同期状況"
@@ -884,6 +795,9 @@ msgstr "同期"
 msgid "Notebooks"
 msgstr "ノートブック"
 
+msgid "Tags"
+msgstr "タグ"
+
 msgid "Searches"
 msgstr "検索"
 
@@ -901,18 +815,12 @@ msgstr "不明なフラグ: %s"
 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 ""
@@ -971,10 +879,6 @@ msgstr "ローカルアイテムの削除: %d."
 msgid "Deleted remote items: %d."
 msgstr "リモートアイテムの削除: %d."
 
-#, fuzzy, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr "ローカルアイテムの作成: %d."
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr "状態: \"%s\"。"
@@ -986,27 +890,10 @@ 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 "衝突"
 
@@ -1062,52 +949,12 @@ msgstr "明るい"
 msgid "Dark"
 msgstr "暗い"
 
-#, fuzzy
-msgid "Uncompleted to-dos on top"
+msgid "Show uncompleted todos on top of the lists"
 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 "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 "同期間隔"
 
@@ -1123,6 +970,9 @@ msgstr "%d 時間"
 msgid "%d hours"
 msgstr "%d 時間"
 
+msgid "Automatically update the application"
+msgstr "アプリケーションの自動更新"
+
 msgid "Show advanced options"
 msgstr "詳細な設定の表示"
 
@@ -1130,9 +980,11 @@ msgid "Synchronisation target"
 msgstr "同期先"
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
+"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 "Directory to synchronise with (absolute path)"
 msgstr "同期先のディレクトリ(絶対パス)"
@@ -1144,77 +996,15 @@ 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): %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)."
+msgid "\"%s\": \"%s\""
 msgstr ""
 
 msgid "Sync status (synced items / total items)"
@@ -1262,9 +1052,6 @@ msgstr "ログ"
 msgid "Export Debug Report"
 msgstr "デバッグレポートの出力"
 
-msgid "Encryption Config"
-msgstr ""
-
 msgid "Configuration"
 msgstr "設定"
 
@@ -1275,9 +1062,6 @@ msgstr "ノートブックへ移動..."
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr "%d個のノートを\"%s\"に移動しますか？"
 
-msgid "Press to set the decryption password."
-msgstr ""
-
 msgid "Select date"
 msgstr "日付の選択"
 
@@ -1287,27 +1071,6 @@ msgstr "確認"
 msgid "Cancel synchronisation"
 msgstr "同期の中止"
 
-msgid "Joplin website"
-msgstr ""
-
-#, 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"
@@ -1315,12 +1078,6 @@ msgstr "ノートブックは保存できませんでした：%s"
 msgid "Edit notebook"
 msgstr "ノートブックの編集"
 
-msgid "Show all"
-msgstr ""
-
-msgid "Errors only"
-msgstr ""
-
 msgid "This note has been modified:"
 msgstr "ノートは変更されています："
 
@@ -1375,86 +1132,3 @@ msgstr ""
 
 msgid "Welcome"
 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,12 +15,63 @@ 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 ""
 
@@ -57,9 +108,6 @@ 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 ""
@@ -117,35 +165,6 @@ 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 ""
 
@@ -163,10 +182,6 @@ 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 ""
 
@@ -174,14 +189,10 @@ msgid "Exits the application."
 msgstr ""
 
 msgid ""
-"Exports Joplin data to the given path. By default, it will export the "
+"Exports Joplin data to the given directory. 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 ""
 
@@ -194,10 +205,6 @@ 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 ""
 
@@ -233,19 +240,25 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr ""
 
 msgid ""
-"For the list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr ""
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, javascript-format
-msgid "Source format: %s"
+msgid "Imports an Evernote notebook file (.enex file)."
 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 ""
@@ -368,14 +381,6 @@ 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 ""
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-
 msgid "Synchronisation is already in progress."
 msgstr ""
 
@@ -386,6 +391,10 @@ msgid ""
 "operation."
 msgstr ""
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -449,9 +458,6 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
-msgid "Type `joplin help` for usage information."
-msgstr ""
-
 msgid "Fatal error:"
 msgstr ""
 
@@ -482,24 +488,6 @@ 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 ""
 
@@ -512,17 +500,10 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import"
+msgid "Import Evernote notes"
 msgstr ""
 
-msgid "Export"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
+msgid "Evernote Export Files"
 msgstr ""
 
 msgid "Quit"
@@ -543,22 +524,13 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr ""
 
 msgid "Synchronisation status"
 msgstr ""
 
-msgid "Encryption options"
-msgstr ""
-
-msgid "General Options"
+msgid "Options"
 msgstr ""
 
 msgid "Help"
@@ -567,12 +539,6 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
-msgid "Make a donation"
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "About Joplin"
 msgstr ""
 
@@ -580,34 +546,12 @@ 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 ""
@@ -664,21 +608,18 @@ 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 "Status"
 msgstr ""
 
 msgid "Encryption is:"
 msgstr ""
 
+msgid "Enabled"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
 msgid "Back"
 msgstr ""
 
@@ -690,9 +631,15 @@ 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 ""
 
@@ -708,9 +655,6 @@ msgstr ""
 msgid "Set alarm:"
 msgstr ""
 
-msgid "Search"
-msgstr ""
-
 msgid "Layout"
 msgstr ""
 
@@ -745,12 +689,6 @@ 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 ""
@@ -758,28 +696,9 @@ 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 ""
 
@@ -789,7 +708,7 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Options"
+msgid "Import"
 msgstr ""
 
 msgid "Synchronisation Status"
@@ -813,6 +732,9 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Searches"
 msgstr ""
 
@@ -830,18 +752,12 @@ 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 ""
@@ -892,10 +808,6 @@ msgstr ""
 msgid "Deleted remote items: %d."
 msgstr ""
 
-#, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr ""
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr ""
@@ -907,26 +819,10 @@ 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 ""
 
@@ -978,47 +874,12 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Uncompleted to-dos on top"
-msgstr ""
-
-msgid "Sort notes by"
-msgstr ""
-
-msgid "Reverse sort order"
+msgid "Show uncompleted todos on top of the lists"
 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 "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 ""
 
@@ -1034,6 +895,9 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
+msgid "Automatically update the application"
+msgstr ""
+
 msgid "Show advanced options"
 msgstr ""
 
@@ -1041,8 +905,8 @@ msgid "Synchronisation target"
 msgstr ""
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
+"The target to synchonise to. If synchronising with the file system, set "
+"`sync.2.path` to specify the target directory."
 msgstr ""
 
 msgid "Directory to synchronise with (absolute path)"
@@ -1053,74 +917,15 @@ 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): %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)."
+msgid "\"%s\": \"%s\""
 msgstr ""
 
 msgid "Sync status (synced items / total items)"
@@ -1168,9 +973,6 @@ msgstr ""
 msgid "Export Debug Report"
 msgstr ""
 
-msgid "Encryption Config"
-msgstr ""
-
 msgid "Configuration"
 msgstr ""
 
@@ -1181,9 +983,6 @@ msgstr ""
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr ""
 
-msgid "Press to set the decryption password."
-msgstr ""
-
 msgid "Select date"
 msgstr ""
 
@@ -1193,26 +992,6 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
-msgid "Joplin website"
-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 ""
@@ -1220,12 +999,6 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
-msgid "Show all"
-msgstr ""
-
-msgid "Errors only"
-msgstr ""
-
 msgid "This note has been modified:"
 msgstr ""
 

CliClient/locales/ru_RU.po

@@ -7,22 +7,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Artyom Karlov <artyom.karlov@gmail.com>\n"
+"Last-Translator: rtmkrlv <artyom.karlov@gmail.com>\n"
 "Language-Team: \n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.4\n"
 "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 "Переключиться на следующую панель"
+
+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 "[tc] переключить консоль между развёрнутой/свёрнутой/скрытой/видимой."
+
+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 "[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»"
 
@@ -60,9 +111,6 @@ 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"
@@ -72,7 +120,7 @@ msgid "%s: %s"
 msgstr "%s: %s"
 
 msgid "Your choice: "
-msgstr "Ваш выбор: "
+msgstr "Ваш выбор:"
 
 #, javascript-format
 msgid "Invalid answer: %s"
@@ -125,39 +173,6 @@ msgstr "Отмечает задачу как завершённую."
 msgid "Note is not a to-do: \"%s\""
 msgstr "Заметка не является задачей: «%s»"
 
-msgid ""
-"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status` and `target-status`."
-msgstr ""
-"Управляет конфигурацией E2EE. Команды: `enable`, `disable`, `decrypt`, "
-"`status` и `target-status`."
-
-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 "Шифрование: %s"
-
 msgid "Edit note."
 msgstr "Редактировать заметку."
 
@@ -179,10 +194,6 @@ msgstr ""
 "Запуск редактирования заметки. Закройте редактор, чтобы вернуться к "
 "командной строке."
 
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Ошибка при открытии заметки в редакторе: %s"
-
 msgid "Note has been saved."
 msgstr "Заметка сохранена."
 
@@ -190,16 +201,12 @@ msgid "Exits the application."
 msgstr "Выход из приложения."
 
 msgid ""
-"Exports Joplin data to the given path. By default, it will export the "
+"Exports Joplin data to the given directory. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
-"Экспортирует данные Joplin по заданному пути. По умолчанию экспортируется "
+"Экспортирует данные Joplin в заданный каталог. По умолчанию экспортируется "
 "полная база данных, включая блокноты, заметки, теги и ресурсы."
 
-#, javascript-format
-msgid "Destination format: %s"
-msgstr "Целевой формат: %s"
-
 msgid "Exports only the given note."
 msgstr "Экспортирует только заданную заметку."
 
@@ -212,10 +219,6 @@ msgstr "Выводит URL геолокации для заметки."
 msgid "Displays usage information."
 msgstr "Выводит информацию об использовании."
 
-#, javascript-format
-msgid "For information on how to customise the shortcuts please visit %s"
-msgstr "Информацию по настройке сочетаний можно получить, посетив %s"
-
 msgid "Shortcuts are not available in CLI mode."
 msgstr "Ярлыки недоступны в режиме командной строки."
 
@@ -240,7 +243,7 @@ msgstr ""
 "элемент."
 
 msgid "To move from one pane to another, press Tab or Shift+Tab."
-msgstr "Чтобы переключаться между панелями, нажимайте Tab или Shift+Tab."
+msgstr "Чтобы переключаться между панелями, нажимайте Tab или Shift+Tab"
 
 msgid ""
 "Use the arrows and page up/down to scroll the lists and text areas "
@@ -259,21 +262,29 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr "Чтобы выйти из режима командной строки, нажмите ESCAPE"
 
 msgid ""
-"For the list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr ""
-"Для просмотра списка клавиатурных сочетаний и настроек конфигурации введите "
-"`help keymap`"
+"Для просмотра списка доступных клавиатурных сочетаний введите `help "
+"shortcuts`."
 
-msgid "Imports data into Joplin."
-msgstr "Импортирует данные в Joplin."
-
-#, javascript-format
-msgid "Source format: %s"
-msgstr "Исходный формат: %s"
+msgid "Imports an Evernote notebook file (.enex file)."
+msgstr "Импортирует файл блокнотов Evernote (.enex-файл)."
 
 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."
@@ -410,15 +421,6 @@ msgstr ""
 "Синхронизация с заданной целью (по умолчанию — значение конфигурации sync."
 "target)"
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr "Аутентификация не была завершена (не получен токен аутентификации)."
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-"Не аутентифицировано с %s. Пожалуйста, предоставьте все недостающие данные."
-
 msgid "Synchronisation is already in progress."
 msgstr "Синхронизация уже выполняется."
 
@@ -432,6 +434,10 @@ msgstr ""
 "производится, вы можете удалить файл блокировки в «%s» и возобновить "
 "операцию."
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+msgstr "Аутентификация не была завершена (не получен токен аутентификации)."
+
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "Цель синхронизации: %s (%s)"
@@ -505,9 +511,6 @@ msgstr "По умолчанию: %s"
 msgid "Possible keys/values:"
 msgstr "Возможные ключи/значения:"
 
-msgid "Type `joplin help` for usage information."
-msgstr "Введите `joplin help` для получения информации об использовании."
-
 msgid "Fatal error:"
 msgstr "Фатальная ошибка:"
 
@@ -550,28 +553,6 @@ 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 ""
-"Один или несколько элементов сейчас зашифрованы и может потребоваться, чтобы "
-"вы предоставили мастер-пароль. Для этого введите, пожалуйста, «e2ee "
-"decrypt». Если пароль уже был вами предоставлен, зашифрованные элементы "
-"расшифруются в фоновом режиме и вскоре станут доступны."
-
-#, javascript-format
-msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr "Экспорт в «%s» в формате «%s». Пожалуйста, ожидайте..."
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Импорт из «%s» в формате «%s». Пожалуйста, ожидайте..."
-
-msgid "PDF File"
-msgstr "PDF-файл"
-
 msgid "File"
 msgstr "Файл"
 
@@ -584,24 +565,17 @@ msgstr "Новая задача"
 msgid "New notebook"
 msgstr "Новый блокнот"
 
-msgid "Import"
-msgstr "Импорт"
+msgid "Import Evernote notes"
+msgstr "Импортировать заметки из Evernote"
 
-msgid "Export"
-msgstr "Экспорт"
-
-msgid "Print"
-msgstr "Печать"
-
-#, javascript-format
-msgid "Hide %s"
-msgstr "Скрыть %s"
+msgid "Evernote Export Files"
+msgstr "Файлы экспорта Evernote"
 
 msgid "Quit"
 msgstr "Выход"
 
 msgid "Edit"
-msgstr "Правка"
+msgstr "Редактировать"
 
 msgid "Copy"
 msgstr "Копировать"
@@ -615,23 +589,14 @@ msgstr "Вставить"
 msgid "Search in all the notes"
 msgstr "Поиск во всех заметках"
 
-msgid "View"
-msgstr "Вид"
-
-msgid "Toggle editor layout"
-msgstr "Переключить вид редактора"
-
 msgid "Tools"
 msgstr "Инструменты"
 
 msgid "Synchronisation status"
 msgstr "Статус синхронизации"
 
-msgid "Encryption options"
-msgstr "Настройки шифрования"
-
-msgid "General Options"
-msgstr "Основные настройки"
+msgid "Options"
+msgstr "Настройки"
 
 msgid "Help"
 msgstr "Помощь"
@@ -639,12 +604,6 @@ msgstr "Помощь"
 msgid "Website and documentation"
 msgstr "Сайт и документация"
 
-msgid "Make a donation"
-msgstr "Сделать пожертвование"
-
-msgid "Check for updates..."
-msgstr "Проверить обновления..."
-
 msgid "About Joplin"
 msgstr "О Joplin"
 
@@ -652,34 +611,12 @@ msgstr "О Joplin"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
-#, javascript-format
-msgid "Open %s"
-msgstr "Открыть %s"
-
-msgid "Exit"
-msgstr "Выход"
-
 msgid "OK"
 msgstr "OK"
 
 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 "Заметки и настройки сохранены в: %s"
@@ -692,9 +629,6 @@ msgid ""
 "re-synchronised and sent unencrypted to the sync target. Do you wish to "
 "continue?"
 msgstr ""
-"Отключение шифрования означает, что *все* ваши заметки и вложения будут "
-"пересинхронизированы и отправлены в расшифрованном виде к цели "
-"синхронизации. Желаете продолжить?"
 
 msgid ""
 "Enabling encryption means *all* your notes and attachments are going to be "
@@ -702,23 +636,18 @@ msgid ""
 "password as, for security purposes, this will be the *only* way to decrypt "
 "the data! To enable encryption, please enter your password below."
 msgstr ""
-"Включение шифрования означает, что *все* ваши заметки и вложения будут "
-"пересинхронизированы и отправлены в зашифрованном виде к цели синхронизации. "
-"Не теряйте пароль, так как в целях безопасности *только* с его помощью можно "
-"будет расшифровать данные! Чтобы включить шифрование, введите ваш пароль "
-"ниже."
 
 msgid "Disable encryption"
-msgstr "Отключить шифрование"
+msgstr ""
 
 msgid "Enable encryption"
-msgstr "Включить шифрование"
+msgstr ""
 
 msgid "Master Keys"
-msgstr "Мастер-ключи"
+msgstr ""
 
 msgid "Active"
-msgstr "Активен"
+msgstr ""
 
 msgid "ID"
 msgstr "ID"
@@ -727,44 +656,35 @@ msgid "Source"
 msgstr "Источник"
 
 msgid "Created"
-msgstr "Создан"
+msgstr "Создана"
 
 msgid "Updated"
-msgstr "Обновлён"
+msgstr "Обновлена"
 
 msgid "Password"
-msgstr "Пароль"
+msgstr ""
 
 msgid "Password OK"
-msgstr "Пароль OK"
+msgstr ""
 
 msgid ""
 "Note: Only one master key is going to be used for encryption (the one marked "
 "as \"active\"). Any of the keys might be used for decryption, depending on "
 "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 ""
-"Мастер-ключи с такими ID используются для шифрования некоторых из ваших "
-"элементов, однако у приложения сейчас нет к ним доступа. Скорее всего, они "
-"загрузятся при синхронизации."
 
 msgid "Status"
 msgstr "Статус"
 
 msgid "Encryption is:"
-msgstr "Шифрование:"
+msgstr ""
+
+#, fuzzy
+msgid "Enabled"
+msgstr "Отключена"
+
+msgid "Disabled"
+msgstr "Отключена"
 
 msgid "Back"
 msgstr "Назад"
@@ -777,9 +697,15 @@ msgstr "Будет создан новый блокнот «%s» и в него
 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 "Название блокнота:"
 
@@ -795,9 +721,6 @@ msgstr "Переименовать блокнот:"
 msgid "Set alarm:"
 msgstr "Установить напоминание:"
 
-msgid "Search"
-msgstr "Поиск"
-
 msgid "Layout"
 msgstr "Вид"
 
@@ -807,11 +730,12 @@ msgstr "Некоторые элементы не могут быть синхр
 msgid "View them now"
 msgstr "Просмотреть их сейчас"
 
+#, fuzzy
 msgid "Some items cannot be decrypted."
-msgstr "Некоторые элементы не могут быть расшифрованы."
+msgstr "Некоторые элементы не могут быть синхронизированы."
 
 msgid "Set the password"
-msgstr "Установить пароль"
+msgstr ""
 
 msgid "Add or remove tags"
 msgstr "Добавить или удалить теги"
@@ -832,12 +756,6 @@ 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 "Неподдерживаемая ссыка или сообщение: %s"
@@ -845,30 +763,9 @@ 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 ""
-"Заметка пуста. Нажмите на «%s», чтобы переключиться в редактор и "
-"отредактировать её."
-
-msgid "to-do"
-msgstr "задача"
-
-msgid "note"
-msgstr "заметка"
-
-#, javascript-format
-msgid "Creating new %s..."
-msgstr "Создание новой %s..."
-
 msgid "Refresh"
 msgstr "Обновить"
 
@@ -878,14 +775,14 @@ msgstr "Очистить"
 msgid "OneDrive Login"
 msgstr "Вход в OneDrive"
 
-msgid "Options"
-msgstr "Настройки"
+msgid "Import"
+msgstr "Импорт"
 
 msgid "Synchronisation Status"
 msgstr "Статус синхронизации"
 
 msgid "Encryption Options"
-msgstr "Настройки шифрования"
+msgstr ""
 
 msgid "Remove this tag from all the notes?"
 msgstr "Убрать этот тег со всех заметок?"
@@ -902,6 +799,9 @@ msgstr "Синхронизировать"
 msgid "Notebooks"
 msgstr "Блокноты"
 
+msgid "Tags"
+msgstr "Теги"
+
 msgid "Searches"
 msgstr "Запросы"
 
@@ -919,18 +819,12 @@ msgstr "Неизвестный флаг: %s"
 msgid "File system"
 msgstr "Файловая система"
 
-msgid "Nextcloud"
-msgstr "Nextcloud"
-
 msgid "OneDrive"
 msgstr "OneDrive"
 
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive Dev (только для тестирования)"
 
-msgid "WebDAV"
-msgstr "WebDAV"
-
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr "Неизвестный уровень лога: %s"
@@ -989,10 +883,6 @@ msgstr "Удалено локальных элементов: %d."
 msgid "Deleted remote items: %d."
 msgstr "Удалено удалённых элементов: %d."
 
-#, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr "Получено элементов: %d/%d."
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr "Статус: «%s»."
@@ -1004,26 +894,10 @@ msgstr "Отмена..."
 msgid "Completed: %s"
 msgstr "Завершено: %s"
 
-#, javascript-format
-msgid "Last error: %s"
-msgstr "Последняя ошибка: %s"
-
-msgid "Idle"
-msgstr "Простой"
-
-msgid "In progress"
-msgstr "Выполнение"
-
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизация уже выполняется. Статус: %s"
 
-msgid "Encrypted"
-msgstr "Зашифровано"
-
-msgid "Encrypted items cannot be modified"
-msgstr "Зашифрованные элементы не могут быть изменены"
-
 msgid "Conflicts"
 msgstr "Конфликты"
 
@@ -1077,49 +951,12 @@ msgstr "Светлая"
 msgid "Dark"
 msgstr "Тёмная"
 
-msgid "Uncompleted to-dos on top"
-msgstr "Незавершённые задачи сверху"
-
-msgid "Sort notes by"
-msgstr "Сортировать заметки по"
-
-msgid "Reverse sort order"
-msgstr "Обратный порядок сортировки"
+msgid "Show uncompleted todos on top of the lists"
+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 "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 "Интервал синхронизации"
 
@@ -1135,6 +972,9 @@ msgstr "%d час"
 msgid "%d hours"
 msgstr "%d часов"
 
+msgid "Automatically update the application"
+msgstr "Автоматически обновлять приложение"
+
 msgid "Show advanced options"
 msgstr "Показывать расширенные настройки"
 
@@ -1142,11 +982,11 @@ msgid "Synchronisation target"
 msgstr "Цель синхронизации"
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
+"The target to synchonise to. If synchronising with the file system, set "
+"`sync.2.path` to specify the target directory."
 msgstr ""
-"Цель синхронизации. Каждая цель синхронизации может иметь дополнительные "
-"параметры, именованные как «sync.NUM.NAME» (все описаны ниже)."
+"То, с чем будет осуществляться синхронизация. При синхронизации с файловой "
+"системой в `sync.2.path` указывается целевой каталог."
 
 msgid "Directory to synchronise with (absolute path)"
 msgstr "Каталог синхронизации (абсолютный путь)"
@@ -1158,81 +998,16 @@ msgstr ""
 "Путь для синхронизации при включённой синхронизации с файловой системой. См. "
 "`sync.target`."
 
-msgid "Nextcloud WebDAV URL"
-msgstr "Nextcloud WebDAV URL"
-
-msgid "Nextcloud username"
-msgstr "Имя пользователя Nextcloud"
-
-msgid "Nextcloud password"
-msgstr "Пароль Nextcloud"
-
-msgid "WebDAV URL"
-msgstr "URL WebDAV"
-
-msgid "WebDAV username"
-msgstr "Имя пользователя WebDAV"
-
-msgid "WebDAV password"
-msgstr "Пароль WebDAV"
-
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Неверное значение параметра: «%s». Доступные значения: %s."
 
-msgid "Joplin Export File"
-msgstr "Файл экспорта Joplin"
-
-msgid "Markdown"
-msgstr "Markdown"
-
-msgid "Joplin Export Directory"
-msgstr "Папка экспорта Joplin"
-
-msgid "Evernote Export File"
-msgstr "Файл экспорта Evernote"
-
-msgid "Directory"
-msgstr "Директория"
-
-#, javascript-format
-msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr "Не удалось загрузить модуль «%s» для формата «%s»"
-
-#, javascript-format
-msgid "Please specify import format for %s"
-msgstr "Пожалуйста, укажите формат импорта для %s"
-
-#, javascript-format
-msgid ""
-"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
-"decrypted and try again."
-msgstr ""
-"Этот элемент сейчас зашифрован: %s «%s». Пожалуйста, дождитесь расшифровки "
-"всех элементов и попробуйте снова."
-
-msgid "There is no data to export."
-msgstr "Нет данных для экспорта."
-
-msgid "Please specify the notebook where the notes should be imported to."
-msgstr ""
-"Пожалуйста, укажите блокнот, в который должны быть импортированы заметки."
-
 msgid "Items that cannot be synchronised"
 msgstr "Элементы, которые не могут быть синхронизированы"
 
 #, 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 ""
-"Эти элементы будут оставаться на устройстве, но не будут загружены в целевой "
-"объект синхронизации. Чтобы найти эти элементы, воспользуйтесь поиском по "
-"названию или ID (который указывается в скобках выше)."
+msgid "\"%s\": \"%s\""
+msgstr "«%s»: «%s»"
 
 msgid "Sync status (synced items / total items)"
 msgstr "Статус синхронизации (элементов синхронизировано/всего)"
@@ -1279,9 +1054,6 @@ msgstr "Лог"
 msgid "Export Debug Report"
 msgstr "Экспортировать отладочный отчёт"
 
-msgid "Encryption Config"
-msgstr "Конфигурация шифрования"
-
 msgid "Configuration"
 msgstr "Конфигурация"
 
@@ -1292,9 +1064,6 @@ msgstr "Переместить в блокнот..."
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr "Переместить %d заметок в блокнот «%s»?"
 
-msgid "Press to set the decryption password."
-msgstr "Нажмите, чтобы установить пароль для расшифровки."
-
 msgid "Select date"
 msgstr "Выбрать дату"
 
@@ -1304,26 +1073,6 @@ msgstr "Подтвердить"
 msgid "Cancel synchronisation"
 msgstr "Отменить синхронизацию"
 
-msgid "Joplin website"
-msgstr "Сайт Joplin"
-
-#, javascript-format
-msgid "Master Key %s"
-msgstr "Мастер-ключ %s"
-
-#, javascript-format
-msgid "Created: %s"
-msgstr "Создано: %s"
-
-msgid "Password:"
-msgstr "Пароль:"
-
-msgid "Password cannot be empty"
-msgstr "Пароль не может быть пустым"
-
-msgid "Enable"
-msgstr "Включено"
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Не удалось сохранить блокнот: %s"
@@ -1331,12 +1080,6 @@ msgstr "Не удалось сохранить блокнот: %s"
 msgid "Edit notebook"
 msgstr "Редактировать блокнот"
 
-msgid "Show all"
-msgstr "Показать всё"
-
-msgid "Errors only"
-msgstr "Только ошибки"
-
 msgid "This note has been modified:"
 msgstr "Эта заметка была изменена:"
 
@@ -1389,103 +1132,3 @@ msgstr "У вас сейчас нет блокнота. Создайте его
 
 msgid "Welcome"
 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 "Отметить задачу как завершённую/незавершённую"
-
-#~ msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-#~ msgstr ""
-#~ "[tc] переключить консоль между развёрнутой/свёрнутой/скрытой/видимой."
-
-#~ 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 "[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 "Error"
-#~ msgstr "Ошибка"
-
-#~ msgid "Could not download the update: %s"
-#~ msgstr "Не удалось загрузить обновление: %s"
-
-#~ msgid "New version downloaded - application will quit now and update..."
-#~ msgstr ""
-#~ "Новая версия загружена — приложение сейчас будет закрыто и обновлено..."
-
-#~ msgid "Could not install the update: %s"
-#~ msgstr "Не удалось установить обновление: %s"
-
-#~ 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 "Название задачи:"
-
-#~ msgid "\"%s\": \"%s\""
-#~ msgstr "«%s»: «%s»"

CliClient/locales/zh_CN.po

@@ -2,7 +2,7 @@
 # Copyright (C) YEAR Laurent Cozic
 # This file is distributed under the same license as the Joplin-CLI package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -15,12 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\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 "在最大化/最小化/隐藏/显示间切换[t]控制台[c]。"
+
+msgid "Search"
+msgstr "搜索"
+
+msgid "[t]oggle note [m]etadata."
+msgstr "切换[t]笔记元数据[m]。"
+
+msgid "[M]ake a new [n]ote"
+msgstr "创建[M]新笔记[n]"
+
+msgid "[M]ake a new [t]odo"
+msgstr "创建[M]新待办事项[t]"
+
+msgid "[M]ake a new note[b]ook"
+msgstr "创建[M]新笔记本[b]"
+
+msgid "Copy ([Y]ank) the [n]ote to a notebook."
+msgstr "复制[Y]笔记[n]至笔记本。"
+
+msgid "Move the note to a notebook."
+msgstr "移动笔记至笔记本。"
+
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "按Ctrl+D或输入\"exit\"退出程序"
 
@@ -57,9 +108,6 @@ 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"
@@ -120,36 +168,6 @@ msgstr "标记待办事项为完成。"
 msgid "Note is not a to-do: \"%s\""
 msgstr "笔记非待办事项：\"%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 "编辑笔记。"
 
@@ -167,28 +185,19 @@ 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 path. By default, it will export the "
+"Exports Joplin data to the given directory. 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 "仅导出给定笔记。"
 
@@ -201,10 +210,6 @@ 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模式下不可用。"
 
@@ -242,21 +247,26 @@ msgstr "按\":\"键进入命令行模式"
 msgid "To exit command line mode, press ESCAPE"
 msgstr "按ESC键退出命令行模式"
 
-#, fuzzy
 msgid ""
-"For the list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr "输入`help shortcuts`显示全部可用的快捷键列表。"
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Source format: %s"
-msgstr "无以下命令：%s"
+msgid "Imports an Evernote notebook file (.enex file)."
+msgstr "导入Evernote笔记本文件（.enex文件）。"
 
 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条。"
@@ -383,14 +393,6 @@ 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 "认证未完成（未收到认证令牌）。"
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-
 msgid "Synchronisation is already in progress."
 msgstr "同步正在进行中。"
 
@@ -403,6 +405,10 @@ msgstr ""
 "锁定文件已被保留。若当前没有任何正在进行的同步，您可以在\"%s\"删除锁定文件并"
 "继续操作。"
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+msgstr "认证未完成（未收到认证令牌）。"
+
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr "同步目标：%s (%s)"
@@ -471,10 +477,6 @@ msgstr "默认值: %s"
 msgid "Possible keys/values:"
 msgstr "可用键/值："
 
-#, fuzzy
-msgid "Type `joplin help` for usage information."
-msgstr "显示使用信息。"
-
 msgid "Fatal error:"
 msgstr "严重错误："
 
@@ -508,25 +510,6 @@ 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 "文件"
-
 msgid "File"
 msgstr "文件"
 
@@ -539,19 +522,11 @@ msgstr "新待办事项"
 msgid "New notebook"
 msgstr "新笔记本"
 
-msgid "Import"
-msgstr "导入"
+msgid "Import Evernote notes"
+msgstr "导入Evernote笔记"
 
-#, fuzzy
-msgid "Export"
-msgstr "导入"
-
-msgid "Print"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
-msgstr ""
+msgid "Evernote Export Files"
+msgstr "Evernote导出文件"
 
 msgid "Quit"
 msgstr "退出"
@@ -571,23 +546,13 @@ msgstr "粘贴"
 msgid "Search in all the notes"
 msgstr "在所有笔记内搜索"
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr "工具"
 
 msgid "Synchronisation status"
 msgstr "同步状态"
 
-msgid "Encryption options"
-msgstr ""
-
-#, fuzzy
-msgid "General Options"
+msgid "Options"
 msgstr "选项"
 
 msgid "Help"
@@ -596,13 +561,6 @@ msgstr "帮助"
 msgid "Website and documentation"
 msgstr "网站与文档"
 
-#, fuzzy
-msgid "Make a donation"
-msgstr "网站与文档"
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "About Joplin"
 msgstr "关于Joplin"
 
@@ -610,36 +568,12 @@ msgstr "关于Joplin"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
-#, fuzzy, javascript-format
-msgid "Open %s"
-msgstr "%s：%s"
-
-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 ""
-
-#, fuzzy
-msgid "No"
-msgstr "否"
-
-#, fuzzy
-msgid "Check synchronisation configuration"
-msgstr "取消同步"
-
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -698,21 +632,19 @@ 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 "Status"
 msgstr "状态"
 
 msgid "Encryption is:"
 msgstr ""
 
+#, fuzzy
+msgid "Enabled"
+msgstr "已禁止"
+
+msgid "Disabled"
+msgstr "已禁止"
+
 msgid "Back"
 msgstr "返回"
 
@@ -724,9 +656,15 @@ msgstr "将创建新笔记本\"%s\"并将文件\"%s\"导入至其中"
 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 "笔记本标题："
 
@@ -742,9 +680,6 @@ msgstr "重命名笔记本："
 msgid "Set alarm:"
 msgstr "设置提醒："
 
-msgid "Search"
-msgstr "搜索"
-
 msgid "Layout"
 msgstr "布局"
 
@@ -781,13 +716,6 @@ 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 "不支持的链接或信息：%s"
@@ -795,30 +723,9 @@ msgstr "不支持的链接或信息：%s"
 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 "新待办事项"
-
-#, fuzzy
-msgid "note"
-msgstr "新笔记"
-
-#, fuzzy, javascript-format
-msgid "Creating new %s..."
-msgstr "正在导入笔记..."
-
 msgid "Refresh"
 msgstr "刷新"
 
@@ -828,8 +735,8 @@ msgstr "清除"
 msgid "OneDrive Login"
 msgstr "登陆OneDrive"
 
-msgid "Options"
-msgstr "选项"
+msgid "Import"
+msgstr "导入"
 
 msgid "Synchronisation Status"
 msgstr "同步状态"
@@ -852,6 +759,9 @@ msgstr "同步"
 msgid "Notebooks"
 msgstr "笔记本"
 
+msgid "Tags"
+msgstr "标签"
+
 msgid "Searches"
 msgstr "搜索历史"
 
@@ -870,18 +780,12 @@ msgstr "未知标记：%s"
 msgid "File system"
 msgstr "文件系统"
 
-msgid "Nextcloud"
-msgstr ""
-
 msgid "OneDrive"
 msgstr "OneDrive"
 
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive开发员（仅测试用）"
 
-msgid "WebDAV"
-msgstr ""
-
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr "未知日志level：%s"
@@ -937,10 +841,6 @@ msgstr "已删除本地项目: %d。"
 msgid "Deleted remote items: %d."
 msgstr "已删除远程项目: %d。"
 
-#, fuzzy, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr "已新建本地项目: %d。"
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr "状态：\"%s\"。"
@@ -952,27 +852,10 @@ 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 "冲突"
 
@@ -1024,52 +907,12 @@ msgstr "浅色"
 msgid "Dark"
 msgstr "深色"
 
-#, fuzzy
-msgid "Uncompleted to-dos on top"
+msgid "Show uncompleted todos on top of the lists"
 msgstr "在列表上方显示未完成的待办事项"
 
-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 "创建新待办事项。"
-
-#, fuzzy
-msgid "Focus title"
-msgstr "笔记标题："
-
-msgid "Focus body"
-msgstr ""
-
-#, fuzzy
-msgid "When creating a new note:"
-msgstr "创建新笔记。"
-
-msgid "Show tray icon"
-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 "同步间隔"
 
@@ -1085,6 +928,9 @@ msgstr "%d小时"
 msgid "%d hours"
 msgstr "%d小时"
 
+msgid "Automatically update the application"
+msgstr "自动更新此程序"
+
 msgid "Show advanced options"
 msgstr "显示高级选项"
 
@@ -1092,9 +938,9 @@ msgid "Synchronisation target"
 msgstr "同步目标"
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
-msgstr ""
+"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 "Directory to synchronise with (absolute path)"
 msgstr ""
@@ -1104,78 +950,16 @@ msgid ""
 "See `sync.target`."
 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导出文件"
-
-msgid "Markdown"
-msgstr ""
-
-msgid "Joplin Export Directory"
-msgstr ""
-
-#, fuzzy
-msgid "Evernote Export File"
-msgstr "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 "请选择最先删除的笔记或笔记本。"
-
 msgid "Items that cannot be synchronised"
 msgstr "项目无法被同步。"
 
-#, 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 ""
+#, javascript-format
+msgid "\"%s\": \"%s\""
+msgstr "\"%s\": \"%s\""
 
 msgid "Sync status (synced items / total items)"
 msgstr "同步状态（已同步项目/项目总数）"
@@ -1222,9 +1006,6 @@ msgstr "日志"
 msgid "Export Debug Report"
 msgstr "导出调试报告"
 
-msgid "Encryption Config"
-msgstr ""
-
 msgid "Configuration"
 msgstr "配置"
 
@@ -1235,9 +1016,6 @@ msgstr "移动至笔记本..."
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr "移动%d条笔记至笔记本\"%s\"？"
 
-msgid "Press to set the decryption password."
-msgstr ""
-
 msgid "Select date"
 msgstr "选择日期"
 
@@ -1247,27 +1025,6 @@ msgstr "确认"
 msgid "Cancel synchronisation"
 msgstr "取消同步"
 
-msgid "Joplin website"
-msgstr ""
-
-#, 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"
@@ -1275,12 +1032,6 @@ msgstr "此笔记本无法保存：%s"
 msgid "Edit notebook"
 msgstr "编辑笔记本"
 
-msgid "Show all"
-msgstr ""
-
-msgid "Errors only"
-msgstr ""
-
 msgid "This note has been modified:"
 msgstr "此笔记已被修改："
 
@@ -1332,87 +1083,6 @@ msgstr "您当前没有任何笔记本。点击(+)按钮创建新笔记本。"
 msgid "Welcome"
 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 "设置待办事项为已完成或未完成"
-
-#~ msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
-#~ msgstr "在最大化/最小化/隐藏/显示间切换[t]控制台[c]。"
-
-#~ msgid "[t]oggle note [m]etadata."
-#~ msgstr "切换[t]笔记元数据[m]。"
-
-#~ msgid "[M]ake a new [n]ote"
-#~ msgstr "创建[M]新笔记[n]"
-
-#~ msgid "[M]ake a new [t]odo"
-#~ msgstr "创建[M]新待办事项[t]"
-
-#~ msgid "[M]ake a new note[b]ook"
-#~ msgstr "创建[M]新笔记本[b]"
-
-#~ msgid "Copy ([Y]ank) the [n]ote to a notebook."
-#~ msgstr "复制[Y]笔记[n]至笔记本。"
-
-#~ 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 "待办事项标题："
-
-#~ msgid "\"%s\": \"%s\""
-#~ msgstr "\"%s\": \"%s\""
-
 #~ msgid "Delete notebook \"%s\"?"
 #~ msgstr "删除笔记本\"%s\"?"
 

CliClient/package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "joplin",
-  "version": "1.0.100",
+  "version": "0.10.84",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
       "requires": {
         "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
@@ -64,11 +64,6 @@
         }
       }
     },
-    "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",
@@ -90,11 +85,6 @@
       "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",
@@ -207,11 +197,6 @@
         "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",
@@ -426,23 +411,15 @@
       }
     },
     "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
       "requires": {
         "graceful-fs": "4.1.11",
-        "jsonfile": "4.0.0",
+        "jsonfile": "3.0.1",
         "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",
@@ -460,7 +437,7 @@
         "ndarray": "1.0.18",
         "ndarray-pack": "1.2.1",
         "node-bitmap": "0.0.1",
-        "omggif": "1.0.9",
+        "omggif": "1.0.8",
         "parse-data-uri": "0.2.0",
         "pngjs": "2.3.1",
         "request": "2.83.0",
@@ -512,7 +489,7 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "5.5.2",
+        "ajv": "5.3.0",
         "har-schema": "2.0.0"
       }
     },
@@ -751,9 +728,9 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
       "requires": {
         "graceful-fs": "4.1.11"
       }
@@ -866,9 +843,9 @@
       }
     },
     "minizlib": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz",
+      "integrity": "sha512-sN4U9tIJtBRwKbwgFh9qJfrPIQ/GGTRr1MGqkgOeMTLy8/lM0FcWU//FqlnZ3Vb7gJ+Mxh3FOg1EklibdajbaQ==",
       "requires": {
         "minipass": "2.2.1"
       }
@@ -971,9 +948,9 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "omggif": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz",
-      "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8="
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.8.tgz",
+      "integrity": "sha1-F483sqsLPXtG7ToORr0HkLWNNTA="
     },
     "once": {
       "version": "1.4.0",
@@ -1068,11 +1045,6 @@
         "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",
@@ -1127,11 +1099,6 @@
         "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",
@@ -1169,20 +1136,6 @@
         "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": {
@@ -1962,9 +1915,9 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
     "string-kit": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.4.tgz",
-      "integrity": "sha512-imrOojdsXlL6xzfERCxvc/iA9Zwpzbfs+qeP6VB0s0rQVnMc3Nwkyhge0e8Uoayph7PVAwPNmLpohox27G3fgA==",
+      "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==",
       "requires": {
         "xregexp": "3.2.0"
       }
@@ -2027,14 +1980,13 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tar": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz",
-      "integrity": "sha512-gJlTiiErwo96K904FnoYWl+5+FBgS+FimU6GMh66XLdLa55al8+d4jeDfPoGwSNHdtWI5FJP6xurmVqhBuGJpQ==",
+      "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",
-        "fs-minipass": "1.2.5",
         "minipass": "2.2.1",
-        "minizlib": "1.1.0",
+        "minizlib": "1.0.4",
         "mkdirp": "0.5.1",
         "yallist": "3.0.2"
       }
@@ -2062,15 +2014,15 @@
       }
     },
     "terminal-kit": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.14.3.tgz",
-      "integrity": "sha512-ZHtuElnBhK0IXOYNvQ7eYgaArwEoOv7saQc4Q0Z9p02JeC7iajC20/odV77BKB3jw/Qthvf9mpASf8gNDYv7xQ==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.14.0.tgz",
+      "integrity": "sha512-ir0I2QtcBDSg2w0UvohlqdDpGlS3S2UYBG4NnYKnK/4VywgnbfxgdpXN3el0uCH3OeH6fG38luW7RmDM96FqUw==",
       "requires": {
         "async-kit": "2.2.3",
         "get-pixels": "3.3.0",
         "ndarray": "1.0.18",
         "nextgen-events": "0.10.2",
-        "string-kit": "0.6.4",
+        "string-kit": "0.6.3",
         "tree-kit": "0.5.26"
       }
     },
@@ -2080,16 +2032,16 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "tkwidgets": {
-      "version": "0.5.25",
-      "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.25.tgz",
-      "integrity": "sha512-f+12QbxNCLg9Jou5JoPJxATGLmzpDAQeM7QRTXvuqdEB/QvPD9+UlPUL7eYJP1QJv2zzT6EIWWbdpDkXPEtzCQ==",
+      "version": "0.5.20",
+      "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.20.tgz",
+      "integrity": "sha512-9wGsMrrFJvE/6TKUc0dEFFhwxvZLeNsYOxnpy1JCwyk/hYCEF70nuvk7VvJeG4TPaQBaGKPj6c7pCgdREvz4Jw==",
       "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.3",
+        "terminal-kit": "1.14.0",
         "wrap-ansi": "3.0.1"
       },
       "dependencies": {
@@ -2143,15 +2095,6 @@
       "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",
@@ -2196,20 +2139,6 @@
       "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

@@ -14,12 +14,11 @@
     "title": "Joplin CLI",
     "years": [
       2016,
-      2017,
-      2018
+      2017
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.100",
+  "version": "0.10.84",
   "bin": {
     "joplin": "./main.js"
   },
@@ -28,12 +27,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",
+    "fs-extra": "^3.0.1",
     "html-entities": "^1.2.1",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
@@ -44,6 +40,7 @@
     "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",
@@ -56,13 +53,10 @@
     "string-padding": "^1.0.2",
     "string-to-stream": "^1.1.0",
     "strip-ansi": "^4.0.0",
-    "tar": "^4.4.0",
     "tcp-port-used": "^0.1.2",
-    "tkwidgets": "^0.5.25",
-    "url-parse": "^1.2.0",
+    "tkwidgets": "^0.5.20",
     "uuid": "^3.0.1",
     "word-wrap": "^1.2.3",
-    "xml2js": "^0.4.19",
     "yargs-parser": "^7.0.0"
   },
   "devDependencies": {

CliClient/publish.sh

@@ -9,10 +9,4 @@ bash $SCRIPT_DIR/build.sh
 cp "$SCRIPT_DIR/package.json" build/
 cp "$SCRIPT_DIR/../README.md" build/
 cd "$SCRIPT_DIR/build"
-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
+npm publish

CliClient/run.sh

@@ -4,4 +4,4 @@ CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"
 
-# bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/.config/joplin --stack-trace-enabled --log-level debug "$@"
+#bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"

CliClient/run_test.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$ROOT_DIR/tests-build"
-TEST_FILE="$1"
 
 rsync -a --exclude "node_modules/" "$ROOT_DIR/tests/" "$BUILD_DIR/"
 rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
 rsync -a "$ROOT_DIR/build/locales/" "$BUILD_DIR/locales/"
 mkdir -p "$BUILD_DIR/data"
 
-if [[ $TEST_FILE == "" ]]; then
-	(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js tests-build/encryption.js tests-build/ArrayUtils.js tests-build/models_Setting.js tests-build/services_InteropService.js)
-else
-	(cd "$ROOT_DIR" && npm test tests-build/$TEST_FILE.js)
-fi
+(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js)

CliClient/tests/ArrayUtils.js

@@ -1,47 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const ArrayUtils = require('lib/ArrayUtils.js');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-describe('ArrayUtils', function() {
-
-	beforeEach(async (done) => {
-		done();
-	});
-
-	it('should remove array elements', async (done) => {
-		let a = ['un', 'deux', 'trois'];
-		a = ArrayUtils.removeElement(a, 'deux');
-
-		expect(a[0]).toBe('un');
-		expect(a[1]).toBe('trois');
-		expect(a.length).toBe(2);
-
-		a = ['un', 'deux', 'trois'];
-		a = ArrayUtils.removeElement(a, 'not in there');
-		expect(a.length).toBe(3);
-
-		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/encryption.js

@@ -1,180 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const { Database } = require('lib/database.js');
-const Setting = require('lib/models/Setting.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const BaseModel = require('lib/BaseModel.js');
-const MasterKey = require('lib/models/MasterKey');
-const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
-const EncryptionService = require('lib/services/EncryptionService.js');
-
-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
-
-let service = null;
-
-describe('Encryption', function() {
-
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		//await setupDatabaseAndSynchronizer(2);
-		//await switchClient(1);
-		service =  new EncryptionService();
-		BaseItem.encryptionService_ = service;
-		Setting.setValue('encryption.enabled', true);
-		done();
-	});
-
-	it('should encode and decode header', async (done) => {
-		const header = {
-			encryptionMethod: EncryptionService.METHOD_SJCL,
-			masterKeyId: '01234568abcdefgh01234568abcdefgh',
-		};
-
-		const encodedHeader = service.encodeHeader_(header);
-		const decodedHeader = service.decodeHeader_(encodedHeader);
-		delete decodedHeader.length;
-
-		expect(objectsEqual(header, decodedHeader)).toBe(true);
-
-		done();
-	});
-
-	it('should generate and decrypt a master key', async (done) => {
-		const masterKey = await service.generateMasterKey('123456');
-		expect(!!masterKey.checksum).toBe(true);
-		expect(!!masterKey.content).toBe(true);
-
-		let hasThrown = false;
-		try {
-			await service.decryptMasterKey(masterKey, 'wrongpassword');
-		} catch (error) {
-			hasThrown = true;
-		}
-
-		expect(hasThrown).toBe(true);
-
-		const decryptedMasterKey = await service.decryptMasterKey(masterKey, '123456');
-		expect(decryptedMasterKey.length).toBe(512);
-
-		done();
-	});
-
-	it('should encrypt and decrypt with a master key', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		const cipherText = await service.encryptString('some secret');
-		const plainText = await service.decryptString(cipherText);
-
-		expect(plainText).toBe('some secret');
-
-		// Test that a long string, that is going to be split into multiple chunks, encrypt
-		// and decrypt properly too.
-		let veryLongSecret = '';
-		for (let i = 0; i < service.chunkSize() * 3; i++) veryLongSecret += Math.floor(Math.random() * 9);
-
-		const cipherText2 = await service.encryptString(veryLongSecret);
-		const plainText2 = await service.decryptString(cipherText2);
-
-		expect(plainText2 === veryLongSecret).toBe(true);
-
-		done();
-	});
-
-	it('should fail to decrypt if master key not present', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		const cipherText = await service.encryptString('some secret');
-
-		await service.unloadMasterKey(masterKey);
-
-		let hasThrown = await checkThrowAsync(async () => await service.decryptString(cipherText));
-
-		expect(hasThrown).toBe(true);
-
-		done();
-	});
-
-
-	it('should fail to decrypt if data tampered with', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		let cipherText = await service.encryptString('some secret');
-		cipherText += "ABCDEFGHIJ";
-
-		let hasThrown = await checkThrowAsync(async () => await service.decryptString(cipherText));
-
-		expect(hasThrown).toBe(true);
-
-		done();
-	});
-
-	it('should encrypt and decrypt notes and folders', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		let folder = await Folder.save({ title: 'folder' });
-		let note = await Note.save({ title: 'encrypted note', body: 'something', parent_id: folder.id });
-		let serialized = await Note.serializeForSync(note);
-		let deserialized = Note.filter(await Note.unserialize(serialized));
-
-		// Check that required properties are not encrypted
-		expect(deserialized.id).toBe(note.id);
-		expect(deserialized.parent_id).toBe(note.parent_id);
-		expect(deserialized.updated_time).toBe(note.updated_time);
-
-		// Check that at least title and body are encrypted
-		expect(!deserialized.title).toBe(true);
-		expect(!deserialized.body).toBe(true);
-
-		// Check that encrypted data is there
-		expect(!!deserialized.encryption_cipher_text).toBe(true);
-
-		encryptedNote = await Note.save(deserialized);
-		decryptedNote = await Note.decrypt(encryptedNote);
-
-		expect(decryptedNote.title).toBe(note.title);
-		expect(decryptedNote.body).toBe(note.body);
-		expect(decryptedNote.id).toBe(note.id);
-		expect(decryptedNote.parent_id).toBe(note.parent_id);
-
-		done();
-	});
-
-	it('should encrypt and decrypt files', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		const sourcePath = __dirname + '/../tests/support/photo.jpg';
-		const encryptedPath = __dirname + '/data/photo.crypted';
-		const decryptedPath = __dirname + '/data/photo.jpg';
-
-		await service.encryptFile(sourcePath, encryptedPath);
-		await service.decryptFile(encryptedPath, decryptedPath);
-
-		expect(fileContentEqual(sourcePath, encryptedPath)).toBe(false);
-		expect(fileContentEqual(sourcePath, decryptedPath)).toBe(true);
-
-		done();
-	});
-
-});

CliClient/tests/models_Setting.js

@@ -1,32 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const 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

@@ -1,252 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const 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/synchronizer.js

@@ -1,25 +1,21 @@
 require('app-module-path').addPath(__dirname);
 
 const { time } = require('lib/time-utils.js');
-const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js');
-const { shim } = require('lib/shim.js');
-const fs = require('fs-extra');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Resource = require('lib/models/Resource.js');
-const Tag = require('lib/models/Tag.js');
+const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId } = require('test-utils.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
 const { Database } = require('lib/database.js');
-const Setting = require('lib/models/Setting.js');
-const MasterKey = require('lib/models/MasterKey');
-const BaseItem = require('lib/models/BaseItem.js');
-const BaseModel = require('lib/BaseModel.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { BaseModel } = require('lib/base-model.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000 + 30000; // The first test is slow because the database needs to be built
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000; // The first test is slow because the database needs to be built
 
 async function allItems() {
 	let folders = await Folder.all();
@@ -27,40 +23,7 @@ async function allItems() {
 	return folders.concat(notes);
 }
 
-async function allSyncTargetItemsEncrypted() {
-	const list = await fileApi().list();
-	const files = list.items;
-
-	//console.info(Setting.value('resourceDir'));
-
-	let totalCount = 0;
-	let encryptedCount = 0;
-	for (let i = 0; i < files.length; i++) {
-		const file = files[i];
-		const remoteContentString = await fileApi().get(file.path);
-		const remoteContent = await BaseItem.unserialize(remoteContentString);
-		const ItemClass = BaseItem.itemClass(remoteContent);
-
-		if (!ItemClass.encryptionSupported()) continue;
-
-		totalCount++;
-
-		if (remoteContent.type_ === BaseModel.TYPE_RESOURCE) {
-			const content = await fileApi().get('.resource/' + remoteContent.id);
-			totalCount++;
-			if (content.substr(0, 5) === 'JED01') output = encryptedCount++;
-		}
-
-		if (!!remoteContent.encryption_applied) encryptedCount++;
-	}
-
-	if (!totalCount) throw new Error('No encryptable item on sync target');
-
-	return totalCount === encryptedCount;
-}
-
 async function localItemsSameAsRemote(locals, expect) {
-	let error = null;
 	try {
 		let files = await fileApi().list();
 		files = files.items;
@@ -75,40 +38,31 @@ 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 (e) {
-		error = e;
+	} catch (error) {
+		console.error(error);
 	}
-
-	expect(error).toBe(null);
 }
 
-let insideBeforeEach = false;
-
 describe('Synchronizer', function() {
 
-	beforeEach(async (done) => {
-		insideBeforeEach = true;
-
+	beforeEach( async (done) => {
 		await setupDatabaseAndSynchronizer(1);
 		await setupDatabaseAndSynchronizer(2);
 		await switchClient(1);
 		done();
-
-		insideBeforeEach = false;
 	});
 
-	it('should create remote items', asyncTest(async () => {
+	it('should create remote items', async (done) => {
 		let folder = await Folder.save({ title: "folder1" });
 		await Note.save({ title: "un", parent_id: folder.id });
 
@@ -117,9 +71,11 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should update remote items', asyncTest(async () => {
+		done();
+	});
+
+	it('should update remote item', async (done) => {
 		let folder = await Folder.save({ title: "folder1" });
 		let note = await Note.save({ title: "un", parent_id: folder.id });
 		await synchronizer().start();
@@ -130,9 +86,11 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should create local items', asyncTest(async () => {
+		done();
+	});
+
+	it('should create local items', async (done) => {
 		let folder = await Folder.save({ title: "folder1" });
 		await Note.save({ title: "un", parent_id: folder.id });
 		await synchronizer().start();
@@ -144,9 +102,11 @@ describe('Synchronizer', function() {
 		let all = await allItems();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should update local items', asyncTest(async () => {
+		done();
+	});
+
+	it('should update local items', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -171,9 +131,11 @@ describe('Synchronizer', function() {
 		let all = await allItems();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should resolve note conflicts', asyncTest(async () => {
+		done();
+	});
+
+	it('should resolve note conflicts', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -212,9 +174,11 @@ describe('Synchronizer', function() {
 			if (!noteUpdatedFromRemote.hasOwnProperty(n)) continue;
 			expect(noteUpdatedFromRemote[n]).toBe(note2[n], 'Property: ' + n);
 		}
-	}));
 
-	it('should resolve folders conflicts', asyncTest(async () => {
+		done();
+	});
+
+	it('should resolve folders conflicts', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -245,9 +209,11 @@ describe('Synchronizer', function() {
 
 		let folder1_final = await Folder.load(folder1.id);
 		expect(folder1_final.title).toBe(folder1_modRemote.title);
-	}));
 
-	it('should delete remote notes', asyncTest(async () => {
+		done();
+	});
+
+	it('should delete remote notes', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -270,9 +236,11 @@ describe('Synchronizer', function() {
 
 		let deletedItems = await BaseItem.deletedItems(syncTargetId());
 		expect(deletedItems.length).toBe(0);
-	}));
 
-	it('should not created deleted_items entries for items deleted via sync', asyncTest(async () => {
+		done();
+	});
+
+	it('should delete local notes', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -280,44 +248,21 @@ describe('Synchronizer', function() {
 		await switchClient(2);
 
 		await synchronizer().start();
-		await Folder.delete(folder1.id);
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-		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 synchronizer().start();
 
 		await switchClient(1);
 
-		context1 = await synchronizer().start({ context: context1 });
+		await synchronizer().start();
 		let items = await allItems();
-		expect(items.length).toBe(2);
+		expect(items.length).toBe(1);
 		let deletedItems = await BaseItem.deletedItems(syncTargetId());
 		expect(deletedItems.length).toBe(0);
-		await Note.delete(note2.id);
-		context1 = await synchronizer().start({ context: context1 });
-	}));
+		
+		done();
+	});
 
-	it('should delete remote folder', asyncTest(async () => {
+	it('should delete remote folder', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let folder2 = await Folder.save({ title: "folder2" });
 		await synchronizer().start();
@@ -333,10 +278,12 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		let all = await allItems();
-		await localItemsSameAsRemote(all, expect);
-	}));
+		localItemsSameAsRemote(all, expect);
+		
+		done();
+	});
 
-	it('should delete local folder', asyncTest(async () => {
+	it('should delete local folder', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let folder2 = await Folder.save({ title: "folder2" });
 		await synchronizer().start();
@@ -356,10 +303,12 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		let items = await allItems();
-		await localItemsSameAsRemote(items, expect);
-	}));
+		localItemsSameAsRemote(items, expect);
+		
+		done();
+	});
 
-	it('should resolve conflict if remote folder has been deleted, but note has been added to folder locally', asyncTest(async () => {
+	it('should resolve conflict if remote folder has been deleted, but note has been added to folder locally', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		await synchronizer().start();
 
@@ -377,9 +326,11 @@ describe('Synchronizer', function() {
 		expect(items.length).toBe(1);
 		expect(items[0].title).toBe('note1');
 		expect(items[0].is_conflict).toBe(1);
-			}));
+		
+		done();
+	});
 
-	it('should resolve conflict if note has been deleted remotely and locally', asyncTest(async () => {
+	it('should resolve conflict if note has been deleted remotely and locally', async (done) => {
 		let folder = await Folder.save({ title: "folder" });
 		let note = await Note.save({ title: "note", parent_id: folder.title });
 		await synchronizer().start();
@@ -399,10 +350,12 @@ describe('Synchronizer', function() {
 		expect(items.length).toBe(1);
 		expect(items[0].title).toBe('folder');
 
-		await localItemsSameAsRemote(items, expect);
-	}));
+		localItemsSameAsRemote(items, expect);
+		
+		done();
+	});
 
-	it('should cross delete all folders', asyncTest(async () => {
+	it('should cross delete all folders', async (done) => {
 		// If client1 and 2 have two folders, client 1 deletes item 1 and client
 		// 2 deletes item 2, they should both end up with no items after sync.
 
@@ -438,9 +391,11 @@ describe('Synchronizer', function() {
 
 		expect(items1.length).toBe(0);
 		expect(items1.length).toBe(items2.length);
-			}));
+		
+		done();
+	});
 
-	it('should handle conflict when remote note is deleted then local note is modified', asyncTest(async () => {
+	it('should handle conflict when remote note is deleted then local note is modified', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -470,9 +425,11 @@ describe('Synchronizer', function() {
 		let unconflictedNotes = await Note.unconflictedNotes();
 
 		expect(unconflictedNotes.length).toBe(0);
-	}));
+		
+		done();
+	});
 
-	it('should handle conflict when remote folder is deleted then local folder is renamed', asyncTest(async () => {
+	it('should handle conflict when remote folder is deleted then local folder is renamed', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let folder2 = await Folder.save({ title: "folder2" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
@@ -500,9 +457,11 @@ describe('Synchronizer', function() {
 		let items = await allItems();
 
 		expect(items.length).toBe(1);
-	}));
+		
+		done();
+	});
 
-	it('should allow duplicate folder titles', asyncTest(async () => {
+	it('should allow duplicate folder titles', async (done) => {
 		let localF1 = await Folder.save({ title: "folder" });
 
 		await switchClient(2);
@@ -534,15 +493,11 @@ describe('Synchronizer', function() {
 		remoteF2 = await Folder.load(remoteF2.id);
 
 		expect(remoteF2.title == localF2.title).toBe(true);
-	}));
 
-	async function shoudSyncTagTest(withEncryption) {
-		let masterKey = null;
-		if (withEncryption) {
-			Setting.setValue('encryption.enabled', true);
-			masterKey = await loadEncryptionMasterKey();
-		}
+		done();
+	});
 
+	it('should sync tags', async (done) => {
 		let f1 = await Folder.save({ title: "folder" });
 		let n1 = await Note.save({ title: "mynote" });
 		let n2 = await Note.save({ title: "mynote2" });
@@ -552,12 +507,6 @@ describe('Synchronizer', function() {
 		await switchClient(2);
 
 		await synchronizer().start();
-		if (withEncryption) {
-			const masterKey_2 = await MasterKey.load(masterKey.id);
-			await encryptionService().loadMasterKey(masterKey_2, '123456', true);
-			let t = await Tag.load(tag.id);
-			await Tag.decrypt(t);
-		}
 		let remoteTag = await Tag.loadByTitle(tag.title);
 		expect(!!remoteTag).toBe(true);
 		expect(remoteTag.id).toBe(tag.id);
@@ -583,17 +532,11 @@ describe('Synchronizer', function() {
 		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);
-	}));
+		done();
+	});
 
-	it('should sync encrypted tags', asyncTest(async () => {
-		await shoudSyncTagTest(true);
-	}));
-
-	it('should not sync notes with conflicts', asyncTest(async () => {
+	it('should not sync notes with conflicts', async (done) => {
 		let f1 = await Folder.save({ title: "folder" });
 		let n1 = await Note.save({ title: "mynote", parent_id: f1.id, is_conflict: 1 });
 		await synchronizer().start();
@@ -605,9 +548,11 @@ describe('Synchronizer', function() {
 		let folders = await Folder.all()
 		expect(notes.length).toBe(0);
 		expect(folders.length).toBe(1);
-	}));
 
-	it('should not try to delete on remote conflicted notes that have been deleted', asyncTest(async () => {
+		done();
+	});
+
+	it('should not try to delete on remote conflicted notes that have been deleted', async (done) => {
 		let f1 = await Folder.save({ title: "folder" });
 		let n1 = await Note.save({ title: "mynote", parent_id: f1.id });
 		await synchronizer().start();
@@ -620,13 +565,17 @@ describe('Synchronizer', function() {
 		const deletedItems = await BaseItem.deletedItems(syncTargetId());
 
 		expect(deletedItems.length).toBe(0);
-	}));
-	
-	async function ignorableNoteConflictTest(withEncryption) {
-		if (withEncryption) {
-			Setting.setValue('encryption.enabled', true);
-			await loadEncryptionMasterKey();
-		}
+
+		done();
+	});
+
+	it('should not consider it is a conflict if neither the title nor body of the note have changed', async (done) => {
+		// That was previously a common conflict:
+		// - Client 1 mark todo as "done", and sync
+		// - Client 2 doesn't sync, mark todo as "done" todo. Then sync.
+		// In theory it is a conflict because the todo_completed dates are different
+		// but in practice it doesn't matter, we can just take the date when the
+		// todo was marked as "done" the first time.
 
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", is_todo: 1, parent_id: folder1.id });
@@ -635,10 +584,6 @@ describe('Synchronizer', function() {
 		await switchClient(2);
 
 		await synchronizer().start();
-		if (withEncryption) {
-			await loadEncryptionMasterKey(null, true);
-			await decryptionWorker().start();
-		}
 		let note2 = await Note.load(note1.id);
 		note2.todo_completed = time.unixMs()-1;
 		await Note.save(note2);
@@ -653,71 +598,48 @@ describe('Synchronizer', function() {
 		note2conf = await Note.load(note1.id);
 		await synchronizer().start();
 
-		if (!withEncryption) {
-			// That was previously a common conflict:
-			// - Client 1 mark todo as "done", and sync
-			// - Client 2 doesn't sync, mark todo as "done" todo. Then sync.
-			// In theory it is a conflict because the todo_completed dates are different
-			// but in practice it doesn't matter, we can just take the date when the
-			// todo was marked as "done" the first time.
+		let conflictedNotes = await Note.conflictedNotes();
+		expect(conflictedNotes.length).toBe(0);
 
-			let conflictedNotes = await Note.conflictedNotes();
-			expect(conflictedNotes.length).toBe(0);
+		let notes = await Note.all();
+		expect(notes.length).toBe(1);
+		expect(notes[0].id).toBe(note1.id);
+		expect(notes[0].todo_completed).toBe(note2.todo_completed);
 
-			let notes = await Note.all();
-			expect(notes.length).toBe(1);
-			expect(notes[0].id).toBe(note1.id);
-			expect(notes[0].todo_completed).toBe(note2.todo_completed);		
-		} else {
-			// If the notes are encrypted however it's not possible to do this kind of
-			// smart conflict resolving since we don't know the content, so in that
-			// case it's handled as a regular conflict.
+		done();
+	});
 
-			let conflictedNotes = await Note.conflictedNotes();
-			expect(conflictedNotes.length).toBe(1);
-
-			let notes = await Note.all();
-			expect(notes.length).toBe(2);
-		}
-	}
-
-	it('should not consider it is a conflict if neither the title nor body of the note have changed', asyncTest(async () => {
-		await ignorableNoteConflictTest(false);
-	}));
-
-	it('should always handle conflict if local or remote are encrypted', asyncTest(async () => {
-		await ignorableNoteConflictTest(true);
-	}));
-
-	it('items should be downloaded again when user cancels in the middle of delta operation', asyncTest(async () => {
+	it('items should be downloaded again when user cancels in the middle of delta operation', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", is_todo: 1, parent_id: folder1.id });
 		await synchronizer().start();
 
 		await switchClient(2);
 
-		synchronizer().testingHooks_ = ['cancelDeltaLoop2'];		
+		synchronizer().debugFlags_ = ['cancelDeltaLoop2'];		
 		let context = await synchronizer().start();
 		let notes = await Note.all();
 		expect(notes.length).toBe(0);
 
-		synchronizer().testingHooks_ = [];
+		synchronizer().debugFlags_ = [];
 		await synchronizer().start({ context: context });
 		notes = await Note.all();
 		expect(notes.length).toBe(1);
-	}));
 
-	it('should skip items that cannot be synced', asyncTest(async () => {
+		done();
+	});
+
+	it('items should skip items that cannot be synced', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", is_todo: 1, parent_id: folder1.id });
 		const noteId = note1.id;
 		await synchronizer().start();
-		let disabledItems = await BaseItem.syncDisabledItems(syncTargetId());
+		let disabledItems = await BaseItem.syncDisabledItems();
 		expect(disabledItems.length).toBe(0);
 		await Note.save({ id: noteId, title: "un mod", });
-		synchronizer().testingHooks_ = ['rejectedByTarget'];
+		synchronizer().debugFlags_ = ['cannotSync'];
 		await synchronizer().start();
-		synchronizer().testingHooks_ = [];
+		synchronizer().debugFlags_ = [];
 		await synchronizer().start(); // Another sync to check that this item is now excluded from sync
 
 		await switchClient(2);
@@ -729,306 +651,10 @@ describe('Synchronizer', function() {
 
 		await switchClient(1);
 
-		disabledItems = await BaseItem.syncDisabledItems(syncTargetId());
+		disabledItems = await BaseItem.syncDisabledItems();
 		expect(disabledItems.length).toBe(1);
-	}));
 
-	it('notes and folders should get encrypted when encryption is enabled', asyncTest(async () => {
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: "un", body: 'to be encrypted', parent_id: folder1.id });
-		await synchronizer().start();
-		// After synchronisation, remote items should be encrypted but local ones remain plain text
-		note1 = await Note.load(note1.id);
-		expect(note1.title).toBe('un');
+		done();
+	});
 
-		await switchClient(2);
-
-		await synchronizer().start();
-		let folder1_2 = await Folder.load(folder1.id);
-		let note1_2 = await Note.load(note1.id);
-		let masterKey_2 = await MasterKey.load(masterKey.id);
-		// On this side however it should be received encrypted
-		expect(!note1_2.title).toBe(true);
-		expect(!folder1_2.title).toBe(true);
-		expect(!!note1_2.encryption_cipher_text).toBe(true);
-		expect(!!folder1_2.encryption_cipher_text).toBe(true);
-		// Master key is already encrypted so it does not get re-encrypted during sync
-		expect(masterKey_2.content).toBe(masterKey.content);
-		expect(masterKey_2.checksum).toBe(masterKey.checksum);
-		// Now load the master key we got from client 1 and try to decrypt
-		await encryptionService().loadMasterKey(masterKey_2, '123456', true);
-		// Get the decrypted items back
-		await Folder.decrypt(folder1_2);
-		await Note.decrypt(note1_2);
-		folder1_2 = await Folder.load(folder1.id);
-		note1_2 = await Note.load(note1.id);
-		// Check that properties match the original items. Also check
-		// the encryption did not affect the updated_time timestamp.
-		expect(note1_2.title).toBe(note1.title);
-		expect(note1_2.body).toBe(note1.body);
-		expect(note1_2.updated_time).toBe(note1.updated_time);
-		expect(!note1_2.encryption_cipher_text).toBe(true);
-		expect(folder1_2.title).toBe(folder1.title);
-		expect(folder1_2.updated_time).toBe(folder1.updated_time);
-		expect(!folder1_2.encryption_cipher_text).toBe(true);
-	}));
-
-	it('should enable encryption automatically when downloading new master key (and none was previously available)',asyncTest(async () => {
-		// Enable encryption on client 1 and sync an item
-		Setting.setValue('encryption.enabled', true);
-		await loadEncryptionMasterKey();
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-
-		await switchClient(2);
-
-		// Synchronising should enable encryption since we're going to get a master key
-		expect(Setting.value('encryption.enabled')).toBe(false);
-		await synchronizer().start();
-		expect(Setting.value('encryption.enabled')).toBe(true);
-
-		// Check that we got the master key from client 1
-		const masterKey = (await MasterKey.all())[0];
-		expect(!!masterKey).toBe(true);
-
-		// Since client 2 hasn't supplied a password yet, no master key is currently loaded
-		expect(encryptionService().loadedMasterKeyIds().length).toBe(0);
-
-		// If we sync now, nothing should be sent to target since we don't have a password.
-		// Technically it's incorrect to set the property of an encrypted variable but it allows confirming
-		// that encryption doesn't work if user hasn't supplied a password.
-		await BaseItem.forceSync(folder1.id);
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-		folder1 = await Folder.load(folder1.id);
-		expect(folder1.title).toBe('folder1'); // Still at old value
-
-		await switchClient(2);
-
-		// Now client 2 set the master key password
-		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-
-		// Now that master key should be loaded
-		expect(encryptionService().loadedMasterKeyIds()[0]).toBe(masterKey.id);
-
-		// Decrypt all the data. Now change the title and sync again - this time the changes should be transmitted
-		await decryptionWorker().start();
-		folder1_2 = await Folder.save({ id: folder1.id, title: "change test" });
-
-		// If we sync now, this time client 1 should get the changes we did earlier
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-		// Decrypt the data we just got
-		await decryptionWorker().start();
-		folder1 = await Folder.load(folder1.id);
-		expect(folder1.title).toBe('change test'); // Got title from client 2
-	}));
-
-	it('should encrypt existing notes too when enabling E2EE', asyncTest(async () => {
-		// First create a folder, without encryption enabled, and sync it
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-		let files = await fileApi().list()
-		let content = await fileApi().get(files.items[0].path);
-		expect(content.indexOf('folder1') >= 0).toBe(true)
-
-		// Then enable encryption and sync again
-		let masterKey = await encryptionService().generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-		await synchronizer().start();
-		
-		// Even though the folder has not been changed it should have been synced again so that
-		// an encrypted version of it replaces the decrypted version.
-		files = await fileApi().list()
-		expect(files.items.length).toBe(2);
-		// By checking that the folder title is not present, we can confirm that the item has indeed been encrypted
-		// One of the two items is the master key
-		content = await fileApi().get(files.items[0].path);
-		expect(content.indexOf('folder1') < 0).toBe(true);
-		content = await fileApi().get(files.items[1].path);
-		expect(content.indexOf('folder1') < 0).toBe(true);
-	}));
-
-	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');
-		let resource1 = (await Resource.all())[0];
-		let resourcePath1 = Resource.fullPath(resource1);
-		await synchronizer().start();
-		expect((await fileApi().list()).items.length).toBe(3);
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		let allResources = await Resource.all();
-		expect(allResources.length).toBe(1);
-		let resource1_2 = allResources[0];
-		let resourcePath1_2 = Resource.fullPath(resource1_2);
-
-		expect(resource1_2.id).toBe(resource1.id);
-		expect(fileContentEqual(resourcePath1, resourcePath1_2)).toBe(true);
-	}));
-
-	it('should encryt resources', asyncTest(async () => {
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-
-		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();
-		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-
-		let resource1_2 = (await Resource.all())[0];
-		resource1_2 = await Resource.decrypt(resource1_2);
-		let resourcePath1_2 = Resource.fullPath(resource1_2);
-
-		expect(fileContentEqual(resourcePath1, resourcePath1_2)).toBe(true);
-	}));
-
-	it('should upload decrypted items to sync target after encryption disabled', asyncTest(async () => {
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-
-		let allEncrypted = await allSyncTargetItemsEncrypted();
-		expect(allEncrypted).toBe(true);
-
-		await encryptionService().disableEncryption();
-
-		await synchronizer().start();
-		allEncrypted = await allSyncTargetItemsEncrypted();
-		expect(allEncrypted).toBe(false);
-	}));
-
-	it('should not upload any item if encryption was enabled, and items have not been decrypted, and then encryption disabled', asyncTest(async () => {
-		// For some reason I can't explain, this test is sometimes executed before beforeEach is finished
-		// which means it's going to fail in unexpected way. So the loop below wait for beforeEach to be done.
-		while (insideBeforeEach) await time.msleep(100);
-
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		expect(Setting.value('encryption.enabled')).toBe(true);
-
-		// If we try to disable encryption now, it should throw an error because some items are
-		// currently encrypted. They must be decrypted first so that they can be sent as
-		// plain text to the sync target.
-		//let hasThrown = await checkThrowAsync(async () => await encryptionService().disableEncryption());
-		//expect(hasThrown).toBe(true);
-
-		// Now supply the password, and decrypt the items
-		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
-		await encryptionService().loadMasterKeysFromSettings();	
-		await decryptionWorker().start();
-
-		// Try to disable encryption again
-		hasThrown = await checkThrowAsync(async () => await encryptionService().disableEncryption());
-		expect(hasThrown).toBe(false);
-
-		// If we sync now the target should receive the decrypted items
-		await synchronizer().start();
-		allEncrypted = await allSyncTargetItemsEncrypted();
-		expect(allEncrypted).toBe(false);
-	}));
-
-	it('should encrypt remote resources after encryption has been enabled', asyncTest(async () => {
-		while (insideBeforeEach) await time.msleep(100);
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
-		let resource1 = (await Resource.all())[0];
-		await synchronizer().start();
-
-		expect(await allSyncTargetItemsEncrypted()).toBe(false);
-
-		const masterKey = await loadEncryptionMasterKey();
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-
-		await synchronizer().start();
-
-		expect(await allSyncTargetItemsEncrypted()).toBe(true);
-	}));
-
-	it('should upload encrypted resource, but it should not mark the blob as encrypted locally', asyncTest(async () => {
-		while (insideBeforeEach) await time.msleep(100);
-
-		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');
-		const masterKey = await loadEncryptionMasterKey();
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-		await synchronizer().start();
-
-		let resource1 = (await Resource.all())[0];
-		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

@@ -1,47 +1,34 @@
 const fs = require('fs-extra');
 const { JoplinDatabase } = require('lib/joplin-database.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Resource = require('lib/models/Resource.js');
-const Tag = require('lib/models/Tag.js');
-const NoteTag = require('lib/models/NoteTag.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
+const { Tag } = require('lib/models/tag.js');
+const { NoteTag } = require('lib/models/note-tag.js');
 const { Logger } = require('lib/logger.js');
-const Setting = require('lib/models/Setting.js');
-const MasterKey = require('lib/models/MasterKey');
-const BaseItem = require('lib/models/BaseItem.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
 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 { FsDriverNode } = require('lib/fs-driver-node.js');
 const { time } = require('lib/time-utils.js');
-const { shimInit } = require('lib/shim-init-node.js');
 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 EncryptionService = require('lib/services/EncryptionService.js');
-const DecryptionWorker = require('lib/services/DecryptionWorker.js');
-const WebDavApi = require('lib/WebDavApi');
 
 let databases_ = [];
 let synchronizers_ = [];
-let encryptionServices_ = [];
-let decryptionWorkers_ = [];
 let fileApi_ = null;
 let currentClient_ = 1;
 
-shimInit();
-
 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);
@@ -49,34 +36,26 @@ fs.mkdirpSync(logDir, 0o755);
 SyncTargetRegistry.addClass(SyncTargetMemory);
 SyncTargetRegistry.addClass(SyncTargetFilesystem);
 SyncTargetRegistry.addClass(SyncTargetOneDrive);
-SyncTargetRegistry.addClass(SyncTargetNextcloud);
 
-// const syncTargetId_ = SyncTargetRegistry.nameToId("nextcloud");
-const syncTargetId_ = SyncTargetRegistry.nameToId("memory");
-//const syncTargetId_ = SyncTargetRegistry.nameToId('filesystem');
+const syncTargetId_ = SyncTargetRegistry.nameToId('memory');
 const syncDir = __dirname + '/../tests/sync';
 
-const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 100;//400;
-
-console.info('Testing with sync target: ' + SyncTargetRegistry.idToName(syncTargetId_));
+const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 400;
 
 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);
 
 BaseItem.loadClass('Note', Note);
 BaseItem.loadClass('Folder', Folder);
 BaseItem.loadClass('Resource', Resource);
 BaseItem.loadClass('Tag', Tag);
 BaseItem.loadClass('NoteTag', NoteTag);
-BaseItem.loadClass('MasterKey', MasterKey);
 
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
 
-Setting.autoSaveEnabled = false;
-
 function syncTargetId() {
 	return syncTargetId_;
 }
@@ -100,15 +79,10 @@ async function switchClient(id) {
 	BaseItem.db_ = databases_[id];
 	Setting.db_ = databases_[id];
 
-	BaseItem.encryptionService_ = encryptionServices_[id];
-	Resource.encryptionService_ = encryptionServices_[id];
-
-	Setting.setConstant('resourceDir', resourceDir(id));
-
 	return Setting.load();
 }
 
-async function clearDatabase(id = null) {
+function clearDatabase(id = null) {
 	if (id === null) id = currentClient_;
 
 	let queries = [
@@ -117,46 +91,35 @@ async function clearDatabase(id = null) {
 		'DELETE FROM resources',
 		'DELETE FROM tags',
 		'DELETE FROM note_tags',
-		'DELETE FROM master_keys',
-		'DELETE FROM settings',
 		
 		'DELETE FROM deleted_items',
 		'DELETE FROM sync_items',
 	];
 
-	await databases_[id].transactionExecBatch(queries);
+	return databases_[id].transactionExecBatch(queries);
 }
 
-async function setupDatabase(id = null) {
+function setupDatabase(id = null) {
 	if (id === null) id = currentClient_;
 
-	Setting.cancelScheduleSave();
-	Setting.cache_ = null;
-
 	if (databases_[id]) {
-		await clearDatabase(id);
-		await Setting.load();
-		return;
+		return clearDatabase(id).then(() => {
+			return Setting.load();
+		});
 	}
 
 	const filePath = __dirname + '/data/test-' + id + '.sqlite';
-
-	try {
-		await fs.unlink(filePath);
-	} catch (error) {
+	return fs.unlink(filePath).catch(() => {
 		// Don't care if the file doesn't exist
-	};
-
-	databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
-	await databases_[id].open({ name: filePath });
-
-	BaseModel.db_ = databases_[id];
-	await Setting.load();
-}
-
-function resourceDir(id = null) {
-	if (id === null) id = currentClient_;
-	return __dirname + '/data/resources-' + id;
+	}).then(() => {
+		databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
+		// databases_[id].setLogger(logger);
+		// console.info(filePath);
+		return databases_[id].open({ name: filePath }).then(() => {
+			BaseModel.db_ = databases_[id];
+			return setupDatabase(id);
+		});
+	});
 }
 
 async function setupDatabaseAndSynchronizer(id = null) {
@@ -164,26 +127,20 @@ async function setupDatabaseAndSynchronizer(id = null) {
 
 	await setupDatabase(id);
 
-	EncryptionService.instance_ = null;
-	DecryptionWorker.instance_ = null;
-
-	await fs.remove(resourceDir(id));
-	await fs.mkdirp(resourceDir(id), 0o755);
-
 	if (!synchronizers_[id]) {
 		const SyncTargetClass = SyncTargetRegistry.classById(syncTargetId_);
 		const syncTarget = new SyncTargetClass(db(id));
 		syncTarget.setFileApi(fileApi());
 		syncTarget.setLogger(logger);
 		synchronizers_[id] = await syncTarget.synchronizer();
-		synchronizers_[id].autoStartDecryptionWorker_ = false; // For testing we disable this since it would make the tests non-deterministic
 	}
 
-	encryptionServices_[id] = new EncryptionService();
-	decryptionWorkers_[id] = new DecryptionWorker();
-	decryptionWorkers_[id].setEncryptionService(encryptionServices_[id]);
-
-	await fileApi().clearRoot();
+	if (syncTargetId_ == SyncTargetRegistry.nameToId('filesystem')) {
+		fs.removeSync(syncDir)
+		fs.mkdirpSync(syncDir, 0o755);
+	} else {
+		await fileApi().format();
+	}
 }
 
 function db(id = null) {
@@ -196,35 +153,6 @@ function synchronizer(id = null) {
 	return synchronizers_[id];
 }
 
-function encryptionService(id = null) {
-	if (id === null) id = currentClient_;
-	return encryptionServices_[id];
-}
-
-function decryptionWorker(id = null) {
-	if (id === null) id = currentClient_;
-	return decryptionWorkers_[id];
-}
-
-async function loadEncryptionMasterKey(id = null, useExisting = false) {
-	const service = encryptionService(id);
-
-	let masterKey = null;
-
-	if (!useExisting) { // Create it
-		masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-	} else { // Use the one already available
-		materKey = await MasterKey.all();
-		if (!materKey.length) throw new Error('No mater key available');
-		masterKey = materKey[0];
-	}
-
-	await service.loadMasterKey(masterKey, '123456', true);
-
-	return masterKey;
-}
-
 function fileApi() {
 	if (fileApi_) return fileApi_;
 
@@ -234,17 +162,7 @@ function fileApi() {
 		fileApi_ = new FileApi(syncDir, new FileApiDriverLocal());
 	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('memory')) {
 		fileApi_ = new FileApi('/root', new FileApiDriverMemory());
-	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('nextcloud')) {
-		const options = {
-			baseUrl: () => 'http://nextcloud.local/remote.php/dav/files/admin/JoplinTest',
-			username: () => 'admin',
-			password: () => '123456',
-		};
-
-		const api = new WebDavApi(options);
-		fileApi_ = new FileApi('', new FileApiDriverWebDav(api));
 	}
-
 	// } else if (syncTargetId == Setting.SYNC_TARGET_ONEDRIVE) {
 	// 	let auth = require('./onedrive-auth.json');
 	// 	if (!auth) {
@@ -264,47 +182,7 @@ function fileApi() {
 
 	fileApi_.setLogger(logger);
 	fileApi_.setSyncTargetId(syncTargetId_);
-	fileApi_.requestRepeatCount_ = 0;
 	return fileApi_;
 }
 
-function objectsEqual(o1, o2) {
-	if (Object.getOwnPropertyNames(o1).length !== Object.getOwnPropertyNames(o2).length) return false;
-	for (let n in o1) {
-		if (!o1.hasOwnProperty(n)) continue;
-		if (o1[n] !== o2[n]) return false;
-	}
-	return true;
-}
-
-async function checkThrowAsync(asyncFn) {
-	let hasThrown = false;
-	try {
-		await asyncFn();
-	} catch (error) {
-		hasThrown = true;
-	}
-	return hasThrown;
-}
-
-function fileContentEqual(path1, path2) {
-	const fs = require('fs-extra');
-	const content1 = fs.readFileSync(path1, 'base64');
-	const content2 = fs.readFileSync(path2, 'base64');
-	return content1 === content2;
-}
-
-// Wrap an async test in a try/catch block so that done() is always called
-// and display a proper error message instead of "unhandled promise error"
-function asyncTest(callback) {
-	return async function(done) {
-		try {
-			await callback();
-		} catch (error) {
-			console.error(error);
-		}
-		done();
-	}
-}
-
-module.exports = { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest };
+module.exports = { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId };

CliClientDemo/package.json

@@ -19,8 +19,7 @@
     "title": "Demo for Joplin CLI",
     "years": [
       2016,
-      2017,
-      2018
+      2017
     ],
     "owner": "Laurent Cozic"
   },

ElectronClient/app/ElectronAppWrapper.js

@@ -1,11 +1,9 @@
 const { _ } = require('lib/locale.js');
-const { BrowserWindow, Menu, Tray } = require('electron');
+const { BrowserWindow } = 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 {
 
@@ -14,8 +12,6 @@ class ElectronAppWrapper {
 		this.env_ = env;
 		this.win_ = null;
 		this.willQuitApp_ = false;
-		this.tray_ = null;
-		this.buildDir_ = null;
 	}
 
 	electronApp() {
@@ -41,14 +37,13 @@ class ElectronAppWrapper {
 		const windowState = windowStateKeeper({
 			defaultWidth: 800,
 			defaultHeight: 600,
-			file: 'window-state-' + this.env_ + '.json',
 		});
 
 		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
@@ -64,30 +59,14 @@ class ElectronAppWrapper {
 		}))
 
 		// Uncomment this to view errors if the application does not start
-		// if (this.env_ === 'dev') this.win_.webContents.openDevTools();
+		if (this.env_ === 'dev') this.win_.webContents.openDevTools();
 
 		this.win_.on('close', (event) => {
-			// If it's on macOS, the app is completely closed only if the user chooses to close the app (willQuitApp_ will be true)
-			// 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();
-				}
+			if (this.willQuitApp_ || process.platform !== 'darwin') {
+				this.win_ = null;
 			} else {
-				if (this.trayShown() && !this.willQuitApp_) {
-					event.preventDefault();
-					this.win_.hide();
-				} else {
-					this.win_ = null;
-				}
+				event.preventDefault();
+				this.win_.hide();
 			}
 		})
 
@@ -110,97 +89,15 @@ class ElectronAppWrapper {
 		});
 	}
 
-	async quit() {
+	async exit() {
 		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

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

@@ -2,14 +2,13 @@ require('app-module-path').addPath(__dirname);
 
 const { BaseApplication } = require('lib/BaseApplication');
 const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { shim } = require('lib/shim.js');
-const BaseModel = require('lib/BaseModel.js');
-const MasterKey = require('lib/models/MasterKey');
+const { BaseModel } = require('lib/base-model.js');
 const { _, setLocale } = require('lib/locale.js');
 const os = require('os');
 const fs = require('fs-extra');
-const Tag = require('lib/models/Tag.js');
+const { Tag } = require('lib/models/tag.js');
 const { reg } = require('lib/registry.js');
 const { sprintf } = require('sprintf-js');
 const { JoplinDatabase } = require('lib/joplin-database.js');
@@ -19,9 +18,6 @@ const { defaultState } = require('lib/reducer.js');
 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 { bridge } = require('electron').remote.require('./bridge');
 const Menu = bridge().Menu;
@@ -51,10 +47,6 @@ class Application extends BaseApplication {
 		return true;
 	}
 
-	checkForUpdateLoggerPath() {
-		return Setting.value('profileDir') + '/log-autoupdater.txt';
-	}
-
 	reducer(state = appDefaultState, action) {
 		let newState = state;
 
@@ -142,16 +134,8 @@ class Application extends BaseApplication {
 			this.refreshMenu();
 		}
 
-		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 (['NOTE_UPDATE_ONE', 'NOTE_DELETE', 'FOLDER_UPDATE_ONE', 'FOLDER_DELETE'].indexOf(action.type) >= 0) {
+			if (!await reg.syncTarget().syncStarted()) reg.scheduleSync();
 		}
 
 		if (['EVENT_NOTE_ALARM_FIELD_CHANGE', 'NOTE_DELETE'].indexOf(action.type) >= 0) {
@@ -181,101 +165,6 @@ 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'),
@@ -301,7 +190,6 @@ class Application extends BaseApplication {
 					}
 				}, {
 					label: _('New notebook'),
-					accelerator: 'CommandOrControl+B',
 					screens: ['Main'],
 					click: () => {
 						this.dispatch({
@@ -312,53 +200,46 @@ class Application extends BaseApplication {
 				}, {
 					type: 'separator',
 				}, {
-					label: _('Import'),
-					submenu: importItems,
-				}, {
-					label: _('Export'),
-					submenu: exportItems,
-				}, {
-					type: 'separator',
-				}, {
-					label: _('Print'),
-					accelerator: 'CommandOrControl+P',
-					screens: ['Main'],
+					label: _('Import Evernote notes'),
 					click: () => {
+						const filePaths = bridge().showOpenDialog({
+							properties: ['openFile', 'createDirectory'],
+							filters: [
+								{ name: _('Evernote Export Files'), extensions: ['enex'] },
+							]
+						});
+						if (!filePaths || !filePaths.length) return;
+
 						this.dispatch({
-							type: 'WINDOW_COMMAND',
-							name: 'print',
+							type: 'NAV_GO',
+							routeName: 'Import',
+							props: {
+								filePath: filePaths[0],
+							},
 						});
 					}
-				}, {
-					type: 'separator',
-					platforms: ['darwin'],
-				}, {
-					label: _('Hide %s', 'Joplin'),
-					platforms: ['darwin'],
-					accelerator: 'CommandOrControl+H',
-					click: () => { bridge().electronApp().hide() }
 				}, {
 					type: 'separator',
 				}, {
 					label: _('Quit'),
 					accelerator: 'CommandOrControl+Q',
-					click: () => { bridge().electronApp().quit() }
+					click: () => { bridge().electronApp().exit() }
 				}]
 			}, {
 				label: _('Edit'),
 				submenu: [{
 					label: _('Copy'),
-					screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
+					screens: ['Main', 'OneDriveLogin'],
 					role: 'copy',
 					accelerator: 'CommandOrControl+C',
 				}, {
 					label: _('Cut'),
-					screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
+					screens: ['Main', 'OneDriveLogin'],
 					role: 'cut',
 					accelerator: 'CommandOrControl+X',
 				}, {
 					label: _('Paste'),
-					screens: ['Main', 'OneDriveLogin', 'Config', 'EncryptionConfig'],
+					screens: ['Main', 'OneDriveLogin'],
 					role: 'paste',
 					accelerator: 'CommandOrControl+V',
 				}, {
@@ -374,43 +255,7 @@ class Application extends BaseApplication {
 							name: 'search',
 						});
 					},
-				}],
-			}, {
-				label: _('View'),
-				submenu: [{
-					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: [{
@@ -421,44 +266,21 @@ class Application extends BaseApplication {
 							routeName: 'Status',
 						});
 					}
-				}, {
-					type: 'separator',
-					screens: ['Main'],
 				},{
-					label: _('Encryption options'),
-					click: () => {
-						this.dispatch({
-							type: 'NAV_GO',
-							routeName: 'EncryptionConfig',
-						});
-					}
-				},{
-					label: _('General Options'),
-					accelerator: 'CommandOrControl+,',
+					label: _('Options'),
 					click: () => {
 						this.dispatch({
 							type: 'NAV_GO',
 							routeName: 'Config',
 						});
 					}
-				}],
+				}]
 			}, {
 				label: _('Help'),
 				submenu: [{
 					label: _('Website and documentation'),
 					accelerator: 'F1',
 					click () { bridge().openExternal('http://joplin.cozic.net') }
-				}, {
-					label: _('Make a donation'),
-					click () { bridge().openExternal('http://joplin.cozic.net/donate') }
-				}, {
-					label: _('Check for updates...'),
-					click: () => {
-						bridge().checkForUpdates(false, bridge().window(), this.checkForUpdateLoggerPath());
-					}
-				}, {
-					type: 'separator',
-					screens: ['Main'],
 				}, {
 					label: _('About Joplin'),
 					click: () => {
@@ -466,11 +288,11 @@ class Application extends BaseApplication {
 						let message = [
 							p.description,
 							'',
-							'Copyright © 2016-2018 Laurent Cozic',
+							'Copyright © 2016-2017 Laurent Cozic',
 							_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
 						];
-						bridge().showInfoMessageBox(message.join('\n'), {
-							icon: bridge().electronApp().buildDir() + '/icons/32x32.png',
+						bridge().showMessageBox({
+							message: message.join('\n'),
 						});
 					}
 				}]
@@ -486,13 +308,10 @@ 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);
@@ -508,43 +327,6 @@ class Application extends BaseApplication {
 		this.lastMenuScreen_ = screen;
 	}
 
-	updateTray() {
-		// Tray icon (called AppIndicator) doesn't work in Ubuntu
-		// http://www.webupd8.org/2017/04/fix-appindicator-not-working-for.html
-		// Might be fixed in Electron 18.x but no non-beta release yet.
-		if (!shim.isWindows() && !shim.isMac()) return;
-
-		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) {
 		argv = await super.start(argv);
 
@@ -572,14 +354,7 @@ class Application extends BaseApplication {
 
 		this.dispatch({
 			type: 'TAG_UPDATE_ALL',
-			items: tags,
-		});
-
-		const masterKeys = await MasterKey.all();
-
-		this.dispatch({
-			type: 'MASTERKEY_UPDATE_ALL',
-			items: masterKeys,
+			tags: tags,
 		});
 
 		this.store().dispatch({
@@ -590,20 +365,17 @@ 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 = () => {
+			const runAutoUpdateCheck = function() {
 				if (Setting.value('autoUpdateEnabled')) {
-					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath());
+					bridge().checkForUpdatesAndNotify(Setting.value('profileDir') + '/log-autoupdater.txt');
 				}
 			}
 			
-			// Initial check on startup
 			setTimeout(() => { runAutoUpdateCheck() }, 5000);
-			// Then every x hours
-			setInterval(() => { runAutoUpdateCheck() }, 12 * 60 * 60 * 1000);
+			// For those who leave the app always open
+			setInterval(() => { runAutoUpdateCheck() }, 2 * 60 * 60 * 1000);
 		}
 
-		this.updateTray();
-
 		setTimeout(() => {
 			AlarmService.garbageCollect();
 		}, 1000 * 60 * 60);
@@ -615,8 +387,6 @@ class Application extends BaseApplication {
 				// Wait for the first sync before updating the notifications, since synchronisation
 				// might change the notifications.
 				AlarmService.updateAllNotifications();
-
-				DecryptionWorker.instance().scheduleStart();
 			});
 		}
 	}

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(this.window(), options);
+		const filePath = dialog.showSaveDialog(options);
 		if (filePath) {
 			this.lastSelectedPath_ = filePath;
 		}
@@ -55,30 +55,27 @@ 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(this.window(), options);
+		const filePaths = dialog.showOpenDialog(options);
 		if (filePaths && filePaths.length) {
 			this.lastSelectedPath_ = dirname(filePaths[0]);
 		}
 		return filePaths;
 	}
 
-	// Don't use this directly - call one of the showXxxxxxxMessageBox() instead
-	showMessageBox_(window, options) {
+	showMessageBox(options) {
 		const {dialog} = require('electron');
-		const nativeImage = require('electron').nativeImage
-		if (!window) window = this.window();
-		return dialog.showMessageBox(window, options);
+		return dialog.showMessageBox(options);
 	}
 
 	showErrorMessageBox(message) {
-		return this.showMessageBox_(this.window(), {
+		return this.showMessageBox({
 			type: 'error',
 			message: message,
 		});
 	}
 
 	showConfirmMessageBox(message) {
-		const result = this.showMessageBox_(this.window(), {
+		const result = this.showMessageBox({
 			type: 'question',
 			message: message,
 			buttons: [_('OK'), _('Cancel')],
@@ -86,12 +83,12 @@ class Bridge {
 		return result === 0;
 	}
 
-	showInfoMessageBox(message, options = {}) {
-		const result = this.showMessageBox_(this.window(), Object.assign({}, {
+	showInfoMessageBox(message) {
+		const result = this.showMessageBox({
 			type: 'info',
 			message: message,
 			buttons: [_('OK')],
-		}, options));
+		});
 		return result === 0;
 	}
 
@@ -111,9 +108,21 @@ class Bridge {
 		return require('electron').shell.openItem(fullPath)
 	}
 
-	checkForUpdates(inBackground, window, logFilePath) {
-		const { checkForUpdates } = require('./checkForUpdates.js');
-		checkForUpdates(inBackground, window, logFilePath);
+	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);
+		}
 	}
 
 }

ElectronClient/app/checkForUpdates.js

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

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

ElectronClient/app/gui/ConfigScreen.jsx

@@ -1,28 +1,20 @@
 const React = require('react');
 const { connect } = require('react-redux');
 const { reg } = require('lib/registry.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { bridge } = require('electron').remote.require('./bridge');
 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();
 
-		shared.init(this);
-
-		this.checkSyncConfig_ = async () => {
-			await shared.checkSyncConfig(this, this.state.settings);
-		}
-
-		this.rowStyle_ = {
-			marginBottom: 10,
+		this.state = {
+			settings: {},
 		};
 	}
 
@@ -40,6 +32,10 @@ class ConfigScreenComponent extends React.Component {
 			});
 		}
 
+		output.sort((a, b) => {
+			return a.label.toLowerCase() < b.label.toLowerCase() ? -1 : +1;
+		});
+
 		return output;
 	}
 
@@ -48,7 +44,9 @@ class ConfigScreenComponent extends React.Component {
 
 		let output = null;
 
-		const rowStyle = this.rowStyle_;
+		const rowStyle = {
+			marginBottom: 10,
+		};
 
 		const labelStyle = Object.assign({}, theme.textStyle, {
 			display: 'inline-block',
@@ -59,27 +57,16 @@ 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) => {
-			return shared.updateSettingValue(this, key, value);
+			const settings = Object.assign({}, this.state.settings);
+			settings[key] = value;
+			this.setState({ settings: settings });
 		}
 
 		// 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();
@@ -95,7 +82,6 @@ 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) {
@@ -103,42 +89,24 @@ 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+value.toString()} style={rowStyle}>
+				<div key={key} 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>						
-						{ descriptionComp }
+						<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>
 					</div>
 				</div>
 			);
 		} else if (md.type === Setting.TYPE_STRING) {
 			const onTextChange = (event) => {
-				updateSettingValue(key, event.target.value);
+				const settings = Object.assign({}, this.state.settings);
+				settings[key] = event.target.value;
+				this.setState({ settings: settings });
 			}
 
-			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={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 }
+					<input type="text" style={controlStyle} value={this.state.settings[key]} onChange={(event) => {onTextChange(event)}} />
 				</div>
 			);
 		} else {
@@ -149,7 +117,10 @@ class ConfigScreenComponent extends React.Component {
 	}
 
 	onSaveClick() {
-		shared.saveSettings(this);
+		for (let n in this.state.settings) {
+			if (!this.state.settings.hasOwnProperty(n)) continue;
+			Setting.setValue(n, this.state.settings[n]);
+		}
 		this.props.dispatch({ type: 'NAV_BACK' });
 	}
 
@@ -159,7 +130,7 @@ class ConfigScreenComponent extends React.Component {
 
 	render() {
 		const theme = themeStyle(this.props.theme);
-		const style = Object.assign({}, this.props.style, { overflow: 'auto' });
+		const style = this.props.style;
 		const settings = this.state.settings;
 
 		const headerStyle = {
@@ -171,28 +142,23 @@ class ConfigScreenComponent extends React.Component {
 		};
 
 		const buttonStyle = {
-			display: this.state.changedSettingKeys.length ? 'inline-block' : 'none',
+			display: this.state.settings === this.props.settings ? 'none' : 'inline-block',
 			marginRight: 10,
 		}
 
-		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>);
+		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);
 		}
 
 		return (

ElectronClient/app/gui/EncryptionConfigScreen.jsx

@@ -1,222 +0,0 @@
-const React = require('react');
-const { connect } = require('react-redux');
-const Setting = require('lib/models/Setting');
-const BaseItem = require('lib/models/BaseItem');
-const EncryptionService = require('lib/services/EncryptionService');
-const { Header } = require('./Header.min.js');
-const { themeStyle } = require('../theme.js');
-const { _ } = require('lib/locale.js');
-const { time } = require('lib/time-utils.js');
-const dialogs = require('./dialogs');
-const shared = require('lib/components/shared/encryption-config-shared.js');
-const pathUtils = require('lib/path-utils.js');
-const { bridge } = require('electron').remote.require('./bridge');
-
-class EncryptionConfigScreenComponent extends React.Component {
-
-	constructor() {
-		super();
-		shared.constructor(this);
-	}
-
-	componentDidMount() {
-		this.isMounted_ = true;
-	}
-
-	componentWillUnmount() {
-		this.isMounted_ = false;
-	}
-
-	initState(props) {
-		return shared.initState(this, props);
-	}
-
-	async refreshStats() {
-		return shared.refreshStats(this);
-	}
-
-	componentWillMount() {
-		this.initState(this.props);
-	}
-
-	componentWillReceiveProps(nextProps) {
-		this.initState(nextProps);
-	}
-
-	async checkPasswords() {
-		return shared.checkPasswords(this);
-	}
-
-	renderMasterKey(mk) {
-		const theme = themeStyle(this.props.theme);
-
-		const onSaveClick = () => {
-			return shared.onSavePasswordClick(this, mk);
-		}
-
-		const onPasswordChange = (event) => {
-			return shared.onPasswordChange(this, mk, event.target.value);
-		}
-
-		const password = this.state.passwords[mk.id] ? this.state.passwords[mk.id] : '';
-		const active = this.props.activeMasterKeyId === mk.id ? '✔' : '';
-		const passwordOk = this.state.passwordChecks[mk.id] === true ? '✔' : '❌';
-
-		return (
-			<tr key={mk.id}>
-				<td style={theme.textStyle}>{active}</td>
-				<td style={theme.textStyle}>{mk.id}</td>
-				<td style={theme.textStyle}>{mk.source_application}</td>
-				<td style={theme.textStyle}>{time.formatMsToLocal(mk.created_time)}</td>
-				<td style={theme.textStyle}>{time.formatMsToLocal(mk.updated_time)}</td>
-				<td style={theme.textStyle}><input type="password" value={password} onChange={(event) => onPasswordChange(event)}/> <button onClick={() => onSaveClick()}>{_('Save')}</button></td>
-				<td style={theme.textStyle}>{passwordOk}</td>
-			</tr>
-		);
-	}
-
-	render() {
-		const style = this.props.style;
-		const theme = themeStyle(this.props.theme);
-		const masterKeys = this.state.masterKeys;
-		const containerPadding = 10;
-
-		const headerStyle = {
-			width: style.width,
-		};
-
-		const containerStyle = {
-			padding: containerPadding,
-			overflow: 'auto',
-			height: style.height - theme.headerHeight - containerPadding * 2,
-		};
-
-		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 () => {
-			const isEnabled = Setting.value('encryption.enabled');
-
-			let answer = null;
-			if (isEnabled) {
-				answer = await dialogs.confirm(_('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 continue?'));
-			} else {
-				answer = await dialogs.prompt(_('Enabling encryption means *all* your notes and attachments are going to be re-synchronised and sent encrypted to the sync target. Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.'), '', '', { type: 'password' });
-			}
-
-			if (!answer) return;
-
-			try {
-				if (isEnabled) {
-					await EncryptionService.instance().disableEncryption();
-				} else {
-					await EncryptionService.instance().generateMasterKeyAndEnableEncryption(answer);
-				}
-			} catch (error) {
-				await dialogs.alert(error.message);
-			}
-		}
-
-		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;
-
-		if (mkComps.length) {
-			masterKeySection = (
-				<div>
-					<h1 style={theme.h1Style}>{_('Master Keys')}</h1>
-					<table>
-						<tbody>
-							<tr>
-								<th style={theme.textStyle}>{_('Active')}</th>
-								<th style={theme.textStyle}>{_('ID')}</th>
-								<th style={theme.textStyle}>{_('Source')}</th>
-								<th style={theme.textStyle}>{_('Created')}</th>
-								<th style={theme.textStyle}>{_('Updated')}</th>
-								<th style={theme.textStyle}>{_('Password')}</th>
-								<th style={theme.textStyle}>{_('Password OK')}</th>
-							</tr>
-							{mkComps}
-						</tbody>
-					</table>
-					<p style={theme.textStyle}>{_('Note: Only one master key is going to be used for encryption (the one marked as "active"). Any of the keys might be used for decryption, depending on how the notes or notebooks were originally encrypted.')}</p>
-				</div>
-			);
-		}
-
-		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 }}>
-						<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.
-						</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>*/}
-					<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>
-		);
-	}
-
-}
-
-const mapStateToProps = (state) => {
-	return {
-		theme: state.settings.theme,
-		masterKeys: state.masterKeys,
-		passwords: state.settings['encryption.passwordCache'],
-		encryptionEnabled: state.settings['encryption.enabled'],
-		activeMasterKeyId: state.settings['encryption.activeMasterKeyId'],
-		notLoadedMasterKeys: state.notLoadedMasterKeys,
-	};
-};
-
-const EncryptionConfigScreen = connect(mapStateToProps)(EncryptionConfigScreenComponent);
-
-module.exports = { EncryptionConfigScreen };

ElectronClient/app/gui/ImportScreen.jsx

@@ -1,7 +1,7 @@
 const React = require('react');
 const { connect } = require('react-redux');
 const { reg } = require('lib/registry.js');
-const Folder = require('lib/models/Folder.js');
+const { Folder } = require('lib/models/folder.js');
 const { bridge } = require('electron').remote.require('./bridge');
 const { Header } = require('./Header.min.js');
 const { themeStyle } = require('../theme.js');
@@ -25,7 +25,9 @@ class ImportScreenComponent extends React.Component {
 				doImport: true,
 				filePath: newProps.filePath,
 				messages: [],
-			}, () => { this.doImport() });
+			});
+
+			this.doImport();
 		}
 	}
 

ElectronClient/app/gui/MainScreen.jsx

@@ -5,12 +5,12 @@ const { SideBar } = require('./SideBar.min.js');
 const { NoteList } = require('./NoteList.min.js');
 const { NoteText } = require('./NoteText.min.js');
 const { PromptDialog } = require('./PromptDialog.min.js');
-const Setting = require('lib/models/Setting.js');
-const BaseModel = require('lib/BaseModel.js');
-const Tag = require('lib/models/Tag.js');
-const Note = require('lib/models/Note.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Tag } = require('lib/models/tag.js');
+const { Note } = require('lib/models/note.js');
 const { uuid } = require('lib/uuid.js');
-const Folder = require('lib/models/Folder.js');
+const { Folder } = require('lib/models/folder.js');
 const { themeStyle } = require('../theme.js');
 const { _ } = require('lib/locale.js');
 const layoutUtils = require('lib/layout-utils.js');
@@ -22,10 +22,6 @@ class MainScreenComponent extends React.Component {
 	componentWillMount() {
 		this.setState({
 			promptOptions: null,
-			modalLayer: {
-				visible: false,
-				message: '',
-			},
 		});
 	}
 
@@ -48,14 +44,16 @@ class MainScreenComponent extends React.Component {
 			const folderId = Setting.value('activeFolderId');
 			if (!folderId) return;
 
-			const newNote = {
+			const note = await Note.save({
+				title: title,
 				parent_id: folderId,
 				is_todo: isTodo ? 1 : 0,
-			};
+			});
+			Note.updateGeolocation(note.id);
 
 			this.props.dispatch({
-				type: 'NOTE_SET_NEW_ONE',
-				item: newNote,
+				type: 'NOTE_SELECT',
+				id: note.id,
 			});
 		}
 
@@ -67,14 +65,30 @@ class MainScreenComponent extends React.Component {
 				return;
 			}
 
-			await createNewNote(null, false);
+			this.setState({
+				promptOptions: {
+					label: _('Note title:'),
+					onClose: async (answer) => {
+						if (answer) await createNewNote(answer, false);
+						this.setState({ promptOptions: null });
+					}
+				},
+			});
 		} else if (command.name === 'newTodo') {
 			if (!this.props.folders.length) {
 				bridge().showErrorMessageBox(_('Please create a notebook first'));
 				return;
 			}
 
-			await createNewNote(null, true);
+			this.setState({
+				promptOptions: {
+					label: _('To-do title:'),
+					onClose: async (answer) => {
+						if (answer) await createNewNote(answer, true);
+						this.setState({ promptOptions: null });
+					}
+				},
+			});
 		} else if (command.name === 'newNotebook') {
 			this.setState({
 				promptOptions: {
@@ -118,7 +132,7 @@ class MainScreenComponent extends React.Component {
 					}
 				},
 			});
-		} else if (command.name === 'renameFolder') {
+		} else if (command.name === 'renameNotebook') {
 			const folder = await Folder.load(command.id);
 			if (!folder) return;
 
@@ -129,8 +143,7 @@ class MainScreenComponent extends React.Component {
 					onClose: async (answer) => {
 						if (answer !== null) {
 							try {
-								folder.title = answer;
-								await Folder.save(folder, { fields: ['title'], userSideValidation: true });
+								await Folder.save({ id: folder.id, title: answer }, { userSideValidation: true });
 							} catch (error) {
 								bridge().showErrorMessageBox(error.message);
 							}
@@ -167,12 +180,6 @@ class MainScreenComponent extends React.Component {
 					}
 				},
 			});
-		} else if (command.name === 'toggleVisiblePanes') {
-			this.toggleVisiblePanes();
-		} 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);
 
@@ -273,17 +280,6 @@ class MainScreenComponent extends React.Component {
 			height: height,
 		};
 
-		this.styles_.modalLayer = Object.assign({}, theme.textStyle, {
-			zIndex: 10000,
-			position: 'absolute',
-			top: 0,
-			left: 0,
-			backgroundColor: theme.backgroundColorTransparent,
-			width: width - 20,
-			height: height - 20,
-			padding: 10,
-		});
-
 		return this.styles_;
 	}
 
@@ -292,25 +288,24 @@ class MainScreenComponent extends React.Component {
 		const promptOptions = this.state.promptOptions;
 		const folders = this.props.folders;
 		const notes = this.props.notes;
-		const messageBoxVisible = this.props.hasDisabledSyncItems || this.props.showMissingMasterKeyMessage;
+		const messageBoxVisible = this.props.hasDisabledSyncItems;
+
 		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible);
 		const theme = themeStyle(this.props.theme);
-		const selectedFolderId = this.props.selectedFolderId;
-		const onConflictFolder = this.props.selectedFolderId === Folder.conflictFolderId();
 
 		const headerButtons = [];
 
 		headerButtons.push({
 			title: _('New note'),
 			iconName: 'fa-file-o',
-			enabled: !!folders.length && !onConflictFolder,
+			enabled: !!folders.length,
 			onClick: () => { this.doCommand({ name: 'newNote' }) },
 		});
 				
 		headerButtons.push({
 			title: _('New to-do'),
 			iconName: 'fa-check-square-o',
-			enabled: !!folders.length && !onConflictFolder,
+			enabled: !!folders.length,
 			onClick: () => { this.doCommand({ name: 'newTodo' }) },
 		});
 
@@ -330,7 +325,9 @@ class MainScreenComponent extends React.Component {
 			title: _('Layout'),
 			iconName: 'fa-columns',
 			enabled: !!notes.length,
-			onClick: () => { this.doCommand({ name: 'toggleVisiblePanes' }) },
+			onClick: () => {
+				this.toggleVisiblePanes();
+			},
 		});
 
 		if (!this.promptOnClose_) {
@@ -346,38 +343,16 @@ class MainScreenComponent extends React.Component {
 			});
 		}
 
-		const onViewMasterKeysClick = () => {
-			this.props.dispatch({
-				type: 'NAV_GO',
-				routeName: 'EncryptionConfig',
-			});
-		}
-
-		let messageComp = null;
-
-		if (messageBoxVisible) {
-			let msg = null;
-			if (this.props.hasDisabledSyncItems) {
-				msg = <span>{_('Some items cannot be synchronised.')} <a href="#" onClick={() => { onViewDisabledItemsClick() }}>{_('View them now')}</a></span>
-			} else if (this.props.showMissingMasterKeyMessage) {
-				msg = <span>{_('Some items cannot be decrypted.')} <a href="#" onClick={() => { onViewMasterKeysClick() }}>{_('Set the password')}</a></span>
-			}
-
-			messageComp = (
-				<div style={styles.messageBox}>
-					<span style={theme.textStyle}>
-						{msg}
-					</span>
-				</div>
-			);
-		}
-
-		const modalLayerStyle = Object.assign({}, styles.modalLayer, { display: this.state.modalLayer.visible ? 'block' : 'none' });
+		const messageComp = messageBoxVisible ? (
+			<div style={styles.messageBox}>
+				<span style={theme.textStyle}>
+					{_('Some items cannot be synchronised.')} <a href="#" onClick={() => { onViewDisabledItemsClick() }}>{_('View them now')}</a>
+				</span>
+			</div>
+		) : null;
 
 		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 : ''}
@@ -408,8 +383,6 @@ const mapStateToProps = (state) => {
 		folders: state.folders,
 		notes: state.notes,
 		hasDisabledSyncItems: state.hasDisabledSyncItems,
-		showMissingMasterKeyMessage: state.notLoadedMasterKeys.length && state.masterKeys.length,
-		selectedFolderId: state.selectedFolderId,
 	};
 };
 

ElectronClient/app/gui/NoteList.jsx

@@ -3,14 +3,11 @@ const React = require('react');
 const { connect } = require('react-redux');
 const { time } = require('lib/time-utils.js');
 const { themeStyle } = require('../theme.js');
-const BaseModel = require('lib/BaseModel');
 const { _ } = require('lib/locale.js');
 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');
 
 class NoteListComponent extends React.Component {
 
@@ -56,61 +53,26 @@ class NoteListComponent extends React.Component {
 	}
 
 	itemContextMenu(event) {
-		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;
-		}
-
+		const noteIds = this.props.selectedNoteIds;
 		if (!noteIds.length) return;
 
-		const notes = noteIds.map((id) => BaseModel.byId(this.props.notes, id));
-
-		let hasEncrypted = false;
-		for (let i = 0; i < notes.length; i++) {
-			if (!!notes[i].encryption_applied) hasEncrypted = true;
-		}
-
 		const menu = new Menu()
 
-		if (!hasEncrypted) {
-			menu.append(new MenuItem({label: _('Add or remove tags'), enabled: noteIds.length === 1, click: async () => {
-				this.props.dispatch({
-					type: 'WINDOW_COMMAND',
-					name: 'setTags',
-					noteId: noteIds[0],
-				});
-			}}));
+		menu.append(new MenuItem({label: _('Add or remove tags'), enabled: noteIds.length === 1, click: async () => {
+			this.props.dispatch({
+				type: 'WINDOW_COMMAND',
+				name: 'setTags',
+				noteId: noteIds[0],
+			});
+		}}));
 
-			menu.append(new MenuItem({label: _('Switch between note and to-do type'), click: async () => {
-				for (let i = 0; i < noteIds.length; i++) {
-					const note = await Note.load(noteIds[i]);
-					await Note.save(Note.toggleIsTodo(note), { userSideValidation: true });
-					eventManager.emit('noteTypeToggle', { noteId: note.id });
-				}
-			}}));
-
-			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 });
-				}}));
+		menu.append(new MenuItem({label: _('Switch between note and to-do type'), click: async () => {
+			for (let i = 0; i < noteIds.length; i++) {
+				const note = await Note.load(noteIds[i]);
+				await Note.save(Note.toggleIsTodo(note));
+				eventManager.emit('noteTypeToggle', { noteId: note.id });
 			}
-
-			const exportMenuItem = new MenuItem({label: _('Export'), submenu: exportMenu});
-
-			menu.append(exportMenuItem);
-		}
+		}}));
 
 		menu.append(new MenuItem({label: _('Delete'), click: async () => {
 			const ok = bridge().showConfirmMessageBox(noteIds.length > 1 ? _('Delete notes?') : _('Delete note?'));
@@ -158,17 +120,14 @@ class NoteListComponent extends React.Component {
 				id: item.id,
 				todo_completed: checked ? time.unixMs() : 0,
 			}
-			await Note.save(newNote, { userSideValidation: true });
+			await Note.save(newNote);
 			eventManager.emit('todoToggle', { noteId: item.id });
 		}
 
 		const hPadding = 10;
 
 		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.
@@ -194,9 +153,8 @@ class NoteListComponent extends React.Component {
 				style={listItemTitleStyle}
 				onClick={(event) => { onTitleClick(event, item) }}
 				onDragStart={(event) => onDragStart(event) }
-				data-id={item.id}
 			>
-			{Note.displayTitle(item)}
+			{item.title}
 			</a>
 		</div>
 	}
@@ -204,9 +162,8 @@ class NoteListComponent extends React.Component {
 	render() {
 		const theme = themeStyle(this.props.theme);
 		const style = this.props.style;
-		let notes = this.props.notes.slice();
 
-		if (!notes.length) {
+		if (!this.props.notes.length) {
 			const padding = 10;
 			const emptyDivStyle = Object.assign({
 				padding: padding + 'px',
@@ -225,7 +182,7 @@ class NoteListComponent extends React.Component {
 				itemHeight={this.style().listItem.height}
 				style={style}
 				className={"note-list"}
-				items={notes}
+				items={this.props.notes}
 				itemRenderer={ (item) => { return this.itemRenderer(item, theme, style.width) } }
 			></ItemList>
 		);

ElectronClient/app/gui/NoteText.jsx

@@ -1,7 +1,7 @@
 const React = require('react');
-const Note = require('lib/models/Note.js');
+const { Note } = require('lib/models/note.js');
 const { time } = require('lib/time-utils.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { IconButton } = require('./IconButton.min.js');
 const Toolbar = require('./Toolbar.min.js');
 const { connect } = require('react-redux');
@@ -16,7 +16,6 @@ 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
@@ -37,13 +36,7 @@ class NoteTextComponent extends React.Component {
 			isLoading: true,
 			webviewReady: false,
 			scrollHeight: null,
-			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,
+			editorScrollTop: 0
 		};
 
 		this.lastLoadedNoteId_ = null;
@@ -82,10 +75,7 @@ class NoteTextComponent extends React.Component {
 
 	async componentWillMount() {
 		let note = null;
-
-		if (this.props.newNote) {
-			note = Object.assign({}, this.props.newNote);
-		} else if (this.props.noteId) {
+		if (this.props.noteId) {
 			note = await Note.load(this.props.noteId);
 		}
 
@@ -116,26 +106,15 @@ class NoteTextComponent extends React.Component {
 		eventManager.removeListener('todoToggle', this.onTodoToggle_);
 	}
 
-	async saveIfNeeded(saveIfNewNote = false) {
-		const forceSave = saveIfNewNote && (this.state.note && !this.state.note.id);
-
+	async saveIfNeeded() {
 		if (this.scheduleSaveTimeout_) clearTimeout(this.scheduleSaveTimeout_);
 		this.scheduleSaveTimeout_ = null;
-		if (!forceSave) {
-			if (!shared.isModified(this)) return;
-		}
+		if (!shared.isModified(this)) return;
 		await shared.saveNoteButton_press(this);
 	}
 
 	async saveOneProperty(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);
-		}
+		await shared.saveOneProperty(this, name, value);
 	}
 
 	scheduleSave() {
@@ -149,32 +128,17 @@ class NoteTextComponent extends React.Component {
 		if (!options) options = {};
 		if (!('noReloadIfLocalChanges' in options)) options.noReloadIfLocalChanges = false;
 
-		await this.saveIfNeeded();
+		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;
 
-		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;
-			}
+		// 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;
@@ -182,68 +146,38 @@ 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 || props.newNote);
+		const webviewReady = this.webview_ && this.state.webviewReady && noteId;
 
-		// Scroll back to top when loading new note
-		if (loadingNewNote) {
-			this.editorMaxScrollTop_ = 0;
+		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;
 
-			if (note) {
-				const focusSettingName = !!note.is_todo ? 'newTodoFocus' : 'newNoteFocus';
+		this.setState({
+			note: note,
+			lastSavedNote: Object.assign({}, note),
+			webviewReady: webviewReady,
+		});
+	}
 
-				if (Setting.value(focusSettingName) === 'title') {
-					if (this.titleField_) this.titleField_.focus();
-				} else {
-					if (this.editor_) this.editor_.editor.focus();
-				}
-			}
-
-			if (this.editor_) {
+	async componentWillReceiveProps(nextProps) {
+		if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) {
+			await this.reloadNote(nextProps);
+			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() {
@@ -256,7 +190,6 @@ class NoteTextComponent extends React.Component {
 
 	title_changeText(event) {
 		shared.noteComponent_change(this, 'title', event.target.value);
-		this.setState({ newAndNoTitleChangeNoteId: null });
 		this.scheduleSave();
 	}
 
@@ -269,7 +202,7 @@ class NoteTextComponent extends React.Component {
 		shared.showMetadata_onPress(this);
 	}
 
-	async webview_ipcMessage(event) {
+	webview_ipcMessage(event) {
 		const msg = event.channel ? event.channel : '';
 		const args = event.args;
 		const arg0 = args && args.length >= 1 ? args[0] : null;
@@ -291,32 +224,6 @@ 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) => {
@@ -324,7 +231,10 @@ class NoteTextComponent extends React.Component {
 				bridge().openItem(filePath);
 			});
 		} else {
-			bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
+			bridge().showMessageBox({
+				type: 'error',
+				message: _('Unsupported link or message: %s', msg),
+			});
 		}
 	}
 
@@ -430,47 +340,18 @@ 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(true);
-		let note = await Note.load(this.state.note.id);
+		await this.saveIfNeeded();
+		let note = await Note.load(noteId);
 
 		for (let i = 0; i < filePaths.length; i++) {
 			const filePath = filePaths[i];
@@ -488,29 +369,20 @@ class NoteTextComponent extends React.Component {
 		}
 	}
 
-	async commandSetAlarm() {
-		await this.saveIfNeeded(true);
+	commandSetAlarm() {
+		const noteId = this.props.noteId;
+		if (!noteId) return;
 
 		this.props.dispatch({
 			type: 'WINDOW_COMMAND',
 			name: 'editAlarm',
-			noteId: this.state.note.id,
-		});
-	}
-
-	async commandSetTags() {
-		await this.saveIfNeeded(true);
-
-		this.props.dispatch({
-			type: 'WINDOW_COMMAND',
-			name: 'setTags',
-			noteId: this.state.note.id,
+			noteId: noteId,
 		});
 	}
 
 	itemContextMenu(event) {
-		const note = this.state.note;
-		if (!note) return;
+		const noteId = this.props.noteId;
+		if (!noteId) return;
 
 		const menu = new Menu()
 
@@ -518,26 +390,29 @@ class NoteTextComponent extends React.Component {
 			return this.commandAttachFile();
 		}}));
 
-		menu.append(new MenuItem({label: _('Tags'), click: async () => {
-			return this.commandSetTags();
+		menu.append(new MenuItem({label: _('Set alarm'), click: async () => {
+			return this.commandSetAlarm();
 		}}));
 
-		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 ? note.body : '';
+		const body = note ? note.body : '';
 		const theme = themeStyle(this.props.theme);
 		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
-		const isTodo = note && !!note.is_todo;
 
 		const borderWidth = 1;
 
@@ -550,7 +425,7 @@ class NoteTextComponent extends React.Component {
 
 		const innerWidth = rootStyle.width - rootStyle.paddingLeft - rootStyle.paddingRight - borderWidth;
 
-		if (!note || !!note.encryption_applied) {
+		if (!note) {
 			const emptyDivStyle = Object.assign({
 				backgroundColor: 'black',
 				opacity: 0.1,
@@ -633,14 +508,7 @@ class NoteTextComponent extends React.Component {
 				},
 				postMessageSyntax: 'ipcRenderer.sendToHost',
 			};
-
-			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);
+			const html = this.mdToHtml().render(body, theme, mdOptions);
 			this.webview_.send('setHtml', html);
 		}
 
@@ -652,12 +520,6 @@ 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'),
@@ -674,11 +536,9 @@ class NoteTextComponent extends React.Component {
 
 		const titleEditor = <input
 			type="text"
-			ref={(elem) => { this.titleField_ = elem; } }
 			style={titleEditorStyle}
-			value={note && note.title ? note.title : ''}
+			value={note ? note.title : ''}
 			onChange={(event) => { this.title_changeText(event); }}
-			placeholder={ this.props.newNote ? _('Creating new %s...', isTodo ? _('to-do') : _('note')) : '' }
 		/>
 
 		const titleBarMenuButton = <IconButton style={{
@@ -745,8 +605,6 @@ const mapStateToProps = (state) => {
 		theme: state.settings.theme,
 		showAdvancedOptions: state.settings.showAdvancedOptions,
 		syncStarted: state.syncStarted,
-		newNote: state.newNote,
-		windowCommand: state.windowCommand,
 	};
 };
 

ElectronClient/app/gui/OneDriveLoginScreen.jsx

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

ElectronClient/app/gui/PromptDialog.jsx

@@ -42,20 +42,17 @@ 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 - paddingTop,
+			height: height,
 			backgroundColor: 'rgba(0,0,0,0.6)',
 			display: visible ? 'flex' : 'none',
-    		alignItems: 'flex-start',
+    		alignItems: 'center',
     		justifyContent: 'center',
-    		paddingTop: paddingTop + 'px',
 		};
 
 		this.styles_.promptDialog = {
@@ -91,6 +88,24 @@ 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

@@ -4,14 +4,13 @@ const { createStore } = require('redux');
 const { connect, Provider } = require('react-redux');
 
 const { _ } = require('lib/locale.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 
 const { MainScreen } = require('./MainScreen.min.js');
 const { OneDriveLoginScreen } = require('./OneDriveLoginScreen.min.js');
 const { StatusScreen } = require('./StatusScreen.min.js');
 const { ImportScreen } = require('./ImportScreen.min.js');
 const { ConfigScreen } = require('./ConfigScreen.min.js');
-const { EncryptionConfigScreen } = require('./EncryptionConfigScreen.min.js');
 const { Navigator } = require('./Navigator.min.js');
 
 const { app } = require('../app');
@@ -78,7 +77,6 @@ class RootComponent extends React.Component {
 			Import: { screen: ImportScreen, title: () => _('Import') },
 			Config: { screen: ConfigScreen, title: () => _('Options') },
 			Status: { screen: StatusScreen, title: () => _('Synchronisation Status') },
-			EncryptionConfig: { screen: EncryptionConfigScreen, title: () => _('Encryption Options') },
 		};
 
 		return (

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/base-model.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,65 +27,62 @@ 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 * 0.9),
+				fontSize: Math.round(theme.fontSize * .9),
 				color: theme.color2,
-				opacity: 0.5,
-				display: "flex",
-				alignItems: "left",
-				justifyContent: "top",
-				flexDirection: "column",
+				opacity: .5,
+				display: 'flex',
+				alignItems: 'left',
+				justifyContent: 'top',
+				flexDirection: 'column',
 				marginTop: 10,
 				marginLeft: 5,
 				marginRight: 5,
 				minHeight: 70,
-				wordWrap: "break-word",
-				width: "100%",
 			},
 		};
 
@@ -93,77 +90,47 @@ 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');
 
-		const itemType = Number(event.target.getAttribute("data-type"));
-		if (!itemId || !itemType) throw new Error("No data on element");
-
-		let deleteMessage = "";
+		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();
 
-		let item = null;
+		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) {
-			item = BaseModel.byId(this.props.folders, itemId);
-		}
-
-		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 && !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({ 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.append(new MenuItem({label: _('Rename'), click: async () => {
+				this.props.dispatch({
+					type: 'WINDOW_COMMAND',
+					name: 'renameNotebook',
+					id: itemId,
+				});
+			}}))
 		}
 
 		menu.popup(bridge().window());
@@ -171,21 +138,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,
 		});
 	}
@@ -200,180 +167,103 @@ 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)}}>{folder.title}
+		</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.title}</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} />;
+		return <div style={{height:2, backgroundColor:'blue' }} key={key}></div>
 	}
 
 	makeHeader(key, label, iconName) {
 		const style = this.style().header;
-		const icon = <i style={{ fontSize: style.fontSize * 1.2, marginRight: 5 }} className={"fa " + iconName} />;
-		return (
-			<div style={style} key={key}>
-				{icon}
-				{label}
-			</div>
-		);
+		const icon = <i style={{fontSize: style.fontSize * 1.2, marginRight: 5}} className={"fa " + iconName}></i>
+		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} />;
-		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}></i>
+		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"));
+			items.push(this.makeHeader('searchHeader', _('Searches'), 'fa-search'));
 
 			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} style={{ wordWrap: "break-word", width: "100%" }}>
-					{lines[i]}
-				</div>
-			);
+			syncReportText.push(<div key={i}>{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}>
@@ -381,9 +271,10 @@ class SideBarComponent extends React.Component {
 			</div>
 		);
 	}
+
 }
 
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
 	return {
 		folders: state.folders,
 		tags: state.tags,
@@ -401,4 +292,4 @@ const mapStateToProps = state => {
 
 const SideBar = connect(mapStateToProps)(SideBarComponent);
 
-module.exports = { SideBar };
+module.exports = { SideBar };