Android release v1.0.306

* Revert "Revert "Desktop: Add ENEX to HTML export (#1795)""

This reverts commit 50b66cceca.

* Revert "Revert "Desktop, Cli: Fixed interop service so that it still allow auto-detecting importer based on format (required for Cli and for test units)""

This reverts commit c7c57ab2a5.

* Fix the .md importer

* Add comment re future refactor

* Rm importerClass for .md importer

* Fix EnexToMd module name

.eslintignore

@@ -39,3 +39,9 @@ ReactNativeClient/node_modules
 readme/
 Tools/node_modules
 Tools/PortableAppsLauncher
+Server/.git/
+Server/.github/
+Server/docs/
+Server/dist/
+Server/bin/
+Server/node_modules/

.eslintrc.js

@@ -4,6 +4,7 @@ module.exports = {
 		'es6': true,
 		'node': true,
 	},
+	"parser": "@typescript-eslint/parser",
 	'extends': ['eslint:recommended'],
 	'globals': {
 		'Atomics': 'readonly',
@@ -36,7 +37,8 @@ module.exports = {
 		"react/jsx-uses-vars": "error",
 		// Ignore all unused function arguments, because in some
 		// case they are kept to indicate the function signature.
-		"no-unused-vars": ["error", { "argsIgnorePattern": ".*" }],
+		//"no-unused-vars": ["error", { "argsIgnorePattern": ".*" }],
+		"@typescript-eslint/no-unused-vars": ["error"],
 		"no-constant-condition": 0,
 		"no-prototype-builtins": 0,
 		"space-in-parens": ["error", "never"],
@@ -46,8 +48,15 @@ module.exports = {
 		"indent": ["error", "tab"],
 		"comma-dangle": ["error", "always-multiline"],
 		"no-trailing-spaces": "error",
+		"linebreak-style": ["error", "unix"],
+		// This error is always a false positive so far since it detects
+		// possible race conditions in contexts where we know it cannot happen.
+		"require-atomic-updates": 0,
+		"prefer-template": ["error"],
+		"template-curly-spacing": ["error", "never"]
 	},
 	"plugins": [
 		"react",
+		"@typescript-eslint",
 	],
 };

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: "🐛 Bug Report"
 about: Report a reproducible bug or regression in Joplin.
 title: ''
-labels: 'bug'
+labels: ':bug: bug'
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Report an accepted feature request.
 title: '[Feature request] '
-labels: 'feature request'
+labels: ':four_leaf_clover: feature request'
 
 ---
 

.github/ISSUE_TEMPLATE/question.md

@@ -2,7 +2,7 @@
 name: "🤔 Questions and Help"
 about: The issue tracker is not for questions. Please ask questions on https://discourse.joplinapp.org/.
 title: 'Question: '
-labels: 'question'
+labels: ':question: question'
 
 ---
 

.github/stale.yml

@@ -5,13 +5,13 @@ daysUntilStale: 90
 daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
-  - "good first issue"
-  - "essential"
-  - "essential-reviewed"
-  - "help wanted"
-  - "nice to have"
-  - "upstream"
-  - "backlog"
+  - ":roller_coaster: good first issue"
+  - ":sparkles: essential"
+  - ":sparkles: :eyes: essential-reviewed"
+  - ":ambulance: help wanted"
+  - ":ribbon: nice to have"
+  - ":mount_fuji: upstream"
+  - ":page_with_curl: backlog"
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

.gitignore

@@ -42,4 +42,5 @@ ReactNativeClient/lib/csstojs/
 ReactNativeClient/lib/rnInjectedJs/
 ElectronClient/app/gui/note-viewer/fonts/
 ElectronClient/app/gui/note-viewer/lib.js
-Tools/commit_hook.txt
+Tools/commit_hook.txt
+.vscode/*

.travis.yml

@@ -1,5 +1,5 @@
 # Only build tags (Doesn't work - doesn't build anything)
-if: tag IS present
+if: tag IS present OR type = pull_request
 
 rvm: 2.3.3
 
@@ -54,8 +54,20 @@ before_install:
 
 script:
   - |
+    # Install tools
     cd Tools
     npm install
+
+    # Run test units
+    cd ../CliClient
+    npm install
+    ./run_test.sh
+    testResult=$?
+    if [ $testResult -ne 0 ]; then
+      exit $testResult
+    fi
+
+    # Prepare the Electron app and build it
     cd ../ElectronClient/app
     rsync -aP --delete ../../ReactNativeClient/lib/ lib/
     npm install && USE_HARD_LINKS=false yarn dist

BUILD.md

@@ -3,6 +3,7 @@
 # General information
 
 - All the applications share the same library, which, for historical reasons, is in ReactNativeClient/lib. This library is copied to the relevant directories when building each app.
+- In general, most of the backend (anything to do with the database, synchronisation, data import or export, etc.) is shared across all the apps, so when making a change please consider how it will affect all the apps.
 
 ## macOS dependencies
 
@@ -18,11 +19,10 @@
 
 # Building the tools
 
-Before building any of the applications, you need to build the tools:
+Before building any of the applications, you need to build the tools and pre-commit hooks:
 
 ```
-cd Tools
-npm install
+npm install && cd Tools && npm install
 ```
 
 # Building the Electron application
@@ -78,4 +78,4 @@ npm install
 rsync --delete -aP ../ReactNativeClient/locales/ build/locales/
 ```
 
-Run `run.sh` to start the application for testing.
+Run `run.sh` to start the application for testing.

CliClient/.eslintrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+	"overrides": [
+		{
+			"files": ["tests/**/*.js"],
+			'rules': {
+				// Ignore all unused function arguments, because in some
+				// case they are kept to indicate the function signature.
+				"no-unused-vars": ["error", { "argsIgnorePattern": ".*" }],
+				"@typescript-eslint/no-unused-vars": 0,
+			}
+		},
+	],
+};

CliClient/app/ResourceServer.js

@@ -28,7 +28,7 @@ class ResourceServer {
 
 	baseUrl() {
 		if (!this.port_) return '';
-		return 'http://127.0.0.1:' + this.port_;
+		return `http://127.0.0.1:${this.port_}`;
 	}
 
 	setLinkHandler(handler) {
@@ -53,7 +53,7 @@ class ResourceServer {
 			const url = urlParser.parse(request.url, true);
 			let resourceId = url.pathname.split('/');
 			if (resourceId.length < 2) {
-				writeResponse('Error: could not get resource ID from path name: ' + url.pathname);
+				writeResponse(`Error: could not get resource ID from path name: ${url.pathname}`);
 				return;
 			}
 			resourceId = resourceId[1];
@@ -62,7 +62,7 @@ class ResourceServer {
 
 			try {
 				const done = await this.linkHandler_(resourceId, response);
-				if (!done) throw new Error('Unhandled resource: ' + resourceId);
+				if (!done) throw new Error(`Unhandled resource: ${resourceId}`);
 			} catch (error) {
 				response.setHeader('Content-Type', 'text/plain');
 				// eslint-disable-next-line require-atomic-updates

CliClient/app/app-gui.js

@@ -288,7 +288,7 @@ class AppGui {
 		if (!cmd) return;
 		const isConfigPassword = cmd.indexOf('config ') >= 0 && cmd.indexOf('password') >= 0;
 		if (isConfigPassword) return;
-		this.stdout(chalk.cyan.bold('> ' + cmd));
+		this.stdout(chalk.cyan.bold(`> ${cmd}`));
 	}
 
 	setupKeymap(keymap) {
@@ -297,7 +297,7 @@ class AppGui {
 		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 (!item.command) throw new Error(`Missing command for keymap item: ${JSON.stringify(item)}`);
 
 			if (!('type' in item)) item.type = 'exec';
 
@@ -440,7 +440,7 @@ class AppGui {
 				if (!item) return;
 
 				if (item.type_ === BaseModel.TYPE_FOLDER) {
-					await this.processPromptCommand('rmbook ' + item.id);
+					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) {
@@ -473,7 +473,7 @@ class AppGui {
 			this.addCommandToConsole(cmd);
 			await this.processPromptCommand(cmd);
 		} else {
-			throw new Error('Unknown command: ' + cmd);
+			throw new Error(`Unknown command: ${cmd}`);
 		}
 	}
 
@@ -593,7 +593,7 @@ class AppGui {
 			if (!s) return false;
 			s = s.trim().toLowerCase();
 			for (let i = 0; i < protocols.length; i++) {
-				if (s.indexOf(protocols[i] + '://') === 0) return true;
+				if (s.indexOf(`${protocols[i]}://`) === 0) return true;
 			}
 			return false;
 		};
@@ -627,7 +627,7 @@ class AppGui {
 			if (link.type === 'item') {
 				const itemId = link.id;
 				let item = await BaseItem.loadItemById(itemId);
-				if (!item) throw new Error('No item with ID ' + itemId); // Should be nearly impossible
+				if (!item) throw new Error(`No item with ID ${itemId}`); // Should be nearly impossible
 
 				if (item.type_ === BaseModel.TYPE_RESOURCE) {
 					if (item.mime) response.setHeader('Content-Type', item.mime);
@@ -640,11 +640,11 @@ class AppGui {
 						<head><meta charset="UTF-8"/></head><body>
 					`,
 					];
-					html.push('<pre>' + htmlentities(item.title) + '\n\n' + htmlentities(item.body) + '</pre>');
+					html.push(`<pre>${htmlentities(item.title)}\n\n${htmlentities(item.body)}</pre>`);
 					html.push('</body></html>');
 					response.write(html.join(''));
 				} else {
-					throw new Error('Unsupported item type: ' + item.type_);
+					throw new Error(`Unsupported item type: ${item.type_}`);
 				}
 
 				return true;
@@ -676,7 +676,7 @@ class AppGui {
 					return url;
 				}
 
-				return linkStyle(this.resourceServer_.baseUrl() + '/' + index);
+				return linkStyle(`${this.resourceServer_.baseUrl()}/${index}`);
 			},
 		};
 	}
@@ -695,7 +695,7 @@ class AppGui {
 
 			term.grabInput();
 
-			term.on('key', async (name, matches, data) => {
+			term.on('key', async (name) => {
 				// -------------------------------------------------------------------------
 				// Handle special shortcuts
 				// -------------------------------------------------------------------------
@@ -777,7 +777,7 @@ class AppGui {
 					} else if (keymapItem.type === 'tkwidgets') {
 						this.widget('root').handleKey(this.tkWidgetKeys_[keymapItem.command]);
 					} else {
-						throw new Error('Unknown command type: ' + JSON.stringify(keymapItem));
+						throw new Error(`Unknown command type: ${JSON.stringify(keymapItem)}`);
 					}
 				}
 

CliClient/app/app.js

@@ -125,7 +125,7 @@ class Application extends BaseApplication {
 			if (this.store()) {
 				return this.store().dispatch(action);
 			} else {
-				return action => {};
+				return () => {};
 			}
 		});
 
@@ -136,10 +136,10 @@ class Application extends BaseApplication {
 			if (!options.answers) options.answers = options.booleanAnswerDefault === 'y' ? [_('Y'), _('n')] : [_('N'), _('y')];
 
 			if (options.type == 'boolean') {
-				message += ' (' + options.answers.join('/') + ')';
+				message += ` (${options.answers.join('/')})`;
 			}
 
-			let answer = await this.gui().prompt('', message + ' ', options);
+			let answer = await this.gui().prompt('', `${message} `, options);
 
 			if (options.type === 'boolean') {
 				if (answer === null) return false; // Pressed ESCAPE
@@ -181,7 +181,7 @@ class Application extends BaseApplication {
 				const ext = fileExtension(path);
 				if (ext != 'js') return;
 
-				let CommandClass = require('./' + path);
+				let CommandClass = require(`./${path}`);
 				let cmd = new CommandClass();
 				if (!cmd.enabled()) return;
 				cmd = this.setupCommand(cmd);
@@ -248,7 +248,7 @@ class Application extends BaseApplication {
 
 		let CommandClass = null;
 		try {
-			CommandClass = require(__dirname + '/command-' + name + '.js');
+			CommandClass = require(`${__dirname}/command-${name}.js`);
 		} catch (error) {
 			if (error.message && error.message.indexOf('Cannot find module') >= 0) {
 				let e = new Error(_('No such command: %s', name));
@@ -278,16 +278,16 @@ class Application extends BaseApplication {
 			stdout: text => {
 				console.info(text);
 			},
-			fullScreen: (b = true) => {},
+			fullScreen: () => {},
 			exit: () => {},
-			showModalOverlay: text => {},
+			showModalOverlay: () => {},
 			hideModalOverlay: () => {},
 			stdoutMaxWidth: () => {
 				return 100;
 			},
 			forceRender: () => {},
 			termSaveState: () => {},
-			termRestoreState: state => {},
+			termRestoreState: () => {},
 		};
 	}
 
@@ -343,7 +343,7 @@ class Application extends BaseApplication {
 			itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i];
 		}
 
-		const filePath = Setting.value('profileDir') + '/keymap.json';
+		const filePath = `${Setting.value('profileDir')}/keymap.json`;
 		if (await fs.pathExists(filePath)) {
 			try {
 				let configString = await fs.readFile(filePath, 'utf-8');
@@ -355,7 +355,7 @@ class Application extends BaseApplication {
 				}
 			} catch (error) {
 				let msg = error.message ? error.message : '';
-				msg = 'Could not load keymap ' + filePath + '\n' + msg;
+				msg = `Could not load keymap ${filePath}\n${msg}`;
 				error.message = msg;
 				throw error;
 			}

CliClient/app/autocompletion.js

@@ -16,9 +16,9 @@ async function handleAutocompletionPromise(line) {
 		if (names.indexOf(words[0]) === -1) {
 			let x = names.filter(n => n.indexOf(words[0]) === 0);
 			if (x.length === 1) {
-				return x[0] + ' ';
+				return `${x[0]} `;
 			}
-			return x.length > 0 ? x.map(a => a + ' ') : line;
+			return x.length > 0 ? x.map(a => `${a} `) : line;
 		} else {
 			return line;
 		}
@@ -56,7 +56,7 @@ async function handleAutocompletionPromise(line) {
 			return line;
 		}
 		let ret = l.map(a => toCommandLine(a));
-		ret.prefix = toCommandLine(words.slice(0, -1)) + ' ';
+		ret.prefix = `${toCommandLine(words.slice(0, -1))} `;
 		return ret;
 	}
 	//Complete an argument
@@ -74,23 +74,23 @@ async function handleAutocompletionPromise(line) {
 		const currentFolder = app().currentFolder();
 
 		if (argName == 'note' || argName == 'note-pattern') {
-			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
+			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: `${next}*` }) : [];
 			l.push(...notes.map(n => n.title));
 		}
 
 		if (argName == 'notebook') {
-			const folders = await Folder.search({ titlePattern: next + '*' });
+			const folders = await Folder.search({ titlePattern: `${next}*` });
 			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 + '*' });
+			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 + '*' });
+			let tags = await Tag.search({ titlePattern: `${next}*` });
 			l.push(...tags.map(n => n.title));
 		}
 
@@ -113,7 +113,7 @@ async function handleAutocompletionPromise(line) {
 		return toCommandLine([...words.slice(0, -1), l[0]]);
 	} else if (l.length > 1) {
 		let ret = l.map(a => toCommandLine(a));
-		ret.prefix = toCommandLine(words.slice(0, -1)) + ' ';
+		ret.prefix = `${toCommandLine(words.slice(0, -1))} `;
 		return ret;
 	}
 	return line;
@@ -128,9 +128,9 @@ function toCommandLine(args) {
 		return args
 			.map(function(a) {
 				if (a.indexOf('"') !== -1 || a.indexOf(' ') !== -1) {
-					return '\'' + a + '\'';
+					return `'${a}'`;
 				} else if (a.indexOf('\'') !== -1) {
-					return '"' + a + '"';
+					return `"${a}"`;
 				} else {
 					return a;
 				}
@@ -138,11 +138,11 @@ function toCommandLine(args) {
 			.join(' ');
 	} else {
 		if (args.indexOf('"') !== -1 || args.indexOf(' ') !== -1) {
-			return '\'' + args + '\' ';
+			return `'${args}' `;
 		} else if (args.indexOf('\'') !== -1) {
-			return '"' + args + '" ';
+			return `"${args}" `;
 		} else {
-			return args + ' ';
+			return `${args} `;
 		}
 	}
 }

CliClient/app/base-command.js

@@ -19,7 +19,7 @@ class BaseCommand {
 		throw new Error('Description not defined');
 	}
 
-	async action(args) {
+	async action() {
 		throw new Error('Action not defined');
 	}
 

CliClient/app/build-doc.js

@@ -54,7 +54,7 @@ function getCommands() {
 		const ext = fileExtension(path);
 		if (ext != 'js') return;
 
-		let CommandClass = require('./' + path);
+		let CommandClass = require(`./${path}`);
 		let cmd = new CommandClass();
 		if (!cmd.enabled()) return;
 		if (cmd.hidden()) return;
@@ -102,14 +102,14 @@ function getFooter() {
 
 	output.push('WEBSITE');
 	output.push('');
-	output.push(INDENT + 'https://joplinapp.org');
+	output.push(`${INDENT}https://joplinapp.org`);
 
 	output.push('');
 
 	output.push('LICENSE');
 	output.push('');
-	let filePath = rootDir + '/LICENSE_' + languageCode();
-	if (!fs.existsSync(filePath)) filePath = rootDir + '/LICENSE';
+	let filePath = `${rootDir}/LICENSE_${languageCode()}`;
+	if (!fs.existsSync(filePath)) filePath = `${rootDir}/LICENSE`;
 	const licenseText = fs.readFileSync(filePath, 'utf8');
 	output.push(wrap(licenseText, INDENT));
 
@@ -131,7 +131,7 @@ async function main() {
 	const commandsText = commandBlocks.join('\n\n');
 	const footerText = getFooter();
 
-	console.info(headerText + '\n\n' + 'USAGE' + '\n\n' + commandsText + '\n\n' + footerText);
+	console.info(`${headerText}\n\n` + 'USAGE' + `\n\n${commandsText}\n\n${footerText}`);
 }
 
 main().catch(error => {

CliClient/app/cli-integration-tests.js

@@ -16,8 +16,8 @@ process.on('unhandledRejection', (reason, p) => {
 	console.error('Unhandled promise rejection', p, 'reason:', reason);
 });
 
-const baseDir = dirname(__dirname) + '/tests/cli-integration';
-const joplinAppPath = __dirname + '/main.js';
+const baseDir = `${dirname(__dirname)}/tests/cli-integration`;
+const joplinAppPath = `${__dirname}/main.js`;
 
 const logger = new Logger();
 logger.addTarget('console');
@@ -33,16 +33,16 @@ db.setLogger(dbLogger);
 function createClient(id) {
 	return {
 		id: id,
-		profileDir: baseDir + '/client' + id,
+		profileDir: `${baseDir}/client${id}`,
 	};
 }
 
 const client = createClient(1);
 
-function execCommand(client, command, options = {}) {
-	let exePath = 'node ' + joplinAppPath;
-	let cmd = exePath + ' --update-geolocation-disabled --env dev --profile ' + client.profileDir + ' ' + command;
-	logger.info(client.id + ': ' + command);
+function execCommand(client, command) {
+	let exePath = `node ${joplinAppPath}`;
+	let cmd = `${exePath} --update-geolocation-disabled --env dev --profile ${client.profileDir} ${command}`;
+	logger.info(`${client.id}: ${command}`);
 
 	return new Promise((resolve, reject) => {
 		exec(cmd, (error, stdout, stderr) => {
@@ -212,12 +212,12 @@ testUnits.testMv = async () => {
 	assertEquals(4, notes2.length);
 };
 
-async function main(argv) {
+async function main() {
 	await fs.remove(baseDir);
 
 	logger.info(await execCommand(client, 'version'));
 
-	await db.open({ name: client.profileDir + '/database.sqlite' });
+	await db.open({ name: `${client.profileDir}/database.sqlite` });
 	BaseModel.db_ = db;
 	await Setting.load();
 
@@ -230,7 +230,7 @@ async function main(argv) {
 
 		await clearDatabase();
 		let testName = n.substr(4).toLowerCase();
-		process.stdout.write(testName + ': ');
+		process.stdout.write(`${testName}: `);
 		await testUnits[n]();
 		console.info('');
 	}

CliClient/app/cli-utils.js

@@ -5,7 +5,7 @@ const stringPadding = require('string-padding');
 
 const cliUtils = {};
 
-cliUtils.printArray = function(logFunction, rows, headers = null) {
+cliUtils.printArray = function(logFunction, rows) {
 	if (!rows.length) return '';
 
 	const ALIGN_LEFT = 0;
@@ -58,7 +58,7 @@ cliUtils.parseFlags = function(flags) {
 };
 
 cliUtils.parseCommandArg = function(arg) {
-	if (arg.length <= 2) throw new Error('Invalid command arg: ' + arg);
+	if (arg.length <= 2) throw new Error(`Invalid command arg: ${arg}`);
 
 	const c1 = arg[0];
 	const c2 = arg[arg.length - 1];
@@ -69,7 +69,7 @@ cliUtils.parseCommandArg = function(arg) {
 	} else if (c1 == '[' && c2 == ']') {
 		return { required: false, name: name };
 	} else {
-		throw new Error('Invalid command arg: ' + arg);
+		throw new Error(`Invalid command arg: ${arg}`);
 	}
 };
 
@@ -82,7 +82,7 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 	let booleanFlags = [];
 	let aliases = {};
 	for (let i = 0; i < options.length; i++) {
-		if (options[i].length != 2) throw new Error('Invalid options: ' + options[i]);
+		if (options[i].length != 2) throw new Error(`Invalid options: ${options[i]}`);
 		let flags = options[i][0];
 
 		flags = cliUtils.parseFlags(flags);
@@ -136,7 +136,7 @@ cliUtils.promptMcq = function(message, answers) {
 	message += '\n\n';
 	for (let n in answers) {
 		if (!answers.hasOwnProperty(n)) continue;
-		message += _('%s: %s', n, answers[n]) + '\n';
+		message += `${_('%s: %s', n, answers[n])}\n`;
 	}
 
 	message += '\n';
@@ -165,10 +165,10 @@ cliUtils.promptConfirm = function(message, answers = null) {
 		output: process.stdout,
 	});
 
-	message += ' (' + answers.join('/') + ')';
+	message += ` (${answers.join('/')})`;
 
-	return new Promise((resolve, reject) => {
-		rl.question(message + ' ', answer => {
+	return new Promise((resolve) => {
+		rl.question(`${message} `, answer => {
 			const ok = !answer || answer.toLowerCase() == answers[0].toLowerCase();
 			rl.close();
 			resolve(ok);
@@ -179,6 +179,7 @@ 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?).
+// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 cliUtils.prompt = function(initialText = '', promptString = ':', options = null) {
 	if (!options) options = {};
 
@@ -198,7 +199,7 @@ cliUtils.prompt = function(initialText = '', promptString = ':', options = null)
 		terminal: true,
 	});
 
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve) => {
 		mutableStdout.muted = false;
 
 		rl.question(promptString, answer => {

CliClient/app/command-apidoc.js

@@ -31,7 +31,7 @@ class Command extends BaseCommand {
 		return markdownUtils.createMarkdownTable(headers, tableFields);
 	}
 
-	async action(args) {
+	async action() {
 		const models = [
 			{
 				type: BaseModel.TYPE_NOTE,
@@ -168,7 +168,7 @@ class Command extends BaseCommand {
 				// });
 			}
 
-			lines.push('# ' + toTitleCase(tableName));
+			lines.push(`# ${toTitleCase(tableName)}`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_FOLDER) {
@@ -181,9 +181,9 @@ class Command extends BaseCommand {
 			lines.push(this.createPropertiesTable(tableFields));
 			lines.push('');
 
-			lines.push('## GET /' + tableName);
+			lines.push(`## GET /${tableName}`);
 			lines.push('');
-			lines.push('Gets all ' + tableName);
+			lines.push(`Gets all ${tableName}`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_FOLDER) {
@@ -191,9 +191,9 @@ class Command extends BaseCommand {
 				lines.push('');
 			}
 
-			lines.push('## GET /' + tableName + '/:id');
+			lines.push(`## GET /${tableName}/:id`);
 			lines.push('');
-			lines.push('Gets ' + singular + ' with ID :id');
+			lines.push(`Gets ${singular} with ID :id`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_TAG) {
@@ -224,9 +224,9 @@ class Command extends BaseCommand {
 				lines.push('');
 			}
 
-			lines.push('## POST /' + tableName);
+			lines.push(`## POST /${tableName}`);
 			lines.push('');
-			lines.push('Creates a new ' + singular);
+			lines.push(`Creates a new ${singular}`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_RESOURCE) {
@@ -270,14 +270,14 @@ class Command extends BaseCommand {
 				lines.push('');
 			}
 
-			lines.push('## PUT /' + tableName + '/:id');
+			lines.push(`## PUT /${tableName}/:id`);
 			lines.push('');
-			lines.push('Sets the properties of the ' + singular + ' with ID :id');
+			lines.push(`Sets the properties of the ${singular} with ID :id`);
 			lines.push('');
 
-			lines.push('## DELETE /' + tableName + '/:id');
+			lines.push(`## DELETE /${tableName}/:id`);
 			lines.push('');
-			lines.push('Deletes the ' + singular + ' with ID :id');
+			lines.push(`Deletes the ${singular} with ID :id`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_TAG) {

CliClient/app/command-dump.js

@@ -16,7 +16,7 @@ class Command extends BaseCommand {
 		return true;
 	}
 
-	async action(args) {
+	async action() {
 		let items = [];
 		let folders = await Folder.all();
 		for (let i = 0; i < folders.length; i++) {

CliClient/app/command-e2ee.js

@@ -97,13 +97,13 @@ class Command extends BaseCommand {
 			while (true) {
 				try {
 					const outputDir = options.output ? options.output : require('os').tmpdir();
-					let outFile = outputDir + '/' + pathUtils.filename(args.path) + '.' + Date.now() + '.bin';
+					let outFile = `${outputDir}/${pathUtils.filename(args.path)}.${Date.now()}.bin`;
 					await EncryptionService.instance().decryptFile(args.path, outFile);
 					const buffer = await readChunk(outFile, 0, 64);
 					const detectedType = imageType(buffer);
 
 					if (detectedType) {
-						const newOutFile = outFile + '.' + detectedType.ext;
+						const newOutFile = `${outFile}.${detectedType.ext}`;
 						await shim.fsDriver().move(outFile, newOutFile);
 						outFile = newOutFile;
 					}
@@ -150,7 +150,7 @@ class Command extends BaseCommand {
 
 			for (let i = 0; i < paths.length; i++) {
 				const path = paths[i];
-				const fullPath = targetPath + '/' + path;
+				const fullPath = `${targetPath}/${path}`;
 				const stat = await fs.stat(fullPath);
 
 				// this.stdout(fullPath);
@@ -160,7 +160,7 @@ class Command extends BaseCommand {
 					for (let j = 0; j < resourcePaths.length; j++) {
 						const resourcePath = resourcePaths[j];
 						resourceCount++;
-						const fullResourcePath = fullPath + '/' + resourcePath;
+						const fullResourcePath = `${fullPath}/${resourcePath}`;
 						const isEncrypted = await EncryptionService.instance().fileIsEncrypted(fullResourcePath);
 						if (isEncrypted) {
 							encryptedResourceCount++;
@@ -194,9 +194,9 @@ class Command extends BaseCommand {
 				}
 			}
 
-			this.stdout('Encrypted items: ' + encryptedItemCount + '/' + itemCount);
-			this.stdout('Encrypted resources: ' + encryptedResourceCount + '/' + resourceCount);
-			this.stdout('Other items (never encrypted): ' + otherItemCount);
+			this.stdout(`Encrypted items: ${encryptedItemCount}/${itemCount}`);
+			this.stdout(`Encrypted resources: ${encryptedResourceCount}/${resourceCount}`);
+			this.stdout(`Other items (never encrypted): ${otherItemCount}`);
 
 			if (options.verbose) {
 				this.stdout('');

CliClient/app/command-edit.js

@@ -60,7 +60,7 @@ class Command extends BaseCommand {
 
 			const originalContent = await Note.serializeForEdit(note);
 
-			tempFilePath = Setting.value('tempDir') + '/' + uuid.create() + '.md';
+			tempFilePath = `${Setting.value('tempDir')}/${uuid.create()}.md`;
 			editorArgs.push(tempFilePath);
 
 			await fs.writeFile(tempFilePath, originalContent);

CliClient/app/command-exit.js

@@ -15,7 +15,7 @@ class Command extends BaseCommand {
 		return ['gui'];
 	}
 
-	async action(args) {
+	async action() {
 		await app().exit();
 	}
 }

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

@@ -17,12 +17,12 @@ class Command extends BaseCommand {
 		return true;
 	}
 
-	async action(args) {
+	async action() {
 		const service = new ReportService();
 		const csv = await service.basicItemList({ format: 'csv' });
-		const filePath = Setting.value('profileDir') + '/syncReport-' + new Date().getTime() + '.csv';
+		const filePath = `${Setting.value('profileDir')}/syncReport-${new Date().getTime()}.csv`;
 		await fs.writeFileSync(filePath, csv);
-		this.stdout('Sync status exported to ' + filePath);
+		this.stdout(`Sync status exported to ${filePath}`);
 
 		app()
 			.gui()

CliClient/app/command-export.js

@@ -18,7 +18,7 @@ class Command extends BaseCommand {
 		const formats = service
 			.modules()
 			.filter(m => m.type === 'exporter')
-			.map(m => m.format + (m.description ? ' (' + m.description + ')' : ''));
+			.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.')]];
 	}

CliClient/app/command-ls.js

@@ -90,7 +90,7 @@ class Command extends BaseCommand {
 
 				let title = item.title;
 				if (!shortIdShown && (seenTitles.indexOf(item.title) >= 0 || !item.title)) {
-					title += ' (' + BaseModel.shortId(item.id) + ')';
+					title += ` (${BaseModel.shortId(item.id)})`;
 				} else {
 					seenTitles.push(item.title);
 				}

CliClient/app/command-server.js

@@ -11,7 +11,7 @@ class Command extends BaseCommand {
 	}
 
 	description() {
-		return _('Start, stop or check the API server. To specify on which port it should run, set the api.port config variable. Commands are (%s).', ['start', 'stop', 'status'].join('|')) + ' This is an experimental feature - use at your own risks! It is recommended that the server runs off its own separate profile so that no two CLI instances access that profile at the same time. Use --profile to specify the profile path.';
+		return `${_('Start, stop or check the API server. To specify on which port it should run, set the api.port config variable. Commands are (%s).', ['start', 'stop', 'status'].join('|'))} This is an experimental feature - use at your own risks! It is recommended that the server runs off its own separate profile so that no two CLI instances access that profile at the same time. Use --profile to specify the profile path.`;
 	}
 
 	async action(args) {
@@ -20,16 +20,16 @@ class Command extends BaseCommand {
 		const ClipperServer = require('lib/ClipperServer');
 		const stdoutFn = (s) => this.stdout(s);
 		const clipperLogger = new Logger();
-		clipperLogger.addTarget('file', { path: Setting.value('profileDir') + '/log-clipper.txt' });
+		clipperLogger.addTarget('file', { path: `${Setting.value('profileDir')}/log-clipper.txt` });
 		clipperLogger.addTarget('console', { console: {
 			info: stdoutFn,
 			warn: stdoutFn,
 			error: stdoutFn,
 		}});
-		ClipperServer.instance().setDispatch(action => {});
+		ClipperServer.instance().setDispatch(() => {});
 		ClipperServer.instance().setLogger(clipperLogger);
 
-		const pidPath = Setting.value('profileDir') + '/clipper-pid.txt';
+		const pidPath = `${Setting.value('profileDir')}/clipper-pid.txt`;
 		const runningOnPort = await ClipperServer.instance().isRunning();
 
 		if (command === 'start') {

CliClient/app/command-set.js

@@ -16,7 +16,7 @@ class Command extends BaseCommand {
 		for (let i = 0; i < fields.length; i++) {
 			const f = fields[i];
 			if (f.name === 'id') continue;
-			s.push(f.name + ' (' + Database.enumName('fieldType', f.type) + ')');
+			s.push(`${f.name} (${Database.enumName('fieldType', f.type)})`);
 		}
 
 		return _('Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s', s.join(', '));

CliClient/app/command-status.js

@@ -13,7 +13,7 @@ class Command extends BaseCommand {
 		return _('Displays summary about the notes and notebooks.');
 	}
 
-	async action(args) {
+	async action() {
 		let service = new ReportService();
 		let report = await service.status(Setting.value('sync.target'));
 
@@ -22,7 +22,7 @@ class Command extends BaseCommand {
 
 			if (i > 0) this.stdout('');
 
-			this.stdout('# ' + section.title);
+			this.stdout(`# ${section.title}`);
 			this.stdout('');
 
 			for (let n in section.body) {

CliClient/app/command-sync.js

@@ -72,7 +72,7 @@ class Command extends BaseCommand {
 			});
 			this.oneDriveApiUtils_ = null;
 
-			Setting.setValue('sync.' + this.syncTargetId_ + '.auth', auth ? JSON.stringify(auth) : 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;
@@ -93,7 +93,7 @@ class Command extends BaseCommand {
 			}
 
 			const response = await api.execAuthToken(authCode);
-			Setting.setValue('sync.' + this.syncTargetId_ + '.auth', response.access_token);
+			Setting.setValue(`sync.${this.syncTargetId_}.auth`, response.access_token);
 			api.setAuthToken(response.access_token);
 			return true;
 		}
@@ -117,7 +117,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 = `${require('os').tmpdir()}/synclock_${md5(escape(Setting.value('profileDir')))}`; // https://github.com/pvorb/node-md5/issues/41
 		if (!(await fs.pathExists(lockFilePath))) await fs.writeFile(lockFilePath, 'synclock');
 
 		try {
@@ -178,7 +178,7 @@ class Command extends BaseCommand {
 
 			this.stdout(_('Starting synchronisation...'));
 
-			const contextKey = 'sync.' + this.syncTargetId_ + '.context';
+			const contextKey = `sync.${this.syncTargetId_}.context`;
 			let context = Setting.value(contextKey);
 
 			context = context ? JSON.parse(context) : {};

CliClient/app/command-version.js

@@ -11,7 +11,7 @@ class Command extends BaseCommand {
 		return _('Displays version information');
 	}
 
-	async action(args) {
+	async action() {
 		const p = require('./package.json');
 		this.stdout(_('%s %s (%s)', p.name, p.version, Setting.value('env')));
 	}

CliClient/app/fuzzing.js

@@ -9,9 +9,9 @@ const lodash = require('lodash');
 const exec = require('child_process').exec;
 const fs = require('fs-extra');
 
-const baseDir = dirname(__dirname) + '/tests/fuzzing';
-const syncDir = baseDir + '/sync';
-const joplinAppPath = __dirname + '/main.js';
+const baseDir = `${dirname(__dirname)}/tests/fuzzing`;
+const syncDir = `${baseDir}/sync`;
+const joplinAppPath = `${__dirname}/main.js`;
 let syncDurations = [];
 
 const fsDriver = new FsDriverNode();
@@ -29,7 +29,7 @@ process.on('unhandledRejection', (reason, p) => {
 function createClient(id) {
 	return {
 		id: id,
-		profileDir: baseDir + '/client' + id,
+		profileDir: `${baseDir}/client${id}`,
 	};
 }
 
@@ -41,7 +41,7 @@ async function createClients() {
 		promises.push(fs.remove(client.profileDir));
 		promises.push(
 			execCommand(client, 'config sync.target 2').then(() => {
-				return execCommand(client, 'config sync.2.path ' + syncDir);
+				return execCommand(client, `config sync.2.path ${syncDir}`);
 			})
 		);
 		output.push(client);
@@ -2064,12 +2064,12 @@ function randomWord() {
 }
 
 function execCommand(client, command, options = {}) {
-	let exePath = 'node ' + joplinAppPath;
-	let cmd = exePath + ' --update-geolocation-disabled --env dev --log-level debug --profile ' + client.profileDir + ' ' + command;
-	logger.info(client.id + ': ' + command);
+	let exePath = `node ${joplinAppPath}`;
+	let cmd = `${exePath} --update-geolocation-disabled --env dev --log-level debug --profile ${client.profileDir} ${command}`;
+	logger.info(`${client.id}: ${command}`);
 
 	if (options.killAfter) {
-		logger.info('Kill after: ' + options.killAfter);
+		logger.info(`Kill after: ${options.killAfter}`);
 	}
 
 	return new Promise((resolve, reject) => {
@@ -2100,7 +2100,7 @@ async function clientItems(client) {
 	try {
 		return JSON.parse(itemsJson);
 	} catch (error) {
-		throw new Error('Cannot parse JSON: ' + itemsJson);
+		throw new Error(`Cannot parse JSON: ${itemsJson}`);
 	}
 }
 
@@ -2136,13 +2136,13 @@ async function execRandomCommand(client) {
 				if (!item) return;
 
 				if (item.type_ == 1) {
-					return execCommand(client, 'rm -f ' + item.id);
+					return execCommand(client, `rm -f ${item.id}`);
 				} else if (item.type_ == 2) {
-					return execCommand(client, 'rm -r -f ' + item.id);
+					return execCommand(client, `rm -r -f ${item.id}`);
 				} else if (item.type_ == 5) {
 					// tag
 				} else {
-					throw new Error('Unknown type: ' + item.type_);
+					throw new Error(`Unknown type: ${item.type_}`);
 				}
 			},
 			30,
@@ -2168,7 +2168,7 @@ async function execRandomCommand(client) {
 				let item = randomNote(items);
 				if (!item) return;
 
-				return execCommand(client, 'set ' + item.id + ' title "' + randomWord() + '"');
+				return execCommand(client, `set ${item.id} title "${randomWord()}"`);
 			},
 			50,
 		],
@@ -2180,9 +2180,9 @@ async function execRandomCommand(client) {
 				if (!note) return;
 
 				let tag = randomTag(items);
-				let tagTitle = !tag || Math.random() >= 0.9 ? 'tag-' + randomWord() : tag.title;
+				let tagTitle = !tag || Math.random() >= 0.9 ? `tag-${randomWord()}` : tag.title;
 
-				return execCommand(client, 'tag add ' + tagTitle + ' ' + note.id);
+				return execCommand(client, `tag add ${tagTitle} ${note.id}`);
 			},
 			50,
 		],
@@ -2211,7 +2211,7 @@ function averageSyncDuration() {
 
 function randomNextCheckTime() {
 	let output = time.unixMs() + 1000 + Math.random() * 1000 * 120;
-	logger.info('Next sync check: ' + time.unixMsToIso(output) + ' (' + Math.round((output - time.unixMs()) / 1000) + ' sec.)');
+	logger.info(`Next sync check: ${time.unixMsToIso(output)} (${Math.round((output - time.unixMs()) / 1000)} sec.)`);
 	return output;
 }
 
@@ -2274,7 +2274,7 @@ async function compareClientItems(clientItems) {
 		let items = clientItems[i];
 		itemCounts.push(items.length);
 	}
-	logger.info('Item count: ' + itemCounts.join(', '));
+	logger.info(`Item count: ${itemCounts.join(', ')}`);
 
 	let missingItems = findMissingItems(clientItems[0], clientItems[1]);
 	if (missingItems[0].length || missingItems[1].length) {
@@ -2290,7 +2290,7 @@ async function compareClientItems(clientItems) {
 		for (let clientId = 1; clientId < clientItems.length; clientId++) {
 			let item2 = findItem(clientItems[clientId], item1.id);
 			if (!item2) {
-				logger.error('Item not found on client ' + clientId + ':');
+				logger.error(`Item not found on client ${clientId}:`);
 				logger.error(item1);
 				process.exit(1);
 			}
@@ -2312,7 +2312,7 @@ async function compareClientItems(clientItems) {
 	}
 }
 
-async function main(argv) {
+async function main() {
 	await fs.remove(syncDir);
 
 	let clients = await createClients();
@@ -2329,12 +2329,12 @@ async function main(argv) {
 
 		execRandomCommand(clients[clientId])
 			.catch(error => {
-				logger.info('Client ' + clientId + ':');
+				logger.info(`Client ${clientId}:`);
 				logger.error(error);
 			})
 			.then(r => {
 				if (r) {
-					logger.info('Client ' + clientId + ':\n' + r.trim());
+					logger.info(`Client ${clientId}:\n${r.trim()}`);
 				}
 				clients[clientId].activeCommandCount--;
 			});

CliClient/app/gui/FolderListWidget.js

@@ -26,7 +26,7 @@ class FolderListWidget extends ListWidget {
 			} else if (item.type_ === Folder.modelType()) {
 				output.push(' '.repeat(this.folderDepth(this.folders, item.id)) + Folder.displayTitle(item));
 			} else if (item.type_ === Tag.modelType()) {
-				output.push('[' + Folder.displayTitle(item) + ']');
+				output.push(`[${Folder.displayTitle(item)}]`);
 			} else if (item.type_ === BaseModel.TYPE_SEARCH) {
 				output.push(_('Search:'));
 				output.push(item.title);
@@ -172,7 +172,7 @@ class FolderListWidget extends ListWidget {
 		if (this.notesParentType === 'Folder') return this.selectedFolderId;
 		if (this.notesParentType === 'Tag') return this.selectedTagId;
 		if (this.notesParentType === 'Search') return this.selectedSearchId;
-		throw new Error('Unknown parent type: ' + this.notesParentType);
+		throw new Error(`Unknown parent type: ${this.notesParentType}`);
 	}
 
 	get selectedJoplinItem() {

CliClient/app/gui/NoteListWidget.js

@@ -11,7 +11,7 @@ class NoteListWidget extends ListWidget {
 		this.itemRenderer = note => {
 			let label = Note.displayTitle(note); // + ' ' + note.id;
 			if (note.is_todo) {
-				label = '[' + (note.todo_completed ? 'X' : ' ') + '] ' + label;
+				label = `[${note.todo_completed ? 'X' : ' '}] ${label}`;
 			}
 			return label;
 		};

CliClient/app/gui/NoteWidget.js

@@ -47,7 +47,7 @@ class NoteWidget extends TextWidget {
 				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;

CliClient/app/help-utils.js

@@ -60,7 +60,7 @@ function renderCommandHelp(cmd, width = null) {
 
 			if ('value' in md) {
 				if (md.type === Setting.TYPE_STRING) {
-					defaultString = md.value ? '"' + md.value + '"' : null;
+					defaultString = md.value ? `"${md.value}"` : null;
 				} else if (md.type === Setting.TYPE_INT) {
 					defaultString = (md.value ? md.value : 0).toString();
 				} else if (md.type === Setting.TYPE_BOOL) {

CliClient/app/main.js

@@ -9,7 +9,7 @@ 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);
+	console.error(`Joplin requires Node 8+. Detected version ${nodeVersion}`);
 	process.exit(1);
 }
 

CliClient/app/onedrive-api-node-utils.js

@@ -44,7 +44,7 @@ class OneDriveApiNodeUtils {
 		const port = await netUtils.findAvailablePort(this.possibleOAuthDancePorts(), 0);
 		if (!port) throw new Error(_('All potential ports are in use - please report the issue at %s', 'https://github.com/laurent22/joplin'));
 
-		let authCodeUrl = this.api().authCodeUrl('http://localhost:' + port);
+		let authCodeUrl = this.api().authCodeUrl(`http://localhost:${port}`);
 
 		return new Promise((resolve, reject) => {
 			this.oauthServer_ = http.createServer();
@@ -80,7 +80,7 @@ class OneDriveApiNodeUtils {
 				if (!query.code) return writeResponse(400, '"code" query parameter is missing');
 
 				this.api()
-					.execTokenRequest(query.code, 'http://localhost:' + port.toString())
+					.execTokenRequest(query.code, `http://localhost:${port.toString()}`)
 					.then(() => {
 						writeResponse(200, _('The application has been authorised - you may now close this browser tab.'));
 						targetConsole.log('');
@@ -114,7 +114,7 @@ class OneDriveApiNodeUtils {
 
 			targetConsole.log(_('Please open the following URL in your browser to authenticate the application. The application will create a directory in "Apps/Joplin" and will only read and write files in this directory. It will have no access to any files outside this directory nor to any other personal data. No data will be shared with any third party.'));
 			targetConsole.log('');
-			targetConsole.log('http://127.0.0.1:' + port + '/auth');
+			targetConsole.log(`http://127.0.0.1:${port}/auth`);
 		});
 	}
 }

CliClient/build.sh

@@ -5,5 +5,6 @@ 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 --delete "$ROOT_DIR/../ReactNativeClient/locales/" "$BUILD_DIR/locales/"
 cp "$ROOT_DIR/package.json" "$BUILD_DIR"
 chmod 755 "$BUILD_DIR/main.js"

CliClient/locales/ar.po

@@ -169,16 +169,6 @@ msgstr "لا يوجد دفتر ملاحظات نشط."
 msgid "Note does not exist: \"%s\". Create it?"
 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 "حدث خطأ أثناء فتح الملاحظة: %s في المحرر"
-
-msgid "Note has been saved."
-msgstr "تم حفظ الملاحظة."
-
 msgid "Exits the application."
 msgstr "الخروج من التطبيق."
 
@@ -534,10 +524,6 @@ msgstr "أكتب `joplin help` لمعلومات الاستخدام."
 msgid "Fatal error:"
 msgstr "خطأ فادح:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "تم التصريح للتطبيق - يمكنك الآن إغلاق تبويب المستعرض هذا."
@@ -589,74 +575,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "التصدير إلى \"%s\" بتنسيق \"%s\". فضلاً انتظر..."
 
-msgid "Sidebar"
-msgstr "الشريط الجانبي"
-
-msgid "Note list"
-msgstr "قائمة ملاحظات"
-
-msgid "Note title"
-msgstr "عنوان الملاحظة"
-
-msgid "Note body"
-msgstr "متن الملاحظة"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "الاستيراد من \"%s\" بتنسيق \"%s\". فضلاً انتظر..."
-
-msgid "PDF File"
-msgstr "ملف PDF"
-
-msgid "Synchronisation status"
-msgstr "حالة المزامنة"
-
-msgid "New note"
-msgstr "ملاحظة جديدة"
-
-msgid "New to-do"
-msgstr "قائمة جديدة للمهام"
-
-msgid "New notebook"
-msgstr "دفتر ملاحظات جديد"
-
-msgid "Print"
-msgstr "اطبع"
-
-msgid "General Options"
-msgstr "الخيارات العامة"
-
-msgid "Encryption options"
-msgstr "خيارات التشفير"
-
-msgid "Web clipper options"
-msgstr "خيارات Web clipper"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "إدراج التاريخ والوقت"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "دليل تصدير بيانات Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&ملف"
 
@@ -866,6 +784,9 @@ msgstr ""
 "هذا الرمز المميز للتصريح مطلوب فقط للسماح لتطبيقات طرف ثالث للوصول إلى "
 "Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "الملاحظات و الإعدادات مخزّنة في: %s"
@@ -876,6 +797,9 @@ msgstr "فحص ضبط المزامنة"
 msgid "Browse..."
 msgstr "استعراض..."
 
+msgid "Back"
+msgstr "عودة"
+
 msgid "Apply"
 msgstr "تطبيق"
 
@@ -968,12 +892,18 @@ msgstr "الحالة"
 msgid "Encryption is:"
 msgstr "التشفير هو:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "الاستخدام"
 
-msgid "Back"
-msgstr "عودة"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1003,6 +933,15 @@ msgstr "ضبط منبّه:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "ملاحظة جديدة"
+
+msgid "New to-do"
+msgstr "قائمة جديدة للمهام"
+
+msgid "New notebook"
+msgstr "دفتر ملاحظات جديد"
+
 msgid "Layout"
 msgstr "تخطيط"
 
@@ -1099,6 +1038,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "يمكن طباعة ملاحظة واحدة فقط أو تصديرها إلى PDF كل مرة."
 
+msgid "PDF File"
+msgstr "ملف PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "حدث خطأ أثناء فتح الملاحظة: %s في المحرر"
+
 msgid "strong text"
 msgstr "نص مشدَّد"
 
@@ -1173,12 +1119,6 @@ msgstr "خيارات"
 msgid "Synchronisation Status"
 msgstr "حالة المزامنة"
 
-msgid "Encryption Options"
-msgstr "خيارات التشفير"
-
-msgid "Clipper Options"
-msgstr "خيارات Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1202,6 +1142,17 @@ msgstr "حذف"
 msgid "Rename"
 msgstr "إعادة تسمية"
 
+msgid "Notebooks"
+msgstr "دفاتر ملاحظات"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "فك تشفير العناصر: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "جلب الموارد: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "فضلاً اختر أين سيتم تصدير حالة المزامنة"
 
@@ -1358,10 +1309,6 @@ msgstr "قيد التقدم"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "المزامنة قيد التقدم بالفعل. الحال: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "مشفّر"
 
@@ -1577,6 +1524,10 @@ msgstr "نسبة التكبير العمومية"
 msgid "Editor font size"
 msgstr "حجم خط المحرّر"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "حجم خط المحرّر"
+
 msgid "Editor font family"
 msgstr "نوع خط المحرّر"
 
@@ -1639,6 +1590,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "تجاهل أخطاء شهادات TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1680,6 +1636,14 @@ msgstr ""
 msgid "Application"
 msgstr "التطبيق"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "التشفير هو:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "خيارات Web clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "الوسم \"%s\" موجود بالفعل. فضلاً إختر اسماً مختلفاً."
@@ -1693,7 +1657,12 @@ msgstr "تنسيق Markdown"
 msgid "Joplin Export Directory"
 msgstr "دليل تصدير بيانات Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "ملف Evernote المصدَّر"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "ملف Evernote المصدَّر"
 
 msgid "Json Export Directory"
@@ -1850,21 +1819,10 @@ msgstr "دفتر ملاحظات جديد"
 msgid "Configuration"
 msgstr "الضبط"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "فك تشفير العناصر: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "جلب الموارد: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "ملاحظة"
 
-msgid "Notebooks"
-msgstr "دفاتر ملاحظات"
-
 msgid "Checking... Please wait."
 msgstr "التحقق جارٍ... فضلاً انتظر."
 
@@ -1911,10 +1869,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "الضبط"
-
 msgid "Encryption Config"
 msgstr "ضبط التشفير"
 
@@ -2102,6 +2056,64 @@ msgstr "تسجيل الدخول عبر OneDrive"
 msgid "Search"
 msgstr "بحث"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "بدء تحرير الملاحظة. أغلق المحرر للعودة إلى المحث."
+
+#~ msgid "Note has been saved."
+#~ msgstr "تم حفظ الملاحظة."
+
+#~ msgid "Sidebar"
+#~ msgstr "الشريط الجانبي"
+
+#~ msgid "Note list"
+#~ msgstr "قائمة ملاحظات"
+
+#~ msgid "Note title"
+#~ msgstr "عنوان الملاحظة"
+
+#~ msgid "Note body"
+#~ msgstr "متن الملاحظة"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "الاستيراد من \"%s\" بتنسيق \"%s\". فضلاً انتظر..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "حالة المزامنة"
+
+#~ msgid "Print"
+#~ msgstr "اطبع"
+
+#~ msgid "General Options"
+#~ msgstr "الخيارات العامة"
+
+#~ msgid "Encryption options"
+#~ msgstr "خيارات التشفير"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "إدراج التاريخ والوقت"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "دليل تصدير بيانات Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "خيارات التشفير"
+
+#~ msgid "Clipper Options"
+#~ msgstr "خيارات Clipper"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "الضبط"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "الإذن باستخدام الكاميرا"

CliClient/locales/bg_BG.po

@@ -174,18 +174,6 @@ msgstr "Няма активна тетрадка."
 msgid "Note does not exist: \"%s\". Create it?"
 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 "Грешка при отварянето на бележката в редактор: %s"
-
-msgid "Note has been saved."
-msgstr "Бележката бе запазена."
-
 msgid "Exits the application."
 msgstr "Напуска приложението."
 
@@ -548,10 +536,6 @@ msgstr "Въведете `joplin help` за информация за употр
 msgid "Fatal error:"
 msgstr "Фатална грешка:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Приложението бе оторизирано - може да затворите таба в браузъра."
@@ -606,74 +590,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Експортирам към \"%s\" във формат \"%s\". Моля изчакайте..."
 
-msgid "Sidebar"
-msgstr "Страничен панел"
-
-msgid "Note list"
-msgstr "Списък бележки"
-
-msgid "Note title"
-msgstr "Заглавие на бележката"
-
-msgid "Note body"
-msgstr "Съдържание на бележката"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Импортирам от \"%s\" във формат \"%s\". Моля изчакайте..."
-
-msgid "PDF File"
-msgstr "PDF файл"
-
-msgid "Synchronisation status"
-msgstr "Състояние на синхронизацията"
-
-msgid "New note"
-msgstr "Нова бележка"
-
-msgid "New to-do"
-msgstr "Нова задача"
-
-msgid "New notebook"
-msgstr "Нова тетрадка"
-
-msgid "Print"
-msgstr "Принтиране"
-
-msgid "General Options"
-msgstr "Общи настройки"
-
-msgid "Encryption options"
-msgstr "Настройки за криптиране"
-
-msgid "Web clipper options"
-msgstr "Настройки на уеб клипера"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Постави датата и часа"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin експорт директория"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "Файл(&F)"
 
@@ -887,6 +803,9 @@ msgstr ""
 "Оторизационният жетон е необходим само ако искате да дадете достъп до Joplin "
 "на приложения от трети страни."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Бележките и настройките са запазени в: %s"
@@ -897,6 +816,9 @@ msgstr "Провери настройките за синхронизация"
 msgid "Browse..."
 msgstr "Търсене..."
 
+msgid "Back"
+msgstr "Назад"
+
 msgid "Apply"
 msgstr "Приложи"
 
@@ -991,12 +913,18 @@ msgstr "Статус"
 msgid "Encryption is:"
 msgstr "Криптирането е:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Употреба"
 
-msgid "Back"
-msgstr "Назад"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1027,6 +955,15 @@ msgstr "Задаване на аларма:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Нова бележка"
+
+msgid "New to-do"
+msgstr "Нова задача"
+
+msgid "New notebook"
+msgstr "Нова тетрадка"
+
 msgid "Layout"
 msgstr "Разположеня"
 
@@ -1128,6 +1065,13 @@ msgstr ""
 "Принтирането и експортирането към PDF не може да бъде извършено с повече от "
 "една бележка."
 
+msgid "PDF File"
+msgstr "PDF файл"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Грешка при отварянето на бележката в редактор: %s"
+
 msgid "strong text"
 msgstr "силно наблегнат текст"
 
@@ -1202,12 +1146,6 @@ msgstr "Конфигурация"
 msgid "Synchronisation Status"
 msgstr "Статус на синхронизацията"
 
-msgid "Encryption Options"
-msgstr "Конфигурация на криптирането"
-
-msgid "Clipper Options"
-msgstr "Конфигурация на клипера"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1231,6 +1169,17 @@ msgstr "Изтрий"
 msgid "Rename"
 msgstr "Преименувай"
 
+msgid "Notebooks"
+msgstr "Тетрадки"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Декриптиране на обекти: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Взимане на ресурси: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Моля изберете къде да бъде експортиран статуса на синхронизацията"
 
@@ -1389,11 +1338,6 @@ msgstr "В момента върви"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизация вече се извършва. Статус: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Неизвестен тип на свален обект - моля обновете Joplin до най-новата версия"
-
 msgid "Encrypted"
 msgstr "Криптирана"
 
@@ -1613,6 +1557,10 @@ msgstr "Процент за глобално уголемяване"
 msgid "Editor font size"
 msgstr "Размер на шрифта на редактора"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Размер на шрифта на редактора"
+
 msgid "Editor font family"
 msgstr "Шрифт на редактора"
 
@@ -1679,6 +1627,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Игнорирай грешки в TLS сертификати"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1720,6 +1673,14 @@ msgstr "Разширения"
 msgid "Application"
 msgstr "Приложение"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Криптирането е:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Настройки на уеб клипера"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Тагът \"%s\" вече съществува. Моля изберете друго име."
@@ -1733,7 +1694,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin експорт директория"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote експорт файл"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote експорт файл"
 
 msgid "Json Export Directory"
@@ -1893,21 +1859,10 @@ msgstr "Нова тетрадка"
 msgid "Configuration"
 msgstr "Настройки"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Декриптиране на обекти: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Взимане на ресурси: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "бележка"
 
-msgid "Notebooks"
-msgstr "Тетрадки"
-
 msgid "Checking... Please wait."
 msgstr "Проверявам... Моля изчакайте."
 
@@ -1957,10 +1912,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Още информация"
-
 msgid "Encryption Config"
 msgstr "Настройки за криптиране"
 
@@ -2151,6 +2102,71 @@ msgstr "Вписване в OneDrive"
 msgid "Search"
 msgstr "Търсене"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Започваме редакция на бележката. Затворете редактора за да се върнете към "
+#~ "командния ред."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Бележката бе запазена."
+
+#~ msgid "Sidebar"
+#~ msgstr "Страничен панел"
+
+#~ msgid "Note list"
+#~ msgstr "Списък бележки"
+
+#~ msgid "Note title"
+#~ msgstr "Заглавие на бележката"
+
+#~ msgid "Note body"
+#~ msgstr "Съдържание на бележката"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Импортирам от \"%s\" във формат \"%s\". Моля изчакайте..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Състояние на синхронизацията"
+
+#~ msgid "Print"
+#~ msgstr "Принтиране"
+
+#~ msgid "General Options"
+#~ msgstr "Общи настройки"
+
+#~ msgid "Encryption options"
+#~ msgstr "Настройки за криптиране"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Постави датата и часа"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin експорт директория"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Конфигурация на криптирането"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Конфигурация на клипера"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Неизвестен тип на свален обект - моля обновете Joplin до най-новата версия"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Още информация"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Разрешение за употреба на камерата"

CliClient/locales/ca.po

@@ -178,18 +178,6 @@ msgstr "No hi ha cap bloc de notes actiu."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "No existeix «%s». Voleu crear-lo?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"S'està iniciant l'edició del a nota. Tanqueu l'editor per a tornar a "
-"l'indicador."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "S'ha produït un error en obrir la nota amb l'editor: %s"
-
-msgid "Note has been saved."
-msgstr "S'ha desat la nota."
-
 msgid "Exits the application."
 msgstr "Surt de l'aplicació"
 
@@ -555,10 +543,6 @@ msgstr "Escriviu «joplin help» per a obtenir informació d'ús."
 msgid "Fatal error:"
 msgstr "Error fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -615,76 +599,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "S'està exportant a «%s» com a format «%s». Espereu..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Títol del bloc de notes:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Blocs de notes"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "S'està important des de «%s» com a format «%s». Espereu..."
-
-msgid "PDF File"
-msgstr "Fitxer PDF"
-
-msgid "Synchronisation status"
-msgstr "Estat de la sincronització"
-
-msgid "New note"
-msgstr "Nota nova"
-
-msgid "New to-do"
-msgstr "Llistat de tasques pendents nou"
-
-msgid "New notebook"
-msgstr "Bloc de notes nou"
-
-msgid "Print"
-msgstr "Imprimeix"
-
-msgid "General Options"
-msgstr "Opcions generals"
-
-msgid "Encryption options"
-msgstr "Opcions del xifratge"
-
-msgid "Web clipper options"
-msgstr "Opcions del desa-retalls de webs"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Insereix la data i hora"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Directori d'exportació del Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fitxer"
@@ -905,6 +819,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes i la configuració es desen a: %s"
@@ -915,6 +832,9 @@ msgstr "Comprova la configuració de la sincronització"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Enrere"
+
 msgid "Apply"
 msgstr "Aplica"
 
@@ -1009,13 +929,19 @@ msgstr "Estat"
 msgid "Encryption is:"
 msgstr "El xifratge és:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Ús: %s"
 
-msgid "Back"
-msgstr "Enrere"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1045,6 +971,15 @@ msgstr "Estableix una alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nota nova"
+
+msgid "New to-do"
+msgstr "Llistat de tasques pendents nou"
+
+msgid "New notebook"
+msgstr "Bloc de notes nou"
+
 msgid "Layout"
 msgstr "Disposició"
 
@@ -1142,6 +1077,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "Fitxer PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "S'ha produït un error en obrir la nota amb l'editor: %s"
+
 msgid "strong text"
 msgstr "text en negreta"
 
@@ -1216,12 +1158,6 @@ msgstr "Opcions"
 msgid "Synchronisation Status"
 msgstr "Estat de la sincronització"
 
-msgid "Encryption Options"
-msgstr "Opcions de xifratge"
-
-msgid "Clipper Options"
-msgstr "Opcions del desa-retalls"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1244,6 +1180,17 @@ msgstr "Suprimeix"
 msgid "Rename"
 msgstr "Canvia el nom"
 
+msgid "Notebooks"
+msgstr "Blocs de notes"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "S'estan desxifrant els elements: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Elements obtinguts: %d/%d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccioneu on s'hauria d'exportar l'estat de la sincronització"
 
@@ -1402,10 +1349,6 @@ msgstr "En progés"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronització ja és en procés. Estat: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Xifrat"
 
@@ -1618,6 +1561,10 @@ msgstr "Percentatge de zoom global"
 msgid "Editor font size"
 msgstr "Tipus de lletra de l'editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Tipus de lletra de l'editor"
+
 msgid "Editor font family"
 msgstr "Tipus de lletra de l'editor"
 
@@ -1683,6 +1630,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignora els errors de certificat TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1728,6 +1680,14 @@ msgstr ""
 msgid "Application"
 msgstr "Surt de l'aplicació"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "El xifratge és:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opcions del desa-retalls de webs"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1741,7 +1701,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Directori d'exportació del Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Fitxer d'exportació de l'Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Fitxer d'exportació de l'Evernote"
 
 #, fuzzy
@@ -1900,21 +1865,10 @@ msgstr "Bloc de notes nou"
 msgid "Configuration"
 msgstr "Configuració"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "S'estan desxifrant els elements: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Elements obtinguts: %d/%d."
-
 #, fuzzy
 msgid "All notes"
 msgstr "Voleu suprimir les notes?"
 
-msgid "Notebooks"
-msgstr "Blocs de notes"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "S'està cancel·lant... Espereu."
@@ -1959,10 +1913,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuració"
-
 msgid "Encryption Config"
 msgstr "Configuració del xifratge"
 
@@ -2154,17 +2104,71 @@ msgstr "Inicia sessió amb OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "S'està iniciant l'edició del a nota. Tanqueu l'editor per a tornar a "
+#~ "l'indicador."
+
+#~ msgid "Note has been saved."
+#~ msgstr "S'ha desat la nota."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Títol del bloc de notes:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Blocs de notes"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "S'està important des de «%s» com a format «%s». Espereu..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Estat de la sincronització"
+
+#~ msgid "Print"
+#~ msgstr "Imprimeix"
+
+#~ msgid "General Options"
+#~ msgstr "Opcions generals"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opcions del xifratge"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Insereix la data i hora"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Directori d'exportació del Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opcions de xifratge"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opcions del desa-retalls"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuració"
+
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separeu les etiquetes amb comes."
 
 #~ msgid "Some items cannot be decrypted."
 #~ msgstr "Alguns elements no s'han pogut desxifrar."
 
-#, javascript-format
 #~ msgid "State: %s."
 #~ msgstr "Estat: %s."
 
-#, javascript-format
 #~ msgid "A notebook with this title already exists: \"%s\""
 #~ msgstr "Ja existeix un bloc de notes amb aquest títol: «%s»"
 
@@ -2175,7 +2179,6 @@ msgstr "Cerca"
 #~ "El camí on sincronitzar en activar la sincronització del sistema. Vegeu "
 #~ "«sync.target»."
 
-#, javascript-format
 #~ msgid "%s (%s): %s"
 #~ msgstr "%s (%s): %s"
 

CliClient/locales/cs_CZ.po

@@ -174,17 +174,6 @@ msgstr "Není vybrán žádný zápisník."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Poznámka \"%s\" neexistuje. Chcete ji vytvořit?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Začínám s úpravou poznámky. Pro návrat do příkazové řádky ukončete editor."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Chyba při otevírání poznámky v editoru: %s"
-
-msgid "Note has been saved."
-msgstr "Poznámka uložena."
-
 msgid "Exits the application."
 msgstr "Ukončí aplikaci."
 
@@ -540,10 +529,6 @@ msgstr "Zadejte `joplin help` pro nápovědu."
 msgid "Fatal error:"
 msgstr "Fatální chyba:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikace byla autorizována, tento tab můžete zavřít."
@@ -595,75 +580,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportuji do \"%s\" jako formát \"%s\". Chvíli strpení..."
 
-msgid "Sidebar"
-msgstr "Postranní lišta"
-
-msgid "Note list"
-msgstr "Seznam položek"
-
-msgid "Note title"
-msgstr "Název zápisníku"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Zápisník"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importuji z \"%s\" jako formát \"%s\". Chvíli strpení..."
-
-msgid "PDF File"
-msgstr "PDF soubor"
-
-msgid "Synchronisation status"
-msgstr "Stav synchronizace"
-
-msgid "New note"
-msgstr "Nová poznámka"
-
-msgid "New to-do"
-msgstr "Nové to-do"
-
-msgid "New notebook"
-msgstr "Nový zápisník"
-
-msgid "Print"
-msgstr "Tisk"
-
-msgid "General Options"
-msgstr "Obecná nastavení"
-
-msgid "Encryption options"
-msgstr "Nastavení šifrování"
-
-msgid "Web clipper options"
-msgstr "Web clipper volby"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Vložit datum a čas"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Složka pro export"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Soubor"
@@ -882,6 +798,9 @@ msgstr ""
 "Tento autorizační token je potřeba pouze pro povolení komunikace Joplin s "
 "aplikacemi třetích stran."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Poznámky a nastavení uloženo v: %s"
@@ -892,6 +811,9 @@ msgstr "Zkontrolujte nastavení synchronizace"
 msgid "Browse..."
 msgstr "Procházet..."
 
+msgid "Back"
+msgstr "Zpět"
+
 msgid "Apply"
 msgstr "Použít"
 
@@ -983,12 +905,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Šifrování je:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Použití: %s"
 
-msgid "Back"
-msgstr "Zpět"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1018,6 +946,15 @@ msgstr "Nastavit alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nová poznámka"
+
+msgid "New to-do"
+msgstr "Nové to-do"
+
+msgid "New notebook"
+msgstr "Nový zápisník"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1113,6 +1050,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Pouze jedna poznámka může být zároveň vytištěna nebo exportována do PDF."
 
+msgid "PDF File"
+msgstr "PDF soubor"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Chyba při otevírání poznámky v editoru: %s"
+
 msgid "strong text"
 msgstr "tučný text"
 
@@ -1188,13 +1132,6 @@ msgstr "Nastavení"
 msgid "Synchronisation Status"
 msgstr "Stav synchronizace"
 
-msgid "Encryption Options"
-msgstr "Nastavení šifrování"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Obecná nastavení"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1215,6 +1152,17 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "Přejmenovat"
 
+msgid "Notebooks"
+msgstr "Zápisníky"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Rozšifrované položky: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Stahování zdrojů: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Prosím vyberte, kam má být stav synchronizace exportován"
 
@@ -1376,10 +1324,6 @@ msgstr "Probíhá"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronizace již probíhá. Stav: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Zašifrováno"
 
@@ -1595,6 +1539,10 @@ msgstr "Globální zoom"
 msgid "Editor font size"
 msgstr "Rodina písma v editoru"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Rodina písma v editoru"
+
 msgid "Editor font family"
 msgstr "Rodina písma v editoru"
 
@@ -1658,6 +1606,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorovat chyby TLS certifikátu"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1699,6 +1652,14 @@ msgstr "Rozšíření"
 msgid "Application"
 msgstr "Aplikace"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Šifrování je:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web clipper volby"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Tag \"%s\" již existuje. Zvolte jiný název."
@@ -1712,7 +1673,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Složka pro export"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Soubor Evernote Exportu"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Soubor Evernote Exportu"
 
 msgid "Json Export Directory"
@@ -1869,21 +1835,10 @@ msgstr "Nový zápisník"
 msgid "Configuration"
 msgstr "Nastavení"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Rozšifrované položky: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Stahování zdrojů: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "poznámka"
 
-msgid "Notebooks"
-msgstr "Zápisníky"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Zastavuji, chvíli strpení."
@@ -1933,10 +1888,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Nastavení"
-
 msgid "Encryption Config"
 msgstr "Nastavení šifrování"
 
@@ -2126,6 +2077,67 @@ msgstr "Přihlásit se pomocí OneDrive"
 msgid "Search"
 msgstr "Hledání"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Začínám s úpravou poznámky. Pro návrat do příkazové řádky ukončete editor."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Poznámka uložena."
+
+#~ msgid "Sidebar"
+#~ msgstr "Postranní lišta"
+
+#~ msgid "Note list"
+#~ msgstr "Seznam položek"
+
+#~ msgid "Note title"
+#~ msgstr "Název zápisníku"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Zápisník"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importuji z \"%s\" jako formát \"%s\". Chvíli strpení..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Stav synchronizace"
+
+#~ msgid "Print"
+#~ msgstr "Tisk"
+
+#~ msgid "General Options"
+#~ msgstr "Obecná nastavení"
+
+#~ msgid "Encryption options"
+#~ msgstr "Nastavení šifrování"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Vložit datum a čas"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Složka pro export"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Nastavení šifrování"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Obecná nastavení"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Nastavení"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Oprávnění použít kameru"

CliClient/locales/da_DK.po

@@ -174,18 +174,6 @@ msgstr "Ingen aktiv notesbog."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Note eksisterer ikke: \"%s\".  Skal den oprettes?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Noteredigering startet. Luk redigering for at komme tilbage til kommando "
-"prompten."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fejl ved åbning af note i editor: %s"
-
-msgid "Note has been saved."
-msgstr "Note gemt."
-
 msgid "Exits the application."
 msgstr "Forlad/luk program."
 
@@ -542,10 +530,6 @@ msgstr "Tast `Joplin help` for alm. info."
 msgid "Fatal error:"
 msgstr "Kritisk fejl:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Denne app er godkendt - du kan nu lukke dette faneblad."
@@ -598,75 +582,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksporterer til \"%s\" som \"%s\"-format. Vent venligst..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Notesbogs titel:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Notesbøger"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importerer fra \"%s\" som \"%s\"-format. Vent venligst..."
-
-msgid "PDF File"
-msgstr "PDF fil"
-
-msgid "Synchronisation status"
-msgstr "Synkroniserings status"
-
-msgid "New note"
-msgstr "Ny note"
-
-msgid "New to-do"
-msgstr "Ny opgave"
-
-msgid "New notebook"
-msgstr "Ny notesbog"
-
-msgid "Print"
-msgstr "Udskriv"
-
-msgid "General Options"
-msgstr "Generelle indstillinger"
-
-msgid "Encryption options"
-msgstr "Krypterings muligheder"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin eksport mappe"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
@@ -880,6 +795,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Noter og indstillinger er gemt i: %s"
@@ -890,6 +808,9 @@ msgstr "Check synkroniserings Indstillinger"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Tilbage"
+
 msgid "Apply"
 msgstr ""
 
@@ -983,13 +904,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Kryptering er:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Forbrug: %s"
 
-msgid "Back"
-msgstr "Tilbage"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1020,6 +947,15 @@ msgstr "Indstil alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Ny note"
+
+msgid "New to-do"
+msgstr "Ny opgave"
+
+msgid "New notebook"
+msgstr "Ny notesbog"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1115,6 +1051,13 @@ msgstr "Denne note er tom. Klik på \"%s\" for at starte editor og rette noten."
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "PDF fil"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fejl ved åbning af note i editor: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1190,13 +1133,6 @@ msgstr "Muligheder"
 msgid "Synchronisation Status"
 msgstr "Synkroniserings status"
 
-msgid "Encryption Options"
-msgstr "Krypterings indstillinger"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Generelle indstillinger"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1217,6 +1153,17 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "Omdøb"
 
+msgid "Notebooks"
+msgstr "Notesbøger"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Hentede emner: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Ressourcer: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Vælg hvor sync status skal eksporteres til"
 
@@ -1377,10 +1324,6 @@ msgstr "I gang"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering er allerede i gang: Tilstand: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Krypteret"
 
@@ -1598,6 +1541,10 @@ msgstr "Global zoom procent"
 msgid "Editor font size"
 msgstr "Rediger skrifttype"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Rediger skrifttype"
+
 msgid "Editor font family"
 msgstr "Rediger skrifttype"
 
@@ -1659,6 +1606,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1704,6 +1656,13 @@ msgstr ""
 msgid "Application"
 msgstr "Forlad/luk program."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Kryptering er:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1717,7 +1676,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin eksport mappe"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote eksport fil"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote eksport fil"
 
 #, fuzzy
@@ -1877,21 +1841,10 @@ msgstr "Ny notesbog"
 msgid "Configuration"
 msgstr "Indstillinger"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Hentede emner: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Ressourcer: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "note"
 
-msgid "Notebooks"
-msgstr "Notesbøger"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Annullerer...  Vent venligst."
@@ -1936,10 +1889,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Indstillinger"
-
 msgid "Encryption Config"
 msgstr "Krypterings indstillinger"
 
@@ -2125,6 +2074,59 @@ msgstr "Log på med OneDrive"
 msgid "Search"
 msgstr "Søg"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Noteredigering startet. Luk redigering for at komme tilbage til kommando "
+#~ "prompten."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Note gemt."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Notesbogs titel:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Notesbøger"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importerer fra \"%s\" som \"%s\"-format. Vent venligst..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synkroniserings status"
+
+#~ msgid "Print"
+#~ msgstr "Udskriv"
+
+#~ msgid "General Options"
+#~ msgstr "Generelle indstillinger"
+
+#~ msgid "Encryption options"
+#~ msgstr "Krypterings muligheder"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin eksport mappe"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Krypterings indstillinger"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Generelle indstillinger"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Indstillinger"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Afbryd synkronisering"
 

CliClient/locales/de_DE.po

@@ -178,18 +178,6 @@ msgstr "Kein aktives Notizbuch."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notiz \"%s\" existiert nicht. Soll sie erstellt werden?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Beginne die Notiz zu bearbeiten. Schließe das Textverarbeitungsprogramm, um "
-"zurück zum Terminal zu gelangen."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fehler beim Öffnen der Notiz im Editor: %s"
-
-msgid "Note has been saved."
-msgstr "Die Notiz wurde gespeichert."
-
 msgid "Exits the application."
 msgstr "Beendet das Programm."
 
@@ -561,12 +549,6 @@ msgstr "Gib `joplin help` ein um die Nutzungsstatistik anzuzeigen."
 msgid "Fatal error:"
 msgstr "Schwerwiegender Fehler:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-"Alle potentielle Port-Nummern sind in Verwendung - bitte melde dieses "
-"Problem auf %s"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -622,72 +604,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportiere „%s“ ins „%s“-Format. Bitte warten..."
 
-msgid "Sidebar"
-msgstr "Seitenleiste"
-
-msgid "Note list"
-msgstr "Notizen-Liste"
-
-msgid "Note title"
-msgstr "Notiz-Titel"
-
-msgid "Note body"
-msgstr "Notiz-Text"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importiere „%s“ als „%s“-Format. Bitte warten..."
-
-msgid "PDF File"
-msgstr "PDF-Datei"
-
-msgid "Synchronisation status"
-msgstr "Status der Synchronisation"
-
-msgid "New note"
-msgstr "Neue Notiz"
-
-msgid "New to-do"
-msgstr "Neues To-Do"
-
-msgid "New notebook"
-msgstr "Neues Notizbuch"
-
-msgid "Print"
-msgstr "Drucken"
-
-msgid "General Options"
-msgstr "Allgemeine Einstellungen"
-
-msgid "Encryption options"
-msgstr "Verschlüsselungsoptionen"
-
-msgid "Web clipper options"
-msgstr "Web-Clipper Optionen"
-
-msgid "Create note from template"
-msgstr "Erstelle Notiz von Vorlage"
-
-msgid "Create to-do from template"
-msgstr "Erstelle To-Do von Vorlage"
-
-msgid "Insert template"
-msgstr "Vorlage einfügen"
-
-msgid "Open template directory"
-msgstr "Öffne Vorlagen Verzeichnis"
-
-msgid "Refresh templates"
-msgstr "Aktualisiere Vorlagen"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "Revision: %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Datei"
 
@@ -903,6 +819,9 @@ msgstr ""
 "Dieses Autorisierung-Token wird nur benötigt, um Drittanbieter-Anwendungen "
 "Zugriff auf Joplin zu gewähren."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notizen und Einstellungen werden gespeichert in: %s"
@@ -913,6 +832,9 @@ msgstr "Überprüfen der Synchronisationseinstellungen"
 msgid "Browse..."
 msgstr "Durchsuche..."
 
+msgid "Back"
+msgstr "Zurück"
+
 msgid "Apply"
 msgstr "Anwenden"
 
@@ -1006,13 +928,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Die Verschlüsselung ist:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 # 'Nutzung', 'Gebrauch', or 'Verwendung' - depends on the context
 msgid "Usage"
 msgstr "Nutzung"
 
-msgid "Back"
-msgstr "Zurück"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1044,6 +972,15 @@ msgstr "Alarm erstellen:"
 msgid "Template file:"
 msgstr "Vorlagen-Datei:"
 
+msgid "New note"
+msgstr "Neue Notiz"
+
+msgid "New to-do"
+msgstr "Neues To-Do"
+
+msgid "New notebook"
+msgstr "Neues Notizbuch"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1146,6 +1083,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Nur eine Notiz kann gedruckt oder als PDF exportiert werden."
 
+msgid "PDF File"
+msgstr "PDF-Datei"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fehler beim Öffnen der Notiz im Editor: %s"
+
 msgid "strong text"
 msgstr "Fetter Text"
 
@@ -1220,12 +1164,6 @@ msgstr "Optionen"
 msgid "Synchronisation Status"
 msgstr "Synchronisations-Status"
 
-msgid "Encryption Options"
-msgstr "Verschlüsselungsoptionen"
-
-msgid "Clipper Options"
-msgstr "Clipper-Einstellungen"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1249,6 +1187,17 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
+msgid "Notebooks"
+msgstr "Notizbücher"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Entschlüsselte Objekte: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Ressourcen abrufen: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll"
@@ -1408,10 +1357,6 @@ msgstr "In Bearbeitung"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronisation ist bereits im Gange. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr "Unbekannter Eintrags-Typ heruntergeladen - bitte aktualisiere Joplin"
-
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
@@ -1634,6 +1579,10 @@ msgstr "Zoomstufe der Benutzeroberfläche"
 msgid "Editor font size"
 msgstr "Schriftgröße im Editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Schriftgröße im Editor"
+
 msgid "Editor font family"
 msgstr "Schriftfamilie im Editor"
 
@@ -1698,6 +1647,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoriere TLS-Zertifikatfehler"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1739,6 +1693,14 @@ msgstr "Zusatzprogramme"
 msgid "Application"
 msgstr "Applikation"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Die Verschlüsselung ist:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web-Clipper Optionen"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1753,7 +1715,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin Export Verzeichnis"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote Export Datei"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote Export Datei"
 
 msgid "Json Export Directory"
@@ -1914,20 +1881,9 @@ msgstr "Neues Notizbuch"
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Entschlüsselte Objekte: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Ressourcen abrufen: %d/%d"
-
 msgid "All notes"
 msgstr "Alle Notizen"
 
-msgid "Notebooks"
-msgstr "Notizbücher"
-
 msgid "Checking... Please wait."
 msgstr "Überprüfe… Bitte warten."
 
@@ -1979,9 +1935,6 @@ msgstr ""
 "Deine Erlaubnis auf externen Speicher zu schreiben ist notwendig um "
 "Synchronisation mit dem Dateisystem zu verwenden."
 
-msgid "Information"
-msgstr "Information"
-
 msgid "Encryption Config"
 msgstr "Verschlüsselungskonfiguration"
 
@@ -2167,6 +2120,81 @@ msgstr "Mit OneDrive anmelden"
 msgid "Search"
 msgstr "Suchen"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Beginne die Notiz zu bearbeiten. Schließe das Textverarbeitungsprogramm, "
+#~ "um zurück zum Terminal zu gelangen."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Die Notiz wurde gespeichert."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "Alle potentielle Port-Nummern sind in Verwendung - bitte melde dieses "
+#~ "Problem auf %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Seitenleiste"
+
+#~ msgid "Note list"
+#~ msgstr "Notizen-Liste"
+
+#~ msgid "Note title"
+#~ msgstr "Notiz-Titel"
+
+#~ msgid "Note body"
+#~ msgstr "Notiz-Text"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importiere „%s“ als „%s“-Format. Bitte warten..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status der Synchronisation"
+
+#~ msgid "Print"
+#~ msgstr "Drucken"
+
+#~ msgid "General Options"
+#~ msgstr "Allgemeine Einstellungen"
+
+#~ msgid "Encryption options"
+#~ msgstr "Verschlüsselungsoptionen"
+
+#~ msgid "Create note from template"
+#~ msgstr "Erstelle Notiz von Vorlage"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "Erstelle To-Do von Vorlage"
+
+#~ msgid "Insert template"
+#~ msgstr "Vorlage einfügen"
+
+#~ msgid "Open template directory"
+#~ msgstr "Öffne Vorlagen Verzeichnis"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Aktualisiere Vorlagen"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Revision: %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Verschlüsselungsoptionen"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper-Einstellungen"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Unbekannter Eintrags-Typ heruntergeladen - bitte aktualisiere Joplin"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Berechtigung zur Verwendung der Kamera"

CliClient/locales/en_GB.po

@@ -160,16 +160,6 @@ msgstr ""
 msgid "Note does not exist: \"%s\". Create it?"
 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 ""
-
 msgid "Exits the application."
 msgstr ""
 
@@ -487,10 +477,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -529,72 +515,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr ""
-
-msgid "Synchronisation status"
-msgstr ""
-
-msgid "New note"
-msgstr ""
-
-msgid "New to-do"
-msgstr ""
-
-msgid "New notebook"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr ""
 
@@ -798,6 +718,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -808,6 +731,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -886,10 +812,16 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
 msgstr ""
 
 #, javascript-format
@@ -921,6 +853,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr ""
+
+msgid "New to-do"
+msgstr ""
+
+msgid "New notebook"
+msgstr ""
+
 msgid "Layout"
 msgstr ""
 
@@ -1012,6 +953,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr ""
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1086,12 +1034,6 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
-msgid "Encryption Options"
-msgstr ""
-
-msgid "Clipper Options"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1112,6 +1054,17 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+msgid "Notebooks"
+msgstr ""
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1260,10 +1213,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1471,6 +1420,9 @@ msgstr ""
 msgid "Editor font size"
 msgstr ""
 
+msgid "Editor font"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1525,6 +1477,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1565,6 +1522,12 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1578,7 +1541,10 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1725,20 +1691,9 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr ""
-
 msgid "All notes"
 msgstr ""
 
-msgid "Notebooks"
-msgstr ""
-
 msgid "Checking... Please wait."
 msgstr ""
 
@@ -1780,9 +1735,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr ""
-
 msgid "Encryption Config"
 msgstr ""
 

CliClient/locales/en_US.po

@@ -161,16 +161,6 @@ msgstr ""
 msgid "Note does not exist: \"%s\". Create it?"
 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 ""
-
 msgid "Exits the application."
 msgstr ""
 
@@ -492,10 +482,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -535,72 +521,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr ""
-
-msgid "Synchronisation status"
-msgstr "Synchronization status"
-
-msgid "New note"
-msgstr ""
-
-msgid "New to-do"
-msgstr ""
-
-msgid "New notebook"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr ""
 
@@ -806,6 +726,9 @@ msgstr ""
 "This authorization token is only needed to allow third-party applications to "
 "access Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -816,6 +739,9 @@ msgstr "Check synchronization configuration"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -904,10 +830,16 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
 msgstr ""
 
 #, javascript-format
@@ -939,6 +871,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr ""
+
+msgid "New to-do"
+msgstr ""
+
+msgid "New notebook"
+msgstr ""
+
 msgid "Layout"
 msgstr ""
 
@@ -1030,6 +971,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr ""
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1104,12 +1052,6 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr "Synchronization Status"
 
-msgid "Encryption Options"
-msgstr ""
-
-msgid "Clipper Options"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1130,6 +1072,17 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+msgid "Notebooks"
+msgstr ""
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1280,10 +1233,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronization is already in progress. State: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1496,6 +1445,9 @@ msgstr ""
 msgid "Editor font size"
 msgstr ""
 
+msgid "Editor font"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1550,6 +1502,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1590,6 +1547,12 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1603,7 +1566,10 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1750,20 +1716,9 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr ""
-
 msgid "All notes"
 msgstr ""
 
-msgid "Notebooks"
-msgstr ""
-
 msgid "Checking... Please wait."
 msgstr ""
 
@@ -1810,9 +1765,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr ""
-
 msgid "Encryption Config"
 msgstr ""
 
@@ -1990,5 +1942,8 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#~ msgid "Synchronisation status"
+#~ msgstr "Synchronization status"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Cancel synchronization"

CliClient/locales/es_ES.po

@@ -179,17 +179,6 @@ msgstr "No hay libreta activa."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "La nota no existe: \"%s\". ¿Crearla?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Iniciando la edición de una nota. Cierre el editor para regresar al prompt."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Error abriendo la nota en el editor: %s"
-
-msgid "Note has been saved."
-msgstr "La nota ha sido guardada."
-
 msgid "Exits the application."
 msgstr "Sale de la aplicación."
 
@@ -550,10 +539,6 @@ msgstr "Escriba `joplin help` para mostrar información de uso."
 msgid "Fatal error:"
 msgstr "Error fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -610,74 +595,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando el formato de \"%s\" a \"%s\". Por favor espere..."
 
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-msgid "Note list"
-msgstr "Lista de notas"
-
-msgid "Note title"
-msgstr "Titulo de nota"
-
-msgid "Note body"
-msgstr "Cuerpo de nota"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
-
-msgid "PDF File"
-msgstr "Archivo PDF"
-
-msgid "Synchronisation status"
-msgstr "Estado de la sincronización"
-
-msgid "New note"
-msgstr "Nueva nota"
-
-msgid "New to-do"
-msgstr "Nueva lista de tareas"
-
-msgid "New notebook"
-msgstr "Nueva libreta"
-
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opciones generales"
-
-msgid "Encryption options"
-msgstr "Opciones de cifrado"
-
-msgid "Web clipper options"
-msgstr "Opciones de recorte web"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Introduce fecha"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Directorio para exportar de Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Archivo"
 
@@ -891,6 +808,9 @@ msgstr ""
 "Este token de autorización se necesita solamente para permitir a "
 "aplicaciones de terceros acceder a Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Las notas y los ajustes se guardan en: %s"
@@ -901,6 +821,9 @@ msgstr "Comprobar sincronización"
 msgid "Browse..."
 msgstr "Explorar..."
 
+msgid "Back"
+msgstr "Atrás"
+
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -994,12 +917,18 @@ msgstr "Estado"
 msgid "Encryption is:"
 msgstr "El cifrado está:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Uso"
 
-msgid "Back"
-msgstr "Atrás"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1029,6 +958,15 @@ msgstr "Ajustar alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nueva nota"
+
+msgid "New to-do"
+msgstr "Nueva lista de tareas"
+
+msgid "New notebook"
+msgstr "Nueva libreta"
+
 msgid "Layout"
 msgstr "Diseño"
 
@@ -1127,6 +1065,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Solo una nota puede ser impresa o exportada a PDF a la vez."
 
+msgid "PDF File"
+msgstr "Archivo PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Error abriendo la nota en el editor: %s"
+
 msgid "strong text"
 msgstr "texto destacado"
 
@@ -1201,12 +1146,6 @@ msgstr "Opciones"
 msgid "Synchronisation Status"
 msgstr "Estado de la sincronización"
 
-msgid "Encryption Options"
-msgstr "Opciones de cifrado"
-
-msgid "Clipper Options"
-msgstr "Opciones de recorte"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1230,6 +1169,17 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
+msgid "Notebooks"
+msgstr "Libretas"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Descifrando elementos: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Obteniendo refuersos: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccione a dónde se debería exportar el estado de sincronización"
 
@@ -1388,12 +1338,6 @@ msgstr "En progreso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronización ya está en progreso. Estado: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Se ha descargado un elemento de tipo desconocido - actualice Joplin a la "
-"última versión"
-
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1616,6 +1560,10 @@ msgstr "Establecer el porcentaje de aumento de la aplicación"
 msgid "Editor font size"
 msgstr "Editar tamaño de fuente"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editar tamaño de fuente"
+
 msgid "Editor font family"
 msgstr "Fuente del editor"
 
@@ -1681,6 +1629,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorar errores en certificados TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1721,6 +1674,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Aplicación"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "El cifrado está:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opciones de recorte web"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "La etiqueta \"%s\" ya existe. Por favor, busque un nuevo nombre."
@@ -1734,7 +1695,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Directorio para exportar de Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Archivo exportado de Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Archivo exportado de Evernote"
 
 msgid "Json Export Directory"
@@ -1891,21 +1857,10 @@ msgstr "Nueva libreta"
 msgid "Configuration"
 msgstr "Configuración"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Descifrando elementos: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Obteniendo refuersos: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "¿Desea eliminar notas?"
 
-msgid "Notebooks"
-msgstr "Libretas"
-
 msgid "Checking... Please wait."
 msgstr "Comprobando... Por favor espere."
 
@@ -1954,10 +1909,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuración"
-
 msgid "Encryption Config"
 msgstr "Configuración de cifrado"
 
@@ -2150,6 +2101,72 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Iniciando la edición de una nota. Cierre el editor para regresar al "
+#~ "prompt."
+
+#~ msgid "Note has been saved."
+#~ msgstr "La nota ha sido guardada."
+
+#~ msgid "Sidebar"
+#~ msgstr "Barra lateral"
+
+#~ msgid "Note list"
+#~ msgstr "Lista de notas"
+
+#~ msgid "Note title"
+#~ msgstr "Titulo de nota"
+
+#~ msgid "Note body"
+#~ msgstr "Cuerpo de nota"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Estado de la sincronización"
+
+#~ msgid "Print"
+#~ msgstr "Imprimir"
+
+#~ msgid "General Options"
+#~ msgstr "Opciones generales"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opciones de cifrado"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Introduce fecha"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Directorio para exportar de Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opciones de cifrado"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opciones de recorte"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Se ha descargado un elemento de tipo desconocido - actualice Joplin a la "
+#~ "última versión"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuración"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Permiso para usar tu cámara"

CliClient/locales/eu.po

@@ -175,16 +175,6 @@ msgstr "Ez dago koadernorik aukeratuta."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Ez dago oharrik: \"%s\". Sortu?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Oharra editatzearen hasiera. Itxi editorea prompt-era bueltatzeko."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Errorea editorean oharra zabaltzean: %s"
-
-msgid "Note has been saved."
-msgstr "Oharra gorde da."
-
 msgid "Exits the application."
 msgstr "Irten aplikaziotik."
 
@@ -546,10 +536,6 @@ msgstr "Erakutsi erabilera datuak."
 msgid "Fatal error:"
 msgstr "Aio! Agur! :_( "
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikazioak baimena hartu du - Orain fitxa hau zarratu dezakezu."
@@ -604,75 +590,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Koadernoaren izenburua: "
-
-#, fuzzy
-msgid "Note body"
-msgstr "Koadernoak"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-#, fuzzy
-msgid "PDF File"
-msgstr "Fitxategia"
-
-msgid "Synchronisation status"
-msgstr "Sinkronizazioaren egoera"
-
-msgid "New note"
-msgstr "Ohar berria"
-
-msgid "New to-do"
-msgstr "Zeregin berria"
-
-msgid "New notebook"
-msgstr "Koaderno berria"
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr "Ezarpenak"
-
-msgid "Encryption options"
-msgstr "Zifratzeko aukerak"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fitxategia"
@@ -887,6 +804,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Oharrak eta ezarpenak hemen daude gordeta: %s"
@@ -898,6 +818,9 @@ msgstr "Sinkronizazioa utzi"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Atzera"
+
 msgid "Apply"
 msgstr ""
 
@@ -988,13 +911,19 @@ msgstr "Egoera"
 msgid "Encryption is:"
 msgstr "Zifratua  da:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Erabili: %s"
 
-msgid "Back"
-msgstr "Atzera"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1027,6 +956,15 @@ msgstr "Ezarri alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Ohar berria"
+
+msgid "New to-do"
+msgstr "Zeregin berria"
+
+msgid "New notebook"
+msgstr "Koaderno berria"
+
 msgid "Layout"
 msgstr "Diseinua"
 
@@ -1123,6 +1061,14 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+#, fuzzy
+msgid "PDF File"
+msgstr "Fitxategia"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Errorea editorean oharra zabaltzean: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1201,13 +1147,6 @@ msgstr "Aukerak"
 msgid "Synchronisation Status"
 msgstr "Sinkronizazioaren egoera"
 
-msgid "Encryption Options"
-msgstr "Zifratzeko aukerak"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Ezarpenak"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1228,6 +1167,17 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
+msgid "Notebooks"
+msgstr "Koadernoak"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Itemak eskuratuta: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Baliabideak: %d/%d"
+
 #, fuzzy
 msgid "Please select where the sync status should be exported to"
 msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
@@ -1389,10 +1339,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizazioa hasita dago. Egoera: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Zifratuta"
 
@@ -1620,6 +1566,10 @@ msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
 msgid "Editor font size"
 msgstr "Oharra editatu."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Oharra editatu."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1678,6 +1628,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1723,6 +1678,13 @@ msgstr ""
 msgid "Application"
 msgstr "Irten aplikaziotik"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Zifratua  da:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1738,7 +1700,11 @@ msgid "Joplin Export Directory"
 msgstr ""
 
 #, fuzzy
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernotetik esportatutako fitxategiak"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernotetik esportatutako fitxategiak"
 
 #, fuzzy
@@ -1896,21 +1862,10 @@ msgstr "Koaderno berria"
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Itemak eskuratuta: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Baliabideak: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "Ohar berria"
 
-msgid "Notebooks"
-msgstr "Koadernoak"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Bertan behera uzten... itxaron, mesedez."
@@ -1955,10 +1910,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfigurazioa"
-
 msgid "Encryption Config"
 msgstr "Zifratze Ezarpenak"
 
@@ -2145,6 +2096,47 @@ msgstr "Login with OneDrive"
 msgid "Search"
 msgstr "Bilatu"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "Oharra editatzearen hasiera. Itxi editorea prompt-era bueltatzeko."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Oharra gorde da."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Koadernoaren izenburua: "
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Koadernoak"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Sinkronizazioaren egoera"
+
+#~ msgid "General Options"
+#~ msgstr "Ezarpenak"
+
+#~ msgid "Encryption options"
+#~ msgstr "Zifratzeko aukerak"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Zifratzeko aukerak"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Ezarpenak"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfigurazioa"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Sinkronizazioa utzi"
 

CliClient/locales/fa.po

@@ -162,16 +162,6 @@ msgstr "دفترچه‌ی فعالی وجود ندارد."
 msgid "Note does not exist: \"%s\". Create it?"
 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 "یادداشت ذخیره شد."
-
 msgid "Exits the application."
 msgstr "خروح از نرم‌افزار."
 
@@ -492,10 +482,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -534,75 +520,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr "نوار کناری"
-
-msgid "Note list"
-msgstr "لیست یادداشت"
-
-msgid "Note title"
-msgstr "موضوع یادداشت"
-
-msgid "Note body"
-msgstr "بدنه ی یادداشت"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr "فایل PDF"
-
-#, fuzzy
-msgid "Synchronisation status"
-msgstr "وضعیت سینک"
-
-msgid "New note"
-msgstr "یادداشت جدید"
-
-msgid "New to-do"
-msgstr "فهرست کارهای جدید"
-
-msgid "New notebook"
-msgstr "دفترچه جدید"
-
-msgid "Print"
-msgstr "پرینت"
-
-msgid "General Options"
-msgstr "تنظیمات کلی"
-
-msgid "Encryption options"
-msgstr "تنظیمات رمزنگاری"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "وارد کردن تاریخ و ساعت"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "فولدر خروجی Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s، %s)"
-
 msgid "&File"
 msgstr ""
 
@@ -808,6 +725,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -818,6 +738,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "بازگشت"
+
 msgid "Apply"
 msgstr "اعمال"
 
@@ -897,11 +820,17 @@ msgstr "وضعیت"
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
-msgstr "بازگشت"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
+msgstr ""
 
 #, javascript-format
 msgid ""
@@ -932,6 +861,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "یادداشت جدید"
+
+msgid "New to-do"
+msgstr "فهرست کارهای جدید"
+
+msgid "New notebook"
+msgstr "دفترچه جدید"
+
 msgid "Layout"
 msgstr ""
 
@@ -1026,6 +964,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "فایل PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1106,12 +1051,6 @@ msgstr "گزینه ها"
 msgid "Synchronisation Status"
 msgstr ""
 
-msgid "Encryption Options"
-msgstr "گزینه های رمزنگاری"
-
-msgid "Clipper Options"
-msgstr "تنظیمات کلیپر"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1132,6 +1071,17 @@ msgstr "پاک کردن"
 msgid "Rename"
 msgstr "تغییر نام"
 
+msgid "Notebooks"
+msgstr "دفترچه ها"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "آیتم های دریافت شده: %d از %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1280,10 +1230,6 @@ msgstr "درحال انجام"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "سینک کردن در حال انجام است. وضعیت: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "رمزنگاری شده"
 
@@ -1493,6 +1439,10 @@ msgstr "درصد برزگنمایی کلی"
 msgid "Editor font size"
 msgstr "سایز فونت ویرایشگر"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "سایز فونت ویرایشگر"
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1548,6 +1498,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1588,6 +1543,13 @@ msgstr "پلاگین ها"
 msgid "Application"
 msgstr "نرم‌افزار"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "رمزنگاری: %s"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "برچسب «%s» وجود دارد. لطفا نام دیگری انتخاب کنی"
@@ -1601,7 +1563,12 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr "فولدر خروجی Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "فولدر خروجی Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "فولدر خروجی Evernote"
 
 msgid "Json Export Directory"
@@ -1751,21 +1718,10 @@ msgstr "دفترچه جدید"
 msgid "Configuration"
 msgstr "تنظیمات"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "آیتم های دریافت شده: %d از %d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "یادداشت"
 
-msgid "Notebooks"
-msgstr "دفترچه ها"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "در حال چک کرد... لطفا صبر کنید."
@@ -1808,10 +1764,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "تنظیمات"
-
 msgid "Encryption Config"
 msgstr "تنظیمات رمزنگاری"
 
@@ -1996,6 +1948,59 @@ msgstr "ورود با OneDrive"
 msgid "Search"
 msgstr "جستجو"
 
+#~ msgid "Note has been saved."
+#~ msgstr "یادداشت ذخیره شد."
+
+#~ msgid "Sidebar"
+#~ msgstr "نوار کناری"
+
+#~ msgid "Note list"
+#~ msgstr "لیست یادداشت"
+
+#~ msgid "Note title"
+#~ msgstr "موضوع یادداشت"
+
+#~ msgid "Note body"
+#~ msgstr "بدنه ی یادداشت"
+
+#, fuzzy
+#~ msgid "Synchronisation status"
+#~ msgstr "وضعیت سینک"
+
+#~ msgid "Print"
+#~ msgstr "پرینت"
+
+#~ msgid "General Options"
+#~ msgstr "تنظیمات کلی"
+
+#~ msgid "Encryption options"
+#~ msgstr "تنظیمات رمزنگاری"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "وارد کردن تاریخ و ساعت"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "فولدر خروجی Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s، %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "گزینه های رمزنگاری"
+
+#~ msgid "Clipper Options"
+#~ msgstr "تنظیمات کلیپر"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "تنظیمات"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "اجازه برای استفاده از دوربین"

CliClient/locales/fr_FR.po

@@ -13,9 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"X-Generator: Poedit 2.0.3\n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "Pour supprimer une vignette, enlever là des notes associées."
@@ -175,18 +173,6 @@ msgstr "Aucun carnet actif."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Cette note n'existe pas : \"%s\". La créer ?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Édition de la note en cours. Fermez l'éditeur de texte pour retourner à "
-"l'invite de commande."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Erreur lors de l'ouverture de la note dans l'éditeur de texte : %s"
-
-msgid "Note has been saved."
-msgstr "La note a été enregistrée."
-
 msgid "Exits the application."
 msgstr "Quitter le logiciel."
 
@@ -552,12 +538,6 @@ msgstr "Tapez `Joplin help` pour afficher l'aide."
 msgid "Fatal error:"
 msgstr "Erreur fatale :"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-"Tous les ports sont en cours d'utilisation. Veuillez signaler ce problème "
-"sur %s"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Le logiciel a été autorisé. Vous pouvez maintenant fermer cet onglet."
@@ -612,72 +592,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exporter vers \"%s\" au format \"%s\". Veuillez patienter..."
 
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-msgid "Note list"
-msgstr "Liste de notes"
-
-msgid "Note title"
-msgstr "Titre de la note"
-
-msgid "Note body"
-msgstr "Corps de la note"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
-
-msgid "PDF File"
-msgstr "Fichier PDF"
-
-msgid "Synchronisation status"
-msgstr "État de la synchronisation"
-
-msgid "New note"
-msgstr "Nouvelle note"
-
-msgid "New to-do"
-msgstr "Nouvelle tâche"
-
-msgid "New notebook"
-msgstr "Nouveau carnet"
-
-msgid "Print"
-msgstr "Imprimer"
-
-msgid "General Options"
-msgstr "Options générales"
-
-msgid "Encryption options"
-msgstr "Options de chiffrement"
-
-msgid "Web clipper options"
-msgstr "Options du Web Clipper"
-
-msgid "Create note from template"
-msgstr "Créer une note à partir d'un modèle"
-
-msgid "Create to-do from template"
-msgstr "Créer une tâche à partir d'un modèle"
-
-msgid "Insert template"
-msgstr "Insérer un modèle"
-
-msgid "Open template directory"
-msgstr "Ouvrir le dossier des modèles"
-
-msgid "Refresh templates"
-msgstr "Rafraichir modèles"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "Révision : %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Fichier"
 
@@ -891,6 +805,9 @@ msgstr ""
 "Ce code d'authentification est nécessaire uniquement pour permettre aux "
 "logiciels tiers d'accéder aux données de Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr "Sauvegarder vos changements avant de continuer ?"
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes et paramètres se trouve dans : %s"
@@ -901,6 +818,9 @@ msgstr "Vérifier config synchronisation"
 msgid "Browse..."
 msgstr "Parcourir…"
 
+msgid "Back"
+msgstr "Retour"
+
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -996,12 +916,18 @@ msgstr "État"
 msgid "Encryption is:"
 msgstr "Le chiffrement est :"
 
+msgid "Firefox Extension"
+msgstr "Module Firefox"
+
+msgid "Chrome Web Store"
+msgstr "Chrome Web Store"
+
+msgid "Get it now:"
+msgstr "L'obtenir maintenant :"
+
 msgid "Usage"
 msgstr "Utilisation"
 
-msgid "Back"
-msgstr "Retour"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1033,6 +959,15 @@ msgstr "Régler alarme :"
 msgid "Template file:"
 msgstr "Fichier de modèle :"
 
+msgid "New note"
+msgstr "Nouvelle note"
+
+msgid "New to-do"
+msgstr "Nouvelle tâche"
+
+msgid "New notebook"
+msgstr "Nouveau carnet"
+
 msgid "Layout"
 msgstr "Disposition"
 
@@ -1134,6 +1069,13 @@ msgstr ""
 "Les notes ne peuvent être imprimées ou exportées en PDF qu'une seule à la "
 "fois."
 
+msgid "PDF File"
+msgstr "Fichier PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Erreur lors de l'ouverture de la note dans l'éditeur de texte : %s"
+
 msgid "strong text"
 msgstr "texte en gras"
 
@@ -1208,12 +1150,6 @@ msgstr "Options"
 msgid "Synchronisation Status"
 msgstr "État de la synchronisation"
 
-msgid "Encryption Options"
-msgstr "Options de chiffrement"
-
-msgid "Clipper Options"
-msgstr "Options du Web Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1237,6 +1173,17 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
+msgid "Notebooks"
+msgstr "Carnets"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Déchiffrement des objets : %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Tél. ressources : %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Veuillez sélectionner un répertoire ou exporter l'état de la synchronisation"
@@ -1396,10 +1343,6 @@ msgstr "En cours"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La synchronisation est déjà en cours. État : %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr "Objet inconnu téléchargé - veuillez mettre Joplin à jour"
-
 msgid "Encrypted"
 msgstr "Chiffré"
 
@@ -1620,6 +1563,9 @@ msgstr "Niveau de zoom"
 msgid "Editor font size"
 msgstr "Taille police éditeur"
 
+msgid "Editor font"
+msgstr "Police de l'éditeur"
+
 msgid "Editor font family"
 msgstr "Police de l'éditeur"
 
@@ -1684,6 +1630,14 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorer les erreurs de certificats TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+"Sécurité : Ne pas supprimer toutes les données lorsque la cible de "
+"synchronisation est vide (souvent à cause d'un bug ou d'un problème de "
+"config)"
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1726,6 +1680,12 @@ msgstr "Modules"
 msgid "Application"
 msgstr "Application"
 
+msgid "Encryption"
+msgstr "Chiffrement"
+
+msgid "Web Clipper"
+msgstr "Web Clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "L'étiquette \"%s\" existe déjà. Veuillez choisir un autre nom."
@@ -1739,8 +1699,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Dossier d'export Joplin"
 
-msgid "Evernote Export File"
-msgstr "Fichiers d'export Evernote"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Fichiers d'export Evernote (vers Markdown)"
+
+msgid "Evernote Export File (as HTML)"
+msgstr "Fichiers d'export Evernote (vers HTML)"
 
 msgid "Json Export Directory"
 msgstr "Dossier d'export JSON"
@@ -1896,20 +1859,9 @@ msgstr "Nouveau carnet"
 msgid "Configuration"
 msgstr "Configuration"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Déchiffrement des objets : %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Tél. ressources : %d/%d"
-
 msgid "All notes"
 msgstr "Toutes les notes"
 
-msgid "Notebooks"
-msgstr "Carnets"
-
 msgid "Checking... Please wait."
 msgstr "Vérification... Veuillez attendre."
 
@@ -1960,9 +1912,6 @@ msgstr ""
 "Pour utiliser la synchronisation par système de fichiers, votre autorisation "
 "pour écrire sur le stockage externe est requise."
 
-msgid "Information"
-msgstr "Information"
-
 msgid "Encryption Config"
 msgstr "Config chiffrement"
 
@@ -2147,6 +2096,80 @@ msgstr "Se connecter à OneDrive"
 msgid "Search"
 msgstr "Chercher"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Édition de la note en cours. Fermez l'éditeur de texte pour retourner à "
+#~ "l'invite de commande."
+
+#~ msgid "Note has been saved."
+#~ msgstr "La note a été enregistrée."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "Tous les ports sont en cours d'utilisation. Veuillez signaler ce problème "
+#~ "sur %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Barre latérale"
+
+#~ msgid "Note list"
+#~ msgstr "Liste de notes"
+
+#~ msgid "Note title"
+#~ msgstr "Titre de la note"
+
+#~ msgid "Note body"
+#~ msgstr "Corps de la note"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "État de la synchronisation"
+
+#~ msgid "Print"
+#~ msgstr "Imprimer"
+
+#~ msgid "General Options"
+#~ msgstr "Options générales"
+
+#~ msgid "Encryption options"
+#~ msgstr "Options de chiffrement"
+
+#~ msgid "Create note from template"
+#~ msgstr "Créer une note à partir d'un modèle"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "Créer une tâche à partir d'un modèle"
+
+#~ msgid "Insert template"
+#~ msgstr "Insérer un modèle"
+
+#~ msgid "Open template directory"
+#~ msgstr "Ouvrir le dossier des modèles"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Rafraichir modèles"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Révision : %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Options de chiffrement"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Options du Web Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr "Objet inconnu téléchargé - veuillez mettre Joplin à jour"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
 #~ msgid ""
 #~ "Joplin does not have permission to access \"%s\". Either choose a "
 #~ "different sync target, or give Joplin the \"Storage\" permission."

CliClient/locales/gl_ES.po

@@ -172,16 +172,6 @@ msgstr "Ningún caderno activo."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "A nota non existe: «%s». Desexa creala?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Comezando a editar a nota. Peche o editor para volver ao diálogo."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Produciuse un erro abrindo a nota no editor: %s"
-
-msgid "Note has been saved."
-msgstr "A nota foi gardada."
-
 msgid "Exits the application."
 msgstr "Sae do aplicativo."
 
@@ -541,10 +531,6 @@ msgstr "Escriba «joplin help» para obter información do uso."
 msgid "Fatal error:"
 msgstr "Erro fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "O aplicativo foi autorizado. Xa pode pechar esta lapela do navegador."
@@ -598,75 +584,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando a «%s» como formato «%s». Agarde..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Título do caderno:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Cadernos"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importando de «%s» como formato «%s». Agarde..."
-
-msgid "PDF File"
-msgstr "Ficheiro PDF"
-
-msgid "Synchronisation status"
-msgstr "Estado da sincronización"
-
-msgid "New note"
-msgstr "Nova nota"
-
-msgid "New to-do"
-msgstr "Nova tarefa"
-
-msgid "New notebook"
-msgstr "Novo caderno"
-
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opcións xerais"
-
-msgid "Encryption options"
-msgstr "Opcións de cifrado"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Cartafol de exportación do Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Ficheiro"
@@ -880,6 +797,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "As notas e axustes gardáronse en: %s"
@@ -890,6 +810,9 @@ msgstr "Comprobar a configuración da sincronización"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Anterior"
+
 msgid "Apply"
 msgstr ""
 
@@ -981,13 +904,19 @@ msgstr "Estado"
 msgid "Encryption is:"
 msgstr "O cifrado é:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Uso: %s"
 
-msgid "Back"
-msgstr "Anterior"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1018,6 +947,15 @@ msgstr "Estabelecer alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova nota"
+
+msgid "New to-do"
+msgstr "Nova tarefa"
+
+msgid "New notebook"
+msgstr "Novo caderno"
+
 msgid "Layout"
 msgstr "Disposición"
 
@@ -1114,6 +1052,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "Ficheiro PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Produciuse un erro abrindo a nota no editor: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1189,13 +1134,6 @@ msgstr "Opcións"
 msgid "Synchronisation Status"
 msgstr "Estado da sincronización"
 
-msgid "Encryption Options"
-msgstr "Opcións de cifrado"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Opcións xerais"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1217,6 +1155,17 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
+msgid "Notebooks"
+msgstr "Cadernos"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementos obtidos: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Recursos: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccione onde exportar o estado da sincronización"
 
@@ -1377,10 +1326,6 @@ msgstr "En proceso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "A sincronización xa está en proceso. Estado: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1598,6 +1543,10 @@ msgstr "Porcentaxe de ampliación"
 msgid "Editor font size"
 msgstr "Familia de tipos de letra do editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Familia de tipos de letra do editor"
+
 msgid "Editor font family"
 msgstr "Familia de tipos de letra do editor"
 
@@ -1659,6 +1608,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1704,6 +1658,13 @@ msgstr ""
 msgid "Application"
 msgstr "Sae do aplicativo."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "O cifrado é:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1717,7 +1678,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Cartafol de exportación do Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Ficheiro de exportación de Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Ficheiro de exportación de Evernote"
 
 #, fuzzy
@@ -1877,21 +1843,10 @@ msgstr "Novo caderno"
 msgid "Configuration"
 msgstr "Configuración"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Elementos obtidos: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Recursos: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "nota"
 
-msgid "Notebooks"
-msgstr "Cadernos"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Cancelando... Agarde."
@@ -1936,10 +1891,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuración"
-
 msgid "Encryption Config"
 msgstr "Configuración de cifrado"
 
@@ -2125,6 +2076,57 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "Comezando a editar a nota. Peche o editor para volver ao diálogo."
+
+#~ msgid "Note has been saved."
+#~ msgstr "A nota foi gardada."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Título do caderno:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Cadernos"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importando de «%s» como formato «%s». Agarde..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Estado da sincronización"
+
+#~ msgid "Print"
+#~ msgstr "Imprimir"
+
+#~ msgid "General Options"
+#~ msgstr "Opcións xerais"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opcións de cifrado"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Cartafol de exportación do Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opcións de cifrado"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Opcións xerais"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuración"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Cancelar sincronización"
 

CliClient/locales/hr_HR.po

@@ -173,18 +173,6 @@ msgstr "Nema aktivne bilježnice."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Bilješka ne postoji: \"%s\". Napravi je?"
 
-#, fuzzy
-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."
 
@@ -547,10 +535,6 @@ msgstr "Prikazuje informacije o korištenju."
 msgid "Fatal error:"
 msgstr "Fatalna greška:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikacija je autorizirana - smiješ zatvoriti karticu preglednika."
@@ -600,76 +584,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Naslov bilježnice:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Bilježnice"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-#, fuzzy
-msgid "PDF File"
-msgstr "Datoteka"
-
-msgid "Synchronisation status"
-msgstr "Status sinkronizacije"
-
-msgid "New note"
-msgstr "Nova bilješka"
-
-msgid "New to-do"
-msgstr "Novi zadatak"
-
-msgid "New notebook"
-msgstr "Nova bilježnica"
-
-msgid "Print"
-msgstr ""
-
-#, fuzzy
-msgid "General Options"
-msgstr "Opcije"
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Datoteka"
@@ -885,6 +799,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Bilješke i postavke su pohranjene u: %s"
@@ -896,6 +813,9 @@ msgstr "Prekini sinkronizaciju"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Natrag"
+
 msgid "Apply"
 msgstr ""
 
@@ -974,13 +894,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr ""
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Korištenje: %s"
 
-msgid "Back"
-msgstr "Natrag"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1013,6 +939,15 @@ msgstr "Postavi upozorenje:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova bilješka"
+
+msgid "New to-do"
+msgstr "Novi zadatak"
+
+msgid "New notebook"
+msgstr "Nova bilježnica"
+
 msgid "Layout"
 msgstr "Izgled"
 
@@ -1108,6 +1043,14 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+#, fuzzy
+msgid "PDF File"
+msgstr "Datoteka"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1185,13 +1128,6 @@ msgstr "Opcije"
 msgid "Synchronisation Status"
 msgstr "Status Sinkronizacije"
 
-msgid "Encryption Options"
-msgstr ""
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Opcije"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1213,6 +1149,17 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
+msgid "Notebooks"
+msgstr "Bilježnice"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Stvorene lokalne stavke: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Resursi: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
 
@@ -1370,10 +1317,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizacija je već u toku. Stanje: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1594,6 +1537,10 @@ msgstr ""
 msgid "Editor font size"
 msgstr "Uredi bilješku."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Uredi bilješku."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1652,6 +1599,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1697,6 +1649,12 @@ msgstr ""
 msgid "Application"
 msgstr "Izađi iz aplikacije."
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1712,7 +1670,11 @@ msgid "Joplin Export Directory"
 msgstr ""
 
 #, fuzzy
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote izvozne datoteke"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote izvozne datoteke"
 
 #, fuzzy
@@ -1868,21 +1830,10 @@ msgstr "Nova bilježnica"
 msgid "Configuration"
 msgstr "Konfiguracija"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Stvorene lokalne stavke: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Resursi: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "Nova bilješka"
 
-msgid "Notebooks"
-msgstr "Bilježnice"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Prekidam... Pričekaj."
@@ -1927,10 +1878,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfiguracija"
-
 msgid "Encryption Config"
 msgstr ""
 
@@ -2118,6 +2065,45 @@ msgstr "Prijavi se u OneDrive"
 msgid "Search"
 msgstr "Traži"
 
+#, fuzzy
+#~ 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č."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Bilješka je spremljena."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Naslov bilježnice:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Bilježnice"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status sinkronizacije"
+
+#, fuzzy
+#~ msgid "General Options"
+#~ msgstr "Opcije"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Opcije"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfiguracija"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Prekini sinkronizaciju"
 

CliClient/locales/it_IT.po

@@ -175,16 +175,6 @@ msgstr "Nessun Taccuino attivo."
 msgid "Note does not exist: \"%s\". Create it?"
 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 "Errore durante l'apertura della nota nell'editor: %s"
-
-msgid "Note has been saved."
-msgstr "La nota è stata salvata."
-
 msgid "Exits the application."
 msgstr "Esci dall'applicazione."
 
@@ -399,17 +389,19 @@ msgid ""
 "Start, stop or check the API server. To specify on which port it should run, "
 "set the api.port config variable. Commands are (%s)."
 msgstr ""
+"Avvia, ferma o controlla il server API. Per specificare su quale porta deve "
+"essere eseguito, setta la variabile api.config. I comandi sono (%s)."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "Il server è già in esecuzione sulla porta %d"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "Il server è in esecuzione sulla porta %d"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "Il server non è in esecuzione."
 
 #, javascript-format
 msgid ""
@@ -552,11 +544,6 @@ msgstr "Scrivi `joplin help` per informazioni sull'uso."
 msgid "Fatal error:"
 msgstr "Errore fatale:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-"Tutte le potenziali porte sono in uso - prego riportare il problema a %s"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -613,72 +600,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Esportazione da \"%s\" come formato \"%s\". Si prega di attendere..."
 
-msgid "Sidebar"
-msgstr "Barra laterale"
-
-msgid "Note list"
-msgstr "Lista delle note"
-
-msgid "Note title"
-msgstr "Titolo della nota"
-
-msgid "Note body"
-msgstr "Corpo della nota"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importazione da \"%s\" come formato \"%s\". Si prega di attendere..."
-
-msgid "PDF File"
-msgstr "PDF File"
-
-msgid "Synchronisation status"
-msgstr "Stato di sincronizzazione"
-
-msgid "New note"
-msgstr "Nuova nota"
-
-msgid "New to-do"
-msgstr "Nuovo \"Cose-da-fare\""
-
-msgid "New notebook"
-msgstr "Nuovo taccuino"
-
-msgid "Print"
-msgstr "Stampa"
-
-msgid "General Options"
-msgstr "Opzioni Generali"
-
-msgid "Encryption options"
-msgstr "Opzioni Crittografia"
-
-msgid "Web clipper options"
-msgstr "Opzioni Web Clipper"
-
-msgid "Create note from template"
-msgstr "Crea nota da modello"
-
-msgid "Create to-do from template"
-msgstr "Nuovo \"Cose-da-fare\" da modello"
-
-msgid "Insert template"
-msgstr "Inserisci modello"
-
-msgid "Open template directory"
-msgstr "Apri cartella modelli"
-
-msgid "Refresh templates"
-msgstr "Aggiorna modelli"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "Revisione: %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&File"
 
@@ -776,9 +697,8 @@ msgstr "&Aiuto"
 msgid "Website and documentation"
 msgstr "Sito web e documentazione"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin v%s"
+msgstr "Joplin Forum"
 
 msgid "Make a donation"
 msgstr "Fai una donazione"
@@ -891,6 +811,9 @@ msgstr ""
 "Il token autorizzativo è necessario solo per permettere ad applicazioni di "
 "terze parti di accedere a Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Le note e le impostazioni sono memorizzate in: %s"
@@ -901,6 +824,9 @@ msgstr "Controlla la configurazione della sincronizzazione"
 msgid "Browse..."
 msgstr "Naviga..."
 
+msgid "Back"
+msgstr "Indietro"
+
 msgid "Apply"
 msgstr "Applica"
 
@@ -996,12 +922,18 @@ msgstr "Stato"
 msgid "Encryption is:"
 msgstr "La crittografia è:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Uso"
 
-msgid "Back"
-msgstr "Indietro"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1031,6 +963,15 @@ msgstr "Imposta allarme:"
 msgid "Template file:"
 msgstr "File del modello:"
 
+msgid "New note"
+msgstr "Nuova nota"
+
+msgid "New to-do"
+msgstr "Nuovo \"Cose-da-fare\""
+
+msgid "New notebook"
+msgstr "Nuovo taccuino"
+
 msgid "Layout"
 msgstr "Disposizione"
 
@@ -1129,6 +1070,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Solo una nota alla volta può essere stampata o esportata come PDF."
 
+msgid "PDF File"
+msgstr "PDF File"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Errore durante l'apertura della nota nell'editor: %s"
+
 msgid "strong text"
 msgstr "Testo grasseto"
 
@@ -1203,12 +1151,6 @@ msgstr "Opzioni"
 msgid "Synchronisation Status"
 msgstr "Stato della Sincronizzazione"
 
-msgid "Encryption Options"
-msgstr "Opzioni di crittografia"
-
-msgid "Clipper Options"
-msgstr "Opzioni Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1232,6 +1174,17 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
+msgid "Notebooks"
+msgstr "Taccuini"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Decrittografia Elementi: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Recupero risorse: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Prego selezionare dove lo stato della sincronizzazione deve essere esportato"
@@ -1391,12 +1344,6 @@ msgstr "In corso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronizzazione è già in corso. Stato: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Tipo elemento scaricato sconosciuto - prego aggiornare Joplin all’ultima "
-"versione"
-
 msgid "Encrypted"
 msgstr "Crittografato"
 
@@ -1588,9 +1535,8 @@ msgstr "Attiva sintassi ++insert++"
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "Attiva sintassi ~sub~"
+msgstr "Attiva supporto sintassi Fountain"
 
 msgid "Show tray icon"
 msgstr "Visualizza tray icon"
@@ -1616,6 +1562,10 @@ msgstr "Percentuale di zoom globale"
 msgid "Editor font size"
 msgstr "Editor dimensione caratteri"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editor dimensione caratteri"
+
 msgid "Editor font family"
 msgstr "Editor famiglia caratteri"
 
@@ -1681,10 +1631,17 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignora gli errori del certificato TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Specifica la porta che deve essere usata dal server API. Se non viene "
+"settato, viene usato un valore di default."
 
 msgid "Enable note history"
 msgstr "Attiva cronologia della nota"
@@ -1721,6 +1678,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Applicazione"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "La crittografia è:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opzioni Web Clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Il tag \"%s\" esiste già. Scegliere un nome differente."
@@ -1734,7 +1699,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Cartella di esportazione di Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Esporta files di Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Esporta files di Evernote"
 
 msgid "Json Export Directory"
@@ -1842,13 +1812,11 @@ msgstr "Permesso di usare la fotocamera"
 msgid "Your permission to use your camera is required."
 msgstr "E’ richiesto il permesso di usare la fotocamera."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "Elimina la nota o il taccuino selezionato."
+msgstr "Al momento non hai taccuini."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "Crea un nuovo Taccuino."
+msgstr "Crea un Taccuino"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
@@ -1891,20 +1859,9 @@ msgstr "Nuovo Taccuino"
 msgid "Configuration"
 msgstr "Configurazione"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Decrittografia Elementi: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Recupero risorse: %d/%d"
-
 msgid "All notes"
 msgstr "Tutte le note"
 
-msgid "Notebooks"
-msgstr "Taccuini"
-
 msgid "Checking... Please wait."
 msgstr "Controllo... Attendere per favore."
 
@@ -1955,9 +1912,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr "Informazioni"
-
 msgid "Encryption Config"
 msgstr "Configurazione Crittografia"
 
@@ -2144,6 +2098,81 @@ msgstr "Accedi a OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
+#~ 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."
+
+#~ msgid "Note has been saved."
+#~ msgstr "La nota è stata salvata."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "Tutte le potenziali porte sono in uso - prego riportare il problema a %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Barra laterale"
+
+#~ msgid "Note list"
+#~ msgstr "Lista delle note"
+
+#~ msgid "Note title"
+#~ msgstr "Titolo della nota"
+
+#~ msgid "Note body"
+#~ msgstr "Corpo della nota"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr ""
+#~ "Importazione da \"%s\" come formato \"%s\". Si prega di attendere..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Stato di sincronizzazione"
+
+#~ msgid "Print"
+#~ msgstr "Stampa"
+
+#~ msgid "General Options"
+#~ msgstr "Opzioni Generali"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opzioni Crittografia"
+
+#~ msgid "Create note from template"
+#~ msgstr "Crea nota da modello"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "Nuovo \"Cose-da-fare\" da modello"
+
+#~ msgid "Insert template"
+#~ msgstr "Inserisci modello"
+
+#~ msgid "Open template directory"
+#~ msgstr "Apri cartella modelli"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Aggiorna modelli"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Revisione: %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opzioni di crittografia"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opzioni Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Tipo elemento scaricato sconosciuto - prego aggiornare Joplin all’ultima "
+#~ "versione"
+
+#~ msgid "Information"
+#~ msgstr "Informazioni"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Permesso di usare la fotocamera"

CliClient/locales/ja_JP.po

@@ -20,7 +20,7 @@ msgid "To delete a tag, untag the associated notes."
 msgstr "タグを削除するには、関連するノートからタグを外してください。"
 
 msgid "Please select the note or notebook to be deleted first."
-msgstr "ます削除するノートかノートブックを選択してください。"
+msgstr "まず削除するノートかノートブックを選択してください。"
 
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "アプリケーションを終了するには、Ctrl+Dまたは\"exit\"と入力してください"
@@ -60,7 +60,7 @@ msgid "The command \"%s\" is only available in GUI mode"
 msgstr "コマンド \"%s\"は、GUIのみで有効です"
 
 msgid "Cannot change encrypted item"
-msgstr "暗号化したアイテムをは変更できません"
+msgstr "暗号化したアイテムは変更できません"
 
 #, javascript-format
 msgid "Missing required argument: %s"
@@ -123,13 +123,12 @@ msgstr "ToDoを完了としてマークします。"
 msgid "Note is not a to-do: \"%s\""
 msgstr "ノートはToDoリストではありません：\"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status`, `decrypt-file` and `target-status`."
 msgstr ""
-"E2EEの設定を変更します。コマンドは `enable`, `disable`, `decrypt`, `status` "
-"and `target-status` です。"
+"エンドツーエンド暗号化(E2EE)の設定コマンドです。<command>には `enable`, "
+"`disable`, `decrypt`, `status`, `target-status` があります。"
 
 msgid "Enter master password:"
 msgstr "マスターパスワードを入力してください:"
@@ -171,18 +170,7 @@ msgstr "有効なノートブックがありません。"
 
 #, javascript-format
 msgid "Note does not exist: \"%s\". Create it?"
-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 "次のエディターで開く際にエラー: %s"
-
-msgid "Note has been saved."
-msgstr "ノートは保存されました。"
+msgstr "\"%s\"というノートはありません。作成しますか？"
 
 msgid "Exits the application."
 msgstr "アプリケーションの終了。"
@@ -336,7 +324,7 @@ msgstr ""
 "(ノートブックのみ), DATE, TODO_CHECKED (ToDoのみ), TITLE"
 
 msgid "Please select a notebook first."
-msgstr "ますはノートブックを選択して下さい。"
+msgstr "まずはノートブックを選択して下さい。"
 
 msgid "Creates a new notebook."
 msgstr "あたらしいノートブックを作成します。"
@@ -390,17 +378,19 @@ msgid ""
 "Start, stop or check the API server. To specify on which port it should run, "
 "set the api.port config variable. Commands are (%s)."
 msgstr ""
+"APIサーバーの起動、停止、状況確認を行います。APIサーバーが使用するポートは "
+"api.port で変更できます。コマンドは (%s)。"
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "サーバーはすでにポート %d で実行中です。"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "サーバーはポート %d で実行中です。"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "サーバーは実行されていません。"
 
 #, javascript-format
 msgid ""
@@ -474,9 +464,10 @@ msgid ""
 "[tag] from [note], or to list the notes associated with [tag]. The command "
 "`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> は\"add\", \"remove\", \"list\"のいずれかで、指定した[ノート]か"
-"ら[タグ]をつけたり外したりできます。あるいは[タグ]で関連するノートをリスト"
-"アップします。`tag list`で、すべてのタグを見ることができます。"
+"<tag-command> は\"add\", \"remove\", \"list\"のいずれかで、指定した[note]から"
+"[tag]をつけたり外したりできます。あるいは[tag]のついたノートをリストアップし"
+"ます。`tag list`で、すべてのタグを見ることができます(-lオプションでより多くの"
+"情報を表示します)。"
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -526,7 +517,7 @@ msgid "Default: %s"
 msgstr "既定値: %s"
 
 msgid "Possible keys/values:"
-msgstr "取り得るキーバリュー:"
+msgstr "取り得るキー/値:"
 
 msgid "Type `joplin help` for usage information."
 msgstr "`joplin help`を実行して使い方を表示します。"
@@ -534,10 +525,6 @@ msgstr "`joplin help`を実行して使い方を表示します。"
 msgid "Fatal error:"
 msgstr "致命的なエラー:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr "すべての潜在ポートは利用中です - 問題を %s に報告してください"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "アプリケーションは認証されました - ブラウザを閉じてもかまいません。"
@@ -573,8 +560,7 @@ msgstr ""
 "`:help shortcuts`と入力することで、キーボードショートカットのリストを見ること"
 "ができます。また、`:help`で使い方を確認できます。\n"
 "\n"
-"例えば、ノートブックの作成には`mb`ででき、ノートの作成は`mn`で行うことができ"
-"ます。"
+"例えば、ノートブックの作成は`mb`で、ノートの作成は`mn`で行うことができます。"
 
 msgid ""
 "One or more items are currently encrypted and you may need to supply a "
@@ -592,80 +578,12 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 "\"%s\" を \"%s\" フォーマットにエクスポート中。しばらくお待ちください..."
 
-msgid "Sidebar"
-msgstr "サイドバー"
-
-msgid "Note list"
-msgstr "ノートの一覧"
-
-msgid "Note title"
-msgstr "ノートの題名："
-
-msgid "Note body"
-msgstr "ノートの本文"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-"\"%s\" を \"%s\" フォーマットとしてインポート中。しばらくお待ちください..."
-
-msgid "PDF File"
-msgstr "PDF ファイル"
-
-msgid "Synchronisation status"
-msgstr "同期状況"
-
-msgid "New note"
-msgstr "新しいノート"
-
-msgid "New to-do"
-msgstr "新しいToDo"
-
-msgid "New notebook"
-msgstr "新しいノートブック"
-
-msgid "Print"
-msgstr "印刷"
-
-msgid "General Options"
-msgstr "全般のオプション"
-
-msgid "Encryption options"
-msgstr "暗号化のオプション"
-
-msgid "Web clipper options"
-msgstr "Webクリッパーのオプション"
-
-msgid "Create note from template"
-msgstr "テンプレートからノートを作成"
-
-msgid "Create to-do from template"
-msgstr "テンプレートからto-doを作成"
-
-msgid "Insert template"
-msgstr "テンプレートを挿入"
-
-msgid "Open template directory"
-msgstr "テンプレートディレクトリを開く"
-
-msgid "Refresh templates"
-msgstr "テンプレートの更新"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "リビジョン: %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&ファイル"
 
 msgid "About Joplin"
 msgstr "Joplinについて"
 
-#, fuzzy
 msgid "Preferences..."
 msgstr "環境設定"
 
@@ -757,9 +675,8 @@ msgstr "&ヘルプ"
 msgid "Website and documentation"
 msgstr "Webサイトとドキュメント"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "JoplinのWebサイト"
+msgstr "Joplinフォーラム"
 
 msgid "Make a donation"
 msgstr "寄付する"
@@ -819,7 +736,7 @@ msgid "Status: %s"
 msgstr "状態: %s"
 
 msgid "Disable Web Clipper Service"
-msgstr "Webクリッパーサービス無効"
+msgstr "Webクリッパーサービスを無効にする"
 
 msgid "The web clipper service is not enabled."
 msgstr "Webクリッパーサービスは有効になっていません。"
@@ -845,21 +762,21 @@ msgid ""
 "enabling it your firewall may ask you to give permission to Joplin to listen "
 "to a particular port."
 msgstr ""
-"このサービスはブラウザーの拡張機能とJoplinを接続します。ファイアーウォールが"
-"有効になっている場合は、Joplinから特定のポートへの許可を与えるよう質問される"
-"でしょう。"
+"このサービスはブラウザー拡張機能からJoplinへのアクセスを可能にします。本サー"
+"ビスを有効化する際には、Joplinが特定のポートで接続を待ち受けることについて、"
+"お使いのファイアーウォールから許可を求められる場合があります。"
 
 msgid "Step 2: Install the extension"
 msgstr "ステップ2: 拡張機能のインストール"
 
 msgid "Download and install the relevant extension for your browser:"
-msgstr "関連する拡張機能をブラウザーにインストールします:"
+msgstr "ご使用のブラウザーに対応する拡張機能をインストールします:"
 
 msgid "Advanced options"
 msgstr "詳細な設定"
 
 msgid "Authorisation token:"
-msgstr "認証するトークン:"
+msgstr "認証トークン:"
 
 msgid "Copy token"
 msgstr "トークンのコピー"
@@ -868,8 +785,11 @@ msgid ""
 "This authorisation token is only needed to allow third-party applications to "
 "access Joplin."
 msgstr ""
-"この認証トークンはサードパーティアプリケーションがJoplinにアクセスするためだ"
-"けに必要です。"
+"この認証トークンはサードパーティのアプリケーションにJoplinへのアクセスを許可"
+"するときにだけ使用します。"
+
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -881,6 +801,9 @@ msgstr "同期の設定を確認する"
 msgid "Browse..."
 msgstr "参照..."
 
+msgid "Back"
+msgstr "戻る"
+
 msgid "Apply"
 msgstr "適用"
 
@@ -945,7 +868,7 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 "注意：\"active\"に指定されたマスターキーのみが暗号化に使用されます。暗号化に"
-"使用されたキーの応じて、すべてのキーが暗号解除のために使用されます。"
+"使用されたキーに応じて、いずれかのキーが暗号解除のために使用されます。"
 
 msgid "Missing Master Keys"
 msgstr "マスターキーがありません"
@@ -955,9 +878,9 @@ msgid ""
 "however the application does not currently have access to them. It is likely "
 "they will eventually be downloaded via synchronisation."
 msgstr ""
-"これらのIDとマスターキーはアイテムを暗号化するのに使われていますが、このアプ"
-"リケーションからはアクセスすることができていません。おそらく同期機能でダウン"
-"ロードしてきたのでしょう。"
+"これらのIDを持つマスターキーはアイテムを暗号化するのに使われていますが、現在"
+"このキーで暗号化されたアイテムにはアクセスできません。おそらくこれらのアイテ"
+"ムはまだ同期（ダウンロード）されていないものと考えられます。"
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advice on how to "
@@ -972,12 +895,18 @@ msgstr "状態"
 msgid "Encryption is:"
 msgstr "暗号化の状態:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "使い方"
 
-msgid "Back"
-msgstr "戻る"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -986,7 +915,7 @@ msgstr ""
 "されます"
 
 msgid "Please create a notebook first."
-msgstr "ますはノートブックを作成して下さい。"
+msgstr "まずはノートブックを作成して下さい。"
 
 msgid "Please create a notebook first"
 msgstr "まず最初にノートブックを作成して下さい"
@@ -1009,6 +938,15 @@ msgstr "アラームをセット："
 msgid "Template file:"
 msgstr "テンプレートファイル："
 
+msgid "New note"
+msgstr "新しいノート"
+
+msgid "New to-do"
+msgstr "新しいToDo"
+
+msgid "New notebook"
+msgstr "新しいノートブック"
+
 msgid "Layout"
 msgstr "レイアウト"
 
@@ -1057,7 +995,7 @@ msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
 msgstr "ノート \"%s\" のノートブック \"%s\"への復元は成功しました。"
 
 msgid "This note has no history"
-msgstr "こののーとに履歴はありません"
+msgstr "このノートに履歴はありません"
 
 msgid "Restore"
 msgstr "復元"
@@ -1087,7 +1025,7 @@ msgid "Copy Link Address"
 msgstr "リンクアドレスをコピー"
 
 msgid "This attachment is not downloaded or not decrypted yet."
-msgstr "この添付ファイルはダウンロードできないか、まだ復号できません。"
+msgstr "この添付ファイルはダウンロードされていないか、まだ復号されていません。"
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -1102,7 +1040,14 @@ msgstr ""
 "ノートを編集してください。"
 
 msgid "Only one note can be printed or exported to PDF at a time."
-msgstr "一度に一つのノートだけPDFに印刷もしくはエクスポートができます。"
+msgstr "一度に印刷またはPDF出力できるノートは1つだけです。"
+
+msgid "PDF File"
+msgstr "PDF ファイル"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "次のエディターで開く際にエラー: %s"
 
 msgid "strong text"
 msgstr "文字を太字に"
@@ -1178,12 +1123,6 @@ msgstr "オプション"
 msgid "Synchronisation Status"
 msgstr "同期状況"
 
-msgid "Encryption Options"
-msgstr "暗号化のオプション"
-
-msgid "Clipper Options"
-msgstr "Clipperのオプション"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1207,6 +1146,17 @@ msgstr "削除"
 msgid "Rename"
 msgstr "名前の変更"
 
+msgid "Notebooks"
+msgstr "ノートブック"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "復号中のアイテム: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "取得中のリソース: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "同期状況の出力先を選択してください"
 
@@ -1365,12 +1315,6 @@ msgstr "実行中"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "同期作業はすでに実行中です。状態: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"不明なアイテムタイプをダウンロードしました - 最新のJoplinにアップデートしてく"
-"ださい"
-
 msgid "Encrypted"
 msgstr "暗号化済"
 
@@ -1493,10 +1437,10 @@ msgid "Dark"
 msgstr "暗い"
 
 msgid "Solarised Light"
-msgstr ""
+msgstr "Solarised (明)"
 
 msgid "Solarised Dark"
-msgstr ""
+msgstr "Solarised (暗)"
 
 msgid "Uncompleted to-dos on top"
 msgstr "未完のToDoをリストの上部に表示"
@@ -1564,9 +1508,8 @@ msgstr "++追加++構文を有効にする"
 msgid "Enable multimarkdown table extension"
 msgstr "MultiMarkdownのテーブル拡張を有効にする"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "~下付きテキスト~構文を有効にする"
+msgstr "Fountain構文を有効にする"
 
 msgid "Show tray icon"
 msgstr "トレイアイコンの表示"
@@ -1583,7 +1526,7 @@ msgstr ""
 "的に同期し、衝突を減らすために強くおすすめする設定です。"
 
 msgid "Start application minimised in the tray icon"
-msgstr "アプリケーションをトレイアンコンで最小化して起動"
+msgstr "アプリケーションをトレイアイコンで最小化して起動"
 
 msgid "Global zoom percentage"
 msgstr "全体ズームの割合"
@@ -1591,6 +1534,10 @@ msgstr "全体ズームの割合"
 msgid "Editor font size"
 msgstr "エディターのフォントサイズ"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "エディターのフォントサイズ"
+
 msgid "Editor font family"
 msgstr "エディターのフォントファミリー"
 
@@ -1653,10 +1600,17 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS証明書のエラーを無視"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"APIサーバーが使用するポートを指定してください。未設定時はデフォルトのポートが"
+"使用されます。"
 
 msgid "Enable note history"
 msgstr "ノートの履歴を有効にする"
@@ -1693,6 +1647,14 @@ msgstr "プラグイン"
 msgid "Application"
 msgstr "アプリケーション"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "暗号化の状態:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Webクリッパーのオプション"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "タグ \"%s\" はすでにあります。ほかの名前を選択してください。"
@@ -1706,7 +1668,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin エクスポートディレクトリ"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote エクスポートファイル"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote エクスポートファイル"
 
 msgid "Json Export Directory"
@@ -1814,13 +1781,11 @@ msgstr "カメラ使用の許可"
 msgid "Your permission to use your camera is required."
 msgstr "カメラを使用するには権限が必要です。"
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "選択中のノートまたはノートブックを削除"
+msgstr "ノートブックがありません。"
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "あたらしいノートブックを作成します。"
+msgstr "ノートブックを作成します。"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "ノートがありません。(+)ボタンを押して新しいノートを作成してください。"
@@ -1863,20 +1828,9 @@ msgstr "新しいノートブック"
 msgid "Configuration"
 msgstr "設定"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "復号中のアイテム: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "取得中のリソース: %d/%d"
-
 msgid "All notes"
 msgstr "すべてのノート"
 
-msgid "Notebooks"
-msgstr "ノートブック"
-
 msgid "Checking... Please wait."
 msgstr "確認中...お待ちください。"
 
@@ -1909,7 +1863,7 @@ msgstr ""
 
 #, javascript-format
 msgid "Decrypted items: %s / %s"
-msgstr "復号中のアイテム: %s/%s"
+msgstr "復号済み（非暗号化）アイテム: %s/%s"
 
 msgid "New tags:"
 msgstr "新しいタグ:"
@@ -1926,9 +1880,6 @@ msgid ""
 msgstr ""
 "ファイルシステムの同期を使うには、外部ストレージへの書き込み権限が必要です。"
 
-msgid "Information"
-msgstr "情報"
-
 msgid "Encryption Config"
 msgstr "暗号化の設定"
 
@@ -2068,7 +2019,6 @@ msgstr "地図上に表示"
 msgid "Go to source URL"
 msgstr "ソースURLに行く"
 
-#, fuzzy
 msgid "Attach..."
 msgstr "添付..."
 
@@ -2096,14 +2046,12 @@ msgstr "ToDoに変換"
 msgid "Properties"
 msgstr "プロパティ"
 
-#, fuzzy
 msgid "Add body"
-msgstr "ボディを追加"
+msgstr "本文を追加"
 
 msgid "Edit"
 msgstr "編集"
 
-#, fuzzy
 msgid "Add title"
 msgstr "タイトルを追加"
 
@@ -2113,6 +2061,81 @@ msgstr "OneDriveログイン"
 msgid "Search"
 msgstr "検索"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "ノートの編集を開始します。エディターを閉じると元の画面に戻ることができま"
+#~ "す。"
+
+#~ msgid "Note has been saved."
+#~ msgstr "ノートは保存されました。"
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr "使用候補のポートはすべて利用中です - 問題を %s に報告してください"
+
+#~ msgid "Sidebar"
+#~ msgstr "サイドバー"
+
+#~ msgid "Note list"
+#~ msgstr "ノートの一覧"
+
+#~ msgid "Note title"
+#~ msgstr "ノートの題名："
+
+#~ msgid "Note body"
+#~ msgstr "ノートの本文"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr ""
+#~ "\"%s\" を \"%s\" フォーマットとしてインポート中。しばらくお待ちください..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "同期状況"
+
+#~ msgid "Print"
+#~ msgstr "印刷"
+
+#~ msgid "General Options"
+#~ msgstr "全般のオプション"
+
+#~ msgid "Encryption options"
+#~ msgstr "暗号化のオプション"
+
+#~ msgid "Create note from template"
+#~ msgstr "テンプレートからノートを作成"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "テンプレートからto-doを作成"
+
+#~ msgid "Insert template"
+#~ msgstr "テンプレートを挿入"
+
+#~ msgid "Open template directory"
+#~ msgstr "テンプレートディレクトリを開く"
+
+#~ msgid "Refresh templates"
+#~ msgstr "テンプレートの更新"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "リビジョン: %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "暗号化のオプション"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipperのオプション"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "不明なアイテムタイプをダウンロードしました - 最新のJoplinにアップデートし"
+#~ "てください"
+
+#~ msgid "Information"
+#~ msgstr "情報"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "カメラ使用の許可"

CliClient/locales/joplin.pot

@@ -160,16 +160,6 @@ msgstr ""
 msgid "Note does not exist: \"%s\". Create it?"
 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 ""
-
 msgid "Exits the application."
 msgstr ""
 
@@ -487,10 +477,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -529,72 +515,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr ""
-
-msgid "Synchronisation status"
-msgstr ""
-
-msgid "New note"
-msgstr ""
-
-msgid "New to-do"
-msgstr ""
-
-msgid "New notebook"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr ""
 
@@ -798,6 +718,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -808,6 +731,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -886,10 +812,16 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
 msgstr ""
 
 #, javascript-format
@@ -921,6 +853,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr ""
+
+msgid "New to-do"
+msgstr ""
+
+msgid "New notebook"
+msgstr ""
+
 msgid "Layout"
 msgstr ""
 
@@ -1012,6 +953,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr ""
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1086,12 +1034,6 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
-msgid "Encryption Options"
-msgstr ""
-
-msgid "Clipper Options"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1112,6 +1054,17 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+msgid "Notebooks"
+msgstr ""
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1260,10 +1213,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1471,6 +1420,9 @@ msgstr ""
 msgid "Editor font size"
 msgstr ""
 
+msgid "Editor font"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1525,6 +1477,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1565,6 +1522,12 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1578,7 +1541,10 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1725,20 +1691,9 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr ""
-
 msgid "All notes"
 msgstr ""
 
-msgid "Notebooks"
-msgstr ""
-
 msgid "Checking... Please wait."
 msgstr ""
 
@@ -1780,9 +1735,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr ""
-
 msgid "Encryption Config"
 msgstr ""
 

CliClient/locales/ko.po

@@ -173,16 +173,6 @@ msgstr "활성화된 노트북이 없습니다."
 msgid "Note does not exist: \"%s\". Create it?"
 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 "편집기에서 노트를 열 수 없는 오류가 발생하였습니다: %s"
-
-msgid "Note has been saved."
-msgstr "노트가 저장되었습니다."
-
 msgid "Exits the application."
 msgstr "애플리케이션을 종료합니다."
 
@@ -389,17 +379,19 @@ msgid ""
 "Start, stop or check the API server. To specify on which port it should run, "
 "set the api.port config variable. Commands are (%s)."
 msgstr ""
+"API 서버를 시작, 중지 혹은 확인할수 있습니다. 실행할 포트를 지정하실려면, "
+"api.port 변수 설정을 변경해주세요. 명령어는 (%s) 입니다."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "서버가 이미 포트 %d에서 동작하고 있습니다"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "서버가 포트 %d에서 동작하고 있습니다"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "서버가 동작하지 않습니다."
 
 #, javascript-format
 msgid ""
@@ -533,10 +525,6 @@ msgstr "사용법에 대한 정보를 알고 싶으시다면 `joplin help`를
 msgid "Fatal error:"
 msgstr "치명적인 오류:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr "모든 가능한 포트들이 사용중에 있습니다 - %s 에 대한 문제를 알려주세요"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "애플리케이션이 허가되었습니다 - 브라우저 탭을 닫으셔도 됩니다."
@@ -589,72 +577,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "\"%s\"에 \"%s\" 포맷으로 내보내는 중입니다. 잠시만 기다려주세요..."
 
-msgid "Sidebar"
-msgstr "사이드바"
-
-msgid "Note list"
-msgstr "노트 목록"
-
-msgid "Note title"
-msgstr "노트 제목"
-
-msgid "Note body"
-msgstr "노트 본문"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "\"%s\"에서 \"%s\" 포맷으로 가져오는 중입니다. 잠시만 기다려주세요..."
-
-msgid "PDF File"
-msgstr "PDF 파일"
-
-msgid "Synchronisation status"
-msgstr "동기화 상태"
-
-msgid "New note"
-msgstr "새 노트"
-
-msgid "New to-do"
-msgstr "새 '할 일'"
-
-msgid "New notebook"
-msgstr "새 노트북"
-
-msgid "Print"
-msgstr "인쇄"
-
-msgid "General Options"
-msgstr "일반 옵션"
-
-msgid "Encryption options"
-msgstr "암호화 옵션"
-
-msgid "Web clipper options"
-msgstr "웹 수집기 옵션"
-
-msgid "Create note from template"
-msgstr "템플릿에서 노트 생성"
-
-msgid "Create to-do from template"
-msgstr "템플릿에서 할일 생성"
-
-msgid "Insert template"
-msgstr "템플릿 삽입"
-
-msgid "Open template directory"
-msgstr "템플릿 디렉터리 열기"
-
-msgid "Refresh templates"
-msgstr "템플릿 새로고침"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "개정판: %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "파일"
 
@@ -752,9 +674,8 @@ msgstr "도움말"
 msgid "Website and documentation"
 msgstr "웹사이트 및 각종 문서"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "조플린 v%s"
+msgstr "Joplin 포럼"
 
 msgid "Make a donation"
 msgstr "기부하기"
@@ -865,6 +786,9 @@ msgstr ""
 "이 인증 토큰은 오직 서드파티 애플리케이션에서 Joplin에 접근할 때만 필요합니"
 "다."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "노트와 설정값이 다음에 저장되었습니다: %s"
@@ -875,6 +799,9 @@ msgstr "동기화 설정 확인"
 msgid "Browse..."
 msgstr "훑어보기…"
 
+msgid "Back"
+msgstr "뒤로 가기"
+
 msgid "Apply"
 msgstr "적용"
 
@@ -966,12 +893,18 @@ msgstr "상태"
 msgid "Encryption is:"
 msgstr "암호화는 다음과 같습니다:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "사용 방법"
 
-msgid "Back"
-msgstr "뒤로 가기"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1001,6 +934,15 @@ msgstr "알람 설정:"
 msgid "Template file:"
 msgstr "템플릿 파일:"
 
+msgid "New note"
+msgstr "새 노트"
+
+msgid "New to-do"
+msgstr "새 '할 일'"
+
+msgid "New notebook"
+msgstr "새 노트북"
+
 msgid "Layout"
 msgstr "배치"
 
@@ -1096,6 +1038,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "한 번에 오직 하나의 노트만 출력하거나 내보내기 할 수 있습니다."
 
+msgid "PDF File"
+msgstr "PDF 파일"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "편집기에서 노트를 열 수 없는 오류가 발생하였습니다: %s"
+
 msgid "strong text"
 msgstr "굵게"
 
@@ -1170,12 +1119,6 @@ msgstr "옵션"
 msgid "Synchronisation Status"
 msgstr "동기화 상태"
 
-msgid "Encryption Options"
-msgstr "암호화 옵션"
-
-msgid "Clipper Options"
-msgstr "수집기 옵션"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1199,6 +1142,17 @@ msgstr "삭제"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
+msgid "Notebooks"
+msgstr "노트북"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "복호화 항목: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "리소스 가져오는 중: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "동기화 상태를 내보낼 대상을 선택하세요"
 
@@ -1357,12 +1311,6 @@ msgstr "진행 중"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "동기화가 이미 진행되고 있습니다. 상태: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"알려지지 않은 타입을 다운로드 했습니다 - Joplin을 최신 버전으로 업데이트 해주"
-"세요"
-
 msgid "Encrypted"
 msgstr "암호화됨"
 
@@ -1551,11 +1499,10 @@ msgid "Enable ++insert++ syntax"
 msgstr "++insert++ 확장 허용"
 
 msgid "Enable multimarkdown table extension"
-msgstr "멀티마크다운 테이블 확장 허용"
+msgstr "멀티 마크다운 테이블 확장 허용"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "~sub~ 구문 허용"
+msgstr "Fountain 구문 지원 허용"
 
 msgid "Show tray icon"
 msgstr "트레이 아이콘 표시"
@@ -1580,6 +1527,10 @@ msgstr "전체 확대 비율"
 msgid "Editor font size"
 msgstr "편집기 글꼴 크기"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "편집기 글꼴 크기"
+
 msgid "Editor font family"
 msgstr "편집기 글꼴 모음"
 
@@ -1643,10 +1594,17 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS 인증서 오류 무시"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"API 서버에 사용할 포트를 선택해주세요. 선택되지 않으면, 기본 포트를 선택합니"
+"다."
 
 msgid "Enable note history"
 msgstr "노트 역사 허용"
@@ -1683,6 +1641,14 @@ msgstr "플러그인"
 msgid "Application"
 msgstr "애플리케이션"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "암호화는 다음과 같습니다:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "웹 수집기 옵션"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "태그 \"%s\"(이)가 이미 존재합니다. 다른 이름을 선택해 주세요."
@@ -1696,7 +1662,12 @@ msgstr "마크다운"
 msgid "Joplin Export Directory"
 msgstr "Joplin 내보내기 폴더"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "에버노트 내보내기 파일"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "에버노트 내보내기 파일"
 
 msgid "Json Export Directory"
@@ -1804,13 +1775,11 @@ msgstr "카메라 사용 허가"
 msgid "Your permission to use your camera is required."
 msgstr "카메라 사용 허가가 필요합니다."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "활성화된 노트북이 없습니다."
+msgstr "현재 노트북이 없습니다."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "새 노트북을 만듭니다."
+msgstr "새 노트북을 만듭니다"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "노트가 없습니다. (+) 버튼을 클릭하여 새로 만드세요."
@@ -1853,20 +1822,9 @@ msgstr "새 노트북"
 msgid "Configuration"
 msgstr "설정"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "복호화 항목: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "리소스 가져오는 중: %d/%d"
-
 msgid "All notes"
 msgstr "모든 노트"
 
-msgid "Notebooks"
-msgstr "노트북"
-
 msgid "Checking... Please wait."
 msgstr "확인 중입니다... 잠시만 기다리세요."
 
@@ -1917,9 +1875,6 @@ msgid ""
 msgstr ""
 "파일 시스템 동기화를 사용하실려면 외부 저장소 쓰기 권한을 필요로 합니다."
 
-msgid "Information"
-msgstr "정보"
-
 msgid "Encryption Config"
 msgstr "암호화 설정"
 
@@ -2101,6 +2056,80 @@ msgstr "OneDrive 로그인"
 msgid "Search"
 msgstr "검색"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "노트 편집을 시작합니다. 프롬프트로 가시려면 편집기를 종료해주세요."
+
+#~ msgid "Note has been saved."
+#~ msgstr "노트가 저장되었습니다."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "모든 가능한 포트들이 사용중에 있습니다 - %s 에 대한 문제를 알려주세요"
+
+#~ msgid "Sidebar"
+#~ msgstr "사이드바"
+
+#~ msgid "Note list"
+#~ msgstr "노트 목록"
+
+#~ msgid "Note title"
+#~ msgstr "노트 제목"
+
+#~ msgid "Note body"
+#~ msgstr "노트 본문"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr ""
+#~ "\"%s\"에서 \"%s\" 포맷으로 가져오는 중입니다. 잠시만 기다려주세요..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "동기화 상태"
+
+#~ msgid "Print"
+#~ msgstr "인쇄"
+
+#~ msgid "General Options"
+#~ msgstr "일반 옵션"
+
+#~ msgid "Encryption options"
+#~ msgstr "암호화 옵션"
+
+#~ msgid "Create note from template"
+#~ msgstr "템플릿에서 노트 생성"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "템플릿에서 할일 생성"
+
+#~ msgid "Insert template"
+#~ msgstr "템플릿 삽입"
+
+#~ msgid "Open template directory"
+#~ msgstr "템플릿 디렉터리 열기"
+
+#~ msgid "Refresh templates"
+#~ msgstr "템플릿 새로고침"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "개정판: %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "암호화 옵션"
+
+#~ msgid "Clipper Options"
+#~ msgstr "수집기 옵션"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "알려지지 않은 타입을 다운로드 했습니다 - Joplin을 최신 버전으로 업데이트 "
+#~ "해주세요"
+
+#~ msgid "Information"
+#~ msgstr "정보"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "카메라 사용 허가"

CliClient/locales/nb_NO.po

@@ -172,18 +172,6 @@ msgstr "Ingen aktiv notatbok."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notat eksisterer ikke: \"%s\". Vil du opprette det?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Notatredigering startet. Lukk editoren for å komme tilbake til "
-"kommandolinjen."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Feil ved åpning av notat i editor: %s"
-
-msgid "Note has been saved."
-msgstr "Notat har blitt lagret."
-
 msgid "Exits the application."
 msgstr "Avslutter programmet."
 
@@ -539,10 +527,6 @@ msgstr "Skriv `joplin help` for brukerinformasjon."
 msgid "Fatal error:"
 msgstr "Kritisk feil:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Applikasjonen er autorisert - du kan nå lukke denne nettleserenfanen."
@@ -596,74 +580,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksporterer til \"%s\" i \"%s\" format. Vennligst vent..."
 
-msgid "Sidebar"
-msgstr "Sidepanel"
-
-msgid "Note list"
-msgstr "Notatliste"
-
-msgid "Note title"
-msgstr "Tittel på notat:"
-
-msgid "Note body"
-msgstr "Notatbrødtekst"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importerer fra \"%s\" i \"%s\"-format. Vennligst vent..."
-
-msgid "PDF File"
-msgstr "PDF-fil"
-
-msgid "Synchronisation status"
-msgstr "Synkroniseringsstatus"
-
-msgid "New note"
-msgstr "Nytt notat"
-
-msgid "New to-do"
-msgstr "Nytt gjøremål"
-
-msgid "New notebook"
-msgstr "Ny notatbok"
-
-msgid "Print"
-msgstr "Skriv ut"
-
-msgid "General Options"
-msgstr "Generelle innstillinger"
-
-msgid "Encryption options"
-msgstr "Krypteringsvalg"
-
-msgid "Web clipper options"
-msgstr "Web Clipper-innstillinger"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Sett inn dato/tid"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin-eksportert katalog"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Fil"
 
@@ -875,6 +791,9 @@ msgstr ""
 "Denne autoriseringsbeviset er det eneste nødvendige for å gi "
 "tredjepartsapplikasjoner tilgang til Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notater og innstillinger er lagret i: %s"
@@ -885,6 +804,9 @@ msgstr "Sjekk synkroniseringskonfigurasjon"
 msgid "Browse..."
 msgstr "Utforsk..."
 
+msgid "Back"
+msgstr "Tilbake"
+
 msgid "Apply"
 msgstr "Bruk"
 
@@ -979,12 +901,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Kryptering er:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Bruk"
 
-msgid "Back"
-msgstr "Tilbake"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1016,6 +944,15 @@ msgstr "Angi alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nytt notat"
+
+msgid "New to-do"
+msgstr "Nytt gjøremål"
+
+msgid "New notebook"
+msgstr "Ny notatbok"
+
 msgid "Layout"
 msgstr "Visning"
 
@@ -1112,6 +1049,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Kun ett notat kan bli printet eller eksportert som PDF om gangen."
 
+msgid "PDF File"
+msgstr "PDF-fil"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Feil ved åpning av notat i editor: %s"
+
 msgid "strong text"
 msgstr "fet tekst"
 
@@ -1186,12 +1130,6 @@ msgstr "Generelle innstillinger"
 msgid "Synchronisation Status"
 msgstr "Synkroniseringsstatus"
 
-msgid "Encryption Options"
-msgstr "Krypteringsinnstillinger"
-
-msgid "Clipper Options"
-msgstr "Clipper-innstillinger"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1216,6 +1154,17 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Gi nytt navn"
 
+msgid "Notebooks"
+msgstr "Notatbøker"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Dekrypterer elementer: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Henter ressurser: %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Velg hvor synkroniseringsstatusen skal eksporteres til"
 
@@ -1372,10 +1321,6 @@ msgstr "Pågår"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering pågår allerede. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Kryptert"
 
@@ -1595,6 +1540,10 @@ msgstr "Global forstørrelse"
 msgid "Editor font size"
 msgstr "Editorskriftstørrelse"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editorskriftstørrelse"
+
 msgid "Editor font family"
 msgstr "Editorskrifttype"
 
@@ -1658,6 +1607,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorer TLS-sertifikatfeil"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1699,6 +1653,14 @@ msgstr ""
 msgid "Application"
 msgstr "Applikasjon"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Kryptering er:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web Clipper-innstillinger"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Merkelappen \"%s\" eksiterer allerede. Vennligst velg et annet navn."
@@ -1712,7 +1674,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-eksportert katalog"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote-eksportert fil"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote-eksportert fil"
 
 msgid "Json Export Directory"
@@ -1869,21 +1836,10 @@ msgstr "Ny notatbok"
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Dekrypterer elementer: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Henter ressurser: %d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notat"
 
-msgid "Notebooks"
-msgstr "Notatbøker"
-
 msgid "Checking... Please wait."
 msgstr "Sjekker… Vennligst vent."
 
@@ -1932,10 +1888,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfigurasjon"
-
 msgid "Encryption Config"
 msgstr "Krypteringsinnstillinger"
 
@@ -2124,6 +2076,66 @@ msgstr "Innlogging med OneDrive"
 msgid "Search"
 msgstr "Søk"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Notatredigering startet. Lukk editoren for å komme tilbake til "
+#~ "kommandolinjen."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notat har blitt lagret."
+
+#~ msgid "Sidebar"
+#~ msgstr "Sidepanel"
+
+#~ msgid "Note list"
+#~ msgstr "Notatliste"
+
+#~ msgid "Note title"
+#~ msgstr "Tittel på notat:"
+
+#~ msgid "Note body"
+#~ msgstr "Notatbrødtekst"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importerer fra \"%s\" i \"%s\"-format. Vennligst vent..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synkroniseringsstatus"
+
+#~ msgid "Print"
+#~ msgstr "Skriv ut"
+
+#~ msgid "General Options"
+#~ msgstr "Generelle innstillinger"
+
+#~ msgid "Encryption options"
+#~ msgstr "Krypteringsvalg"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Sett inn dato/tid"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin-eksportert katalog"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Krypteringsinnstillinger"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper-innstillinger"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfigurasjon"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Tillatelse til å bruke kamera"

CliClient/locales/nl_BE.po

@@ -174,17 +174,6 @@ msgstr "Geen actief notitieboek."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notitie bestaat niet: \"%s\". Aanmaken?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Bewerken notitie gestart. Sluit de editor om terug naar de prompt te gaan."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
-msgid "Note has been saved."
-msgstr "Notitie is opgeslaan."
-
 msgid "Exits the application."
 msgstr "Sluit de applicatie."
 
@@ -548,10 +537,6 @@ msgstr "Toont gebruiksinformatie."
 msgid "Fatal error:"
 msgstr "Fatale fout:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "De applicatie is geauthenticeerd - U kan deze tab sluiten."
@@ -606,75 +591,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Notitieboek titel:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Notitieboeken"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-#, fuzzy
-msgid "PDF File"
-msgstr "Bestand"
-
-msgid "Synchronisation status"
-msgstr "Synchronisatie status"
-
-msgid "New note"
-msgstr "Nieuwe notitie"
-
-msgid "New to-do"
-msgstr "Nieuwe to-do"
-
-msgid "New notebook"
-msgstr "Nieuw notitieboek"
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr "Algemene opties"
-
-msgid "Encryption options"
-msgstr "Versleutelopties"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Bestand"
@@ -889,6 +805,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen zijn opgeslaan in %s"
@@ -900,6 +819,9 @@ msgstr "Annuleer synchronisatie"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Terug"
+
 msgid "Apply"
 msgstr ""
 
@@ -990,13 +912,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Versleuteling is:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Gebruik: %s"
 
-msgid "Back"
-msgstr "Terug"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1029,6 +957,15 @@ msgstr "Stel melding in:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nieuwe notitie"
+
+msgid "New to-do"
+msgstr "Nieuwe to-do"
+
+msgid "New notebook"
+msgstr "Nieuw notitieboek"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1127,6 +1064,14 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+#, fuzzy
+msgid "PDF File"
+msgstr "Bestand"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1204,13 +1149,6 @@ msgstr "Opties"
 msgid "Synchronisation Status"
 msgstr "Synchronisatie status"
 
-msgid "Encryption Options"
-msgstr "Versleutelopties"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Algemene opties"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1233,6 +1171,17 @@ msgstr "Verwijderen"
 msgid "Rename"
 msgstr "Hernoem"
 
+msgid "Notebooks"
+msgstr "Notitieboeken"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Opgehaalde items: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Middelen: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
 
@@ -1393,10 +1342,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronisatie is reeds bezig. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1620,6 +1565,10 @@ msgstr ""
 msgid "Editor font size"
 msgstr "Bewerk notitie."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Bewerk notitie."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1679,6 +1628,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1724,6 +1678,13 @@ msgstr ""
 msgid "Application"
 msgstr "Sluit de applicatie."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Versleuteling is:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1739,7 +1700,11 @@ msgid "Joplin Export Directory"
 msgstr ""
 
 #, fuzzy
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Exporteer Evernote bestanden"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Exporteer Evernote bestanden"
 
 #, fuzzy
@@ -1899,21 +1864,10 @@ msgstr "Nieuw notitieboek"
 msgid "Configuration"
 msgstr "Configuratie"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Opgehaalde items: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Middelen: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "Nieuwe notitie"
 
-msgid "Notebooks"
-msgstr "Notitieboeken"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Annuleren.. Even geduld."
@@ -1958,10 +1912,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuratie"
-
 msgid "Encryption Config"
 msgstr "Encryptie configuratie"
 
@@ -2148,6 +2098,48 @@ msgstr "Log in met OneDrive"
 msgid "Search"
 msgstr "Zoeken"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Bewerken notitie gestart. Sluit de editor om terug naar de prompt te gaan."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notitie is opgeslaan."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Notitieboek titel:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Notitieboeken"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synchronisatie status"
+
+#~ msgid "General Options"
+#~ msgstr "Algemene opties"
+
+#~ msgid "Encryption options"
+#~ msgstr "Versleutelopties"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Versleutelopties"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Algemene opties"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuratie"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Annuleer synchronisatie"
 

CliClient/locales/nl_NL.po

@@ -176,17 +176,6 @@ msgstr "Geen actief notitieboek."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notitie bestaat niet: \"%s\". Wil je deze creëren?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Bezig met starten van notitiebewerking. Sluit de bewerker om terug te keren."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fout bij openen van notitie in bewerker: %s"
-
-msgid "Note has been saved."
-msgstr "Notitie is opgeslagen."
-
 msgid "Exits the application."
 msgstr "Sluit de applicatie af."
 
@@ -546,10 +535,6 @@ msgstr "Typ `joplin help` voor meer informatie over het gebruik."
 msgid "Fatal error:"
 msgstr "Fatale fout:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr "Alle potentiële poorten zijn in gebruik - Meld het probleem op %s"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -605,74 +590,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Bezig met exporteren van \"%s\" in het formaat \"%s\". Even geduld..."
 
-msgid "Sidebar"
-msgstr "Zijbalk"
-
-msgid "Note list"
-msgstr "Notitielijst"
-
-msgid "Note title"
-msgstr "Titel van notitie"
-
-msgid "Note body"
-msgstr "Inhoud van notitie"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Bezig met importeren van \"%s\" in het formaat \"%s\". Even geduld..."
-
-msgid "PDF File"
-msgstr "PDF-bestand"
-
-msgid "Synchronisation status"
-msgstr "Synchronisatiestatus"
-
-msgid "New note"
-msgstr "Nieuwe notitie"
-
-msgid "New to-do"
-msgstr "Nieuwe taak"
-
-msgid "New notebook"
-msgstr "Nieuw notitieboek"
-
-msgid "Print"
-msgstr "Afdrukken"
-
-msgid "General Options"
-msgstr "Algemene opties"
-
-msgid "Encryption options"
-msgstr "Versleutelingsopties"
-
-msgid "Web clipper options"
-msgstr "Webclipper-opties"
-
-msgid "Create note from template"
-msgstr "Notitie maken van sjabloon"
-
-msgid "Create to-do from template"
-msgstr "To-do maken van sjabloon"
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Datum en tijd invoegen"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin-exportmap"
-
-msgid "Refresh templates"
-msgstr "Sjablonen vernieuwen"
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Bestand"
 
@@ -885,6 +802,9 @@ msgstr ""
 "Dit autorisatie-token is alleen nodig om applicaties van derden toegang te "
 "geven tot Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen worden opgeslagen in: %s"
@@ -895,6 +815,9 @@ msgstr "Synchronisatieconfiguratie controleren"
 msgid "Browse..."
 msgstr "Bladeren…"
 
+msgid "Back"
+msgstr "Terug"
+
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -989,12 +912,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Gebruikte versleuteling:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Gebruik"
 
-msgid "Back"
-msgstr "Terug"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1026,6 +955,15 @@ msgstr "Alarm instellen:"
 msgid "Template file:"
 msgstr "Sjabloonbestand:"
 
+msgid "New note"
+msgstr "Nieuwe notitie"
+
+msgid "New to-do"
+msgstr "Nieuwe taak"
+
+msgid "New notebook"
+msgstr "Nieuw notitieboek"
+
 msgid "Layout"
 msgstr "Indeling"
 
@@ -1128,6 +1066,13 @@ msgstr ""
 "Slechts één notitie kan gelijktijdig worden afgedrukt of geëxporteerd naar "
 "PDF."
 
+msgid "PDF File"
+msgstr "PDF-bestand"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fout bij openen van notitie in bewerker: %s"
+
 msgid "strong text"
 msgstr "vetgedrukte tekst"
 
@@ -1202,12 +1147,6 @@ msgstr "Opties"
 msgid "Synchronisation Status"
 msgstr "Synchronisatiestatus"
 
-msgid "Encryption Options"
-msgstr "Versleutelopties"
-
-msgid "Clipper Options"
-msgstr "Webclipperopties"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1232,6 +1171,17 @@ msgstr "Verwijderen"
 msgid "Rename"
 msgstr "Naam wijzigen"
 
+msgid "Notebooks"
+msgstr "Notitieboeken"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Bezig met ontsleutelen van items: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Bronnen ophalen: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Kies waar de synchronisatiestatus naar moet worden geëxporteerd"
 
@@ -1390,11 +1340,6 @@ msgstr "Bezig"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "De synchronisatie loopt al. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Onbekend type item gedownload - graag Joplin upgraden naar de laatste versie"
-
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1616,6 +1561,10 @@ msgstr "Globaal zoompercentage"
 msgid "Editor font size"
 msgstr "Lettergrootte van bewerker"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Lettergrootte van bewerker"
+
 msgid "Editor font family"
 msgstr "Lettertype van bewerker"
 
@@ -1681,6 +1630,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS-certificaatfouten negeren"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1721,6 +1675,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Applicatie"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Gebruikte versleuteling:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Webclipper-opties"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Het label “%s” bestaat al. Kies een andere naam."
@@ -1734,7 +1696,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-exportmap"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote-exportbestand"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote-exportbestand"
 
 msgid "Json Export Directory"
@@ -1897,21 +1864,10 @@ msgstr "Nieuw notitieboek"
 msgid "Configuration"
 msgstr "Configuratie"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Bezig met ontsleutelen van items: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Bronnen ophalen: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notitie"
 
-msgid "Notebooks"
-msgstr "Notitieboeken"
-
 msgid "Checking... Please wait."
 msgstr "Controleren… Even geduld."
 
@@ -1962,10 +1918,6 @@ msgstr ""
 "Om synchronisatie via het bestandssysteem te gebruiken is je toestemming "
 "nodig om naar externe opslag te schrijven."
 
-#, fuzzy
-msgid "Information"
-msgstr "Meer informatie"
-
 msgid "Encryption Config"
 msgstr "Versleutelconfiguratie"
 
@@ -2156,6 +2108,85 @@ msgstr "Inloggen met OneDrive"
 msgid "Search"
 msgstr "Zoeken"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Bezig met starten van notitiebewerking. Sluit de bewerker om terug te "
+#~ "keren."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notitie is opgeslagen."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr "Alle potentiële poorten zijn in gebruik - Meld het probleem op %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Zijbalk"
+
+#~ msgid "Note list"
+#~ msgstr "Notitielijst"
+
+#~ msgid "Note title"
+#~ msgstr "Titel van notitie"
+
+#~ msgid "Note body"
+#~ msgstr "Inhoud van notitie"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr ""
+#~ "Bezig met importeren van \"%s\" in het formaat \"%s\". Even geduld..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synchronisatiestatus"
+
+#~ msgid "Print"
+#~ msgstr "Afdrukken"
+
+#~ msgid "General Options"
+#~ msgstr "Algemene opties"
+
+#~ msgid "Encryption options"
+#~ msgstr "Versleutelingsopties"
+
+#~ msgid "Create note from template"
+#~ msgstr "Notitie maken van sjabloon"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "To-do maken van sjabloon"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Datum en tijd invoegen"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin-exportmap"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Sjablonen vernieuwen"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Versleutelopties"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Webclipperopties"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Onbekend type item gedownload - graag Joplin upgraden naar de laatste "
+#~ "versie"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Meer informatie"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Toestemming om de camera te gebruiken"

CliClient/locales/pl_PL.po

@@ -178,18 +178,6 @@ msgstr "Brak aktywnego notatnika."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notatka nie istnieje: \"%s\". Utworzyć?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Rozpoczynanie edycji notatki. Zamknij edytor, aby powrócić do wiersza "
-"poleceń."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Błąd przy otwieraniu notatki w edytorze: %s"
-
-msgid "Note has been saved."
-msgstr "Notatka została zapisana."
-
 msgid "Exits the application."
 msgstr "Wychodzi z aplikacji."
 
@@ -556,10 +544,6 @@ msgstr "Wpisz `joplin help` dla informacji o użytkowaniu."
 msgid "Fatal error:"
 msgstr "Błąd krytyczny:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikacja została uwierzytelniona - możesz zamknąć kartę przeglądarki."
@@ -615,74 +599,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksportowanie do \"%s\" jako \"%s\". Proszę czekać..."
 
-msgid "Sidebar"
-msgstr "Nawigator"
-
-msgid "Note list"
-msgstr "Lista notatek"
-
-msgid "Note title"
-msgstr "Tytuł notatki"
-
-msgid "Note body"
-msgstr "Zawartość notatki"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importowanie z \"%s\"  jako \"%s\". Proszę czekać..."
-
-msgid "PDF File"
-msgstr "Plik PDF"
-
-msgid "Synchronisation status"
-msgstr "Status synchronizacji"
-
-msgid "New note"
-msgstr "Nowa notatka"
-
-msgid "New to-do"
-msgstr "Nowe zadanie"
-
-msgid "New notebook"
-msgstr "Nowy notatnik"
-
-msgid "Print"
-msgstr "Drukuj"
-
-msgid "General Options"
-msgstr "Opcje główne"
-
-msgid "Encryption options"
-msgstr "Opcje szyfrowania"
-
-msgid "Web clipper options"
-msgstr "Opcje Web clipper"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Wstaw stempel czasowy"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Katalog Joplin Export"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Plik"
 
@@ -894,6 +810,9 @@ msgstr ""
 "Token uwierzytelniający jest potrzebny jedynie w celu pozwolenia aplikacjom "
 "firm trzecich na dostęp do Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notatki i ustawienia są przechowywane w: %s"
@@ -904,6 +823,9 @@ msgstr "Sprawdź konfigurację synchronizacji"
 msgid "Browse..."
 msgstr "Przeglądaj..."
 
+msgid "Back"
+msgstr "Cofnij"
+
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -998,12 +920,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Szyfrowanie jest:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Przykłady"
 
-msgid "Back"
-msgstr "Cofnij"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1035,6 +963,15 @@ msgstr "Ustaw powiadomienie:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nowa notatka"
+
+msgid "New to-do"
+msgstr "Nowe zadanie"
+
+msgid "New notebook"
+msgstr "Nowy notatnik"
+
 msgid "Layout"
 msgstr "Układ"
 
@@ -1134,6 +1071,13 @@ msgstr ""
 "Jedna notatka może zostać wydrukowana lub wyeksportowana do pliku PDF w tym "
 "samym czasie."
 
+msgid "PDF File"
+msgstr "Plik PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Błąd przy otwieraniu notatki w edytorze: %s"
+
 msgid "strong text"
 msgstr "pogrubienie"
 
@@ -1208,12 +1152,6 @@ msgstr "Opcje"
 msgid "Synchronisation Status"
 msgstr "Status synchronizacji"
 
-msgid "Encryption Options"
-msgstr "Opcje szyfrowania"
-
-msgid "Clipper Options"
-msgstr "Opcje funkcji Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1238,6 +1176,17 @@ msgstr "Usuń"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
+msgid "Notebooks"
+msgstr "Notatniki"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Deszyfrowanie obiektów %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Pobieranie zasobów: %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Proszę wybrać gdzie powinen zostać eksportowany status synchronizacji"
 
@@ -1396,12 +1345,6 @@ msgstr "W trakcie"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronizacja w toku. Stan: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Pobrano nieznany typ pliku - proszę zaaktualizować Joplin do najnowszej "
-"wersji"
-
 msgid "Encrypted"
 msgstr "Zaszyfrowane"
 
@@ -1624,6 +1567,10 @@ msgstr "Powiększenie globalne w procentach"
 msgid "Editor font size"
 msgstr "Wielkość czcionki edytora"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Wielkość czcionki edytora"
+
 msgid "Editor font family"
 msgstr "Rodzina czcionek edytora"
 
@@ -1691,6 +1638,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoruj błędy certyfikatu TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1731,6 +1683,14 @@ msgstr "Wtyczki"
 msgid "Application"
 msgstr "Aplikacja"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Szyfrowanie jest:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opcje Web clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Znacznik \"%s\" istnieje. Proszę wybrać inną nazwę."
@@ -1744,7 +1704,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Katalog Joplin Export"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Plik Evernote Export"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Plik Evernote Export"
 
 msgid "Json Export Directory"
@@ -1901,21 +1866,10 @@ msgstr "Nowy notatnik"
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Deszyfrowanie obiektów %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Pobieranie zasobów: %d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notatka"
 
-msgid "Notebooks"
-msgstr "Notatniki"
-
 msgid "Checking... Please wait."
 msgstr "Sprawdzanie... Proszę czekać."
 
@@ -1964,10 +1918,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfiguracja"
-
 msgid "Encryption Config"
 msgstr "Konfiguracja szyfrowania"
 
@@ -2161,6 +2111,72 @@ msgstr "Zaloguj z OneDrive"
 msgid "Search"
 msgstr "Wyszukaj"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Rozpoczynanie edycji notatki. Zamknij edytor, aby powrócić do wiersza "
+#~ "poleceń."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notatka została zapisana."
+
+#~ msgid "Sidebar"
+#~ msgstr "Nawigator"
+
+#~ msgid "Note list"
+#~ msgstr "Lista notatek"
+
+#~ msgid "Note title"
+#~ msgstr "Tytuł notatki"
+
+#~ msgid "Note body"
+#~ msgstr "Zawartość notatki"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importowanie z \"%s\"  jako \"%s\". Proszę czekać..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status synchronizacji"
+
+#~ msgid "Print"
+#~ msgstr "Drukuj"
+
+#~ msgid "General Options"
+#~ msgstr "Opcje główne"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opcje szyfrowania"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Wstaw stempel czasowy"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Katalog Joplin Export"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opcje szyfrowania"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opcje funkcji Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Pobrano nieznany typ pliku - proszę zaaktualizować Joplin do najnowszej "
+#~ "wersji"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfiguracja"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Uprawenie do użytkowania kamery"

CliClient/locales/pt_BR.po

@@ -173,16 +173,6 @@ msgstr "Nenhum caderno ativo."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "A nota não existe: \"%s\". Criar?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Começando a editar a nota. Feche o editor para voltar ao prompt."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Erro ao abir a nota no editor: %s"
-
-msgid "Note has been saved."
-msgstr "Nota gravada."
-
 msgid "Exits the application."
 msgstr "Sai da aplicação."
 
@@ -544,10 +534,6 @@ msgstr "Digite 'joplin help' para informações de uso."
 msgid "Fatal error:"
 msgstr "Erro fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -603,74 +589,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando para \"%s\" com o formato \"%s\". Por favor, aguarde..."
 
-msgid "Sidebar"
-msgstr "Barra Lateral"
-
-msgid "Note list"
-msgstr "Lista de notas"
-
-msgid "Note title"
-msgstr "Título da Nota"
-
-msgid "Note body"
-msgstr "Corpo da Nota"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importando de \"%s\" com o formato \"%s\". Por favor, aguarde..."
-
-msgid "PDF File"
-msgstr "Arquivo PDF"
-
-msgid "Synchronisation status"
-msgstr "Status de sincronização"
-
-msgid "New note"
-msgstr "Nova nota"
-
-msgid "New to-do"
-msgstr "Nova tarefa"
-
-msgid "New notebook"
-msgstr "Novo caderno"
-
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opções Gerais"
-
-msgid "Encryption options"
-msgstr "Opções de Encriptação"
-
-msgid "Web clipper options"
-msgstr "Opções do Web clipper"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Inserir Data e Hora"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Diretório de Exportação do Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Arquivo"
 
@@ -883,6 +801,9 @@ msgstr ""
 "Esse token de autorização só é necessário para permitir que aplicativos de "
 "terceiros acessem o Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notas e configurações estão armazenadas em: %s"
@@ -893,6 +814,9 @@ msgstr "Verificar a configuração da sincronização"
 msgid "Browse..."
 msgstr "Navegar..."
 
+msgid "Back"
+msgstr "Voltar"
+
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -986,12 +910,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Encriptação está:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Uso"
 
-msgid "Back"
-msgstr "Voltar"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1022,6 +952,15 @@ msgstr "Definir alarme:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova nota"
+
+msgid "New to-do"
+msgstr "Nova tarefa"
+
+msgid "New notebook"
+msgstr "Novo caderno"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1118,6 +1057,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Só uma nota pode ser impressa ou exportada para PDF de cada vez."
 
+msgid "PDF File"
+msgstr "Arquivo PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Erro ao abir a nota no editor: %s"
+
 msgid "strong text"
 msgstr "texto forte"
 
@@ -1192,12 +1138,6 @@ msgstr "Opções"
 msgid "Synchronisation Status"
 msgstr "Status de sincronização"
 
-msgid "Encryption Options"
-msgstr "Opções de Encriptação"
-
-msgid "Clipper Options"
-msgstr "Opções do Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1221,6 +1161,17 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
+msgid "Notebooks"
+msgstr "Cadernos"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Decriptando itens: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Buscando recursos: %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Favor selecionar o local para onde o status de sincronia deveria ser "
@@ -1381,12 +1332,6 @@ msgstr "Em andamento"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sincronização já em andamento. Estado: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Tipo de item desconhecido baixado - por favor, atualize o Joplin para a "
-"última versão"
-
 msgid "Encrypted"
 msgstr "Encriptado"
 
@@ -1607,6 +1552,10 @@ msgstr "Porcentagem global do zoom"
 msgid "Editor font size"
 msgstr "Tamanho da fonte no Editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Tamanho da fonte no Editor"
+
 msgid "Editor font family"
 msgstr "Família de fontes do editor"
 
@@ -1671,6 +1620,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorar erros de certificados TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1711,6 +1665,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Aplicação"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Encriptação está:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opções do Web clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "A tag \"%s\" já existe. Escolha um nome diferente."
@@ -1724,7 +1686,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Diretório de Exportação do Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Arquivo de Exportação do Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Arquivo de Exportação do Evernote"
 
 msgid "Json Export Directory"
@@ -1882,20 +1849,9 @@ msgstr "Novo caderno"
 msgid "Configuration"
 msgstr "Configuração"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Decriptando itens: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Buscando recursos: %d"
-
 msgid "All notes"
 msgstr "Todas as notas"
 
-msgid "Notebooks"
-msgstr "Cadernos"
-
 msgid "Checking... Please wait."
 msgstr "Verificando... Por favor aguarde."
 
@@ -1945,9 +1901,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr "Informação"
-
 msgid "Encryption Config"
 msgstr "Configuração de Encriptação"
 
@@ -2133,6 +2086,69 @@ msgstr "Login com OneDrive"
 msgid "Search"
 msgstr "Procurar"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "Começando a editar a nota. Feche o editor para voltar ao prompt."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Nota gravada."
+
+#~ msgid "Sidebar"
+#~ msgstr "Barra Lateral"
+
+#~ msgid "Note list"
+#~ msgstr "Lista de notas"
+
+#~ msgid "Note title"
+#~ msgstr "Título da Nota"
+
+#~ msgid "Note body"
+#~ msgstr "Corpo da Nota"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importando de \"%s\" com o formato \"%s\". Por favor, aguarde..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status de sincronização"
+
+#~ msgid "Print"
+#~ msgstr "Imprimir"
+
+#~ msgid "General Options"
+#~ msgstr "Opções Gerais"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opções de Encriptação"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Inserir Data e Hora"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Diretório de Exportação do Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opções de Encriptação"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opções do Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Tipo de item desconhecido baixado - por favor, atualize o Joplin para a "
+#~ "última versão"
+
+#~ msgid "Information"
+#~ msgstr "Informação"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Permissão para utilizar sua câmera"

CliClient/locales/ro.po

@@ -164,16 +164,6 @@ msgstr "Niciun caiet de notițe activ."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notița nu există: \"%s\". Doriți să o creați?"
 
-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 "Eroare deschidere notiță în editor: %s"
-
-msgid "Note has been saved."
-msgstr "Notița a fost salvată."
-
 msgid "Exits the application."
 msgstr ""
 
@@ -493,10 +483,6 @@ msgstr "Tastați `joplin help` pentru informații de utilizare."
 msgid "Fatal error:"
 msgstr "Eroare fatală:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -542,74 +528,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Se exportă către \"%s\" în format \"%s\". Vă rugăm să așteotați..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Titlul caietului de notițe:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Caiete de notițe"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr "Fișier PDF"
-
-msgid "Synchronisation status"
-msgstr "Statusul sincronizării"
-
-msgid "New note"
-msgstr "Adăugați o nouă notiță"
-
-msgid "New to-do"
-msgstr "Adăugați o nouă sarcină"
-
-msgid "New notebook"
-msgstr "Adăugați un nou caiet de notițe"
-
-msgid "Print"
-msgstr "Printați"
-
-msgid "General Options"
-msgstr "Opțiuni Generale"
-
-msgid "Encryption options"
-msgstr "Opțiuni de criptare"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fișier"
@@ -822,6 +740,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -832,6 +753,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Înapoi"
+
 msgid "Apply"
 msgstr "Aplicați"
 
@@ -910,13 +834,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Criptarea este:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Utilizare: %s"
 
-msgid "Back"
-msgstr "Înapoi"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -946,6 +876,15 @@ msgstr "Setați alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Adăugați o nouă notiță"
+
+msgid "New to-do"
+msgstr "Adăugați o nouă sarcină"
+
+msgid "New notebook"
+msgstr "Adăugați un nou caiet de notițe"
+
 msgid "Layout"
 msgstr ""
 
@@ -1039,6 +978,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "Fișier PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Eroare deschidere notiță în editor: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1113,12 +1059,6 @@ msgstr "Opțiuni"
 msgid "Synchronisation Status"
 msgstr "Statutul sincronizării"
 
-msgid "Encryption Options"
-msgstr "Opțiuni de criptare"
-
-msgid "Clipper Options"
-msgstr "Opțiuni Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1139,6 +1079,17 @@ msgstr "Ștergeți"
 msgid "Rename"
 msgstr "Redenumiți"
 
+msgid "Notebooks"
+msgstr "Caiete de notițe"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Se decriptează itemi: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Resurse: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1290,10 +1241,6 @@ msgstr "În progres"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Criptat"
 
@@ -1504,6 +1451,10 @@ msgstr ""
 msgid "Editor font size"
 msgstr "Editează notiță."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editează notiță."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1558,6 +1509,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoră erorile de certificat TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1603,6 +1559,13 @@ msgstr ""
 msgid "Application"
 msgstr "Duplicați"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Criptarea este:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1616,7 +1579,10 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1769,21 +1735,10 @@ msgstr "Adăugați un nou caiet de notițe"
 msgid "Configuration"
 msgstr "Configurare"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Se decriptează itemi: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Resurse: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notiță"
 
-msgid "Notebooks"
-msgstr "Caiete de notițe"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Se anulează... Vă rugăm să așteptați."
@@ -1826,10 +1781,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configurare"
-
 msgid "Encryption Config"
 msgstr ""
 
@@ -2015,6 +1966,46 @@ msgstr "Autentificare prin OneDrive"
 msgid "Search"
 msgstr "Caută"
 
+#~ msgid "Note has been saved."
+#~ msgstr "Notița a fost salvată."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Titlul caietului de notițe:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Caiete de notițe"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Statusul sincronizării"
+
+#~ msgid "Print"
+#~ msgstr "Printați"
+
+#~ msgid "General Options"
+#~ msgstr "Opțiuni Generale"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opțiuni de criptare"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opțiuni de criptare"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opțiuni Clipper"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configurare"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Amânați sincronizarea"
 

CliClient/locales/ru_RU.po

@@ -177,18 +177,6 @@ msgstr "Нет активного блокнота."
 msgid "Note does not exist: \"%s\". Create it?"
 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 "Ошибка при открытии заметки в редакторе: %s"
-
-msgid "Note has been saved."
-msgstr "Заметка сохранена."
-
 msgid "Exits the application."
 msgstr "Выйти из приложения."
 
@@ -551,10 +539,6 @@ msgstr "Введите `joplin help` для получения информац
 msgid "Fatal error:"
 msgstr "Фатальная ошибка:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Приложение авторизовано — можно закрыть вкладку браузера."
@@ -609,74 +593,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Экспорт в \"%s\" в формате \"%s\". Пожалуйста, подождите..."
 
-msgid "Sidebar"
-msgstr "Боковая панель"
-
-msgid "Note list"
-msgstr "Список заметок"
-
-msgid "Note title"
-msgstr "Название заметки"
-
-msgid "Note body"
-msgstr "Тело заметки"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Импорт из \"%s\" в формате \"%s\". Пожалуйста, подождите..."
-
-msgid "PDF File"
-msgstr "Файл PDF"
-
-msgid "Synchronisation status"
-msgstr "Статус синхронизации"
-
-msgid "New note"
-msgstr "Новая заметка"
-
-msgid "New to-do"
-msgstr "Новая задача"
-
-msgid "New notebook"
-msgstr "Новый блокнот"
-
-msgid "Print"
-msgstr "Печать"
-
-msgid "General Options"
-msgstr "Основные настройки"
-
-msgid "Encryption options"
-msgstr "Настройки шифрования"
-
-msgid "Web clipper options"
-msgstr "Настройки веб-клиппера"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Вставить дату и время"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Каталог экспорта Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Файл"
 
@@ -888,6 +804,9 @@ msgstr ""
 "Этот токен авторизации необходим только для разрешения сторонним приложениям "
 "получать доступ к Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Заметки и настройки сохранены в: %s"
@@ -898,6 +817,9 @@ msgstr "Проверить настройки синхронизации"
 msgid "Browse..."
 msgstr "Обзор..."
 
+msgid "Back"
+msgstr "Назад"
+
 msgid "Apply"
 msgstr "Применить"
 
@@ -993,12 +915,18 @@ msgstr "Статус"
 msgid "Encryption is:"
 msgstr "Шифрование:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Использование: %s"
 
-msgid "Back"
-msgstr "Назад"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1029,6 +957,15 @@ msgstr "Установить напоминание:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Новая заметка"
+
+msgid "New to-do"
+msgstr "Новая задача"
+
+msgid "New notebook"
+msgstr "Новый блокнот"
+
 msgid "Layout"
 msgstr "Разметка"
 
@@ -1126,6 +1063,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Только одна заметка может быть напечатана или экспортирована в PDF за раз."
 
+msgid "PDF File"
+msgstr "Файл PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Ошибка при открытии заметки в редакторе: %s"
+
 msgid "strong text"
 msgstr "выделенный текст"
 
@@ -1200,12 +1144,6 @@ msgstr "Настройки"
 msgid "Synchronisation Status"
 msgstr "Статус синхронизации"
 
-msgid "Encryption Options"
-msgstr "Настройки шифрования"
-
-msgid "Clipper Options"
-msgstr "Настройки клиппера"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1228,6 +1166,17 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
+msgid "Notebooks"
+msgstr "Блокноты"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Расшифровано элементов: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Получение ресурсов: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Пожалуйста, выберите, куда должен быть экспортирован статус синхронизации"
@@ -1385,10 +1334,6 @@ msgstr "Выполнение"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизация уже выполняется. Состояние: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Зашифровано"
 
@@ -1606,6 +1551,10 @@ msgstr "Глобальный масштаб в процентах"
 msgid "Editor font size"
 msgstr "Размер шрифта редактора"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Размер шрифта редактора"
+
 msgid "Editor font family"
 msgstr "Семейство шрифтов редактора"
 
@@ -1672,6 +1621,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Игнорировать ошибки сертификата TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1713,6 +1667,14 @@ msgstr ""
 msgid "Application"
 msgstr "Приложение"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Шифрование:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Настройки веб-клиппера"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Метка \"%s\" уже существует. Пожалуйста, выберите другое имя."
@@ -1726,7 +1688,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Каталог экспорта Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Файл экспорта Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Файл экспорта Evernote"
 
 msgid "Json Export Directory"
@@ -1884,21 +1851,10 @@ msgstr "Новый блокнот"
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Расшифровано элементов: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Получение ресурсов: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "заметка"
 
-msgid "Notebooks"
-msgstr "Блокноты"
-
 msgid "Checking... Please wait."
 msgstr "Проверка... Пожалуйста, подождите."
 
@@ -1947,10 +1903,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Конфигурация"
-
 msgid "Encryption Config"
 msgstr "Конфигурация шифрования"
 
@@ -2143,6 +2095,66 @@ msgstr "Войти с OneDrive"
 msgid "Search"
 msgstr "Поиск"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Запуск редактирования заметки. Закройте редактор, чтобы вернуться к "
+#~ "приглашению."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Заметка сохранена."
+
+#~ msgid "Sidebar"
+#~ msgstr "Боковая панель"
+
+#~ msgid "Note list"
+#~ msgstr "Список заметок"
+
+#~ msgid "Note title"
+#~ msgstr "Название заметки"
+
+#~ msgid "Note body"
+#~ msgstr "Тело заметки"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Импорт из \"%s\" в формате \"%s\". Пожалуйста, подождите..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Статус синхронизации"
+
+#~ msgid "Print"
+#~ msgstr "Печать"
+
+#~ msgid "General Options"
+#~ msgstr "Основные настройки"
+
+#~ msgid "Encryption options"
+#~ msgstr "Настройки шифрования"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Вставить дату и время"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Каталог экспорта Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Настройки шифрования"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Настройки клиппера"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Конфигурация"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Разрешение на использование камеры"

CliClient/locales/sl_SI.po

@@ -173,18 +173,6 @@ msgstr "Ni aktivnih beležnic."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Zabeležka ne obstaja: \"%s\". Bi jo radi ustvarili?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Urejanje zabeležke se začenja. Zaprite urejevalnik, da se vrnete na ukazni "
-"poziv."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Napaka v odpiranju zabeležke v urejevalniku: %s"
-
-msgid "Note has been saved."
-msgstr "Zabeležka je bila shranjena."
-
 msgid "Exits the application."
 msgstr "Izhod iz aplikacije."
 
@@ -546,10 +534,6 @@ msgstr "Vtipkajte `joplin help` za informacije o uporabi."
 msgid "Fatal error:"
 msgstr "Usodna napaka:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikacija je bila avtorizirana - lahko zaprete zavihek v brskalniku."
@@ -604,75 +588,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Izvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Naslov beležnice:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Beležnice"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Uvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
-
-msgid "PDF File"
-msgstr "PDF datoteka"
-
-msgid "Synchronisation status"
-msgstr "Status sinhronizacije"
-
-msgid "New note"
-msgstr "Nova zabeležka"
-
-msgid "New to-do"
-msgstr "Novi seznam opravil"
-
-msgid "New notebook"
-msgstr "Nova beležnica"
-
-msgid "Print"
-msgstr "Natisni"
-
-msgid "General Options"
-msgstr "Splošne možnosti"
-
-msgid "Encryption options"
-msgstr "Možnosti enkripcije"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin izvozno mesto"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Datoteka"
@@ -886,6 +801,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Zabeležke in nastavitve so shranjene v: %s"
@@ -896,6 +814,9 @@ msgstr "Preveri nastavitve sinhronizacije"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Nazaj"
+
 msgid "Apply"
 msgstr ""
 
@@ -989,13 +910,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Enkripcija je:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Uporaba: %s"
 
-msgid "Back"
-msgstr "Nazaj"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1027,6 +954,15 @@ msgstr "Nastavi alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova zabeležka"
+
+msgid "New to-do"
+msgstr "Novi seznam opravil"
+
+msgid "New notebook"
+msgstr "Nova beležnica"
+
 msgid "Layout"
 msgstr "Izgled"
 
@@ -1128,6 +1064,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "PDF datoteka"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Napaka v odpiranju zabeležke v urejevalniku: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1203,13 +1146,6 @@ msgstr "Možnosti"
 msgid "Synchronisation Status"
 msgstr "Sinhronizacijski status"
 
-msgid "Encryption Options"
-msgstr "Možnosti enkripcije"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Splošne možnosti"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1232,6 +1168,17 @@ msgstr "Izbriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
+msgid "Notebooks"
+msgstr "Beležnice"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Preneseni predmeti: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Viri: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Prosim izberite, kam želite izvoziti sinhronizacijski status"
 
@@ -1392,10 +1339,6 @@ msgstr "V postopku"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinhronizacija je že v postopku. Stanje: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Enkriptirano"
 
@@ -1613,6 +1556,10 @@ msgstr "Celokupen procent povečave"
 msgid "Editor font size"
 msgstr "Družina urejevalnika besedilnega stila"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Družina urejevalnika besedilnega stila"
+
 msgid "Editor font family"
 msgstr "Družina urejevalnika besedilnega stila"
 
@@ -1674,6 +1621,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1719,6 +1671,13 @@ msgstr ""
 msgid "Application"
 msgstr "Izhod iz aplikacije."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Enkripcija je:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1732,7 +1691,12 @@ msgstr "Sistem označevanja"
 msgid "Joplin Export Directory"
 msgstr "Joplin izvozno mesto"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote izvozna datoteka"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote izvozna datoteka"
 
 #, fuzzy
@@ -1892,21 +1856,10 @@ msgstr "Nova beležnica"
 msgid "Configuration"
 msgstr "Nastavitve"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Preneseni predmeti: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Viri: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "zabeležka"
 
-msgid "Notebooks"
-msgstr "Beležnice"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "V preklicu...Prosim počakajte."
@@ -1951,10 +1904,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Nastavitve"
-
 msgid "Encryption Config"
 msgstr "Nastavite enkripcije"
 
@@ -2140,6 +2089,59 @@ msgstr "Prijavi se z OneDrive"
 msgid "Search"
 msgstr "Išči"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Urejanje zabeležke se začenja. Zaprite urejevalnik, da se vrnete na "
+#~ "ukazni poziv."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Zabeležka je bila shranjena."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Naslov beležnice:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Beležnice"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Uvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status sinhronizacije"
+
+#~ msgid "Print"
+#~ msgstr "Natisni"
+
+#~ msgid "General Options"
+#~ msgstr "Splošne možnosti"
+
+#~ msgid "Encryption options"
+#~ msgstr "Možnosti enkripcije"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin izvozno mesto"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Možnosti enkripcije"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Splošne možnosti"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Nastavitve"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Prekliči sinhronizacijo"
 

CliClient/locales/sr_RS.po

@@ -176,16 +176,6 @@ msgstr "Нема активне бележнице."
 msgid "Note does not exist: \"%s\". Create it?"
 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 "Грешка при отварању бележнице у уреднику: %s"
-
-msgid "Note has been saved."
-msgstr "Белешка је сачувана."
-
 msgid "Exits the application."
 msgstr "Излаз из апликације."
 
@@ -549,10 +539,6 @@ msgstr "Укуцајте 'joplin help' за информацију о кориш
 msgid "Fatal error:"
 msgstr "Фатална грешка:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -608,74 +594,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Извозим у \"%s као \"%s\" формат. Молимо вас да сачекате..."
 
-msgid "Sidebar"
-msgstr "Бочна трака"
-
-msgid "Note list"
-msgstr "Листа белешки"
-
-msgid "Note title"
-msgstr "Наслов белешке"
-
-msgid "Note body"
-msgstr "Тело белешке"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Увозим из \"%s\" као \"%s\" формат. Молимо вас да сачекате..."
-
-msgid "PDF File"
-msgstr "ПДФ Фајл"
-
-msgid "Synchronisation status"
-msgstr "Статус синхронизације"
-
-msgid "New note"
-msgstr "Нова белешка"
-
-msgid "New to-do"
-msgstr "Нова ставка задужења"
-
-msgid "New notebook"
-msgstr "Нова бележница"
-
-msgid "Print"
-msgstr "Штампај"
-
-msgid "General Options"
-msgstr "Опште поставке"
-
-msgid "Encryption options"
-msgstr "Опције шифровања"
-
-msgid "Web clipper options"
-msgstr "Опције веб клипера"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Уметни време и датум"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Џоплин директоријум за извоз"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "Нова верзија: %s"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr "&Фајл"
 
@@ -888,6 +806,9 @@ msgstr ""
 "Овај токен за ауторизацију је само потребан када се дозвољава апликацијама "
 "трећих страна да приступе Џоплину."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Белешке и подешавања су складиштени у: %s"
@@ -898,6 +819,9 @@ msgstr "Проверите поставке синхронизације"
 msgid "Browse..."
 msgstr "Пронађи."
 
+msgid "Back"
+msgstr "Назад"
+
 msgid "Apply"
 msgstr "Примени"
 
@@ -992,12 +916,18 @@ msgstr "Статус"
 msgid "Encryption is:"
 msgstr "Шифровање је:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Употреба"
 
-msgid "Back"
-msgstr "Назад"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1028,6 +958,15 @@ msgstr "Подеси аларм:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Нова белешка"
+
+msgid "New to-do"
+msgstr "Нова ставка задужења"
+
+msgid "New notebook"
+msgstr "Нова бележница"
+
 msgid "Layout"
 msgstr "Распоред"
 
@@ -1125,6 +1064,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Jедино једна белешка може бити одштампана или извезена у ПДВ истовремено."
 
+msgid "PDF File"
+msgstr "ПДФ Фајл"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Грешка при отварању бележнице у уреднику: %s"
+
 msgid "strong text"
 msgstr "подебљан текст"
 
@@ -1199,12 +1145,6 @@ msgstr "Опције"
 msgid "Synchronisation Status"
 msgstr "Статус синхронизације"
 
-msgid "Encryption Options"
-msgstr "Опције шифровања"
-
-msgid "Clipper Options"
-msgstr "Опције клипера"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1228,6 +1168,17 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr "Преименуј"
 
+msgid "Notebooks"
+msgstr "Бележнице"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Дешифрујем ставке: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Дохватам ресурсе: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Молимо вас да одаберете где ће се извести статус синхронизације"
 
@@ -1386,12 +1337,6 @@ msgstr "У току"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизација је већ у току. Стање: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Непознати тип ставке је преузет - молимо вас да надоградите Џоплин у "
-"последњу верзију"
-
 msgid "Encrypted"
 msgstr "Шифровано"
 
@@ -1613,6 +1558,10 @@ msgstr "Глобални проценат увећања"
 msgid "Editor font size"
 msgstr "Величина слова у уреднику"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Величина слова у уреднику"
+
 msgid "Editor font family"
 msgstr "Породица фонтова у уреднику"
 
@@ -1677,6 +1626,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Занемари грешке са ТЛС сертификатима"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1717,6 +1671,14 @@ msgstr "Проширења/прикључци"
 msgid "Application"
 msgstr "Апликација"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Шифровање је:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Опције веб клипера"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Ознака \"%s\" већ постоји. Молимо вас да одаберете други назив."
@@ -1730,7 +1692,12 @@ msgstr "Маркдаун"
 msgid "Joplin Export Directory"
 msgstr "Џоплин директоријум за извоз"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Еверноут фајл за извоз"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Еверноут фајл за извоз"
 
 msgid "Json Export Directory"
@@ -1890,21 +1857,10 @@ msgstr "Нова бележница"
 msgid "Configuration"
 msgstr "Поставке"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Дешифрујем ставке: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Дохватам ресурсе: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "белешка"
 
-msgid "Notebooks"
-msgstr "Бележнице"
-
 msgid "Checking... Please wait."
 msgstr "Проверавам... Молимо вас да сачекате."
 
@@ -1954,10 +1910,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Више информација"
-
 msgid "Encryption Config"
 msgstr "Поставке шифровања"
 
@@ -2145,6 +2097,68 @@ msgstr "Пријави се са УванДрајвом"
 msgid "Search"
 msgstr "Претрага"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Започињете са изменом белешке. Затворите уредника да се вратите назад."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Белешка је сачувана."
+
+#~ msgid "Sidebar"
+#~ msgstr "Бочна трака"
+
+#~ msgid "Note list"
+#~ msgstr "Листа белешки"
+
+#~ msgid "Note title"
+#~ msgstr "Наслов белешке"
+
+#~ msgid "Note body"
+#~ msgstr "Тело белешке"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Увозим из \"%s\" као \"%s\" формат. Молимо вас да сачекате..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Статус синхронизације"
+
+#~ msgid "Print"
+#~ msgstr "Штампај"
+
+#~ msgid "General Options"
+#~ msgstr "Опште поставке"
+
+#~ msgid "Encryption options"
+#~ msgstr "Опције шифровања"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Уметни време и датум"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Џоплин директоријум за извоз"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Нова верзија: %s"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Опције шифровања"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Опције клипера"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Непознати тип ставке је преузет - молимо вас да надоградите Џоплин у "
+#~ "последњу верзију"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Више информација"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Дозвола за употребу камере"

CliClient/locales/sv.po

@@ -174,18 +174,6 @@ msgstr "Ingen aktiv anteckningsbok."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Anteckning finns inte: \"%s\". Skapa den?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Börjar redigera anteckning. Stäng redigeraren för att komma tillbaka till "
-"prompten."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fel vid öppning av anteckning i redigeraren: %s"
-
-msgid "Note has been saved."
-msgstr "Anteckning har sparats."
-
 msgid "Exits the application."
 msgstr "Avslutar programmet."
 
@@ -552,10 +540,6 @@ msgstr "Skriv `joplin help` för användningsinformation."
 msgid "Fatal error:"
 msgstr "Allvarligt fel:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Programmet har godkänts - du kan nu stänga den här webbläsarfliken."
@@ -610,74 +594,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportera till \"%s\" som \"%s\" format. Vänta..."
 
-msgid "Sidebar"
-msgstr "Sidofältet"
-
-msgid "Note list"
-msgstr "Anteckningsboken"
-
-msgid "Note title"
-msgstr "Rubriken"
-
-msgid "Note body"
-msgstr "Texten"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importerar från \"%s\" som \"%s\" format. Vänta..."
-
-msgid "PDF File"
-msgstr "PDF-fil"
-
-msgid "Synchronisation status"
-msgstr "Synkroniseringstillstånd"
-
-msgid "New note"
-msgstr "Ny anteckning"
-
-msgid "New to-do"
-msgstr "Ny att-göra"
-
-msgid "New notebook"
-msgstr "Ny anteckningsbok"
-
-msgid "Print"
-msgstr "Skriv ut"
-
-msgid "General Options"
-msgstr "Allmänna inställningar"
-
-msgid "Encryption options"
-msgstr "Krypteringsinställningar"
-
-msgid "Web clipper options"
-msgstr "Web clipper-inställningar"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Infoga datumtid"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin-exporteringskatalog"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
@@ -894,6 +810,9 @@ msgstr ""
 "Denna auktorisering behövs endast för att tillåta tredjepartsprogram att "
 "integrera med Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Anteckningar och inställningar lagras i: %s"
@@ -904,6 +823,9 @@ msgstr "Kontrollera synkroniseringskonfigurationen"
 msgid "Browse..."
 msgstr "Bläddra..."
 
+msgid "Back"
+msgstr "Tillbaka"
+
 msgid "Apply"
 msgstr "Tillämpa"
 
@@ -998,12 +920,18 @@ msgstr "Tillstånd"
 msgid "Encryption is:"
 msgstr "Kryptering är:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Användning"
 
-msgid "Back"
-msgstr "Tillbaka"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1035,6 +963,15 @@ msgstr "Ställ in alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Ny anteckning"
+
+msgid "New to-do"
+msgstr "Ny att-göra"
+
+msgid "New notebook"
+msgstr "Ny anteckningsbok"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1134,6 +1071,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Endast en anteckning i taget kan bli utskriven eller exporterad till PDF."
 
+msgid "PDF File"
+msgstr "PDF-fil"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fel vid öppning av anteckning i redigeraren: %s"
+
 msgid "strong text"
 msgstr "stark text"
 
@@ -1208,12 +1152,6 @@ msgstr "Inställningar"
 msgid "Synchronisation Status"
 msgstr "Synkroniseringstillstånd"
 
-msgid "Encryption Options"
-msgstr "Krypteringsinställningar"
-
-msgid "Clipper Options"
-msgstr "Clipper-inställningar"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1236,6 +1174,17 @@ msgstr "Ta bort"
 msgid "Rename"
 msgstr "Byt namn"
 
+msgid "Notebooks"
+msgstr "Anteckningsböcker"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Dekrypterar objekt: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Hämtar resurser: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Välj vart synkroniseringstillståndet ska exporteras till"
 
@@ -1394,10 +1343,6 @@ msgstr "Pågår"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering pågår redan. Tillstånd: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Krypterad"
 
@@ -1616,6 +1561,10 @@ msgstr "Global zoomprocent"
 msgid "Editor font size"
 msgstr "Redigerarens teckenstorlek"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Redigerarens teckenstorlek"
+
 msgid "Editor font family"
 msgstr "Redigerarens typsnittsfamilj"
 
@@ -1681,6 +1630,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorera TLS-certifikatfel"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1723,6 +1677,14 @@ msgstr ""
 msgid "Application"
 msgstr "Avslutar programmet"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Kryptering är:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web clipper-inställningar"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Taggen \"%s\" finns redan. Välj ett annat namn."
@@ -1736,7 +1698,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-exporteringskatalog"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote-exporteringsfil"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote-exporteringsfil"
 
 msgid "Json Export Directory"
@@ -1895,21 +1862,10 @@ msgstr "Ny anteckningsbok"
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Dekrypterar objekt: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Hämtar resurser: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "anteckning"
 
-msgid "Notebooks"
-msgstr "Anteckningsböcker"
-
 msgid "Checking... Please wait."
 msgstr "Kontrollerar... vänta."
 
@@ -1958,10 +1914,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfiguration"
-
 msgid "Encryption Config"
 msgstr "Kryptering-konfiguration"
 
@@ -2155,6 +2107,66 @@ msgstr "Logga in med OneDrive"
 msgid "Search"
 msgstr "Sök"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Börjar redigera anteckning. Stäng redigeraren för att komma tillbaka till "
+#~ "prompten."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Anteckning har sparats."
+
+#~ msgid "Sidebar"
+#~ msgstr "Sidofältet"
+
+#~ msgid "Note list"
+#~ msgstr "Anteckningsboken"
+
+#~ msgid "Note title"
+#~ msgstr "Rubriken"
+
+#~ msgid "Note body"
+#~ msgstr "Texten"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importerar från \"%s\" som \"%s\" format. Vänta..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synkroniseringstillstånd"
+
+#~ msgid "Print"
+#~ msgstr "Skriv ut"
+
+#~ msgid "General Options"
+#~ msgstr "Allmänna inställningar"
+
+#~ msgid "Encryption options"
+#~ msgstr "Krypteringsinställningar"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Infoga datumtid"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin-exporteringskatalog"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Krypteringsinställningar"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper-inställningar"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfiguration"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Tillåtelse att använda kameran"

CliClient/locales/tr_TR.po

@@ -171,16 +171,6 @@ msgstr "Aktif not defteri yok."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "\"%s\" notu mevcut değil. Oluşturulsun mu?"
 
-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 "Editörde not açılırken hata oluştu: %s"
-
-msgid "Note has been saved."
-msgstr "Not kaydedildi."
-
 msgid "Exits the application."
 msgstr "Uygulamadan çıkar."
 
@@ -518,10 +508,6 @@ msgstr "Kullanım bilgisi için `joplin help` yazın."
 msgid "Fatal error:"
 msgstr "Büyük hata:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -577,74 +563,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "\"%s\" den \"%s\" biçiminde dışa aktarılıyor. Lütfen bekleyin..."
 
-msgid "Sidebar"
-msgstr "Kenar çubuğu"
-
-msgid "Note list"
-msgstr "Not listesi"
-
-msgid "Note title"
-msgstr "Not başlığı"
-
-msgid "Note body"
-msgstr "Not gövdesi"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "\"%s\" den \"%s\" biçiminde içe aktarılıyor. Lütfen bekleyin..."
-
-msgid "PDF File"
-msgstr "PDF Dosyası"
-
-msgid "Synchronisation status"
-msgstr "Senkronizasyon durumu"
-
-msgid "New note"
-msgstr "Yeni not"
-
-msgid "New to-do"
-msgstr "Yeni yapılacak"
-
-msgid "New notebook"
-msgstr "Yeni not defteri"
-
-msgid "Print"
-msgstr "Yazdır"
-
-msgid "General Options"
-msgstr "Genel seçenekler"
-
-msgid "Encryption options"
-msgstr "Şifreleme seçenekleri"
-
-msgid "Web clipper options"
-msgstr "Web alıntılama ayarları"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Tarih Ekle"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin Dizin Dışa Aktarım"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Dosya"
@@ -862,6 +780,9 @@ msgstr ""
 "Bu yetkilendirme yalnızca üçüncü taraf uygulamaların Joplin'e erişmesine "
 "izin vermek için gereklidir."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notlar ve ayarlar şu konumda saklanır: %s"
@@ -872,6 +793,9 @@ msgstr "Senkronizasyon yapılandırmasını kontrol et"
 msgid "Browse..."
 msgstr "Bul..."
 
+msgid "Back"
+msgstr "Geri"
+
 msgid "Apply"
 msgstr "Uygula"
 
@@ -967,12 +891,18 @@ msgstr "Durum"
 msgid "Encryption is:"
 msgstr "Şifreleme:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Kullanım"
 
-msgid "Back"
-msgstr "Geri"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1004,6 +934,15 @@ msgstr "Alarm kur:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Yeni not"
+
+msgid "New to-do"
+msgstr "Yeni yapılacak"
+
+msgid "New notebook"
+msgstr "Yeni not defteri"
+
 msgid "Layout"
 msgstr "Düzen"
 
@@ -1104,6 +1043,13 @@ msgstr ""
 "Bir seferde yalnızca bir not yazdırılabilir veya PDF olarak dışa "
 "aktarılabilir."
 
+msgid "PDF File"
+msgstr "PDF Dosyası"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Editörde not açılırken hata oluştu: %s"
+
 msgid "strong text"
 msgstr "kuvvetli metin"
 
@@ -1178,12 +1124,6 @@ msgstr "Seçenekler"
 msgid "Synchronisation Status"
 msgstr "Senkronizasyon Durumu"
 
-msgid "Encryption Options"
-msgstr "Şifreleme Seçenekleri"
-
-msgid "Clipper Options"
-msgstr "Alıntılama Seçenekleri"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1205,6 +1145,17 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
+msgid "Notebooks"
+msgstr "Not defterleri"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Şifresi çözülenler: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Kaynaklar alınıyor: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Lütfen senkronizasyon durumunun nereye aktarılacağını seçin"
 
@@ -1363,10 +1314,6 @@ msgstr "Devam etmekte"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Senkronizasyon zaten devam ediyor. Durum: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Şifrelenmiş"
 
@@ -1584,6 +1531,10 @@ msgstr "Global yakınlaştırma yüzdesi"
 msgid "Editor font size"
 msgstr "Editör yazı boyutu"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editör yazı boyutu"
+
 msgid "Editor font family"
 msgstr "Editör yazı tipi"
 
@@ -1648,6 +1599,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS sertifikası hatalarını yoksay"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1689,6 +1645,14 @@ msgstr ""
 msgid "Application"
 msgstr "Uygulama"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Şifreleme:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web alıntılama ayarları"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr " \"%s\" etiketi mevcut. Lütfen başka isim seçin."
@@ -1702,7 +1666,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin Dizin Dışa Aktarım"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote Dosya Dışa Aktarım"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote Dosya Dışa Aktarım"
 
 msgid "Json Export Directory"
@@ -1859,21 +1828,10 @@ msgstr "Yeni not defteri"
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Şifresi çözülenler: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Kaynaklar alınıyor: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "not"
 
-msgid "Notebooks"
-msgstr "Not defterleri"
-
 msgid "Checking... Please wait."
 msgstr "Kontrol ediliyor... Lütfen bekleyin."
 
@@ -1922,10 +1880,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Yapılandırma"
-
 msgid "Encryption Config"
 msgstr "Yapılandırmayı şifrele"
 
@@ -2116,6 +2070,61 @@ msgstr "OneDrive ile giriş yapın"
 msgid "Search"
 msgstr "Arama"
 
+#~ msgid "Note has been saved."
+#~ msgstr "Not kaydedildi."
+
+#~ msgid "Sidebar"
+#~ msgstr "Kenar çubuğu"
+
+#~ msgid "Note list"
+#~ msgstr "Not listesi"
+
+#~ msgid "Note title"
+#~ msgstr "Not başlığı"
+
+#~ msgid "Note body"
+#~ msgstr "Not gövdesi"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "\"%s\" den \"%s\" biçiminde içe aktarılıyor. Lütfen bekleyin..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Senkronizasyon durumu"
+
+#~ msgid "Print"
+#~ msgstr "Yazdır"
+
+#~ msgid "General Options"
+#~ msgstr "Genel seçenekler"
+
+#~ msgid "Encryption options"
+#~ msgstr "Şifreleme seçenekleri"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Tarih Ekle"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin Dizin Dışa Aktarım"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Şifreleme Seçenekleri"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Alıntılama Seçenekleri"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Yapılandırma"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Kamera kullanımı için izin"

CliClient/locales/zh_CN.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "移除相关笔记的标签后才可删除此标签。"
@@ -167,16 +167,6 @@ msgstr "无活动笔记本。"
 msgid "Note does not exist: \"%s\". Create it?"
 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 "打开以下笔记时出现错误：%s"
-
-msgid "Note has been saved."
-msgstr "笔记已被保存。"
-
 msgid "Exits the application."
 msgstr "退出程序。"
 
@@ -376,17 +366,19 @@ msgid ""
 "Start, stop or check the API server. To specify on which port it should run, "
 "set the api.port config variable. Commands are (%s)."
 msgstr ""
+"启动，停止或检查API服务。可以通过设置‘api.port’变量指定API服务运行在哪个端口"
+"上。执行命令（%s）。"
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "服务已在端口%d上运行"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "服务正在端口%d上运行"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "服务没有运行。"
 
 #, javascript-format
 msgid ""
@@ -516,10 +508,6 @@ msgstr "输入 `joplin help` 获取用量信息。"
 msgid "Fatal error:"
 msgstr "严重错误："
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "授权成功 - 您可以关闭此页面了。"
@@ -568,74 +556,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "从“%s”导出，导出格式为“%s”。请稍等……"
 
-msgid "Sidebar"
-msgstr "边栏"
-
-msgid "Note list"
-msgstr "笔记列表"
-
-msgid "Note title"
-msgstr "笔记标题"
-
-msgid "Note body"
-msgstr "笔记正文"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "从“%s”导入，导入格式为“%s”。请稍等……"
-
-msgid "PDF File"
-msgstr "PDF 文件"
-
-msgid "Synchronisation status"
-msgstr "同步状态"
-
-msgid "New note"
-msgstr "新建笔记"
-
-msgid "New to-do"
-msgstr "新建待办事项"
-
-msgid "New notebook"
-msgstr "新建笔记本"
-
-msgid "Print"
-msgstr "打印"
-
-msgid "General Options"
-msgstr "通用选项"
-
-msgid "Encryption options"
-msgstr "加密选项"
-
-msgid "Web clipper options"
-msgstr "网页剪辑选项"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "插入时间"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin 导出目录"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "文件 (&F)"
 
@@ -649,7 +569,7 @@ msgid "Check for updates..."
 msgstr "检查更新..."
 
 msgid "Templates"
-msgstr ""
+msgstr "模版"
 
 msgid "Import"
 msgstr "导入"
@@ -733,9 +653,8 @@ msgstr "帮助 (&H)"
 msgid "Website and documentation"
 msgstr "网站与文档"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin v%s"
+msgstr "Joplin 论坛"
 
 msgid "Make a donation"
 msgstr "捐赠"
@@ -842,6 +761,9 @@ msgid ""
 "access Joplin."
 msgstr "该授权令牌仅用于允许第三方应用程序访问 Joplin。"
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "笔记与设置文件储存在：%s"
@@ -852,6 +774,9 @@ msgstr "检查同步配置"
 msgid "Browse..."
 msgstr "浏览..."
 
+msgid "Back"
+msgstr "返回"
+
 msgid "Apply"
 msgstr "应用"
 
@@ -939,12 +864,18 @@ msgstr "状态"
 msgid "Encryption is:"
 msgstr "加密状态："
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "用法提示"
 
-msgid "Back"
-msgstr "返回"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -972,7 +903,16 @@ msgid "Set alarm:"
 msgstr "设置提醒："
 
 msgid "Template file:"
-msgstr ""
+msgstr "模版文件："
+
+msgid "New note"
+msgstr "新建笔记"
+
+msgid "New to-do"
+msgstr "新建待办事项"
+
+msgid "New notebook"
+msgstr "新建笔记本"
 
 msgid "Layout"
 msgstr "布局"
@@ -1009,7 +949,7 @@ msgid "Note History"
 msgstr "笔记历史"
 
 msgid "Markup"
-msgstr ""
+msgstr "标记"
 
 msgid "Previous versions of this note"
 msgstr "此笔记的早期版本"
@@ -1067,6 +1007,13 @@ msgstr "该笔记没有任何内容。点击 \"%s\" 切换到编辑器并编辑
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "一次只能输出一个笔记或导出为 PDF 文件。"
 
+msgid "PDF File"
+msgstr "PDF 文件"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "打开以下笔记时出现错误：%s"
+
 msgid "strong text"
 msgstr "加粗文本"
 
@@ -1141,12 +1088,6 @@ msgstr "选项"
 msgid "Synchronisation Status"
 msgstr "同步状态"
 
-msgid "Encryption Options"
-msgstr "加密选项"
-
-msgid "Clipper Options"
-msgstr "网页剪辑选项"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1170,6 +1111,17 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
+msgid "Notebooks"
+msgstr "笔记本"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "正在解密项目：%d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "正在获取资源：%d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "请选择同步状态的导出位置"
 
@@ -1325,10 +1277,6 @@ msgstr "正在进行"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "已经在同步。状态：%s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr "已下载项目为未知类型，请将 Joplin 升级到最新版本"
-
 msgid "Encrypted"
 msgstr "已加密"
 
@@ -1446,10 +1394,10 @@ msgid "Dark"
 msgstr "深邃"
 
 msgid "Solarised Light"
-msgstr ""
+msgstr "Solarised Light风格"
 
 msgid "Solarised Dark"
-msgstr ""
+msgstr "Solarised Dark风格"
 
 msgid "Uncompleted to-dos on top"
 msgstr "将未完成的待办事项置顶"
@@ -1482,7 +1430,7 @@ msgid "When creating a new note:"
 msgstr "当新建笔记时："
 
 msgid "Enable soft breaks"
-msgstr ""
+msgstr "启动软中断"
 
 msgid "Enable math expressions"
 msgstr "启用数学表达式"
@@ -1517,9 +1465,8 @@ msgstr "启用 ++insert++ 句法"
 msgid "Enable multimarkdown table extension"
 msgstr "启用 multimarkdown 表格扩展"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "启用 ~sub~ 句法"
+msgstr "启用 Fountain 语法支持"
 
 msgid "Show tray icon"
 msgstr "显示托盘图标"
@@ -1544,6 +1491,10 @@ msgstr "全局缩放比例"
 msgid "Editor font size"
 msgstr "编辑器字体大小"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "编辑器字体大小"
+
 msgid "Editor font family"
 msgstr "编辑器字体"
 
@@ -1605,20 +1556,25 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "忽略 TLS 证书错误"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
-msgstr ""
+msgstr "请设置一个API服务的端口数字。如果不指定，默认的端口会被使用。"
 
 msgid "Enable note history"
 msgstr "启用笔记历史"
 
 msgid "days"
-msgstr ""
+msgstr "天"
 
 #, javascript-format
 msgid "%d days"
-msgstr ""
+msgstr "%d天"
 
 msgid "Keep note history for"
 msgstr "保留笔记历史记录"
@@ -1645,6 +1601,14 @@ msgstr "插件"
 msgid "Application"
 msgstr "应用程序"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "加密状态："
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "网页剪辑选项"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "标签“%s”已存在。请选择一个不同的名称。"
@@ -1658,7 +1622,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin 导出目录"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote 导出文件"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote 导出文件"
 
 msgid "Json Export Directory"
@@ -1762,13 +1731,11 @@ msgstr "使用摄像头的权限"
 msgid "Your permission to use your camera is required."
 msgstr "您须要授予相机权限。"
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "无活动笔记本。"
+msgstr "你现在还没有笔记本。"
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "新建笔记本。"
+msgstr "新建笔记本"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "当前没有任何笔记。点击 (+) 按钮创建。"
@@ -1798,35 +1765,21 @@ msgstr "选择日期"
 msgid "Confirm"
 msgstr "确认"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "笔记本"
+msgstr "笔记本：%s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "无法修改已加密的项目"
+msgstr "无法重命名已加密的笔记本"
 
-#, fuzzy
 msgid "New Notebook"
-msgstr "新建笔记本"
+msgstr "新笔记本"
 
 msgid "Configuration"
 msgstr "配置"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "正在解密项目：%d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "正在获取资源：%d/%d"
-
-#, fuzzy
 msgid "All notes"
-msgstr "笔记"
-
-msgid "Notebooks"
-msgstr "笔记本"
+msgstr "全部笔记"
 
 msgid "Checking... Please wait."
 msgstr "正在检查... 请稍候。"
@@ -1869,48 +1822,42 @@ msgid "Type new tags or select from list"
 msgstr "输入新的标签或从列表中选择"
 
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
-msgstr ""
-
-#, fuzzy
-msgid "Information"
-msgstr "更多信息"
+msgstr "要使用文件系统同步，您需要写入外部存储的权限。"
 
 msgid "Encryption Config"
 msgstr "加密配置"
 
-#, fuzzy
 msgid "Tools"
-msgstr "工具 (&T)"
+msgstr "工具"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "状态"
+msgstr "同步的状态"
 
 msgid "Log"
 msgstr "日志"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "新建 %s…"
+msgstr "新建报告…"
 
 msgid "Export Debug Report"
 msgstr "导出调试报告"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "正在修复搜索索引…"
 
 msgid "Fix search index"
-msgstr ""
+msgstr "修复搜索索引"
 
 msgid ""
 "Use this to rebuild the search index if there is a problem with search. It "
 "may take a long time depending on the number of notes."
 msgstr ""
+"如果‘搜索’功能遇到问题，可以使用这个重建索引。花费的时间取决于笔记的数量。"
 
 msgid "More information"
 msgstr "更多信息"
@@ -1974,9 +1921,8 @@ msgstr "该笔记本无法保存：%s"
 msgid "Edit notebook"
 msgstr "编辑笔记本"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "笔记本标题："
+msgstr "笔记本标题"
 
 msgid "Show all"
 msgstr "显示全部"
@@ -2009,9 +1955,9 @@ msgstr "不支持“%s”协议链接"
 msgid "Unsupported image type: %s"
 msgstr "不支持的图片格式：%s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "已更新：%d条。"
+msgstr "已更新：%s"
 
 msgid "View on map"
 msgstr "查看地图"
@@ -2019,13 +1965,11 @@ msgstr "查看地图"
 msgid "Go to source URL"
 msgstr "定位到源 URL"
 
-#, fuzzy
 msgid "Attach..."
-msgstr "搜索..."
+msgstr "添附…"
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "显示高级选项"
+msgstr "选择一个选项"
 
 msgid "Take photo"
 msgstr "拍照"
@@ -2045,19 +1989,17 @@ msgstr "转换为笔记"
 msgid "Convert to todo"
 msgstr "转换为待办事项"
 
-#, fuzzy
 msgid "Properties"
 msgstr "笔记属性"
 
 msgid "Add body"
-msgstr ""
+msgstr "添加body内容"
 
 msgid "Edit"
 msgstr "编辑"
 
-#, fuzzy
 msgid "Add title"
-msgstr "标题"
+msgstr "添加标题"
 
 msgid "Login with OneDrive"
 msgstr "通过 OneDrive 登录"
@@ -2065,6 +2007,76 @@ msgstr "通过 OneDrive 登录"
 msgid "Search"
 msgstr "搜索"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "开始编辑笔记。关闭编辑器将回到提示符。"
+
+#~ msgid "Note has been saved."
+#~ msgstr "笔记已被保存。"
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr "所有默认端口都已经被使用中-请在%s反馈这个问题"
+
+#~ msgid "Sidebar"
+#~ msgstr "边栏"
+
+#~ msgid "Note list"
+#~ msgstr "笔记列表"
+
+#~ msgid "Note title"
+#~ msgstr "笔记标题"
+
+#~ msgid "Note body"
+#~ msgstr "笔记正文"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "从“%s”导入，导入格式为“%s”。请稍等……"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "同步状态"
+
+#~ msgid "Print"
+#~ msgstr "打印"
+
+#~ msgid "General Options"
+#~ msgstr "通用选项"
+
+#~ msgid "Encryption options"
+#~ msgstr "加密选项"
+
+#~ msgid "Create note from template"
+#~ msgstr "从模版创建笔记"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "从模版创建TODO列表"
+
+#~ msgid "Insert template"
+#~ msgstr "插入模版"
+
+#~ msgid "Open template directory"
+#~ msgstr "打开模版目录"
+
+#~ msgid "Refresh templates"
+#~ msgstr "刷新模版"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "调整： %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "加密选项"
+
+#~ msgid "Clipper Options"
+#~ msgstr "网页剪辑选项"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr "已下载项目为未知类型，请将 Joplin 升级到最新版本"
+
+#~ msgid "Information"
+#~ msgstr "说明"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "使用摄像头的权限"

CliClient/locales/zh_TW.po

@@ -168,16 +168,6 @@ msgstr "無使用中的記事本。"
 msgid "Note does not exist: \"%s\". Create it?"
 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 "在編輯器中開啟記事時出錯: %s"
-
-msgid "Note has been saved."
-msgstr "記事已被儲存。"
-
 msgid "Exits the application."
 msgstr "離開本程式。"
 
@@ -518,10 +508,6 @@ msgstr "鍵入 `joplin help` 檢視使用說明。"
 msgid "Fatal error:"
 msgstr "嚴重錯誤:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "應用程式已取得權限 - 您現在可以關閉此瀏覽器分頁。"
@@ -570,76 +556,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "匯出到 \"%s\" 為 \"%s\" 格式。請稍候..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "記事本標題:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "記事本"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "從 \"%s\" 匯入為 \"%s\" 格式。請稍候..."
-
-msgid "PDF File"
-msgstr "PDF 檔案"
-
-msgid "Synchronisation status"
-msgstr "顯示同步狀態"
-
-msgid "New note"
-msgstr "新增記事"
-
-msgid "New to-do"
-msgstr "新增待辦事項"
-
-msgid "New notebook"
-msgstr "新增記事本"
-
-msgid "Print"
-msgstr "列印"
-
-msgid "General Options"
-msgstr "一般選項"
-
-msgid "Encryption options"
-msgstr "加密選項"
-
-msgid "Web clipper options"
-msgstr "Web clipper 選項"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "插入日期時間"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin 匯出目錄"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "檔案"
@@ -855,6 +771,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "所有記事和設置均儲存於: %s"
@@ -865,6 +784,9 @@ msgstr "檢測同步設置"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "返回"
+
 msgid "Apply"
 msgstr "套用"
 
@@ -952,13 +874,19 @@ msgstr "狀態"
 msgid "Encryption is:"
 msgstr "加密:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "使用資訊: %s"
 
-msgid "Back"
-msgstr "返回"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -988,6 +916,15 @@ msgstr "設置提醒:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "新增記事"
+
+msgid "New to-do"
+msgstr "新增待辦事項"
+
+msgid "New notebook"
+msgstr "新增記事本"
+
 msgid "Layout"
 msgstr "頁面佈局"
 
@@ -1082,6 +1019,13 @@ msgstr "此筆記沒有內容。按一下 \"%s\" 切換到編輯模式並編輯
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "PDF 檔案"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "在編輯器中開啟記事時出錯: %s"
+
 msgid "strong text"
 msgstr "重要文字 <strong>"
 
@@ -1156,12 +1100,6 @@ msgstr "選項"
 msgid "Synchronisation Status"
 msgstr "同步狀態"
 
-msgid "Encryption Options"
-msgstr "加密選項"
-
-msgid "Clipper Options"
-msgstr "Clipper 選項"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1182,6 +1120,17 @@ msgstr "刪除"
 msgid "Rename"
 msgstr "重新命名"
 
+msgid "Notebooks"
+msgstr "記事本"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "正在解密項目: %d/%d 項"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "資源: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "請選擇將同步狀態導出到的位置"
 
@@ -1337,10 +1286,6 @@ msgstr "進行中"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "同步已在進行中。狀態: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "已加密"
 
@@ -1553,6 +1498,10 @@ msgstr "整體縮放比例 (%)"
 msgid "Editor font size"
 msgstr "編輯器字型系列"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "編輯器字型系列"
+
 msgid "Editor font family"
 msgstr "編輯器字型系列"
 
@@ -1614,6 +1563,11 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "忽略 TLS 證書錯誤"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
@@ -1659,6 +1613,14 @@ msgstr ""
 msgid "Application"
 msgstr "離開本程式。"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "加密:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web clipper 選項"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1672,7 +1634,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin 匯出目錄"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote 匯出檔"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote 匯出檔"
 
 #, fuzzy
@@ -1828,21 +1795,10 @@ msgstr "新增記事本"
 msgid "Configuration"
 msgstr "設置"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "正在解密項目: %d/%d 項"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "資源: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "記事"
 
-msgid "Notebooks"
-msgstr "記事本"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "正在取消中...請稍候。"
@@ -1887,10 +1843,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "設置"
-
 msgid "Encryption Config"
 msgstr "加密設置"
 
@@ -2077,6 +2029,60 @@ msgstr "以 OneDrive 登錄"
 msgid "Search"
 msgstr "搜尋"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "開始編輯記事。如需返回命令行，請關閉編輯器。"
+
+#~ msgid "Note has been saved."
+#~ msgstr "記事已被儲存。"
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "記事本標題:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "記事本"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "從 \"%s\" 匯入為 \"%s\" 格式。請稍候..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "顯示同步狀態"
+
+#~ msgid "Print"
+#~ msgstr "列印"
+
+#~ msgid "General Options"
+#~ msgstr "一般選項"
+
+#~ msgid "Encryption options"
+#~ msgstr "加密選項"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "插入日期時間"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin 匯出目錄"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "加密選項"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper 選項"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "設置"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "取消同步"
 

CliClient/package-lock.json

@@ -312,6 +312,22 @@
         "source-map": "0.5.x"
       }
     },
+    "clean-html": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/clean-html/-/clean-html-1.5.0.tgz",
+      "integrity": "sha512-eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q==",
+      "requires": {
+        "htmlparser2": "^3.8.2",
+        "minimist": "^1.1.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
     "cliss": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/cliss/-/cliss-0.0.2.tgz",
@@ -550,6 +566,32 @@
       "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz",
       "integrity": "sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="
     },
+    "dom-serializer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
+        },
+        "entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
+        }
+      }
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
     "domexception": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
@@ -558,6 +600,23 @@
         "webidl-conversions": "^4.0.2"
       }
     },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -1015,22 +1074,41 @@
         "uglify-js": "3.3.x"
       }
     },
-    "http-errors": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
         }
       }
     },
@@ -3130,7 +3208,7 @@
       "requires": {
         "chalk": "^2.1.0",
         "emphasize": "^1.5.0",
-        "node-emoji": "git+https://github.com/laurent22/node-emoji.git",
+        "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5",
         "slice-ansi": "^1.0.0",
         "string-width": "^2.1.1",
         "terminal-kit": "^1.13.11",

CliClient/package.json

@@ -31,6 +31,7 @@
     "app-module-path": "^2.2.0",
     "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
+    "clean-html": "^1.5.0",
     "compare-version": "^0.1.2",
     "diacritics": "^1.3.0",
     "diff-match-patch": "^1.0.4",

CliClient/run_test.sh

@@ -6,7 +6,7 @@ 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/"
+rsync -a "$ROOT_DIR/../ReactNativeClient/locales/" "$BUILD_DIR/locales/"
 mkdir -p "$BUILD_DIR/data"
 
 if [[ $TEST_FILE != "" ]]; then
@@ -21,27 +21,27 @@ function finish {
 trap finish EXIT
 
 cd "$ROOT_DIR"
-npm test tests-build/ArrayUtils.js
-npm test tests-build/encryption.js
-npm test tests-build/EnexToMd.js
-npm test tests-build/HtmlToMd.js
-npm test tests-build/markdownUtils.js
-npm test tests-build/models_BaseItem.js
-npm test tests-build/models_Folder.js
-npm test tests-build/models_ItemChange.js
-npm test tests-build/models_Note.js
-npm test tests-build/models_Resource.js
-npm test tests-build/models_Revision.js
-npm test tests-build/models_Setting.js
-npm test tests-build/models_Tag.js
-npm test tests-build/pathUtils.js
-npm test tests-build/services_InteropService.js
-npm test tests-build/services_KvStore.js
-npm test tests-build/services_ResourceService.js
-npm test tests-build/services_rest_Api.js
-npm test tests-build/services_SearchEngine.js
-npm test tests-build/services_Revision.js
-npm test tests-build/StringUtils.js
-npm test tests-build/TaskQueue.js
-npm test tests-build/synchronizer.js
+npm test tests-build/ArrayUtils.js && \
+npm test tests-build/encryption.js && \
+npm test tests-build/EnexToMd.js && \
+npm test tests-build/HtmlToMd.js && \
+npm test tests-build/markdownUtils.js && \
+npm test tests-build/models_BaseItem.js && \
+npm test tests-build/models_Folder.js && \
+npm test tests-build/models_ItemChange.js && \
+npm test tests-build/models_Note.js && \
+npm test tests-build/models_Resource.js && \
+npm test tests-build/models_Revision.js && \
+npm test tests-build/models_Setting.js && \
+npm test tests-build/models_Tag.js && \
+npm test tests-build/pathUtils.js && \
+npm test tests-build/services_InteropService.js && \
+npm test tests-build/services_KvStore.js && \
+npm test tests-build/services_ResourceService.js && \
+npm test tests-build/services_rest_Api.js && \
+npm test tests-build/services_SearchEngine.js && \
+npm test tests-build/services_Revision.js && \
+npm test tests-build/StringUtils.js && \
+npm test tests-build/TaskQueue.js && \
+npm test tests-build/synchronizer.js && \
 npm test tests-build/urlUtils.js

CliClient/tests/ArrayUtils.js

@@ -3,7 +3,7 @@
 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 { asyncTest, 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) => {
@@ -16,7 +16,7 @@ describe('ArrayUtils', function() {
 		done();
 	});
 
-	it('should remove array elements', async (done) => {
+	it('should remove array elements', asyncTest(async () => {
 		let a = ['un', 'deux', 'trois'];
 		a = ArrayUtils.removeElement(a, 'deux');
 
@@ -27,11 +27,9 @@ describe('ArrayUtils', function() {
 		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) => {
+	it('should find items using binary search', asyncTest(async () => {
 		let items = ['aaa', 'ccc', 'bbb'];
 		expect(ArrayUtils.binarySearch(items, 'bbb')).toBe(-1); // Array not sorted!
 		items.sort();
@@ -42,17 +40,13 @@ describe('ArrayUtils', function() {
 
 		items = [];
 		expect(ArrayUtils.binarySearch(items, 'aaa')).toBe(-1);
+	}));
 
-		done();
-	});
-
-	it('should compare arrays', async (done) => {
+	it('should compare arrays', asyncTest(async () => {
 		expect(ArrayUtils.contentEquals([], [])).toBe(true);
 		expect(ArrayUtils.contentEquals(['a'], ['a'])).toBe(true);
 		expect(ArrayUtils.contentEquals(['b', 'a'], ['a', 'b'])).toBe(true);
 		expect(ArrayUtils.contentEquals(['b'], ['a', 'b'])).toBe(false);
-
-		done();
-	});
+	}));
 
 });

CliClient/tests/EnexToHtml.js

@@ -0,0 +1,108 @@
+require('app-module-path').addPath(__dirname);
+
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
+const { shim } = require('lib/shim');
+const { enexXmlToHtml } = require('lib/import-enex-html-gen.js');
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 60 * 60 * 1000; // Can run for a while since everything is in the same test unit
+
+process.on('unhandledRejection', (reason, p) => {
+	console.warn('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+const fileWithPath = (filename) =>
+	`${__dirname}/enex_to_html/${filename}`;
+
+const audioResource = {
+	filename: 'audio test',
+	id: '9168ee833d03c5ea7c730ac6673978c1',
+	mime: 'audio/x-m4a',
+	size: 82011,
+	title: 'audio test',
+};
+
+/**
+ * Tests the importer for a single note, checking that the result of
+ * processing the given `.enex` input file matches the contents of the given
+ * `.html` file.
+ *
+ * Note that this does not test the importing of an entire exported `.enex`
+ * archive, but rather a single node of such a file. Thus, the test data files
+ * (e.g. `./enex_to_html/code1.enex`) correspond to the contents of a single
+ * `<note>...</note>` node in an `.enex` file already extracted from
+ * `<content><![CDATA[...]]</content>`.
+ */
+const compareOutputToExpected = (options) => {
+	const inputFile = fileWithPath(`${options.testName}.enex`);
+	const outputFile = fileWithPath(`${options.testName}.html`);
+	const testTitle = `should convert from Enex to Html: ${options.testName}`;
+
+	it(testTitle, asyncTest(async () => {
+		const enexInput = await shim.fsDriver().readFile(inputFile);
+		const expectedOutput = await shim.fsDriver().readFile(outputFile);
+		const actualOutput = await enexXmlToHtml(enexInput, options.resources);
+
+		expect(actualOutput).toEqual(expectedOutput);
+	}));
+};
+
+describe('EnexToHtml', function() {
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	compareOutputToExpected({
+		testName: 'checklist-list',
+		resources: [],
+	});
+
+	compareOutputToExpected({
+		testName: 'svg',
+		resources: [],
+	});
+
+	compareOutputToExpected({
+		testName: 'en-media--image',
+		resources: [{
+			filename: '',
+			id: '89ce7da62c6b2832929a6964237e98e9', // Mock id
+			mime: 'image/jpeg',
+			size: 50347,
+			title: '',
+		}],
+	});
+
+	compareOutputToExpected({
+		testName: 'en-media--audio',
+		resources: [audioResource],
+	});
+
+	compareOutputToExpected({
+		testName: 'attachment',
+		resources: [{
+			filename: 'attachment-1',
+			id: '21ca2b948f222a38802940ec7e2e5de3',
+			mime: 'application/pdf', // Any non-image/non-audio mime type will do
+			size: 1000,
+		}],
+	});
+
+	it('fails when not given a matching resource', asyncTest(async () => {
+		// To test the promise-unexpectedly-resolved case, add `audioResource` to the array.
+		const resources = [];
+		const inputFile = fileWithPath('en-media--image.enex');
+		const enexInput = await shim.fsDriver().readFile(inputFile);
+		const promisedOutput = enexXmlToHtml(enexInput, resources);
+
+		promisedOutput.then(() => {
+			// Promise should not be resolved
+			expect(false).toEqual(true);
+		}, (reason) => {
+			expect(reason)
+				.toBe('Hash with no associated resource: 89ce7da62c6b2832929a6964237e98e9');
+		});
+	}));
+
+});

CliClient/tests/EnexToMd.js

@@ -27,22 +27,22 @@ describe('EnexToMd', function() {
 	});
 
 	it('should convert from Enex to Markdown', asyncTest(async () => {
-		const basePath = __dirname + '/enex_to_md';
+		const basePath = `${__dirname}/enex_to_md`;
 		const files = await shim.fsDriver().readDirStats(basePath);
 
 		for (let i = 0; i < files.length; i++) {
 			const htmlFilename = files[i].path;
 			if (htmlFilename.indexOf('.html') < 0) continue;
 
-			const htmlPath = basePath + '/' + htmlFilename;
-			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
+			const htmlPath = `${basePath}/${htmlFilename}`;
+			const mdPath = `${basePath}/${filename(htmlFilename)}.md`;
 
 			// if (htmlFilename !== 'multiline_inner_text.html') continue;
 
 			const html = await shim.fsDriver().readFile(htmlPath);
 			let expectedMd = await shim.fsDriver().readFile(mdPath);
 
-			let actualMd = await enexXmlToMd('<div>' + html + '</div>', []);
+			let actualMd = await enexXmlToMd(`<div>${html}</div>`, []);
 
 			if (os.EOL === '\r\n') {
 				expectedMd = expectedMd.replace(/\r\n/g, '\n');
@@ -51,7 +51,7 @@ describe('EnexToMd', function() {
 
 			if (actualMd !== expectedMd) {
 				console.info('');
-				console.info('Error converting file: ' + htmlFilename);
+				console.info(`Error converting file: ${htmlFilename}`);
 				console.info('--------------------------------- Got:');
 				console.info(actualMd.split('\n'));
 				console.info('--------------------------------- Expected:');

CliClient/tests/HtmlToMd.js

@@ -28,7 +28,7 @@ describe('HtmlToMd', function() {
 	});
 
 	it('should convert from Html to Markdown', asyncTest(async () => {
-		const basePath = __dirname + '/html_to_md';
+		const basePath = `${__dirname}/html_to_md`;
 		const files = await shim.fsDriver().readDirStats(basePath);
 		const htmlToMd = new HtmlToMd();
 
@@ -36,8 +36,8 @@ describe('HtmlToMd', function() {
 			const htmlFilename = files[i].path;
 			if (htmlFilename.indexOf('.html') < 0) continue;
 
-			const htmlPath = basePath + '/' + htmlFilename;
-			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
+			const htmlPath = `${basePath}/${htmlFilename}`;
+			const mdPath = `${basePath}/${filename(htmlFilename)}.md`;
 
 			// if (htmlFilename !== 'table_with_pipe.html') continue;
 
@@ -54,7 +54,7 @@ describe('HtmlToMd', function() {
 			const html = await shim.fsDriver().readFile(htmlPath);
 			let expectedMd = await shim.fsDriver().readFile(mdPath);
 
-			let actualMd = await htmlToMd.parse('<div>' + html + '</div>', htmlToMdOptions);
+			let actualMd = await htmlToMd.parse(`<div>${html}</div>`, htmlToMdOptions);
 
 			if (os.EOL === '\r\n') {
 				expectedMd = expectedMd.replace(/\r\n/g, '\n');
@@ -63,7 +63,7 @@ describe('HtmlToMd', function() {
 
 			if (actualMd !== expectedMd) {
 				console.info('');
-				console.info('Error converting file: ' + htmlFilename);
+				console.info(`Error converting file: ${htmlFilename}`);
 				console.info('--------------------------------- Got:');
 				console.info(actualMd);
 				console.info('--------------------------------- Raw:');

CliClient/tests/StringUtils.js

@@ -2,8 +2,7 @@
 
 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 { asyncTest } = require('test-utils.js');
 const StringUtils = require('lib/string-utils');
 
 process.on('unhandledRejection', (reason, p) => {
@@ -16,7 +15,7 @@ describe('StringUtils', function() {
 		done();
 	});
 
-	it('should surround keywords with strings', async (done) => {
+	it('should surround keywords with strings', asyncTest(async () => {
 		const testCases = [
 			[[], 'test', 'a', 'b', 'test'],
 			[['test'], 'test', 'a', 'b', 'atestb'],
@@ -38,10 +37,8 @@ describe('StringUtils', function() {
 
 			const actual = StringUtils.surroundKeywords(keywords, input, prefix, suffix);
 
-			expect(actual).toBe(expected, 'Test case ' + i);
+			expect(actual).toBe(expected, `Test case ${i}`);
 		}
-
-		done();
-	});
+	}));
 
 });

CliClient/tests/encryption.js

@@ -3,7 +3,7 @@
 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 { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
@@ -34,7 +34,7 @@ describe('Encryption', function() {
 		done();
 	});
 
-	it('should encode and decode header', async (done) => {
+	it('should encode and decode header', asyncTest(async () => {
 		const header = {
 			encryptionMethod: EncryptionService.METHOD_SJCL,
 			masterKeyId: '01234568abcdefgh01234568abcdefgh',
@@ -45,11 +45,9 @@ describe('Encryption', function() {
 		delete decodedHeader.length;
 
 		expect(objectsEqual(header, decodedHeader)).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should generate and decrypt a master key', async (done) => {
+	it('should generate and decrypt a master key', asyncTest(async () => {
 		const masterKey = await service.generateMasterKey('123456');
 		expect(!!masterKey.checksum).toBe(true);
 		expect(!!masterKey.content).toBe(true);
@@ -65,11 +63,9 @@ describe('Encryption', function() {
 
 		const decryptedMasterKey = await service.decryptMasterKey(masterKey, '123456');
 		expect(decryptedMasterKey.length).toBe(512);
+	}));
 
-		done();
-	});
-
-	it('should encrypt and decrypt with a master key', async (done) => {
+	it('should encrypt and decrypt with a master key', asyncTest(async () => {
 		let masterKey = await service.generateMasterKey('123456');
 		masterKey = await MasterKey.save(masterKey);
 
@@ -89,11 +85,9 @@ describe('Encryption', function() {
 		const plainText2 = await service.decryptString(cipherText2);
 
 		expect(plainText2 === veryLongSecret).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should fail to decrypt if master key not present', async (done) => {
+	it('should fail to decrypt if master key not present', asyncTest(async () => {
 		let masterKey = await service.generateMasterKey('123456');
 		masterKey = await MasterKey.save(masterKey);
 
@@ -106,12 +100,10 @@ describe('Encryption', function() {
 		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) => {
+	it('should fail to decrypt if data tampered with', asyncTest(async () => {
 		let masterKey = await service.generateMasterKey('123456');
 		masterKey = await MasterKey.save(masterKey);
 
@@ -123,11 +115,9 @@ describe('Encryption', function() {
 		let hasThrown = await checkThrowAsync(async () => await service.decryptString(cipherText));
 
 		expect(hasThrown).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should encrypt and decrypt notes and folders', async (done) => {
+	it('should encrypt and decrypt notes and folders', asyncTest(async () => {
 		let masterKey = await service.generateMasterKey('123456');
 		masterKey = await MasterKey.save(masterKey);
 		await service.loadMasterKey(masterKey, '123456', true);
@@ -156,26 +146,22 @@ describe('Encryption', function() {
 		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) => {
+	it('should encrypt and decrypt files', asyncTest(async () => {
 		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';
+		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/enex_to_html/attachment.enex

@@ -0,0 +1,8 @@
+<en-note>
+  <div>
+    <en-media hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" />
+  </div>
+  <div>
+    <br />
+  </div>
+</en-note>

CliClient/tests/enex_to_html/attachment.html

@@ -0,0 +1,7 @@
+<en-note>
+  <div><a href="#" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1" onclick="ipcProxySendToHost('joplin://21ca2b948f222a38802940ec7e2e5de3'); return false;">attachment-1</a></div>
+  <div>
+    <br>
+    <br>
+  </div>
+</en-note>

CliClient/tests/enex_to_html/checklist-list.enex

@@ -0,0 +1,11 @@
+<en-note>
+  <div>
+    <p>For example, consider an exported Evernote list with todo checkboxes like this:</p>
+
+    <ul>
+      <li><div><en-todo checked="true"/>Foo</div></li>
+      <li><div><en-todo checked="false"/><b>Bar</b></div></li>
+      <li><div><en-todo checked="false"/><i>Baz</i></div></li>
+    </ul>
+  </div>
+</en-note>

CliClient/tests/enex_to_html/checklist-list.html

@@ -0,0 +1,16 @@
+<en-note>
+  <div>
+    <p>For example, consider an exported Evernote list with todo checkboxes like this:</p>
+    <ul>
+      <li>
+        <div><input type="checkbox" onclick="return false;">Foo</div>
+      </li>
+      <li>
+        <div><input type="checkbox" onclick="return false;"><b>Bar</b></div>
+      </li>
+      <li>
+        <div><input type="checkbox" onclick="return false;"><i>Baz</i></div>
+      </li>
+    </ul>
+  </div>
+</en-note>

CliClient/tests/enex_to_html/en-media--audio.enex

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+<en-note><div><en-media hash="9168ee833d03c5ea7c730ac6673978c1" type="audio/x-m4a" title="Attachment"/></div><div><br/></div></en-note>

CliClient/tests/enex_to_html/en-media--audio.html

@@ -0,0 +1,13 @@
+<en-note>
+  <div>
+    <audio controls="" preload="none" style="width:480px;">
+      <source src=":/9168ee833d03c5ea7c730ac6673978c1" type="audio/mp4">
+      <p>Your browser does not support HTML5 audio.</p>
+    </audio>
+    <p><a href=":/9168ee833d03c5ea7c730ac6673978c1" onclick="ipcProxySendToHost('joplin://9168ee833d03c5ea7c730ac6673978c1'); return false;">audio test</a></p>
+  </div>
+  <div>
+    <br>
+    <br>
+  </div>
+</en-note>

CliClient/tests/enex_to_html/en-media--image.enex

@@ -0,0 +1 @@
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><div><en-todo checked="false" />This is a test</div><div><en-todo checked="false" />A test for <span style="font-weight: bold;">bold</span></div><div><en-todo checked="false" />A test for <i>italic</i><br /></div><div><br /></div><div><i><en-media hash="89ce7da62c6b2832929a6964237e98e9" type="image/jpeg" /></i></div></en-note>

CliClient/tests/enex_to_html/en-media--image.html

@@ -0,0 +1,14 @@
+<en-note>
+  <div><input type="checkbox" onclick="return false;">This is a test</div>
+  <div><input type="checkbox" onclick="return false;">A test for <span style="font-weight: bold;">bold</span></div>
+  <div>
+    <input type="checkbox" onclick="return false;">A test for <i>italic</i>
+    <br>
+    <br>
+  </div>
+  <div>
+    <br>
+    <br>
+  </div>
+  <div><i><img src=":/89ce7da62c6b2832929a6964237e98e9" hash="89ce7da62c6b2832929a6964237e98e9" type="image/jpeg" alt=""></i></div>
+</en-note>

CliClient/tests/enex_to_html/svg.enex

@@ -0,0 +1,5 @@
+<en-note>
+  <div>
+    <img style="margin:0px;padding:0px;outline:0px;width:74px;height:36px;position:absolute;bottom:-5px;left:0px;transform:translate(0px, 100%);stroke-dasharray:90;transition:stroke-dashoffset 0.5s cubic-bezier(0.97, 0.16, 0.62, 0.76) 0s;stroke-dashoffset:0;" src="data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' data-evernote-id='97' class='js-evernote-checked'%3e%3cuse xlink:href='https://wordminds.com/wp-content/themes/wordminds/assets/img/hint_left.svg%23hint_left' data-evernote-id='98' class='js-evernote-checked'%3e%3c/use%3e%3c/svg%3e"/>
+  </div>
+</en-note>

CliClient/tests/enex_to_html/svg.html

@@ -0,0 +1,3 @@
+<en-note>
+  <div><img style="margin:0px;padding:0px;outline:0px;width:74px;height:36px;position:absolute;bottom:-5px;left:0px;transform:translate(0px, 100%);stroke-dasharray:90;transition:stroke-dashoffset 0.5s cubic-bezier(0.97, 0.16, 0.62, 0.76) 0s;stroke-dashoffset:0;" src="data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' data-evernote-id='97' class='js-evernote-checked'%3e%3cuse xlink:href='https://wordminds.com/wp-content/themes/wordminds/assets/img/hint_left.svg%23hint_left' data-evernote-id='98' class='js-evernote-checked'%3e%3c/use%3e%3c/svg%3e"></div>
+</en-note>

CliClient/tests/htmlUtils.js

@@ -2,8 +2,7 @@
 
 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 { asyncTest } = require('test-utils.js');
 const htmlUtils = require('lib/htmlUtils.js');
 
 process.on('unhandledRejection', (reason, p) => {
@@ -16,7 +15,7 @@ describe('htmlUtils', function() {
 		done();
 	});
 
-	it('should extract image URLs', async (done) => {
+	it('should extract image URLs', asyncTest(async () => {
 		const testCases = [
 			['<img src="http://test.com/img.png"/>', ['http://test.com/img.png']],
 			['<img src="http://test.com/img.png"/> <img src="http://test.com/img2.png"/>', ['http://test.com/img.png', 'http://test.com/img2.png']],
@@ -31,11 +30,9 @@ describe('htmlUtils', function() {
 
 			expect(htmlUtils.extractImageUrls(md).join(' ')).toBe(expected.join(' '));
 		}
+	}));
 
-		done();
-	});
-
-	it('should replace image URLs', async (done) => {
+	it('should replace image URLs', asyncTest(async () => {
 		const testCases = [
 			['<img src="http://test.com/img.png"/>', ['http://other.com/img2.png'], '<img src="http://other.com/img2.png"/>'],
 			['<img src="http://test.com/img.png"/> <img src="http://test.com/img2.png"/>', ['http://other.com/img2.png', 'http://other.com/img3.png'], '<img src="http://other.com/img2.png"/> <img src="http://other.com/img3.png"/>'],
@@ -56,11 +53,9 @@ describe('htmlUtils', function() {
 			const r = htmlUtils.replaceImageUrls(md, callback(testCases[i][1]));
 			expect(r.trim()).toBe(testCases[i][2].trim());
 		}
+	}));
 
-		done();
-	});
-
-	it('should encode attributes', async (done) => {
+	it('should encode attributes', asyncTest(async () => {
 		const testCases = [
 			[{ a: 'one', b: 'two' }, 'a="one" b="two"'],
 			[{ a: 'one&two' }, 'a="one&amp;two"'],
@@ -71,11 +66,9 @@ describe('htmlUtils', function() {
 			const expected = testCases[i][1];
 			expect(htmlUtils.attributesHtml(attrs)).toBe(expected);
 		}
+	}));
 
-		done();
-	});
-
-	it('should prepend a base URL', async (done) => {
+	it('should prepend a base URL', asyncTest(async () => {
 		const testCases = [
 			[
 				'<a href="a.html">Something</a>',
@@ -100,8 +93,6 @@ describe('htmlUtils', function() {
 			const expected = testCases[i][2];
 			expect(htmlUtils.prependBaseUrl(html, baseUrl)).toBe(expected);
 		}
-
-		done();
-	});
+	}));
 
 });

CliClient/tests/markdownUtils.js

@@ -2,8 +2,7 @@
 
 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 { asyncTest } = require('test-utils.js');
 const markdownUtils = require('lib/markdownUtils.js');
 
 process.on('unhandledRejection', (reason, p) => {
@@ -16,7 +15,7 @@ describe('markdownUtils', function() {
 		done();
 	});
 
-	it('should prepend a base URL', async (done) => {
+	it('should prepend a base URL', asyncTest(async () => {
 		const baseUrl = 'https://test.com/site';
 
 		const testCases = [
@@ -32,11 +31,9 @@ describe('markdownUtils', function() {
 			const expected = testCases[i][1];
 			expect(markdownUtils.prependBaseUrl(md, baseUrl)).toBe(expected);
 		}
+	}));
 
-		done();
-	});
-
-	it('should extract image URLs', async (done) => {
+	it('should extract image URLs', asyncTest(async () => {
 		const testCases = [
 			['![something](http://test.com/img.png)', ['http://test.com/img.png']],
 			['![something](http://test.com/img.png) ![something2](http://test.com/img2.png)', ['http://test.com/img.png', 'http://test.com/img2.png']],
@@ -50,8 +47,6 @@ describe('markdownUtils', function() {
 
 			expect(markdownUtils.extractImageUrls(md).join('')).toBe(expected.join(''));
 		}
-
-		done();
-	});
+	}));
 
 });

CliClient/tests/models_BaseItem.js

@@ -29,14 +29,6 @@ describe('models_BaseItem', function() {
 		done();
 	});
 
-	// it('should be able to exclude keys when syncing', asyncTest(async () => {
-	// 	let folder1 = await Folder.save({ title: "folder1" });
-	// 	let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-	// 	await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
-	// 	let resource1 = (await Resource.all())[0];
-	// 	console.info(await Resource.serializeForSync(resource1));
-	// }));
-
 	// This is to handle the case where a property is removed from a BaseItem table - in that case files in
 	// the sync target will still have the old property but we don't need it locally.
 	it('should ignore properties that are present in sync file but not in database when serialising', asyncTest(async () => {

CliClient/tests/models_Note.js

@@ -25,23 +25,23 @@ describe('models_Note', function() {
 	it('should find resource and note IDs', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: `Lien vers première note : ${Note.markdownTag(note1)}`, parent_id: folder1.id });
 
 		let items = await Note.linkedItems(note2.body);
 		expect(items.length).toBe(1);
 		expect(items[0].id).toBe(note1.id);
 
-		await shim.attachFileToNote(note2, __dirname + '/../tests/support/photo.jpg');
+		await shim.attachFileToNote(note2, `${__dirname}/../tests/support/photo.jpg`);
 		note2 = await Note.load(note2.id);
 		items = await Note.linkedItems(note2.body);
 		expect(items.length).toBe(2);
 		expect(items[0].type_).toBe(BaseModel.TYPE_NOTE);
 		expect(items[1].type_).toBe(BaseModel.TYPE_RESOURCE);
 
-		const resource2 = await shim.createResourceFromPath(__dirname + '/../tests/support/photo.jpg');
-		const resource3 = await shim.createResourceFromPath(__dirname + '/../tests/support/photo.jpg');
-		note2.body += '<img alt="bla" src=":/' + resource2.id + '"/>';
-		note2.body += '<img src=\':/' + resource3.id + '\' />';
+		const resource2 = await shim.createResourceFromPath(`${__dirname}/../tests/support/photo.jpg`);
+		const resource3 = await shim.createResourceFromPath(`${__dirname}/../tests/support/photo.jpg`);
+		note2.body += `<img alt="bla" src=":/${resource2.id}"/>`;
+		note2.body += `<img src=':/${resource3.id}' />`;
 		items = await Note.linkedItems(note2.body);
 		expect(items.length).toBe(4);
 	}));

CliClient/tests/models_Resource.js

@@ -16,7 +16,7 @@ process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
 
-const testImagePath = __dirname + '/../tests/support/photo.jpg';
+const testImagePath = `${__dirname}/../tests/support/photo.jpg`;
 
 describe('models_Resource', function() {
 

CliClient/tests/pathUtils.js

@@ -2,8 +2,8 @@
 
 require('app-module-path').addPath(__dirname);
 
-const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath} = require('lib/path-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath } = require('lib/path-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -15,7 +15,7 @@ describe('pathUtils', function() {
 		done();
 	});
 
-	it('should create friendly safe filename', async (done) => {
+	it('should create friendly safe filename', asyncTest(async () => {
 		const testCases = [
 			['生活', '生活'],
 			['not/good', 'not_good'],
@@ -34,11 +34,9 @@ describe('pathUtils', function() {
 
 		expect(!!friendlySafeFilename('')).toBe(true);
 		expect(!!friendlySafeFilename('...')).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should quote and unquote paths', async (done) => {
+	it('should quote and unquote paths', asyncTest(async () => {
 		const testCases = [
 			['', ''],
 			['/my/path', '/my/path'],
@@ -53,11 +51,9 @@ describe('pathUtils', function() {
 			expect(quotePath(t[0])).toBe(t[1]);
 			expect(unquotePath(quotePath(t[0]))).toBe(t[0]);
 		}
+	}));
 
-		done();
-	});
-
-	it('should extract executable path from command', async (done) => {
+	it('should extract executable path from command', asyncTest(async () => {
 		const testCases = [
 			['', ''],
 			['/my/cmd -some -args', '/my/cmd'],
@@ -71,11 +67,9 @@ describe('pathUtils', function() {
 			const t = testCases[i];
 			expect(extractExecutablePath(t[0])).toBe(t[1]);
 		}
+	}));
 
-		done();
-	});
-
-	it('should create correct fileURL syntax', async (done) => {
+	it('should create correct fileURL syntax', asyncTest(async () => {
 		const testCases_win32 = [
 			['C:\\handle\\space test', 'file:///C:/handle/space+test'],
 			['C:\\escapeplus\\+', 'file:///C:/escapeplus/%2B'],
@@ -95,8 +89,6 @@ describe('pathUtils', function() {
 			const t = testCases_unixlike[i];
 			expect(toFileProtocolPath(t[0], 'linux')).toBe(t[1]);
 		}
-
-		done();
-	});
+	}));
 
 });

CliClient/tests/services_InteropService.js

@@ -22,13 +22,13 @@ process.on('unhandledRejection', (reason, p) => {
 });
 
 function exportDir() {
-	return __dirname + '/export';
+	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);
+		expect(model1[f]).toBe(model2[f], `For key ${f}`);
 	}
 }
 
@@ -48,7 +48,7 @@ describe('services_InteropService', function() {
 		const service = new InteropService();
 		let folder1 = await Folder.save({ title: 'folder1' });
 		folder1 = await Folder.load(folder1.id);
-		const filePath = exportDir() + '/test.jex';
+		const filePath = `${exportDir()}/test.jex`;
 
 		await service.export({ path: filePath });
 
@@ -84,7 +84,7 @@ describe('services_InteropService', function() {
 		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';
+		const filePath = `${exportDir()}/test.jex`;
 
 		await service.export({ path: filePath });
 
@@ -123,7 +123,7 @@ describe('services_InteropService', function() {
 		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';
+		const filePath = `${exportDir()}/test.jex`;
 
 		await service.export({ path: filePath });
 
@@ -139,7 +139,7 @@ describe('services_InteropService', function() {
 
 	it('should export and import tags', asyncTest(async () => {
 		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
+		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' });
@@ -179,10 +179,10 @@ describe('services_InteropService', function() {
 
 	it('should export and import resources', asyncTest(async () => {
 		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
+		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		note1 = await Note.load(note1.id);
 		let resourceIds = await Note.linkedResourceIds(note1.body);
 		let resource1 = await Resource.load(resourceIds[0]);
@@ -215,7 +215,7 @@ describe('services_InteropService', function() {
 
 	it('should export and import single notes', asyncTest(async () => {
 		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
+		const filePath = `${exportDir()}/test.jex`;
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
 
@@ -235,7 +235,7 @@ describe('services_InteropService', function() {
 
 	it('should export and import single folders', asyncTest(async () => {
 		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
+		const filePath = `${exportDir()}/test.jex`;
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
 
@@ -256,7 +256,7 @@ describe('services_InteropService', function() {
 	it('should export and import folder and its sub-folders', asyncTest(async () => {
 
 		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
+		const filePath = `${exportDir()}/test.jex`;
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let folder2 = await Folder.save({ title: 'folder2', parent_id: folder1.id });
 		let folder3 = await Folder.save({ title: 'folder3', parent_id: folder2.id });
@@ -290,10 +290,10 @@ describe('services_InteropService', function() {
 
 	it('should export and import links to notes', asyncTest(async () => {
 		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
+		const filePath = `${exportDir()}/test.jex`;
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: `Lien vers première note : ${Note.markdownTag(note1)}`, parent_id: folder1.id });
 
 		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
 
@@ -324,7 +324,7 @@ describe('services_InteropService', function() {
 		// verify that the json files exist and can be parsed
 		const items = [folder1, note1];
 		for (let i = 0; i < items.length; i++) {
-			const jsonFile = filePath + '/' + items[i].id + '.json';
+			const jsonFile = `${filePath}/${items[i].id}.json`;
 			let json = await fs.readFile(jsonFile, 'utf-8');
 			let obj = JSON.parse(json);
 			expect(obj.id).toBe(items[i].id);
@@ -350,13 +350,13 @@ describe('services_InteropService', function() {
 
 		await service.export({ path: outDir, format: 'md' });
 
-		expect(await shim.fsDriver().exists(outDir + '/folder1/生活.md')).toBe(true);
-		expect(await shim.fsDriver().exists(outDir + '/folder1/生活 (1).md')).toBe(true);
-		expect(await shim.fsDriver().exists(outDir + '/folder1/生活 (2).md')).toBe(true);
-		expect(await shim.fsDriver().exists(outDir + '/folder1/Untitled.md')).toBe(true);
-		expect(await shim.fsDriver().exists(outDir + '/folder1/Untitled (1).md')).toBe(true);
-		expect(await shim.fsDriver().exists(outDir + '/folder1/salut, ça roule _.md')).toBe(true);
-		expect(await shim.fsDriver().exists(outDir + '/ジョプリン/ジョプリン.md')).toBe(true);
+		expect(await shim.fsDriver().exists(`${outDir}/folder1/生活.md`)).toBe(true);
+		expect(await shim.fsDriver().exists(`${outDir}/folder1/生活 (1).md`)).toBe(true);
+		expect(await shim.fsDriver().exists(`${outDir}/folder1/生活 (2).md`)).toBe(true);
+		expect(await shim.fsDriver().exists(`${outDir}/folder1/Untitled.md`)).toBe(true);
+		expect(await shim.fsDriver().exists(`${outDir}/folder1/Untitled (1).md`)).toBe(true);
+		expect(await shim.fsDriver().exists(`${outDir}/folder1/salut, ça roule _.md`)).toBe(true);
+		expect(await shim.fsDriver().exists(`${outDir}/ジョプリン/ジョプリン.md`)).toBe(true);
 	}));
 
 });

CliClient/tests/services_ResourceService.js

@@ -26,13 +26,13 @@ process.on('unhandledRejection', (reason, p) => {
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
 function exportDir() {
-	return __dirname + '/export';
+	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);
+		expect(model1[f]).toBe(model2[f], `For key ${f}`);
 	}
 }
 
@@ -50,7 +50,7 @@ describe('services_ResourceService', function() {
 
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 		const resourcePath = Resource.fullPath(resource1);
 
@@ -82,7 +82,7 @@ describe('services_ResourceService', function() {
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
 		let note2 = await Note.save({ title: 'ma deuxième note', parent_id: folder1.id });
-		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 
 		await service.indexNoteResources();
@@ -102,7 +102,7 @@ describe('services_ResourceService', function() {
 
 	it('should not delete a resource that has never been associated with any note, because it probably means the resource came via sync, and associated note has not arrived yet', asyncTest(async () => {
 		const service = new ResourceService();
-		const resource = await shim.createResourceFromPath(__dirname + '/../tests/support/photo.jpg');
+		const resource = await shim.createResourceFromPath(`${__dirname}/../tests/support/photo.jpg`);
 
 		await service.indexNoteResources();
 		await service.deleteOrphanResources(0);
@@ -115,12 +115,12 @@ describe('services_ResourceService', function() {
 
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 
 		await service.indexNoteResources();
 
-		await Note.save({ id: note1.id, body: 'This is HTML: <img src=":/' + resource1.id + '"/>' });
+		await Note.save({ id: note1.id, body: `This is HTML: <img src=":/${resource1.id}"/>` });
 
 		await service.indexNoteResources();
 
@@ -134,7 +134,7 @@ describe('services_ResourceService', function() {
 
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 
 		await service.indexNoteResources();
@@ -171,7 +171,7 @@ describe('services_ResourceService', function() {
 		await encryptionService().loadMasterKeysFromSettings();
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg'); // R1
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`); // R1
 		await resourceService().indexNoteResources();
 		await synchronizer().start();
 		expect(await allSyncTargetItemsEncrypted()).toBe(true);
@@ -184,7 +184,7 @@ describe('services_ResourceService', function() {
 		await decryptionWorker().start();
 		{
 			const n1 = await Note.load(note1.id);
-			await shim.attachFileToNote(n1, __dirname + '/../tests/support/photo.jpg'); // R2
+			await shim.attachFileToNote(n1, `${__dirname}/../tests/support/photo.jpg`); // R2
 		}
 		await synchronizer().start();
 
@@ -201,7 +201,7 @@ describe('services_ResourceService', function() {
 
 		let folder1 = await Folder.save({ title: 'folder1' });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		await resourceService().indexNoteResources();
 		const bodyWithResource = note1.body;
 		await Note.save({ id: note1.id, body: '' });

CliClient/tests/services_SearchEngine.js

@@ -297,9 +297,9 @@ describe('services_SearchEngine', function() {
 			const titleValues = actual.terms.title ? actual.terms.title.map(v => v.value) : undefined;
 			const bodyValues = actual.terms.body ? actual.terms.body.map(v => v.value) : undefined;
 
-			expect(JSON.stringify(_Values)).toBe(JSON.stringify(expected._), 'Test case (_) ' + i);
-			expect(JSON.stringify(titleValues)).toBe(JSON.stringify(expected.title), 'Test case (title) ' + i);
-			expect(JSON.stringify(bodyValues)).toBe(JSON.stringify(expected.body), 'Test case (body) ' + i);
+			expect(JSON.stringify(_Values)).toBe(JSON.stringify(expected._), `Test case (_) ${i}`);
+			expect(JSON.stringify(titleValues)).toBe(JSON.stringify(expected.title), `Test case (title) ${i}`);
+			expect(JSON.stringify(bodyValues)).toBe(JSON.stringify(expected.body), `Test case (body) ${i}`);
 		}
 	}));
 

CliClient/tests/services_rest_Api.js

@@ -2,9 +2,7 @@
 
 require('app-module-path').addPath(__dirname);
 
-const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const markdownUtils = require('lib/markdownUtils.js');
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient, checkThrowAsync } = require('test-utils.js');
 const Api = require('lib/services/rest/Api');
 const Folder = require('lib/models/Folder');
 const Resource = require('lib/models/Resource');
@@ -29,49 +27,39 @@ describe('services_rest_Api', function() {
 		done();
 	});
 
-	it('should ping', async (done) => {
+	it('should ping', asyncTest(async () => {
 		const response = await api.route('GET', 'ping');
-		expect(response).toBe('JoplinClipperServer');
-		done();
-	});
+	}));
 
-	it('should handle Not Found errors', async (done) => {
+	it('should handle Not Found errors', asyncTest(async () => {
 		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'pong'));
-		expect(hasThrown).toBe(true);
-		done();
-	});
+	}));
 
-	it('should get folders', async (done) => {
+	it('should get folders', asyncTest(async () => {
 		let f1 = await Folder.save({ title: 'mon carnet' });
 		const response = await api.route('GET', 'folders');
 		expect(response.length).toBe(1);
-		expect(response[0].title).toBe('mon carnet');
-		done();
-	});
+	}));
 
-	it('should update folders', async (done) => {
+	it('should update folders', asyncTest(async () => {
 		let f1 = await Folder.save({ title: 'mon carnet' });
-		const response = await api.route('PUT', 'folders/' + f1.id, null, JSON.stringify({
+		const response = await api.route('PUT', `folders/${f1.id}`, null, JSON.stringify({
 			title: 'modifié',
 		}));
 
 		let f1b = await Folder.load(f1.id);
 		expect(f1b.title).toBe('modifié');
+	}));
 
-		done();
-	});
-
-	it('should delete folders', async (done) => {
+	it('should delete folders', asyncTest(async () => {
 		let f1 = await Folder.save({ title: 'mon carnet' });
-		await api.route('DELETE', 'folders/' + f1.id);
+		await api.route('DELETE', `folders/${f1.id}`);
 
 		let f1b = await Folder.load(f1.id);
 		expect(!f1b).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should create folders', async (done) => {
+	it('should create folders', asyncTest(async () => {
 		const response = await api.route('POST', 'folders', null, JSON.stringify({
 			title: 'from api',
 		}));
@@ -81,42 +69,34 @@ describe('services_rest_Api', function() {
 		let f = await Folder.all();
 		expect(f.length).toBe(1);
 		expect(f[0].title).toBe('from api');
+	}));
 
-		done();
-	});
-
-	it('should get one folder', async (done) => {
+	it('should get one folder', asyncTest(async () => {
 		let f1 = await Folder.save({ title: 'mon carnet' });
-		const response = await api.route('GET', 'folders/' + f1.id);
+		const response = await api.route('GET', `folders/${f1.id}`);
 		expect(response.id).toBe(f1.id);
 
 		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'folders/doesntexist'));
 		expect(hasThrown).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should get the folder notes', async (done) => {
+	it('should get the folder notes', asyncTest(async () => {
 		let f1 = await Folder.save({ title: 'mon carnet' });
-		const response2 = await api.route('GET', 'folders/' + f1.id + '/notes');
+		const response2 = await api.route('GET', `folders/${f1.id}/notes`);
 		expect(response2.length).toBe(0);
 
 		const n1 = await Note.save({ title: 'un', parent_id: f1.id });
 		const n2 = await Note.save({ title: 'deux', parent_id: f1.id });
-		const response = await api.route('GET', 'folders/' + f1.id + '/notes');
+		const response = await api.route('GET', `folders/${f1.id}/notes`);
 		expect(response.length).toBe(2);
+	}));
 
-		done();
-	});
-
-	it('should fail on invalid paths', async (done) => {
+	it('should fail on invalid paths', asyncTest(async () => {
 		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'schtroumpf'));
 		expect(hasThrown).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should get notes', async (done) => {
+	it('should get notes', asyncTest(async () => {
 		let response = null;
 		const f1 = await Folder.save({ title: 'mon carnet' });
 		const f2 = await Folder.save({ title: 'mon deuxième carnet' });
@@ -127,18 +107,16 @@ describe('services_rest_Api', function() {
 		response = await api.route('GET', 'notes');
 		expect(response.length).toBe(3);
 
-		response = await api.route('GET', 'notes/' + n1.id);
+		response = await api.route('GET', `notes/${n1.id}`);
 		expect(response.id).toBe(n1.id);
 
-		response = await api.route('GET', 'notes/' + n3.id, { fields: 'id,title' });
+		response = await api.route('GET', `notes/${n3.id}`, { fields: 'id,title' });
 		expect(Object.getOwnPropertyNames(response).length).toBe(3);
 		expect(response.id).toBe(n3.id);
 		expect(response.title).toBe('trois');
+	}));
 
-		done();
-	});
-
-	it('should create notes', async (done) => {
+	it('should create notes', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
 
@@ -155,11 +133,9 @@ describe('services_rest_Api', function() {
 		}));
 		expect(response.title).toBe('testing');
 		expect(!!response.id).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should preserve user timestamps when creating notes', async (done) => {
+	it('should preserve user timestamps when creating notes', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
 
@@ -174,11 +150,9 @@ describe('services_rest_Api', function() {
 
 		expect(response.user_updated_time).toBe(updatedTime);
 		expect(response.user_created_time).toBe(createdTime);
+	}));
 
-		done();
-	});
-
-	it('should create notes with supplied ID', async (done) => {
+	it('should create notes with supplied ID', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
 
@@ -188,11 +162,9 @@ describe('services_rest_Api', function() {
 			parent_id: f.id,
 		}));
 		expect(response.id).toBe('12345678123456781234567812345678');
+	}));
 
-		done();
-	});
-
-	it('should create todos', async (done) => {
+	it('should create todos', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'stuff to do' });
 
@@ -221,22 +193,18 @@ describe('services_rest_Api', function() {
 			parent_id: f.id,
 			is_todo: '1',
 		}));
-		expect(response.is_todo).toBe(1);
-		done();
-	});
+	}));
 
-	it('should create folders with supplied ID', async (done) => {
+	it('should create folders with supplied ID', asyncTest(async () => {
 		const response = await api.route('POST', 'folders', null, JSON.stringify({
 			id: '12345678123456781234567812345678',
 			title: 'from api',
 		}));
 
 		expect(response.id).toBe('12345678123456781234567812345678');
+	}));
 
-		done();
-	});
-
-	it('should create notes with images', async (done) => {
+	it('should create notes with images', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
 
@@ -251,11 +219,9 @@ describe('services_rest_Api', function() {
 
 		const resource = resources[0];
 		expect(response.body.indexOf(resource.id) >= 0).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should delete resources', async (done) => {
+	it('should delete resources', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
 
@@ -270,14 +236,12 @@ describe('services_rest_Api', function() {
 		const filePath = Resource.fullPath(resource);
 		expect(await shim.fsDriver().exists(filePath)).toBe(true);
 
-		await api.route('DELETE', 'resources/' + resource.id);
+		await api.route('DELETE', `resources/${resource.id}`);
 		expect(await shim.fsDriver().exists(filePath)).toBe(false);
 		expect(!(await Resource.load(resource.id))).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should create notes from HTML', async (done) => {
+	it('should create notes from HTML', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
 
@@ -288,11 +252,9 @@ describe('services_rest_Api', function() {
 		}));
 
 		expect(response.body).toBe('**Bold text**');
+	}));
 
-		done();
-	});
-
-	it('should filter fields', async (done) => {
+	it('should filter fields', asyncTest(async () => {
 		let f = api.fields_({ query: { fields: 'one,two' } }, []);
 		expect(f.length).toBe(2);
 		expect(f[0]).toBe('one');
@@ -306,11 +268,9 @@ describe('services_rest_Api', function() {
 		f = api.fields_({ query: { fields: '  ' } }, ['def']);
 		expect(f.length).toBe(1);
 		expect(f[0]).toBe('def');
+	}));
 
-		done();
-	});
-
-	it('should handle tokens', async (done) => {
+	it('should handle tokens', asyncTest(async () => {
 		api = new Api('mytoken');
 
 		let hasThrown = await checkThrowAsync(async () => await api.route('GET', 'notes'));
@@ -321,38 +281,32 @@ describe('services_rest_Api', function() {
 
 		hasThrown = await checkThrowAsync(async () => await api.route('POST', 'notes', null, JSON.stringify({title:'testing'})));
 		expect(hasThrown).toBe(true);
+	}));
 
-		done();
-	});
-
-	it('should add tags to notes', async (done) => {
+	it('should add tags to notes', asyncTest(async () => {
 		const tag = await Tag.save({ title: 'mon étiquette' });
 		const note = await Note.save({ title: 'ma note' });
 
-		const response = await api.route('POST', 'tags/' + tag.id + '/notes', null, JSON.stringify({
+		const response = await api.route('POST', `tags/${tag.id}/notes`, null, JSON.stringify({
 			id: note.id,
 		}));
 
 		const noteIds = await Tag.noteIds(tag.id);
 		expect(noteIds[0]).toBe(note.id);
+	}));
 
-		done();
-	});
-
-	it('should remove tags from notes', async (done) => {
+	it('should remove tags from notes', asyncTest(async () => {
 		const tag = await Tag.save({ title: 'mon étiquette' });
 		const note = await Note.save({ title: 'ma note' });
 		await Tag.addNote(tag.id, note.id);
 
-		const response = await api.route('DELETE', 'tags/' + tag.id + '/notes/' + note.id);
+		const response = await api.route('DELETE', `tags/${tag.id}/notes/${note.id}`);
 
 		const noteIds = await Tag.noteIds(tag.id);
 		expect(noteIds.length).toBe(0);
+	}));
 
-		done();
-	});
-
-	it('should list all tag notes', async (done) => {
+	it('should list all tag notes', asyncTest(async () => {
 		const tag = await Tag.save({ title: 'mon étiquette' });
 		const tag2 = await Tag.save({ title: 'mon étiquette 2' });
 		const note1 = await Note.save({ title: 'ma note un' });
@@ -360,18 +314,16 @@ describe('services_rest_Api', function() {
 		await Tag.addNote(tag.id, note1.id);
 		await Tag.addNote(tag.id, note2.id);
 
-		const response = await api.route('GET', 'tags/' + tag.id + '/notes');
+		const response = await api.route('GET', `tags/${tag.id}/notes`);
 		expect(response.length).toBe(2);
 		expect('id' in response[0]).toBe(true);
 		expect('title' in response[0]).toBe(true);
 
-		const response2 = await api.route('GET', 'notes/' + note1.id + '/tags');
+		const response2 = await api.route('GET', `notes/${note1.id}/tags`);
 		expect(response2.length).toBe(1);
 		await Tag.addNote(tag2.id, note1.id);
-		const response3 = await api.route('GET', 'notes/' + note1.id + '/tags');
+		const response3 = await api.route('GET', `notes/${note1.id}/tags`);
 		expect(response3.length).toBe(2);
-
-		done();
-	});
+	}));
 
 });

CliClient/tests/synchronizer.js

@@ -196,13 +196,13 @@ describe('Synchronizer', function() {
 		for (let n in conflictedNote) {
 			if (!conflictedNote.hasOwnProperty(n)) continue;
 			if (n == 'id' || n == 'is_conflict') continue;
-			expect(conflictedNote[n]).toBe(note2conf[n], 'Property: ' + n);
+			expect(conflictedNote[n]).toBe(note2conf[n], `Property: ${n}`);
 		}
 
 		let noteUpdatedFromRemote = await Note.load(note1.id);
 		for (let n in noteUpdatedFromRemote) {
 			if (!noteUpdatedFromRemote.hasOwnProperty(n)) continue;
-			expect(noteUpdatedFromRemote[n]).toBe(note2[n], 'Property: ' + n);
+			expect(noteUpdatedFromRemote[n]).toBe(note2[n], `Property: ${n}`);
 		}
 	}));
 
@@ -850,7 +850,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 		let resourcePath1 = Resource.fullPath(resource1);
 		await synchronizer().start();
@@ -883,7 +883,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 		let resourcePath1 = Resource.fullPath(resource1);
 		await synchronizer().start();
@@ -910,7 +910,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		await synchronizer().start();
 
 		await switchClient(2);
@@ -933,7 +933,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 		let resourcePath1 = Resource.fullPath(resource1);
 		await synchronizer().start();
@@ -949,7 +949,7 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 		expect((await remoteNotesFoldersResources()).length).toBe(2);
 
-		const remoteBlob = await fileApi().stat('.resource/' + resource1.id);
+		const remoteBlob = await fileApi().stat(`.resource/${resource1.id}`);
 		expect(!remoteBlob).toBe(true);
 
 		await switchClient(1);
@@ -967,7 +967,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 		let resourcePath1 = Resource.fullPath(resource1);
 		await synchronizer().start();
@@ -1049,7 +1049,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		let resource1 = (await Resource.all())[0];
 		await Resource.setFileSizeOnly(resource1.id, -1);
 		let resourcePath1 = Resource.fullPath(resource1);
@@ -1075,7 +1075,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		await synchronizer().start();
 
 		expect(await allSyncTargetItemsEncrypted()).toBe(false);
@@ -1094,7 +1094,7 @@ describe('Synchronizer', function() {
 
 		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');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		const masterKey = await loadEncryptionMasterKey();
 		await encryptionService().enableEncryption(masterKey, '123456');
 		await encryptionService().loadMasterKeysFromSettings();
@@ -1307,7 +1307,7 @@ describe('Synchronizer', function() {
 
 	it('should not download resources over the limit', asyncTest(async () => {
 		const note1 = await Note.save({ title: 'note' });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		await synchronizer().start();
 
 		await switchClient(2);
@@ -1337,7 +1337,7 @@ describe('Synchronizer', function() {
 		// does get uploaded.
 
 		const note1 = await Note.save({ title: 'note' });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		const resource = (await Resource.all())[0];
 		await Resource.setLocalState(resource.id, { fetch_status: Resource.FETCH_STATUS_IDLE });
 		await synchronizer().start();
@@ -1352,7 +1352,7 @@ describe('Synchronizer', function() {
 
 	it('should decrypt the resource metadata, but not try to decrypt the file, if it is not present', asyncTest(async () => {
 		const note1 = await Note.save({ title: 'note' });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
 		const masterKey = await loadEncryptionMasterKey();
 		await encryptionService().enableEncryption(masterKey, '123456');
 		await encryptionService().loadMasterKeysFromSettings();
@@ -1480,4 +1480,20 @@ describe('Synchronizer', function() {
 		expect((await decryptionWorker().decryptionDisabledItems()).length).toBe(0);
 	}));
 
+	it('should not wipe out user data when syncing with an empty target', asyncTest(async () => {
+		await Note.save({ title: 'ma note' });
+		await Note.save({ title: 'mon autre note' });
+		await Note.save({ title: 'ma troisième note' });
+
+		Setting.setValue('sync.wipeOutFailSafe', true);
+		await synchronizer().start();
+		await fileApi().clearRoot(); // oops
+		await synchronizer().start();
+		expect((await Note.all()).length).toBe(3); // but since the fail-safe if on, the notes have not been deleted
+
+		Setting.setValue('sync.wipeOutFailSafe', false); // Now switch it off
+		await synchronizer().start();
+		expect((await Note.all()).length).toBe(0); // Since the fail-safe was off, the data has been cleared
+	}));
+
 });