Android release v1.0.310

* Adding node counts for folders and tags

* Add unit tests

* Fix count update when the tag list for a note is updated

* Right align note counts and remove from the settings screen

* Folder note count calculation update to include descendants

* Update Setting.js

* Change count style and fix click on counts

* Fix tag/folder count update on delete/add note

* Review updates

.eslintignore

@@ -45,3 +45,4 @@ Server/docs/
 Server/dist/
 Server/bin/
 Server/node_modules/
+ElectronClient/app/packageInfo.js

.eslintrc.js

@@ -33,14 +33,22 @@ module.exports = {
 	    "sourceType": "module",
 	},
 	'rules': {
+		// -------------------------------
+		// Code correctness
+		// -------------------------------
 		"react/jsx-uses-react": "error",
 		"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": ".*" }],
-		"@typescript-eslint/no-unused-vars": ["error"],
+		"no-unused-vars": "error",
 		"no-constant-condition": 0,
 		"no-prototype-builtins": 0,
+		// 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,
+		// "no-lonely-if": "error",
+
+		// -------------------------------
+		// Formatting
+		// -------------------------------
 		"space-in-parens": ["error", "never"],
 		"semi": ["error", "always"],
 		"eol-last": ["error", "always"],
@@ -49,11 +57,26 @@ module.exports = {
 		"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"]
+		"template-curly-spacing": ["error", "never"],
+		"key-spacing": ["error", {
+			"beforeColon": false,
+			"afterColon": true,
+			"mode": "strict"
+		}],
+		"block-spacing": ["error"],
+		"brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+		"no-spaced-func": ["error"],
+		"func-call-spacing": ["error"],
+		"space-before-function-paren": ["error", {
+			"anonymous": "never",
+			"named": "never",
+			"asyncArrow": "always"
+		}],
+		"multiline-comment-style": ["error", "separate-lines"],
+		"space-before-blocks": "error",
+		"spaced-comment": ["error", "always"],
+		"keyword-spacing": ["error", { "before": true, "after": true }]
 	},
 	"plugins": [
 		"react",

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,9 @@
 👉 Please follow one of these issue templates:
 - https://github.com/laurent22/joplin/issues/new/choose
 
+⚠️
+The GitHub issue tracker is for **bugs** and **security issues** ONLY. For feature requests and support, please use the forum:
+https://discourse.joplinapp.org/
+⚠️
+
 Note: to keep the backlog clean and actionable, issues may be immediately closed if they do not follow one of the above issue templates.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Report an accepted feature request.
-title: ''
-labels: 'feature request'
-
----
-
-<!--
-  Please search open issues first - many features have already been requested!
--->
-
-🚨 A feature request that has not been accepted on the forum will be closed! 🚨
-
-## Has it been discussed in the forum? Link to topic.
-<!--
-  Feature requests must be discussed and accepted in the forum first. https://discourse.joplinapp.org
-  Please provide a link to the topic.
-  Feature requests without a link to the discussion/topic on the forum will be closed.
--->

.github/ISSUE_TEMPLATE/question.md

@@ -2,11 +2,11 @@
 name: "🤔 Questions and Help"
 about: The issue tracker is not for questions. Please ask questions on https://discourse.joplinapp.org/.
 title: ''
-labels: 'question'
+labels: 'invalid'
 
 ---
 
-🚨 The issue tracker is not for questions. 🚨
+⚠🚨⛔ The issue tracker is not for questions. ⛔🚨⚠
 
 As it happens, support requests that are created as issues are likely to be closed. We want to make sure you are able to find the help you seek.
 

.github/PULL_REQUEST_TEMPLATE

@@ -6,6 +6,8 @@ Please prefix the title with the platform you are targetting:
 - "Mobile" for the mobile app (or "Android" / "iOS" if the pull request only applies to one of the mobile platforms)
 - "CLI" for the CLI app
 
+If it's not related to any platform (such as a translation, change to the documentation, etc.), simply don't add a platform.
+
 For example: "Desktop: Added new setting to change font", or "Mobile: Fixed config screen error"
 
 PLEASE READ THE GUIDE FIRST: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md

.github/lock.yml

@@ -0,0 +1,25 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 7
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: false
+# Limit to only `issues` or `pulls`
+only: issues
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+# pulls:
+#   daysUntilLock: 30
+# Repository to extend settings from
+# _extends: repo

.travis.yml

@@ -55,19 +55,42 @@ before_install:
 script:
   - |
     # Install tools
+    npm install
     cd Tools
     npm install
+    cd ..
 
     # Run test units
-    cd ../CliClient
+    cd CliClient
     npm install
     ./run_test.sh
     testResult=$?
     if [ $testResult -ne 0 ]; then
       exit $testResult
     fi
+    cd ..
+
+    # Run linter for pull requests only - this is so that
+    # bypassing eslint is allowed for urgent fixes.
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      npm run linter-ci ./
+      testResult=$?
+      if [ $testResult -ne 0 ]; then
+        exit $testResult
+      fi
+    fi
+
+    # Find out if we should run the build or not. Electron-builder gets stuck when
+    # builing PRs so we disable it in this case. The Linux build should provide
+    # enough info if the app builds or not.
+    # https://github.com/electron-userland/electron-builder/issues/4263
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+        exit 0
+      fi
+    fi
 
     # Prepare the Electron app and build it
-    cd ../ElectronClient/app
+    cd ElectronClient/app
     rsync -aP --delete ../../ReactNativeClient/lib/ lib/
     npm install && USE_HARD_LINKS=false yarn dist

BUILD.md

@@ -65,7 +65,7 @@ The [building\_win32\_tips on this page](./readme/building_win32_tips.md) might
 
 # Building the Mobile application
 
-First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "Building Projects with Native Code" tab.
+First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "React Native CLI Quickstart" tab.
 
 Then, from `/ReactNativeClient`, run `npm install`, then `react-native run-ios` or `react-native run-android`.
 

CONTRIBUTING.md

@@ -32,7 +32,8 @@ Joplin is available in multiple languages thanks to the help of its users. You c
 
 If you want to start contributing to the project's code, please follow these guidelines before creating a pull request: 
 
-- Bug fixes are always welcome. Start by reviewing the list of [essential issues](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3Aessential)
+- Bug fixes are always welcome. Start by reviewing the [list of bugs](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
+- A good way to easily start contributing is to pick and work on a [good first issue](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). We try to make these issues as clear as possible and provide basic info on how the code should be changed, and if something is unclear feel free to ask for more information on the issue.
 - Before adding a new feature, ask about it in the [Github Issue Tracker](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue) or the [Joplin Forum](https://discourse.joplinapp.org/), or check if existing discussions exist to make sure the new functionality is desired.
 - **Changes that will consist in more than 50 lines of code should be discussed the [Joplin Forum](https://discourse.joplinapp.org/)**, so that you don't spend too much time implementing something that might not be accepted.
 
@@ -70,4 +71,4 @@ Then run the tests in a second window. To run all the test units:
 
 To run just one particular file:
 
-    ./run_test.sh markdownUtils # Don't add the .js extension
+    ./run_test.sh markdownUtils # Don't add the .js extension

CliClient/app/app.js

@@ -367,6 +367,18 @@ class Application extends BaseApplication {
 			output.push(itemsByCommand[n]);
 		}
 
+		// Map reserved shortcuts to their equivalent key
+		// https://github.com/cronvel/terminal-kit/issues/101
+		for (let i = 0; i < output.length; i++) {
+			const newKeys = output[i].keys.map(k => {
+				k = k.replace(/CTRL_H/g, 'BACKSPACE');
+				k = k.replace(/CTRL_I/g, 'TAB');
+				k = k.replace(/CTRL_M/g, 'ENTER');
+				return k;
+			});
+			output[i].keys = newKeys;
+		}
+
 		return output;
 	}
 
@@ -399,7 +411,7 @@ class Application extends BaseApplication {
 
 			await Setting.saveAll();
 
-			// Need to call exit() explicitely, otherwise Node wait for any timeout to complete
+			// Need to call exit() explicitly, otherwise Node wait for any timeout to complete
 			// https://stackoverflow.com/questions/18050095
 			process.exit(0);
 		} else {

CliClient/app/autocompletion.js

@@ -10,8 +10,8 @@ async function handleAutocompletionPromise(line) {
 	// Auto-complete the command name
 	const names = await app().commandNames();
 	let words = getArguments(line);
-	//If there is only one word and it is not already a command name then you
-	//should look for commmands it could be
+	// If there is only one word and it is not already a command name then you
+	// should look for commands it could be
 	if (words.length == 1) {
 		if (names.indexOf(words[0]) === -1) {
 			let x = names.filter(n => n.indexOf(words[0]) === 0);
@@ -23,29 +23,34 @@ async function handleAutocompletionPromise(line) {
 			return line;
 		}
 	}
-	//There is more than one word and it is a command
+	// There is more than one word and it is a command
 	const metadata = (await app().commandMetadata())[words[0]];
-	//If for some reason this command does not have any associated metadata
-	//just don't autocomplete. However, this should not happen.
+	// If for some reason this command does not have any associated metadata
+	// just don't autocomplete. However, this should not happen.
 	if (metadata === undefined) {
 		return line;
 	}
-	//complete an option
+
+	if (words[0] === 'tag' && words[1] === 'notetags') {
+		metadata.usage = 'tag <tag-command> <note>';
+	}
+
+	// complete an option
 	let next = words.length > 1 ? words[words.length - 1] : '';
 	let l = [];
 	if (next[0] === '-') {
 		for (let i = 0; i < metadata.options.length; i++) {
 			const options = metadata.options[i][0].split(' ');
-			//if there are multiple options then they will be separated by comma and
-			//space. The comma should be removed
+			// if there are multiple options then they will be separated by comma and
+			// space. The comma should be removed
 			if (options[0][options[0].length - 1] === ',') {
 				options[0] = options[0].slice(0, -1);
 			}
 			if (words.includes(options[0]) || words.includes(options[1])) {
 				continue;
 			}
-			//First two elements are the flag and the third is the description
-			//Only autocomplete long
+			// First two elements are the flag and the third is the description
+			// Only autocomplete long
 			if (options.length > 1 && options[1].indexOf(next) === 0) {
 				l.push(options[1]);
 			} else if (options[0].indexOf(next) === 0) {
@@ -59,9 +64,9 @@ async function handleAutocompletionPromise(line) {
 		ret.prefix = `${toCommandLine(words.slice(0, -1))} `;
 		return ret;
 	}
-	//Complete an argument
-	//Determine the number of positional arguments by counting the number of
-	//words that don't start with a - less one for the command name
+	// Complete an argument
+	// Determine the number of positional arguments by counting the number of
+	// words that don't start with a - less one for the command name
 	const positionalArgs = words.filter(a => a.indexOf('-') !== 0).length - 1;
 
 	let cmdUsage = yargParser(metadata.usage)['_'];
@@ -100,7 +105,7 @@ async function handleAutocompletionPromise(line) {
 		}
 
 		if (argName == 'tag-command') {
-			let c = filterList(['add', 'remove', 'list'], next);
+			let c = filterList(['add', 'remove', 'list', 'notetags'], next);
 			l.push(...c);
 		}
 
@@ -155,20 +160,20 @@ function getArguments(line) {
 		if (line[i] === '"') {
 			if (inDoubleQuotes) {
 				inDoubleQuotes = false;
-				//maybe push word to parsed?
-				//currentWord += '"';
+				// maybe push word to parsed?
+				// currentWord += '"';
 			} else {
 				inDoubleQuotes = true;
-				//currentWord += '"';
+				// currentWord += '"';
 			}
 		} else if (line[i] === '\'') {
 			if (inSingleQuotes) {
 				inSingleQuotes = false;
-				//maybe push word to parsed?
-				//currentWord += "'";
+				// maybe push word to parsed?
+				// currentWord += "'";
 			} else {
 				inSingleQuotes = true;
-				//currentWord += "'";
+				// currentWord += "'";
 			}
 		} else if (/\s/.test(line[i]) && !(inDoubleQuotes || inSingleQuotes)) {
 			if (currentWord !== '') {

CliClient/app/command-apidoc.js

@@ -208,6 +208,11 @@ class Command extends BaseCommand {
 				lines.push('');
 				lines.push('Gets all the tags attached to this note.');
 				lines.push('');
+
+				lines.push('## GET /notes/:id/resources');
+				lines.push('');
+				lines.push('Gets all the resources attached to this note.');
+				lines.push('');
 			}
 
 			if (model.type === BaseModel.TYPE_FOLDER) {

CliClient/app/command-e2ee.js

@@ -50,7 +50,15 @@ class Command extends BaseCommand {
 				this.stdout(_('Operation cancelled'));
 				return;
 			}
-
+			const password2 = await this.prompt(_('Confirm password:'), { type: 'string', secure: true });
+			if (!password2) {
+				this.stdout(_('Operation cancelled'));
+				return;
+			}
+			if (password !== password2) {
+				this.stdout(_('Passwords do not match!'));
+				return;
+			}
 			await EncryptionService.instance().generateMasterKeyAndEnableEncryption(password);
 			return;
 		}

CliClient/app/command-edit.js

@@ -1,5 +1,6 @@
 const fs = require('fs-extra');
 const { BaseCommand } = require('./base-command.js');
+const { splitCommandString } = require('lib/string-utils.js');
 const { uuid } = require('lib/uuid.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
@@ -53,7 +54,7 @@ class Command extends BaseCommand {
 			// -------------------------------------------------------------------------
 
 			let editorPath = textEditorPath();
-			let editorArgs = editorPath.split(' ');
+			let editorArgs = splitCommandString(editorPath);
 
 			editorPath = editorArgs[0];
 			editorArgs = editorArgs.splice(1);
@@ -71,30 +72,18 @@ class Command extends BaseCommand {
 
 			this.logger().info('Disabling fullscreen...');
 
-			app()
-				.gui()
-				.showModalOverlay(_('Starting to edit note. Close the editor to get back to the prompt.'));
-			await app()
-				.gui()
-				.forceRender();
-			const termState = app()
-				.gui()
-				.termSaveState();
+			app().gui().showModalOverlay(_('Starting to edit note. Close the editor to get back to the prompt.'));
+			await app().gui().forceRender();
+			const termState = app().gui().termSaveState();
 
 			const spawnSync = require('child_process').spawnSync;
 			const result = spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
 
 			if (result.error) this.stdout(_('Error opening note in editor: %s', result.error.message));
 
-			app()
-				.gui()
-				.termRestoreState(termState);
-			app()
-				.gui()
-				.hideModalOverlay();
-			app()
-				.gui()
-				.forceRender();
+			app().gui().termRestoreState(termState);
+			app().gui().hideModalOverlay();
+			app().gui().forceRender();
 
 			// -------------------------------------------------------------------------
 			// Save the note and clean up

CliClient/app/command-set.js

@@ -39,7 +39,14 @@ class Command extends BaseCommand {
 				type_: notes[i].type_,
 			};
 			newNote[propName] = propValue;
-			await Note.save(newNote);
+
+			const timestamp = Date.now();
+
+			await Note.save(newNote, {
+				autoTimestamp: false, // No auto-timestamp because user may have provided them
+				updated_time: timestamp,
+				created_time: timestamp,
+			});
 		}
 	}
 }

CliClient/app/command-sync.js

@@ -197,7 +197,7 @@ class Command extends BaseCommand {
 
 			// When using the tool in command line mode, the ResourceFetcher service is
 			// not going to be running in the background, so the resources need to be
-			// explicitely downloaded below.
+			// explicitly downloaded below.
 			if (!app().hasGui()) {
 				this.stdout(_('Downloading resources...'));
 				await ResourceFetcher.instance().fetchAll();

CliClient/app/command-tag.js

@@ -11,7 +11,7 @@ class Command extends BaseCommand {
 	}
 
 	description() {
-		return _('<tag-command> can be "add", "remove" or "list" to assign or remove [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).');
+		return _('<tag-command> can be "add", "remove", "list", or "notetags" to assign or remove [tag] from [note], to list notes associated with [tag], or to list tags associated with [note]. The command `tag list` can be used to list all the tags (use -l for long option).');
 	}
 
 	options() {
@@ -75,6 +75,17 @@ class Command extends BaseCommand {
 					this.stdout(tag.title);
 				});
 			}
+		} else if (command == 'notetags') {
+			if (args.tag) {
+				const note = await app().loadItem(BaseModel.TYPE_NOTE, args.tag);
+				if (!note) throw new Error(_('Cannot find "%s".', args.tag));
+				const tags = await Tag.tagsByNoteId(note.id);
+				tags.map(tag => {
+					this.stdout(tag.title);
+				});
+			} else {
+				throw new Error(_('Cannot find "%s".', ''));
+			}
 		} else {
 			throw new Error(_('Invalid command: "%s"', command));
 		}

CliClient/app/gui/StatusBarWidget.js

@@ -84,8 +84,8 @@ class StatusBarWidget extends BaseWidget {
 		// On Windows, bgBlueBright is fine and looks dark enough (Windows is probably in the wrong though)
 		// For now, just don't use any colour at all.
 
-		//const textStyle = this.promptActive ? (s) => s : chalk.bgBlueBright.white;
-		//const textStyle = (s) => s;
+		// const textStyle = this.promptActive ? (s) => s : chalk.bgBlueBright.white;
+		// const textStyle = (s) => s;
 		const textStyle = this.promptActive ? s => s : chalk.gray;
 
 		this.term.drawHLine(this.absoluteInnerX, this.absoluteInnerY, this.innerWidth, textStyle(' '));

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

@@ -107,7 +107,7 @@ class OneDriveApiNodeUtils {
 
 			enableServerDestroy(this.oauthServer_);
 
-			// Rather than displaying authCodeUrl directly, we go throught the local
+			// Rather than displaying authCodeUrl directly, we go through the local
 			// server. This is just so that the URL being displayed is shorter and
 			// doesn't get cut in terminals (especially those that don't handle multi
 			// lines URLs).

CliClient/locales/ar.po

@@ -135,6 +135,14 @@ msgstr "أدخل كلمة المرور الرئيسة:"
 msgid "Operation cancelled"
 msgstr "ألغيت العملية"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "أدخل كلمة المرور الرئيسة:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "لا يمكن أن تكون كلمة المرور فارغة"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -460,10 +468,12 @@ msgstr "يجري تنزيل الموارد..."
 msgid "Cancelling... Please wait."
 msgstr "الإلغاء جارٍ... فضلاً انتظر."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> (أمر-وسم) يمكن أن يكون \"add\" (أضف) ، \"remove\" (أزل) أو "
 "\"list\" (أسرد) ، وذلك لإضافة [وسم] أو إزالته من [ملاحظة] أو لسرد الملاحظات "
@@ -575,6 +585,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "التصدير إلى \"%s\" بتنسيق \"%s\". فضلاً انتظر..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "&ملف"
 
@@ -657,6 +671,13 @@ msgstr "&عرض"
 msgid "Toggle sidebar"
 msgstr "تبديل الشريط الجانبي"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "قائمة ملاحظات"
+
 msgid "Toggle editor layout"
 msgstr "تبديل تخطيط المحرّر"
 
@@ -719,6 +740,9 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr "تم نسخ الرمز المميز إلى الحافظة!"
 
@@ -996,6 +1020,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "جرى تعديل هذه الملاحظة:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "رابط أو رسالة غير مدعومان: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1024,10 +1052,6 @@ msgstr "نسخ عنوان الرابط"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "لم يجر تنزيل هذا المرفق أو فك تشفيره حتى الآن."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "رابط أو رسالة غير مدعومان: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1119,6 +1143,10 @@ msgstr "خيارات"
 msgid "Synchronisation Status"
 msgstr "حالة المزامنة"
 
+#, fuzzy
+msgid "Remove"
+msgstr "إزالة ؟"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1129,6 +1157,9 @@ msgstr ""
 "\n"
 "سيتم حذف كل الملاحظات و دفاتر الملاحظات الفرعية ضمن هذا الدفتر أيضاً."
 
+msgid "Delete"
+msgstr "حذف"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "إزالة الوسم \"%s\" من كل الملاحظات؟"
@@ -1136,8 +1167,9 @@ msgstr "إزالة الوسم \"%s\" من كل الملاحظات؟"
 msgid "Remove this search from the sidebar?"
 msgstr "حذف هذا البحث من الشريط الجانبي؟"
 
-msgid "Delete"
-msgstr "حذف"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "دفتر ملاحظات جديد"
 
 msgid "Rename"
 msgstr "إعادة تسمية"
@@ -1305,10 +1337,6 @@ msgstr "خامل"
 msgid "In progress"
 msgstr "قيد التقدم"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "المزامنة قيد التقدم بالفعل. الحال: %s"
-
 msgid "Encrypted"
 msgstr "مشفّر"
 
@@ -1354,6 +1382,19 @@ msgstr ""
 "تنبيه: إذا غيرت هذا المكان ، تأكد من نسخ كافة المحتويات لديك إليه قبل البدء "
 "بالمزامنة ، وإلا فسيتم حذف كل الملفات! أنظر الأسئلة المتكررة لتفاصيل أكثر: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "التلقائية: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "وجهة المزامنة"
 
@@ -1424,12 +1465,41 @@ msgstr "فاتحة"
 msgid "Dark"
 msgstr "غامقة"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "إظهار أيقونة لوحة النظام"
+
+#, fuzzy
+msgid "Editor"
+msgstr "تحرير"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&عرض"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "قوائم المهام غير المكتملة في الأعلى"
 
@@ -1464,6 +1534,9 @@ msgstr "عند إنشاء ملاحظة جديدة:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "تفعيل التشفير"
@@ -1573,6 +1646,36 @@ msgstr ""
 "أمر محرر النصوص (قد يتضمن معامِلات) الذي سيستخدم لفتح ملاحظة. إذا لم يجر "
 "التزويد بأي محرر فسيحاول التطبيق اكتشاف المحرِّر التلقائي آلياً."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "شهادات TLS خاصة"
 
@@ -1955,6 +2058,10 @@ msgstr "كلمة المرور:"
 msgid "Password cannot be empty"
 msgstr "لا يمكن أن تكون كلمة المرور فارغة"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "لا يمكن أن تكون كلمة المرور فارغة"
+
 msgid "Enable"
 msgstr "تفعيل"
 
@@ -2056,6 +2163,21 @@ msgstr "تسجيل الدخول عبر OneDrive"
 msgid "Search"
 msgstr "بحث"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "المزامنة قيد التقدم بالفعل. الحال: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "أدخل كلمة المرور الرئيسة:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "أدخل كلمة المرور الرئيسة:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "المعامل المطلوب %s مفقود"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr "بدء تحرير الملاحظة. أغلق المحرر للعودة إلى المحث."
 
@@ -2065,9 +2187,6 @@ msgstr "بحث"
 #~ msgid "Sidebar"
 #~ msgstr "الشريط الجانبي"
 
-#~ msgid "Note list"
-#~ msgstr "قائمة ملاحظات"
-
 #~ msgid "Note title"
 #~ msgstr "عنوان الملاحظة"
 
@@ -2156,6 +2275,3 @@ msgstr "بحث"
 #~ msgstr ""
 #~ "المسار الذي ستتم المزامنة معه عند تفعيل مزامنة نظام الملفات. أنظر `sync."
 #~ "target`."
-
-#~ msgid "Remove?"
-#~ msgstr "إزالة ؟"

CliClient/locales/bg_BG.po

@@ -138,6 +138,14 @@ msgstr "Въведете главната парола:"
 msgid "Operation cancelled"
 msgstr "Действието бе отменено"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Въведете главната парола:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Паролата не може да е празна"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -470,10 +478,12 @@ msgstr "Свалям ресурси..."
 msgid "Cancelling... Please wait."
 msgstr "Отменям... Моля изчакайте."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<таг-команда> може да е \"add\", \"remove\" или \"list\" за да добавите или "
 "премахнете [таг] от [бележка], или за да изредите бележките които имат "
@@ -590,6 +600,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Експортирам към \"%s\" във формат \"%s\". Моля изчакайте..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "Файл(&F)"
 
@@ -672,6 +686,13 @@ msgstr "Изглед(&V)"
 msgid "Toggle sidebar"
 msgstr "Страничен панел"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Списък бележки"
+
 msgid "Toggle editor layout"
 msgstr "Промени изгледа на редактора"
 
@@ -734,6 +755,10 @@ msgstr "Да"
 msgid "No"
 msgstr "Не"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Възстановени бележки"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Жетона бе копиран в клипборда!"
 
@@ -1017,6 +1042,10 @@ msgstr "Бележка \"%s\" бе успешно създадена и слож
 msgid "This note has no history"
 msgstr "Тази бележка няма история"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Неподдържан линк или съобщение: %s"
+
 msgid "Restore"
 msgstr "Възстанови"
 
@@ -1048,10 +1077,6 @@ msgstr "Копирай адреса на линка"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Прикаченият файл не е свален или все още не е декриптиран."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Неподдържан линк или съобщение: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1146,6 +1171,9 @@ msgstr "Конфигурация"
 msgid "Synchronisation Status"
 msgstr "Статус на синхронизацията"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1156,6 +1184,9 @@ msgstr ""
 "\n"
 "Всички бележки и под-тетрадки също ще бъдат изтрити."
 
+msgid "Delete"
+msgstr "Изтрий"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Да премахна ли таг \"%s\" от всички бележки?"
@@ -1163,8 +1194,9 @@ msgstr "Да премахна ли таг \"%s\" от всички бележк
 msgid "Remove this search from the sidebar?"
 msgstr "Да премахна ли това търсене от страничния панел?"
 
-msgid "Delete"
-msgstr "Изтрий"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Нова тетрадка"
 
 msgid "Rename"
 msgstr "Преименувай"
@@ -1334,10 +1366,6 @@ msgstr "В момента не прави нищо"
 msgid "In progress"
 msgstr "В момента върви"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Синхронизация вече се извършва. Статус: %s"
-
 msgid "Encrypted"
 msgstr "Криптирана"
 
@@ -1384,6 +1412,19 @@ msgstr ""
 "съдържание там преди да синхронизирате, иначе всички файлове ще бъдат "
 "премахнати! Вижчте ЧЗВ за повече подробности: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Стойност по подразбиране: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Цел за синхронизация"
 
@@ -1457,12 +1498,41 @@ msgstr "Светла"
 msgid "Dark"
 msgstr "Тъмна"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Покажи иконка до часовника"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Редактиране"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Изглед(&V)"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Неизпълнените задачи най-отгоре"
 
@@ -1496,6 +1566,10 @@ msgstr "Когато се създава нова бележка:"
 msgid "Enable soft breaks"
 msgstr "Пусни меките краища (soft breaks)"
 
+#, fuzzy
+msgid "Enable typographer support"
+msgstr "Пусни синтаксис ~ниско~"
+
 msgid "Enable math expressions"
 msgstr "Пусни математическите изрази"
 
@@ -1609,6 +1683,36 @@ msgstr ""
 "опитва автоматично да засече кой е текстовия редактор по подразбиране на "
 "системата ви."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Допълнителни TLS сертификати"
 
@@ -2000,6 +2104,10 @@ msgstr "Парола:"
 msgid "Password cannot be empty"
 msgstr "Паролата не може да е празна"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Паролата не може да е празна"
+
 msgid "Enable"
 msgstr "Включи"
 
@@ -2102,6 +2210,21 @@ msgstr "Вписване в OneDrive"
 msgid "Search"
 msgstr "Търсене"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Синхронизация вече се извършва. Статус: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Въведете главната парола:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Въведете главната парола:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Липсващ задължителен параметър: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr ""
 #~ "Започваме редакция на бележката. Затворете редактора за да се върнете към "
@@ -2113,9 +2236,6 @@ msgstr "Търсене"
 #~ msgid "Sidebar"
 #~ msgstr "Страничен панел"
 
-#~ msgid "Note list"
-#~ msgstr "Списък бележки"
-
 #~ msgid "Note title"
 #~ msgstr "Заглавие на бележката"
 

CliClient/locales/ca.po

@@ -142,6 +142,14 @@ msgstr "Introduïu una contrasenya mestra:"
 msgid "Operation cancelled"
 msgstr "L'operació s'ha cancel·lat"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Introduïu una contrasenya mestra:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "La contrasenya no pot ser buida"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -477,9 +485,10 @@ msgstr "S'està cancel·lant... Espereu."
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command>pot ser «add», «remove» o «list» per a assignar o suprimir "
 "l'[etiqueta] de la [nota], o per a llistar les notes associades amb "
@@ -599,6 +608,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "S'està exportant a «%s» com a format «%s». Espereu..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Fitxer"
@@ -686,6 +699,13 @@ msgstr "Visualització"
 msgid "Toggle sidebar"
 msgstr "Mostra o amaga la barra lateral"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Activa el xifratge"
+
 msgid "Toggle editor layout"
 msgstr "Canvia el disseny de l'editor"
 
@@ -751,6 +771,9 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -1034,6 +1057,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Aquesta nota s'ha modificat:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Missatge o enllaç no suportat: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1062,10 +1089,6 @@ msgstr "Copia l'adreça de l'enllaç"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Missatge o enllaç no suportat: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1158,6 +1181,9 @@ msgstr "Opcions"
 msgid "Synchronisation Status"
 msgstr "Estat de la sincronització"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1167,6 +1193,9 @@ msgstr ""
 "Voleu suprimir el bloc de notes? També se suprimiran tots els sub-blocs "
 "d'aquest bloc de notes."
 
+msgid "Delete"
+msgstr "Suprimeix"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Voleu suprimir aquesta etiqueta de totes les notes?"
@@ -1174,8 +1203,9 @@ msgstr "Voleu suprimir aquesta etiqueta de totes les notes?"
 msgid "Remove this search from the sidebar?"
 msgstr "Voleu suprimir aquesta cerca de la barra laterla?"
 
-msgid "Delete"
-msgstr "Suprimeix"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Bloc de notes nou"
 
 msgid "Rename"
 msgstr "Canvia el nom"
@@ -1345,10 +1375,6 @@ msgstr "Ociós"
 msgid "In progress"
 msgstr "En progés"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "La sincronització ja és en procés. Estat: %s"
-
 msgid "Encrypted"
 msgstr "Xifrat"
 
@@ -1392,6 +1418,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Per defecte: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Objectiu de sincronització"
 
@@ -1462,12 +1501,41 @@ msgstr "Clar"
 msgid "Dark"
 msgstr "Fosc"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Mostra la icona a la safata"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Edita"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Visualització"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Les tasques pendents sense finalitzar a la part superior"
 
@@ -1502,6 +1570,9 @@ msgstr "En crear una nota:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Activa el xifratge"
@@ -1612,6 +1683,36 @@ msgstr ""
 "nota. Si no se'n proporciona cap, l'editor predeterminat es detectarà "
 "automàticament."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Certificats TLS personalitzats"
 
@@ -2002,6 +2103,10 @@ msgstr "Contrasenya:"
 msgid "Password cannot be empty"
 msgstr "La contrasenya no pot ser buida"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "La contrasenya no pot ser buida"
+
 msgid "Enable"
 msgstr "Activa"
 
@@ -2104,6 +2209,21 @@ msgstr "Inicia sessió amb OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "La sincronització ja és en procés. Estat: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Introduïu una contrasenya mestra:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Introduïu una contrasenya mestra:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Manca un argument requerit: %s"
+
 #~ 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 "

CliClient/locales/cs_CZ.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.0.6\n"
+"X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -138,6 +138,12 @@ msgstr "Zadejte master heslo:"
 msgid "Operation cancelled"
 msgstr "Operace zrušena"
 
+msgid "Confirm password:"
+msgstr "Potvrďte heslo:"
+
+msgid "Passwords do not match!"
+msgstr "Hesla se neshodují!"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -311,9 +317,9 @@ msgid ""
 "for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the "
 "to-dos, while `-ttd` would display notes and to-dos."
 msgstr ""
-"Zobrazit pouze položky vybraného typu. MoŽnosti jsou  `n` pro poznámky "
+"Zobrazit pouze položky vybraného typu. Možnosti jsou  `n` pro poznámky "
 "(notes), `t` pro to-do, a `nt` pro poznámky a to-do  (tedy `-tt` zobrazí "
-"pouze to-do, zatímco `-ttd` zobrazí poznámky a to-do.)"
+"pouze to-do, zatímco `-ttd` zobrazí poznámky a to-do)."
 
 msgid "Either \"text\" or \"json\""
 msgstr "Buď \"text\" nebo \"json\""
@@ -352,11 +358,12 @@ msgstr "Smaže vybraný zápisník."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Smaže zápisník bez potvrzení."
 
-#, fuzzy
 msgid ""
 "Delete notebook? All notes and sub-notebooks within this notebook will also "
 "be deleted."
-msgstr "Smazat zápisník? Budou smazány i všechny poznámky v něm obsažené."
+msgstr ""
+"Smazat zápisník? Budou smazány i všechny poznámky a pod-zápisníky v něm "
+"obsažené."
 
 msgid "Deletes the notes matching <note-pattern>."
 msgstr "Smazat poznámky vyhovující <note-pattern>."
@@ -379,17 +386,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 ""
+"Spustit, zastavit či zkontrolovat API server. Pro specifikování portu pro "
+"server nastavte api.port proměnnou v config. Příkazy jsou (%s)."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "Server je již spuštěný na portu %d"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "Server je spuštěný na portu %d"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "Server není spuštěný."
 
 #, javascript-format
 msgid ""
@@ -415,7 +424,7 @@ msgstr ""
 
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
-msgstr "Autentizace nebyla dokončena (nedostali jsme autentizační token)"
+msgstr "Autentizace nebyla dokončena (nedostali jsme autentizační token)."
 
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
@@ -463,10 +472,12 @@ msgstr "Stahování zdrojů..."
 msgid "Cancelling... Please wait."
 msgstr "Zastavuji, chvíli strpení."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> může být \"add\", \"remove\" nebo \"list\" - přidat (add) či "
 "odebrat (remove) [tag] k [poznámce], nebo vypsat (list) seznam poznámek "
@@ -580,6 +591,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportuji do \"%s\" jako formát \"%s\". Chvíli strpení..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr "Nebylo možné exportovat poznámky: %s"
+
 #, fuzzy
 msgid "&File"
 msgstr "Soubor"
@@ -594,7 +609,7 @@ msgid "Check for updates..."
 msgstr "Zkontrolovat updaty..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Šablony"
 
 msgid "Import"
 msgstr "Import"
@@ -613,7 +628,7 @@ msgid "Quit"
 msgstr "Ukončit"
 
 msgid "Close Window"
-msgstr ""
+msgstr "Zavřít akno"
 
 #, fuzzy
 msgid "&Edit"
@@ -665,6 +680,13 @@ msgstr "Zobrazit"
 msgid "Toggle sidebar"
 msgstr "Přepnout postranní lištu"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Seznam položek"
+
 msgid "Toggle editor layout"
 msgstr "Změňit layout editoru"
 
@@ -691,7 +713,7 @@ msgid "Make a donation"
 msgstr "Přispět"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Otevřít developerské nástroje"
 
 #, javascript-format
 msgid "Open %s"
@@ -730,6 +752,9 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
+msgid "Full Release Notes"
+msgstr "Úplné poznámky k verzi"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Token byl zkopírován do schránky!"
 
@@ -799,7 +824,7 @@ msgstr ""
 "aplikacemi třetích stran."
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "Toto otevře nové okno. Chcete uložit současné změny?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -906,13 +931,14 @@ msgid "Encryption is:"
 msgstr "Šifrování je:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Doplněk pro Firefox"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome Web Store"
 
+#, fuzzy
 msgid "Get it now:"
-msgstr ""
+msgstr "Získejte to hned:"
 
 msgid "Usage"
 msgstr "Použití: %s"
@@ -944,7 +970,7 @@ msgid "Set alarm:"
 msgstr "Nastavit alarm:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "Soubor šablony:"
 
 msgid "New note"
 msgstr "Nová poznámka"
@@ -967,9 +993,8 @@ msgstr "Některé položky nelze synchronizovat."
 msgid "View them now"
 msgstr "Zobrazit"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "Zadejte master heslo:"
+msgstr "Jeden nebo více master klíčů potřebují heslo."
 
 msgid "Set the password"
 msgstr "Nastavit heslo"
@@ -987,35 +1012,41 @@ msgstr "Lokace"
 msgid "URL"
 msgstr "URL"
 
-#, fuzzy
 msgid "Note History"
-msgstr "Seznam položek"
+msgstr "Historie poznámky"
 
+#, fuzzy
 msgid "Markup"
-msgstr ""
+msgstr "Markup"
 
 msgid "Previous versions of this note"
-msgstr ""
+msgstr "Předchozí verze poznámky"
 
 msgid "Note properties"
 msgstr "Nastavení poznámek"
 
 #, javascript-format
 msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
-msgstr ""
+msgstr "Poznámka \"%s\" byla úspěšně obnovena v zápisníku \"%s\"."
 
-#, fuzzy
 msgid "This note has no history"
-msgstr "Poznámka byla upravena:"
+msgstr "Tato poznámka nemá historii"
+
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Nepodporovaný link či zpráva: %s"
 
 msgid "Restore"
-msgstr ""
+msgstr "Obnovit"
 
 #, javascript-format
 msgid ""
 "Click \"%s\" to restore the note. It will be copied in the notebook named "
 "\"%s\". The current version of the note will not be replaced or modified."
 msgstr ""
+"Klikněte na \"%s\" pro obnovení poznámky. Poznámka bude zkopírována do "
+"zápisníku s názvem \"%s\". Současná verze poznámky nebude nahrazena či "
+"změněna."
 
 msgid "Open..."
 msgstr "Otevřít..."
@@ -1036,10 +1067,6 @@ msgstr "Kopírovat adresu odkazu"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Tato příloha není ještě stažena nebo rozšifrována."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Nepodporovaný link či zpráva: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1075,9 +1102,9 @@ msgstr "Přiložit soubor"
 msgid "Set alarm"
 msgstr "Nastavit alarm"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "In: %s"
-msgstr "%s: %s"
+msgstr "V: %s"
 
 msgid "Hyperlink"
 msgstr "Odkaz"
@@ -1100,7 +1127,6 @@ msgstr "Horizontální čára"
 msgid "Click to stop external editing"
 msgstr "Kliknutím ukončíte externí úpravy"
 
-#, fuzzy
 msgid "Watching..."
 msgstr "Sleduji..."
 
@@ -1132,12 +1158,21 @@ msgstr "Nastavení"
 msgid "Synchronisation Status"
 msgstr "Stav synchronizace"
 
-#, fuzzy, javascript-format
+msgid "Remove"
+msgstr "Odstranit"
+
+#, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
 "All notes and sub-notebooks within this notebook will also be deleted."
-msgstr "Smazat zápisník? Budou smazány i všechny poznámky v něm obsažené."
+msgstr ""
+"Smazat zápisník \"%s\"?\n"
+"\n"
+"Budou smazány i všechny poznámky a pod-zápisníky v tomto zápisníku."
+
+msgid "Delete"
+msgstr "Smazat"
 
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
@@ -1146,8 +1181,9 @@ msgstr "Odebrat tag \"%s\" ze všech poznámek?"
 msgid "Remove this search from the sidebar?"
 msgstr "Smazat tento hledaný výraz z panelu?"
 
-msgid "Delete"
-msgstr "Smazat"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nový zápisník"
 
 msgid "Rename"
 msgstr "Přejmenovat"
@@ -1167,7 +1203,7 @@ msgid "Please select where the sync status should be exported to"
 msgstr "Prosím vyberte, kam má být stav synchronizace exportován"
 
 msgid "Retry"
-msgstr ""
+msgstr "Znovu"
 
 msgid "Add or remove tags"
 msgstr "Přidat či odebrat tagy"
@@ -1182,17 +1218,14 @@ msgstr "%s - Kopírovat"
 msgid "Switch between note and to-do type"
 msgstr "Přepnout mezi poznámkou a to-do"
 
-#, fuzzy
 msgid "Switch to note type"
-msgstr "Přepnout mezi poznámkou a to-do"
+msgstr "Přepnout na poznámku"
 
-#, fuzzy
 msgid "Switch to to-do type"
-msgstr "Přepnout mezi poznámkou a to-do"
+msgstr "Přepnout na to-do"
 
-#, fuzzy
 msgid "Copy Markdown link"
-msgstr "Markdown"
+msgstr "Vytvořit Markdown odkaz"
 
 #, javascript-format
 msgid "Delete note \"%s\"?"
@@ -1320,10 +1353,6 @@ msgstr "Nečinný"
 msgid "In progress"
 msgstr "Probíhá"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Synchronizace již probíhá. Stav: %s"
-
 msgid "Encrypted"
 msgstr "Zašifrováno"
 
@@ -1370,6 +1399,19 @@ msgstr ""
 "jste do něj zkopírovali veškerý obsah, jinak budou všechny soubory "
 "odstraněny! Další podrobnosti naleznete v FAQ: % s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Default: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Cíl synchronizace"
 
@@ -1402,25 +1444,28 @@ msgid "WebDAV password"
 msgstr "WebDAV heslo"
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "Chování při stahování přílohy"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"V režimu \"Manuální\" se přílohy stahují pouze po kliknutí na ně. V režimu "
+"„Automaticky“ se stáhnou při otevření poznámky. V režimu „Vždy“ se stáhnou "
+"všechny přílohy, ať už poznámku otevřete nebo ne."
 
 msgid "Always"
-msgstr ""
+msgstr "Vždy"
 
 msgid "Manual"
-msgstr ""
+msgstr "Manuální"
 
 msgid "Auto"
-msgstr ""
+msgstr "Auto"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "Maximální souběžné připojení"
 
 msgid "Language"
 msgstr "Jazyk"
@@ -1440,10 +1485,39 @@ msgstr "Světlý"
 msgid "Dark"
 msgstr "Tmavý"
 
+msgid "Dracula"
+msgstr "Dracula"
+
 msgid "Solarised Light"
-msgstr ""
+msgstr "Solarised Light"
 
 msgid "Solarised Dark"
+msgstr "Solarised Dark"
+
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Zobrazovat ikonu v panelu"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Upravit"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Zobrazit"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1461,6 +1535,7 @@ msgstr "Řadit od konce"
 msgid "Sort notebooks by"
 msgstr "Řadit poznámky podle"
 
+#, fuzzy
 msgid "Save geo-location with notes"
 msgstr "Ukládat k poznámkám informace o poloze (geolokaci)"
 
@@ -1479,6 +1554,9 @@ msgstr "Při vytváření nové poznámky:"
 msgid "Enable soft breaks"
 msgstr "Povolit měkké zalomení"
 
+msgid "Enable typographer support"
+msgstr "Povolit podporu pro typographer"
+
 msgid "Enable math expressions"
 msgstr "Zapnout matematické výrazy"
 
@@ -1512,9 +1590,8 @@ msgstr "Povolit ++insert++ syntaxi"
 msgid "Enable multimarkdown table extension"
 msgstr "Povolit rozšíření multimarkdown tabulky"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "Povolit ~sub~ syntaxi"
+msgstr "Povolit podporu Fountain syntaxe"
 
 msgid "Show tray icon"
 msgstr "Zobrazovat ikonu v panelu"
@@ -1537,11 +1614,10 @@ msgid "Global zoom percentage"
 msgstr "Globální zoom"
 
 msgid "Editor font size"
-msgstr "Rodina písma v editoru"
+msgstr "Velikost písma v editoru"
 
-#, fuzzy
 msgid "Editor font"
-msgstr "Rodina písma v editoru"
+msgstr "Písmo editoru"
 
 msgid "Editor font family"
 msgstr "Rodina písma v editoru"
@@ -1581,13 +1657,43 @@ msgstr "%d hodin"
 msgid "Text editor command"
 msgstr "Textový editor"
 
-#, fuzzy
 msgid ""
 "The editor command (may include arguments) that will be used to open a note. "
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
-"Editor ve kterém budou otvírány poznámky. Pokud není specifikováno, aplikace "
-"se pokusí o autodetekci defaultního editoru."
+"Příkaz editoru (může obsahovat argumenty) ve kterém budou otvírány poznámky. "
+"Pokud není specifikováno, aplikace se pokusí o autodetekci defaultního "
+"editoru."
+
+msgid "Page size for PDF export"
+msgstr "Velikost stránky pro PDF export"
+
+msgid "A4"
+msgstr "A4"
+
+msgid "Letter"
+msgstr "Dopis"
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A5"
+msgstr "A5"
+
+msgid "Tabloid"
+msgstr "Tabloid"
+
+msgid "Legal"
+msgstr "Legal"
+
+msgid "Page orientation for PDF export"
+msgstr "Orientace stránky pro PDF export"
+
+msgid "Portrait"
+msgstr "Na výšku"
+
+msgid "Landscape"
+msgstr "Na šířku"
 
 msgid "Custom TLS certificates"
 msgstr "Vlastní TLS certifikát"
@@ -1610,25 +1716,28 @@ msgid ""
 "Fail-safe: Do not wipe out local data when sync target is empty (often the "
 "result of a misconfiguration or bug)"
 msgstr ""
+"Zabezpečení proti selhání: Nevypírejte místní data, když je synchronizační "
+"cíl prázdný (často v důsledku nesprávné konfigurace nebo chyby)"
 
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Určete port, který by měl server API používat. Pokud není nastavena, použije "
+"se výchozí."
 
-#, fuzzy
 msgid "Enable note history"
-msgstr "Povolit poznámky pod čarou"
+msgstr "Povolit historii poznámky"
 
 msgid "days"
-msgstr ""
+msgstr "dní"
 
 #, javascript-format
 msgid "%d days"
-msgstr ""
+msgstr "%d dní"
 
 msgid "Keep note history for"
-msgstr ""
+msgstr "Uchovat historii poznámky"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1652,9 +1761,8 @@ msgstr "Rozšíření"
 msgid "Application"
 msgstr "Aplikace"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "Šifrování je:"
+msgstr "Šifrování"
 
 #, fuzzy
 msgid "Web Clipper"
@@ -1673,13 +1781,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Složka pro export"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Soubor Evernote Exportu"
+msgstr "Soubor exportu Evernote (jako Markdown)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Soubor Evernote Exportu"
+msgstr "Soubor Evernote Exportu (jako HTML)"
 
 msgid "Json Export Directory"
 msgstr "Složka pro JSON export"
@@ -1713,7 +1819,7 @@ msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Prosím specifikujte sešit, do kterého mají být poznámky importovány."
 
 msgid "Restored Notes"
-msgstr ""
+msgstr "Obnovené Poznámky"
 
 msgid "Items that cannot be synchronised"
 msgstr "Položky jež nelze synchronizovat"
@@ -1727,23 +1833,25 @@ msgstr ""
 "synchronizace. Pro přístup k těmto souborům hledejte jejich název nebo ID (v "
 "hranatých závorkách)."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s (%s) could not be uploaded: %s"
-msgstr "Soubor se nepodařilo otevřít: %s"
+msgstr "%s (%s) se nepodařilo nahrát: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "Soubor se nepodařilo otevřít: %s"
+msgstr "Soubor \"%s\" se nepodařilo stáhnout: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Položky jež nelze synchronizovat"
+msgstr "Položky jež nelze dešifrovat"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin nedokázal tyto položky dešifrovat, pravděpodobně proto, že jsou "
+"poškozené nebo příliš velké. Tyto položky zůstanou v zařízení, ale Joplin se "
+"již nebude pokoušet je dešifrovat."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Stav synchronizace (synchronizováno / celkem)"
@@ -1784,13 +1892,11 @@ msgstr "Oprávnění použít kameru"
 msgid "Your permission to use your camera is required."
 msgstr "Je vyžadováno oprávnění použít vaši kameru."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "Není vybrán žádný zápisník."
+msgstr "Momentálně nemáte žádné zápisníky."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "Vytvoří nový zápisník."
+msgstr "Vytvořit nový zápisník"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Nemáte žádné poznámky. Vytvořte jednu kliknutím na tlačítko (+)."
@@ -1820,28 +1926,24 @@ msgstr "Vybrat datum"
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Zápisníky"
+msgstr "Zápisník:  %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Nelze editovat zašifrovanou položku"
+msgstr "Nelze přejmenovat  zašifrovanou položku"
 
-#, fuzzy
 msgid "New Notebook"
 msgstr "Nový zápisník"
 
 msgid "Configuration"
 msgstr "Nastavení"
 
-#, fuzzy
 msgid "All notes"
-msgstr "poznámka"
+msgstr "Všechny poznámky"
 
-#, fuzzy
 msgid "Checking... Please wait."
-msgstr "Zastavuji, chvíli strpení."
+msgstr "Kontroluji... chvíli strpení."
 
 msgid "Success! Synchronisation configuration appears to be correct."
 msgstr "Úspěch! Nastavení synchronizace se zdá být v pořádku."
@@ -1881,12 +1983,14 @@ msgid "Type new tags or select from list"
 msgstr "Zadejte nové tagy, nebo vyberte existující ze seznamu"
 
 msgid "Warning"
-msgstr ""
+msgstr "Upozornění"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
+"Pro použití synchronizace systému souborů je vyžadováno vaše oprávnění k "
+"zápisu do externího úložiště."
 
 msgid "Encryption Config"
 msgstr "Nastavení šifrování"
@@ -1895,34 +1999,34 @@ msgstr "Nastavení šifrování"
 msgid "Tools"
 msgstr "Nástroje"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Status"
+msgstr "Status synchronizace"
 
 msgid "Log"
 msgstr "Log"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Vytvářím %s..."
+msgstr "Vytvářím report..."
 
 msgid "Export Debug Report"
 msgstr "Exportovat Debug Report"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Opravuji vyhledávací index..."
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Opravit vyhledávací index"
 
 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 ""
+"Použijte toto k opětovnému vytvoření indexu vyhledávání, pokud dojde k "
+"problému s vyhledáváním. Toto může trvat dlouho, v závislosti na počtu "
+"poznámek."
 
-#, fuzzy
 msgid "More information"
-msgstr "Nastavení"
+msgstr "Více informací"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1952,9 +2056,9 @@ msgstr "Web Joplinu"
 msgid "Database v%s"
 msgstr "Databáze v%s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "FTS enabled: %d"
-msgstr "K smazání: %d"
+msgstr "FTS povolené: %d"
 
 msgid "Login with Dropbox"
 msgstr "Přihlášení Dropbox"
@@ -1976,6 +2080,9 @@ msgstr "Heslo:"
 msgid "Password cannot be empty"
 msgstr "Heslo nemůže být prázdné"
 
+msgid "Confirm password cannot be empty"
+msgstr "Heslo pro potvrzení nemůže být prázdné"
+
 msgid "Enable"
 msgstr "Zapnout"
 
@@ -1986,9 +2093,8 @@ msgstr "Nebylo možné uložit zápisník: %s"
 msgid "Edit notebook"
 msgstr "Upravit zápisník"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Název zápisníku:"
+msgstr "Vložte název zápisníku"
 
 msgid "Show all"
 msgstr "Zobrazit vše"
@@ -2015,15 +2121,15 @@ msgstr "Mobilní aplikace Joplin aktuálně nepodporuje tento typ odkazu:% s"
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "Odkazy s protokolem \"%s\" nejsou podporovány"
 
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodporovaný formát obrázku: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Upraveno: %d."
+msgstr "Upraveno: %s"
 
 msgid "View on map"
 msgstr "Zobrazit na map+"
@@ -2031,13 +2137,11 @@ msgstr "Zobrazit na map+"
 msgid "Go to source URL"
 msgstr "Jít na zdrojovou URL"
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Hledat..."
+msgstr "Přiložit..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Ukázat pokročilé volby"
+msgstr "Zvolit možnost"
 
 msgid "Take photo"
 msgstr "Přiložit foto"
@@ -2057,19 +2161,17 @@ msgstr "Konvertovat na poznámku"
 msgid "Convert to todo"
 msgstr "Konvertovat na todo"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Nastavení poznámek"
+msgstr "Nastavení"
 
 msgid "Add body"
-msgstr ""
+msgstr "Přidat tělo"
 
 msgid "Edit"
 msgstr "Upravit"
 
-#, fuzzy
 msgid "Add title"
-msgstr "bez názvu"
+msgstr "Přidejte nadpis"
 
 msgid "Login with OneDrive"
 msgstr "Přihlásit se pomocí OneDrive"
@@ -2077,6 +2179,19 @@ msgstr "Přihlásit se pomocí OneDrive"
 msgid "Search"
 msgstr "Hledání"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Synchronizace již probíhá. Stav: %s"
+
+#~ msgid "Confirm master password:"
+#~ msgstr "Potvrďte master heslo:"
+
+#~ msgid "Confirm password"
+#~ msgstr "Potvrďte heslo"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Chybí povinný parametr: %s"
+
 #~ 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."
@@ -2087,9 +2202,6 @@ msgstr "Hledání"
 #~ msgid "Sidebar"
 #~ msgstr "Postranní lišta"
 
-#~ msgid "Note list"
-#~ msgstr "Seznam položek"
-
 #~ msgid "Note title"
 #~ msgstr "Název zápisníku"
 

CliClient/locales/de_DE.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.3\n"
+"X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -142,6 +142,12 @@ msgstr "Master-Passwort eingeben:"
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
+msgid "Confirm password:"
+msgstr "Passwort bestätigen:"
+
+msgid "Passwords do not match!"
+msgstr "Passwörter sind nicht identisch!"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -396,17 +402,20 @@ 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 ""
+"Starte, stoppe oder überprüfe den API Server. Um den Port zu spezifizieren "
+"auf dem er laufen soll, setze die api.port Konfigurationsvariable. Die "
+"Befehle lauten (%s)."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "Der Server lauft schon auf Port %d"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "Der Server lauft auf Port %d"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "Der Server ist nicht gestartet."
 
 #, javascript-format
 msgid ""
@@ -484,14 +493,16 @@ msgid "Cancelling... Please wait."
 msgstr "Abbrechen... Bitte warten."
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> kann „add“, „remove“ oder „list“ sein um [tag] zu [note] "
-"hinzuzufügen oder zu entfernen, oder um die Notizen aufzulisten die [tag] "
-"zugeordnet sind. Der Befehl `tag list` kann benutzt werden, um alle "
-"Schlagwörter anzuzeigen (nutze -l für die lange Option)."
+"<tag-command> kann „add“, „remove“, „list“, oder „notetags“ sein um [tag] zu "
+"[note] hinzuzufügen oder zu entfernen, um die Notizen aufzulisten die [tag] "
+"zugeordnet sind, oder um die Schlagwörter aufzulisten, die [note] zugeordnet "
+"sind. Der Befehl `tag list` kann benutzt werden, um alle Schlagwörter "
+"anzuzeigen (nutze -l für die lange Option)."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -604,6 +615,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportiere „%s“ ins „%s“-Format. Bitte warten..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr "Konnte Notizen nicht exportieren: %s"
+
 msgid "&File"
 msgstr "&Datei"
 
@@ -684,7 +699,13 @@ msgid "&View"
 msgstr "&Ansicht"
 
 msgid "Toggle sidebar"
-msgstr "Seitenleiste umschalten"
+msgstr "Seitenleiste ein-/ausschalten"
+
+msgid "Layout button sequence"
+msgstr "Layout Reihenfolge"
+
+msgid "Toggle note list"
+msgstr "Notizen-Liste ein-/ausschalten"
 
 msgid "Toggle editor layout"
 msgstr "Editor-Layout umschalten"
@@ -701,9 +722,8 @@ msgstr "&Hilfe"
 msgid "Website and documentation"
 msgstr "Webseite und Dokumentation"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin v%s"
+msgstr "Joplin Forum"
 
 msgid "Make a donation"
 msgstr "Spenden"
@@ -749,6 +769,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
+msgid "Full Release Notes"
+msgstr "Alle Versionshinweise"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Token wurde in die Zwischenablage kopiert!"
 
@@ -821,6 +844,7 @@ msgstr ""
 
 msgid "This will open a new screen. Save your current changes?"
 msgstr ""
+"Diese Aktion wird ein neues Fenster öffnen. Aktuelle Änderungen speichern?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -850,7 +874,7 @@ msgid ""
 "continue?"
 msgstr ""
 "Durch die Deaktivierung der Verschlüsselung werden *alle* Notizen und "
-"Anhänge neu synchronisiert und unverschlüsselt an das Synchronisierungsziel "
+"Anhänge neu synchronisiert und unverschlüsselt an das Synchronisationsziel "
 "gesendet. Möchtest du fortfahren?"
 
 msgid ""
@@ -929,13 +953,13 @@ msgid "Encryption is:"
 msgstr "Die Verschlüsselung ist:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Firefox Erweiterung"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome-Webstore"
 
 msgid "Get it now:"
-msgstr ""
+msgstr "Hole es jetzt:"
 
 # 'Nutzung', 'Gebrauch', or 'Verwendung' - depends on the context
 msgid "Usage"
@@ -1037,6 +1061,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Diese Notiz hat keinen Verlauf"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Nicht unterstützter Link oder Nachricht: %s"
+
 msgid "Restore"
 msgstr "Wiederherstellen"
 
@@ -1068,10 +1096,6 @@ msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 "Dieser Anhang wurde nicht heruntergeladen oder noch nicht entschlüsselt."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Nicht unterstützter Link oder Nachricht: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1164,6 +1188,9 @@ msgstr "Optionen"
 msgid "Synchronisation Status"
 msgstr "Synchronisations-Status"
 
+msgid "Remove"
+msgstr "Entfernen"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1174,6 +1201,9 @@ msgstr ""
 "\n"
 "Alle Notizen und Unternotizen darin werden ebenfalls gelöscht."
 
+msgid "Delete"
+msgstr "Löschen"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Schlagwort \"%s\" von allen Notizen entfernen?"
@@ -1181,8 +1211,8 @@ msgstr "Schlagwort \"%s\" von allen Notizen entfernen?"
 msgid "Remove this search from the sidebar?"
 msgstr "Diese Suche von der Seitenleiste entfernen?"
 
-msgid "Delete"
-msgstr "Löschen"
+msgid "New sub-notebook"
+msgstr "Neues Unternotizbuch"
 
 msgid "Rename"
 msgstr "Umbenennen"
@@ -1353,10 +1383,6 @@ msgstr "Wartend"
 msgid "In progress"
 msgstr "In Bearbeitung"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Synchronisation ist bereits im Gange. Status: %s"
-
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
@@ -1404,6 +1430,18 @@ msgstr ""
 "neuen Ablageort kopiert hast, sonst werden alle Dateien gelöscht! Lies auch "
 "die FAQs hierzu: %s"
 
+msgid "Keyboard Mode"
+msgstr "Tastatur Modus"
+
+msgid "Default"
+msgstr "Standard"
+
+msgid "Emacs"
+msgstr "Emacs"
+
+msgid "Vim"
+msgstr "Vim"
+
 msgid "Synchronisation target"
 msgstr "Synchronisationsziel"
 
@@ -1479,12 +1517,38 @@ msgstr "Hell"
 msgid "Dark"
 msgstr "Dunkel"
 
+msgid "Dracula"
+msgstr "Dracula"
+
 msgid "Solarised Light"
 msgstr "Solarized Hell"
 
 msgid "Solarised Dark"
 msgstr "Solarised Dark"
 
+msgid "Nord"
+msgstr "Nord"
+
+msgid "Show note counts"
+msgstr "Zeige Notizenanzahl"
+
+msgid "Editor"
+msgstr "Editor"
+
+msgid "Viewer"
+msgstr "Vorschau"
+
+msgid "Split View"
+msgstr "Geteilte Ansicht"
+
+#, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s / %s / %s"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr "%s / %s"
+
 msgid "Uncompleted to-dos on top"
 msgstr "Zeige unvollständige To-Dos an oberster Stelle"
 
@@ -1518,6 +1582,9 @@ msgstr "Wenn eine neue Notiz erstellt wird:"
 msgid "Enable soft breaks"
 msgstr "Aktiviere weiche Zeilenumbrüche"
 
+msgid "Enable typographer support"
+msgstr "Aktiviere Typographie Unterstützung"
+
 msgid "Enable math expressions"
 msgstr "Aktiviere mathematische Ausdrücke"
 
@@ -1551,9 +1618,8 @@ msgstr "Aktiviere ++insert++ Syntax"
 msgid "Enable multimarkdown table extension"
 msgstr "Aktiviere multimarkdown Tabellen Erweiterung"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "Aktiviere ~sub~ Syntax"
+msgstr "Aktiviere Fountain Unterstützung"
 
 msgid "Show tray icon"
 msgstr "Zeige Tray-Icon"
@@ -1579,7 +1645,6 @@ msgstr "Zoomstufe der Benutzeroberfläche"
 msgid "Editor font size"
 msgstr "Schriftgröße im Editor"
 
-#, fuzzy
 msgid "Editor font"
 msgstr "Schriftgröße im Editor"
 
@@ -1629,6 +1694,36 @@ msgstr ""
 "Der Editor, mit dem Notizen geöffnet werden. Wenn keiner ausgewählt wurde, "
 "wird Joplin versuchen den Standardeditor zu erkennen."
 
+msgid "Page size for PDF export"
+msgstr "Seitengröße für den PDF-Export"
+
+msgid "A4"
+msgstr "A4"
+
+msgid "Letter"
+msgstr "Letter"
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A5"
+msgstr "A5"
+
+msgid "Tabloid"
+msgstr "Tabloid"
+
+msgid "Legal"
+msgstr "Legal"
+
+msgid "Page orientation for PDF export"
+msgstr "Seitenausrichtung für den PDF-Export"
+
+msgid "Portrait"
+msgstr "Hochformat"
+
+msgid "Landscape"
+msgstr "Querformat"
+
 msgid "Custom TLS certificates"
 msgstr "Benutzerdefinierte TLS-Zertifikate"
 
@@ -1651,11 +1746,16 @@ msgid ""
 "Fail-safe: Do not wipe out local data when sync target is empty (often the "
 "result of a misconfiguration or bug)"
 msgstr ""
+"Störungssicher: Lösche nicht die lokalen Daten, wenn das "
+"Synchronisationsziel leer ist (oft ein Resultat von Fehlkonfiguration oder "
+"einem Programmfehler)"
 
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Spezifiziere den Port, der vom API Server verwendet werden soll. Wenn er "
+"nicht gesetzt ist, wird ein Standardwert verwendet."
 
 msgid "Enable note history"
 msgstr "Aktiviere Notizen-Verlauf"
@@ -1693,13 +1793,11 @@ msgstr "Zusatzprogramme"
 msgid "Application"
 msgstr "Applikation"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "Die Verschlüsselung ist:"
+msgstr "Verschlüsselung"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Web-Clipper Optionen"
+msgstr "Web Clipper"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1715,13 +1813,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin Export Verzeichnis"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Evernote Export Datei"
+msgstr "Evernote Export Datei (als Markdown)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Evernote Export Datei"
+msgstr "Evernote Export Datei (als HTML)"
 
 msgid "Json Export Directory"
 msgstr "Json Export Verzeichnis"
@@ -1830,13 +1926,11 @@ msgstr "Berechtigung zur Verwendung der Kamera"
 msgid "Your permission to use your camera is required."
 msgstr "Deine Zustimmung zur Verwendung deiner Kamera ist erforderlich."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "Die/das momentan ausgewählte Notiz(-buch) löschen."
+msgstr "Du hast momentan keine Notizbücher."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "Erstellt ein neues Notizbuch."
+msgstr "Notizbuch erstellen"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
@@ -1896,7 +1990,7 @@ msgid ""
 "the sync target is accessible. The reported error was:"
 msgstr ""
 "Fehler. Bitte überprüfe, ob die URL, der Benutzername, das Passwort. usw. "
-"korrekt sind und das das Synchronisierungsziel erreichbar ist. Fehlermeldung:"
+"korrekt sind und das das Synchronisationsziel erreichbar ist. Fehlermeldung:"
 
 msgid "The application has been authorised!"
 msgstr "Das Programm wurde erfolgreich autorisiert!"
@@ -2023,6 +2117,9 @@ msgstr "Passwort:"
 msgid "Password cannot be empty"
 msgstr "Passwort darf nicht leer sein"
 
+msgid "Confirm password cannot be empty"
+msgstr "Bestätigungs-Passwort darf nicht leer sein"
+
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -2120,6 +2217,19 @@ msgstr "Mit OneDrive anmelden"
 msgid "Search"
 msgstr "Suchen"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Synchronisation ist bereits im Gange. Status: %s"
+
+#~ msgid "Confirm master password:"
+#~ msgstr "Master-Passwort bestätigen:"
+
+#~ msgid "Confirm password"
+#~ msgstr "Passwort bestätigen"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Fehlendes erforderliches Argument: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr ""
 #~ "Beginne die Notiz zu bearbeiten. Schließe das Textverarbeitungsprogramm, "
@@ -2136,9 +2246,6 @@ msgstr "Suchen"
 #~ msgid "Sidebar"
 #~ msgstr "Seitenleiste"
 
-#~ msgid "Note list"
-#~ msgstr "Notizen-Liste"
-
 #~ msgid "Note title"
 #~ msgstr "Notiz-Titel"
 
@@ -2247,9 +2354,6 @@ msgstr "Suchen"
 #~ "Der Pfad, mit dem synchronisiert werden soll, wenn die Dateisystem-"
 #~ "Synchronisation aktiviert ist. Siehe `sync.target`."
 
-#~ msgid "Remove?"
-#~ msgstr "Löschen?"
-
 #~ msgid "State: %s."
 #~ msgstr "Status: %s."
 
@@ -2259,15 +2363,6 @@ msgstr "Suchen"
 #~ msgid "Searches"
 #~ msgstr "Suchen"
 
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Versionshinweise:\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Importiert eine Evernote Notizbuch-Datei (.enex Datei)."
 

CliClient/locales/en_GB.po

@@ -128,6 +128,12 @@ msgstr ""
 msgid "Operation cancelled"
 msgstr ""
 
+msgid "Confirm password:"
+msgstr ""
+
+msgid "Passwords do not match!"
+msgstr ""
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -422,9 +428,10 @@ msgid "Cancelling... Please wait."
 msgstr ""
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 
 #, javascript-format
@@ -515,6 +522,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr ""
 
@@ -597,6 +608,12 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+msgid "Toggle note list"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -658,6 +675,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -912,6 +932,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr ""
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr ""
+
 msgid "Restore"
 msgstr ""
 
@@ -940,10 +964,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1034,6 +1054,9 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1041,6 +1064,9 @@ msgid ""
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr ""
@@ -1048,7 +1074,7 @@ msgstr ""
 msgid "Remove this search from the sidebar?"
 msgstr ""
 
-msgid "Delete"
+msgid "New sub-notebook"
 msgstr ""
 
 msgid "Rename"
@@ -1209,10 +1235,6 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1256,6 +1278,18 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+msgid "Default"
+msgstr ""
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr ""
 
@@ -1324,12 +1358,38 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+msgid "Show note counts"
+msgstr ""
+
+msgid "Editor"
+msgstr ""
+
+msgid "Viewer"
+msgstr ""
+
+msgid "Split View"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s / %s"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr ""
 
@@ -1363,6 +1423,9 @@ msgstr ""
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 msgid "Enable math expressions"
 msgstr ""
 
@@ -1464,6 +1527,36 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1814,6 +1907,9 @@ msgstr ""
 msgid "Password cannot be empty"
 msgstr ""
 
+msgid "Confirm password cannot be empty"
+msgstr ""
+
 msgid "Enable"
 msgstr ""
 

CliClient/locales/en_US.po

@@ -129,6 +129,12 @@ msgstr ""
 msgid "Operation cancelled"
 msgstr ""
 
+msgid "Confirm password:"
+msgstr ""
+
+msgid "Passwords do not match!"
+msgstr ""
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -427,9 +433,10 @@ msgid "Cancelling... Please wait."
 msgstr ""
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 
 #, javascript-format
@@ -521,6 +528,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr ""
 
@@ -603,6 +614,12 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+msgid "Toggle note list"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -664,6 +681,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -930,6 +950,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr ""
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr ""
+
 msgid "Restore"
 msgstr ""
 
@@ -958,10 +982,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1052,6 +1072,9 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr "Synchronization Status"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1059,6 +1082,9 @@ msgid ""
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr ""
@@ -1066,7 +1092,7 @@ msgstr ""
 msgid "Remove this search from the sidebar?"
 msgstr ""
 
-msgid "Delete"
+msgid "New sub-notebook"
 msgstr ""
 
 msgid "Rename"
@@ -1229,10 +1255,6 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Synchronization is already in progress. State: %s"
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1276,6 +1298,18 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+msgid "Default"
+msgstr ""
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Synchronization target"
 
@@ -1346,12 +1380,38 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr "Solarized Light"
 
 msgid "Solarised Dark"
 msgstr "Solarized Dark"
 
+msgid "Nord"
+msgstr ""
+
+msgid "Show note counts"
+msgstr ""
+
+msgid "Editor"
+msgstr ""
+
+msgid "Viewer"
+msgstr ""
+
+msgid "Split View"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s / %s"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr ""
 
@@ -1385,6 +1445,9 @@ msgstr ""
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 msgid "Enable math expressions"
 msgstr ""
 
@@ -1489,6 +1552,36 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1846,6 +1939,9 @@ msgstr ""
 msgid "Password cannot be empty"
 msgstr ""
 
+msgid "Confirm password cannot be empty"
+msgstr ""
+
 msgid "Enable"
 msgstr ""
 
@@ -1942,6 +2038,9 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Synchronization is already in progress. State: %s"
+
 #~ msgid "Synchronisation status"
 #~ msgstr "Synchronization status"
 

CliClient/locales/es_ES.po

@@ -17,7 +17,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.3\n"
+"X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
@@ -54,7 +54,7 @@ msgid "y"
 msgstr "y"
 
 msgid "Cancelling background synchronisation... Please wait."
-msgstr "Cancelando sincronización de segundo plano... Por favor espere."
+msgstr "Cancelando sincronización en segundo plano... Por favor espere."
 
 #, javascript-format
 msgid "No such command: %s"
@@ -87,7 +87,7 @@ msgstr "Adjuntar archivo a la nota."
 
 #, javascript-format
 msgid "Cannot find \"%s\"."
-msgstr "No se encuentra \"%s\"."
+msgstr "No se puede encontrar \"%s\"."
 
 msgid "Displays the given note."
 msgstr "Mostrar la nota dada."
@@ -129,13 +129,12 @@ msgstr "Marca una tarea como hecha."
 msgid "Note is not a to-do: \"%s\""
 msgstr "La nota no es una tarea: \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status`, `decrypt-file` and `target-status`."
 msgstr ""
-"Maneja la configuración E2EE. Los comandos disponibles son: `enable`, "
-"`disable`, `decrypt`, `status` y `target-status`."
+"Gestiona la configuración E2EE. Los comandos disponibles son: `enable`, "
+"`disable`, `decrypt`, `status`, `decrypt-file` y `target-status`."
 
 msgid "Enter master password:"
 msgstr "Introduzca la contraseña maestra:"
@@ -143,6 +142,14 @@ msgstr "Introduzca la contraseña maestra:"
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Introduzca la contraseña maestra:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "La contraseña no puede estar vacía"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -345,7 +352,7 @@ msgid "Creates a new note."
 msgstr "Crea una nueva nota."
 
 msgid "Notes can only be created within a notebook."
-msgstr "Notas solamente pueden ser creadas dentro de una libreta."
+msgstr "Solo se pueden crear notas dentro de una libreta."
 
 msgid "Creates a new to-do."
 msgstr "Crea una nueva lista de tareas."
@@ -380,7 +387,7 @@ msgid "%d notes match this pattern. Delete them?"
 msgstr "%d notas coinciden con el patrón. ¿Eliminarlas?"
 
 msgid "Delete note?"
-msgstr "¿Eliminar nota?"
+msgstr "¿Borrar nota?"
 
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Buscar el patrón <pattern> en todas las notas."
@@ -390,17 +397,20 @@ 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 ""
+"Inicie, pare o compruebe el servidor API. Para especificar el puerto que "
+"debe ejecutarse use api.port como variable en la configuración. Los comandos "
+"son (%s)."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "El servidor ya esta iniciado en el puerto %d"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "El servidor se está ejecutando en el puerto %d"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "El servidor no se está ejecutando."
 
 #, javascript-format
 msgid ""
@@ -474,10 +484,12 @@ msgstr "Descargando recursos..."
 msgid "Cancelling... Please wait."
 msgstr "Cancelando... Por favor espere."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> puede ser \"add\", \"remove\" o \"list\" para asignar o "
 "eliminar [tag] de [note], o para listar las notas asociadas con [tag]. El "
@@ -595,6 +607,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando el formato de \"%s\" a \"%s\". Por favor espere..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "&Archivo"
 
@@ -608,7 +624,7 @@ msgid "Check for updates..."
 msgstr "Comprobar actualizaciones..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Plantillas"
 
 msgid "Import"
 msgstr "Importar"
@@ -677,6 +693,13 @@ msgstr "&Ver"
 msgid "Toggle sidebar"
 msgstr "Cambia la barra lateral"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Lista de notas"
+
 msgid "Toggle editor layout"
 msgstr "Cambia el diseño del editor"
 
@@ -692,15 +715,14 @@ msgstr "&Ayuda"
 msgid "Website and documentation"
 msgstr "Sitio web y documentación"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin v%s"
+msgstr "Foro Joplin"
 
 msgid "Make a donation"
 msgstr "Hacer una donación"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Activa o desactiva las herramientas de desarrollo"
 
 #, javascript-format
 msgid "Open %s"
@@ -739,6 +761,13 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr ""
+"Notas de la versión:\n"
+"\n"
+"%s"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "¡El token ha sido copiado al portapapeles!"
 
@@ -809,7 +838,7 @@ msgstr ""
 "aplicaciones de terceros acceder a Joplin."
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "Esto abrirá una nueva pantalla. ¿Quieres salvar los cambios actuales?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -918,13 +947,13 @@ msgid "Encryption is:"
 msgstr "El cifrado está:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Extensión Firefox"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome Web Store"
 
 msgid "Get it now:"
-msgstr ""
+msgstr "Obtenerlo ahora en:"
 
 msgid "Usage"
 msgstr "Uso"
@@ -956,7 +985,7 @@ msgid "Set alarm:"
 msgstr "Ajustar alarma:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "Archivo de plantilla:"
 
 msgid "New note"
 msgstr "Nueva nota"
@@ -979,9 +1008,8 @@ msgstr "No se han podido sincronizar algunos de los elementos."
 msgid "View them now"
 msgstr "Verlos ahora"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "Introduzca la contraseña maestra:"
+msgstr "Una o más llaves maestras necesitan una contraseña."
 
 msgid "Set the password"
 msgstr "Establecer la contraseña"
@@ -1005,7 +1033,7 @@ msgstr ""
 " de notas"
 
 msgid "Markup"
-msgstr ""
+msgstr "Aumento"
 
 msgid "Previous versions of this note"
 msgstr "Versiones anteriores de esta nota"
@@ -1020,6 +1048,10 @@ msgstr "La nota \"%s\" se ha restaurado correctamente en la libreta \"%s\"."
 msgid "This note has no history"
 msgstr "Esta nota no dispone de historial"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Enlace o mensaje no soportado: %s"
+
 msgid "Restore"
 msgstr "Restaurar"
 
@@ -1050,10 +1082,6 @@ msgstr "Copiar enlace"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "El adjunto no ha sido descargado o desencriptado todavía."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Enlace o mensaje no soportado: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1146,6 +1174,10 @@ msgstr "Opciones"
 msgid "Synchronisation Status"
 msgstr "Estado de la sincronización"
 
+#, fuzzy
+msgid "Remove"
+msgstr "¿Borrar?"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1156,6 +1188,9 @@ msgstr ""
 "\n"
 "Todas las notas y sublibretas de esta libreta serán borradas."
 
+msgid "Delete"
+msgstr "Eliminar"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Desea borrar las etiquetas pertenecientes a \"%s\" de todas las notas?"
@@ -1163,8 +1198,9 @@ msgstr "Desea borrar las etiquetas pertenecientes a \"%s\" de todas las notas?"
 msgid "Remove this search from the sidebar?"
 msgstr "¿Desea eliminar esta búsqueda de la barra lateral?"
 
-msgid "Delete"
-msgstr "Eliminar"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nueva libreta"
 
 msgid "Rename"
 msgstr "Renombrar"
@@ -1184,7 +1220,7 @@ 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"
 
 msgid "Retry"
-msgstr ""
+msgstr "Reintento"
 
 msgid "Add or remove tags"
 msgstr "Añadir o borrar etiquetas"
@@ -1334,10 +1370,6 @@ msgstr "Espera"
 msgid "In progress"
 msgstr "En progreso"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "La sincronización ya está en progreso. Estado: %s"
-
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1385,6 +1417,19 @@ msgstr ""
 "antes de sincronizarlo, de lo contrario todos los archivos serán eliminados. "
 "Consulte las preguntas frecuentes para obtener más detalles: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Por  defecto: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Destino de sincronización"
 
@@ -1440,7 +1485,7 @@ msgid "Auto"
 msgstr "Automático"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "Conexiones simultáneas máximas"
 
 msgid "Language"
 msgstr "Idioma"
@@ -1460,10 +1505,39 @@ msgstr "Claro"
 msgid "Dark"
 msgstr "Oscuro"
 
-msgid "Solarised Light"
+msgid "Dracula"
 msgstr ""
 
+msgid "Solarised Light"
+msgstr "Solarised Light"
+
 msgid "Solarised Dark"
+msgstr "Solarised Dark"
+
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Mostrar icono en la bandeja"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Editar"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&Ver"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1499,6 +1573,10 @@ msgstr "Cuando se crear una nota nueva:"
 msgid "Enable soft breaks"
 msgstr "Activar saltos de línea"
 
+#, fuzzy
+msgid "Enable typographer support"
+msgstr "Habilitar el soporte de sintaxis de Fountain"
+
 msgid "Enable math expressions"
 msgstr "Habilitar expresiones matemáticas"
 
@@ -1532,9 +1610,8 @@ msgstr "Activar sintaxis ++insert++"
 msgid "Enable multimarkdown table extension"
 msgstr "Activar extensión de tablas multimarkdown"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "Activar sintaxis ~sub~"
+msgstr "Habilitar el soporte de sintaxis de Fountain"
 
 msgid "Show tray icon"
 msgstr "Mostrar icono en la bandeja"
@@ -1560,12 +1637,11 @@ 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"
+msgstr "Editar fuente"
 
 msgid "Editor font family"
-msgstr "Fuente del editor"
+msgstr "Editor de familia de fuente"
 
 msgid ""
 "This must be *monospace* font or it will not work properly. If the font is "
@@ -1611,6 +1687,36 @@ msgstr ""
 "una nota. Si no se provee ninguno se intentará auto detectar el editor por "
 "defecto."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Certificados TLS personalizados"
 
@@ -1633,11 +1739,16 @@ msgid ""
 "Fail-safe: Do not wipe out local data when sync target is empty (often the "
 "result of a misconfiguration or bug)"
 msgstr ""
+"A prueba de fallos: No borre los datos locales cuando el objetivo de "
+"sincronización esté vacío (a menudo como resultado de una configuración "
+"errónea o de un error)."
 
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Especifique el puerto que debe utilizar el servidor de la API. Si no está "
+"configurado, se utilizará un valor predeterminado."
 
 msgid "Enable note history"
 msgstr "Habilitar historial de notas"
@@ -1674,13 +1785,11 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Aplicación"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "El cifrado está:"
+msgstr "Encriptación"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Opciones de recorte web"
+msgstr "Web Clipper"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1695,13 +1804,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Directorio para exportar de Joplin"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Archivo exportado de Evernote"
+msgstr "Exportar como archivo Evernote (como Markdown)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Archivo exportado de Evernote"
+msgstr "Exportar como archivo Evernote (como HTML)"
 
 msgid "Json Export Directory"
 msgstr "Directorio para exportar JSON"
@@ -1749,23 +1856,25 @@ msgstr ""
 "destino de sincronización. Para encontrar dichos elementos busca en el "
 "título o en el ID (el cual se muestra arriba entre corchetes)."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s (%s) could not be uploaded: %s"
-msgstr "No se ha podido subir el archivo %s (%s): %s"
+msgstr "%s (%s) no se ha podido actualizar: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "No se ha podido abrir el archivo %s (%s): %s"
+msgstr "El elemento \"%s\" no se pudo descargar: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Elementos que no se pueden sincronizar"
+msgstr "Elementos que no se pueden descifrar"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin no ha descifrado estos elementos varias veces, posiblemente porque "
+"están dañados o son demasiado grandes. Estos elementos permanecerán en el "
+"dispositivo pero Joplin ya no intentará descifrarlos."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Estado de sincronización (elementos sincronizados/elementos totales)"
@@ -1806,13 +1915,11 @@ msgstr "Permiso para usar tu cámara"
 msgid "Your permission to use your camera is required."
 msgstr "El permiso para usar tu cámara es necesario."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "Eliminar la nota o libreta seleccionada."
+msgstr "Actualmente no tiene ningún cuaderno."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "Crea una nueva libreta."
+msgstr "Crea una nueva libreta"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "No hay notas. Cree una pulsando en el botón (+)."
@@ -1842,24 +1949,21 @@ msgstr "Seleccione fecha"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Libretas"
+msgstr "Libretas: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Los elementos cifrados no pueden ser modificados"
+msgstr "Los cuadernos cifrados no pueden ser renombrados"
 
-#, fuzzy
 msgid "New Notebook"
-msgstr "Nueva libreta"
+msgstr "Nueva cuaderno"
 
 msgid "Configuration"
 msgstr "Configuración"
 
-#, fuzzy
 msgid "All notes"
-msgstr "¿Desea eliminar notas?"
+msgstr "Notas las notas"
 
 msgid "Checking... Please wait."
 msgstr "Comprobando... Por favor espere."
@@ -1902,48 +2006,49 @@ msgid "Type new tags or select from list"
 msgstr "Escriba nuevas etiquetas o seleccionelas de la lista"
 
 msgid "Warning"
-msgstr ""
+msgstr "Advertencia"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
+"Para utilizar la sincronización del sistema de archivos se requieren sus "
+"permisospara escribir en el almacenamiento externo."
 
 msgid "Encryption Config"
 msgstr "Configuración de cifrado"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Herramientas"
+msgstr "Herramientas"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Estado"
+msgstr "Estado de sincronización"
 
 msgid "Log"
 msgstr "Log"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Creando nuevo %s..."
+msgstr "Creando reporte..."
 
 msgid "Export Debug Report"
 msgstr "Exportar informe de depuración"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Reparando indice de busqueda..."
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Repara indice de busqueda"
 
 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 ""
+"Use esto para reparar el indice de busqueda si hay un problema con la "
+"busqueda.Puede tomar un largo periodo de tiempo dependiendo del número de "
+"notas."
 
-#, fuzzy
 msgid "More information"
-msgstr "Configuración"
+msgstr "Más información"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1999,6 +2104,10 @@ msgstr "Contraseña:"
 msgid "Password cannot be empty"
 msgstr "La contraseña no puede estar vacía"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "La contraseña no puede estar vacía"
+
 msgid "Enable"
 msgstr "Habilitado"
 
@@ -2009,9 +2118,8 @@ msgstr "No se ha podido guardar esta libreta: %s"
 msgid "Edit notebook"
 msgstr "Editar libreta"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Título de libreta:"
+msgstr "Introduzca título de libreta"
 
 msgid "Show all"
 msgstr "Mostrar todo"
@@ -2039,15 +2147,15 @@ msgstr ""
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "Enlazar con el protocolo \"%s\" no es soportado"
 
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagen no soportado: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Actualizado: %d."
+msgstr "Actualizado: %s"
 
 msgid "View on map"
 msgstr "Ver en un mapa"
@@ -2055,13 +2163,11 @@ msgstr "Ver en un mapa"
 msgid "Go to source URL"
 msgstr "Ir a  origen URL"
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Buscar..."
+msgstr "Adjuntar..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Mostrar opciones avanzadas"
+msgstr "Selecciona una opción"
 
 msgid "Take photo"
 msgstr "Tomar foto"
@@ -2081,19 +2187,17 @@ msgstr "Convertir a nota"
 msgid "Convert to todo"
 msgstr "Convertir a lista de tareas"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Propiedades de nota"
+msgstr "Propiedades"
 
 msgid "Add body"
-msgstr ""
+msgstr "Añadir cuerpo"
 
 msgid "Edit"
 msgstr "Editar"
 
-#, fuzzy
 msgid "Add title"
-msgstr "título"
+msgstr "Añadir título"
 
 msgid "Login with OneDrive"
 msgstr "Acceder con OneDrive"
@@ -2101,6 +2205,21 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "La sincronización ya está en progreso. Estado: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Introduzca la contraseña maestra:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Introduzca la contraseña maestra:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Falta un argumento requerido: %s"
+
 #~ 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 "
@@ -2112,9 +2231,6 @@ msgstr "Buscar"
 #~ msgid "Sidebar"
 #~ msgstr "Barra lateral"
 
-#~ msgid "Note list"
-#~ msgstr "Lista de notas"
-
 #~ msgid "Note title"
 #~ msgstr "Titulo de nota"
 
@@ -2214,9 +2330,6 @@ msgstr "Buscar"
 #~ "La ruta a la que sincronizar cuando se activa la sincronización con "
 #~ "sistema de archivos. Vea «sync.target»."
 
-#~ msgid "Remove?"
-#~ msgstr "¿Borrar?"
-
 #~ msgid "State: %s."
 #~ msgstr "Estado: «%s»."
 
@@ -2233,15 +2346,6 @@ msgstr "Buscar"
 #~ msgid "Searches"
 #~ msgstr "Búsquedas"
 
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Notas de la versión:\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Importar una libreta de Evernote (archivo .enex)."
 

CliClient/locales/eu.po

@@ -139,6 +139,14 @@ msgstr "Sartu pasahitz nagusia:"
 msgid "Operation cancelled"
 msgstr " Eragiketa utzita"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Sartu pasahitz nagusia:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Pasahitza ezin utz daiteke hutsik"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -471,9 +479,10 @@ msgstr "Bertan behera uzten... itxaron, mesedez."
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> izan daiteke \"add\", \"remove\" edo \"list\" [oharra]tik "
 "[etiketa] esleitu edo kentzeko, edo [etiketa]rekin elkartutako oharrak "
@@ -590,6 +599,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Fitxategia"
@@ -677,6 +690,13 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Zifratua gaitu"
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -743,6 +763,10 @@ msgstr ""
 msgid "No"
 msgstr "E"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Oharrak ezabatu?"
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -1019,6 +1043,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Ohar hau mugitua izan da:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Esteka edo mezu ez dago onartua: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1048,10 +1076,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Esteka edo mezu ez dago onartua: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1147,6 +1171,9 @@ msgstr "Aukerak"
 msgid "Synchronisation Status"
 msgstr "Sinkronizazioaren egoera"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1154,6 +1181,9 @@ msgid ""
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr "Koadernoa ezabatu? Dituen ohar guztiak ere ezabatuko dira."
 
+msgid "Delete"
+msgstr "Ezabatu"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Kendu etiketa hori ohar guztietatik?"
@@ -1161,8 +1191,9 @@ msgstr "Kendu etiketa hori ohar guztietatik?"
 msgid "Remove this search from the sidebar?"
 msgstr "Kendu bilaketa hori ohar guztietatik?"
 
-msgid "Delete"
-msgstr "Ezabatu"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Koaderno berria"
 
 msgid "Rename"
 msgstr "Berrizendatu"
@@ -1335,10 +1366,6 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Sinkronizazioa hasita dago. Egoera: %s"
-
 msgid "Encrypted"
 msgstr "Zifratuta"
 
@@ -1387,6 +1414,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Lehenetsia: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Sinkronizazio helbudua"
 
@@ -1461,12 +1501,39 @@ msgstr "Argia"
 msgid "Dark"
 msgstr "Iluna"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+msgid "Show note counts"
+msgstr ""
+
+#, fuzzy
+msgid "Editor"
+msgstr "Editatu"
+
+msgid "Viewer"
+msgstr ""
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 #, fuzzy
 msgid "Uncompleted to-dos on top"
 msgstr "Bete gabeko zereginak erakutsi zerrendaren goiko partean"
@@ -1506,6 +1573,9 @@ msgstr "Ohar berria sortzen du."
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Zifratua gaitu"
@@ -1615,6 +1685,36 @@ msgstr ""
 "Editorea erabiliko da oharra zabaltzeko. Ez badago zehaztutakorik lehenetsia "
 "igartzen ahaleginduko da."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1995,6 +2095,10 @@ msgstr "Pasahitza:"
 msgid "Password cannot be empty"
 msgstr "Pasahitza ezin utz daiteke hutsik"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Pasahitza ezin utz daiteke hutsik"
+
 msgid "Enable"
 msgstr "Gaituta"
 
@@ -2096,6 +2200,21 @@ msgstr "Login with OneDrive"
 msgid "Search"
 msgstr "Bilatu"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Sinkronizazioa hasita dago. Egoera: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Sartu pasahitz nagusia:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Sartu pasahitz nagusia:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Beharrezko argumentua faltan: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr "Oharra editatzearen hasiera. Itxi editorea prompt-era bueltatzeko."
 
@@ -2188,13 +2307,6 @@ msgstr "Bilatu"
 #~ msgid "Searches"
 #~ msgstr "Bilaketak"
 
-#, fuzzy
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "Oharrak ezabatu?"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Inportatu Evernote koaderno fitxategia (.enex fitxategia)."
 

CliClient/locales/fa.po

@@ -130,6 +130,14 @@ msgstr "رمز اصلی را وارد کنید:"
 msgid "Operation cancelled"
 msgstr "عملیات لغو شد"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "رمز اصلی را وارد کنید:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "رمز نمیتواند خالی باشد"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -427,14 +435,15 @@ msgid "Cancelling... Please wait."
 msgstr "در حال لغو... لطفا منتظر بمانید."
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "Invalid command: \"%s\""
-msgstr ""
+msgstr "پاسخ نامعتبر: %s"
 
 msgid ""
 "<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
@@ -520,6 +529,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr ""
 
@@ -603,6 +616,13 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "لیست یادداشت"
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -665,6 +685,10 @@ msgstr "بله"
 msgid "No"
 msgstr "خیر"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "یادداشت های بازیابی شده"
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -923,6 +947,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "این یادداشت هیچ تاریخچه ای ندارد"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr ""
+
 msgid "Restore"
 msgstr "بازگرداندن"
 
@@ -951,10 +979,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1051,6 +1075,9 @@ msgstr "گزینه ها"
 msgid "Synchronisation Status"
 msgstr ""
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1058,6 +1085,9 @@ msgid ""
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr ""
 
+msgid "Delete"
+msgstr "پاک کردن"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr ""
@@ -1065,8 +1095,9 @@ msgstr ""
 msgid "Remove this search from the sidebar?"
 msgstr "این جستجو را از نواک کناری حذف شود؟"
 
-msgid "Delete"
-msgstr "پاک کردن"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "دفترچه جدید"
 
 msgid "Rename"
 msgstr "تغییر نام"
@@ -1226,10 +1257,6 @@ msgstr "بیکار"
 msgid "In progress"
 msgstr "درحال انجام"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "سینک کردن در حال انجام است. وضعیت: %s"
-
 msgid "Encrypted"
 msgstr "رمزنگاری شده"
 
@@ -1274,6 +1301,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "پیشفرض: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 #, fuzzy
 msgid "Synchronisation target"
 msgstr "هدف سینک"
@@ -1343,12 +1383,39 @@ msgstr "روشن"
 msgid "Dark"
 msgstr "تیره"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+msgid "Show note counts"
+msgstr ""
+
+#, fuzzy
+msgid "Editor"
+msgstr "ویرایش"
+
+msgid "Viewer"
+msgstr ""
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr ""
 
@@ -1382,6 +1449,9 @@ msgstr "در زمان ایجاد یادداشت جدید:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 msgid "Enable math expressions"
 msgstr ""
 
@@ -1485,6 +1555,36 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1847,6 +1947,10 @@ msgstr "رمز:"
 msgid "Password cannot be empty"
 msgstr "رمز نمیتواند خالی باشد"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "رمز نمیتواند خالی باشد"
+
 msgid "Enable"
 msgstr "فعال سازی"
 
@@ -1948,15 +2052,27 @@ msgstr "ورود با OneDrive"
 msgid "Search"
 msgstr "جستجو"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "سینک کردن در حال انجام است. وضعیت: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "رمز اصلی را وارد کنید:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "رمز اصلی را وارد کنید:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "کمبود آرگمان در دستور: %s"
+
 #~ msgid "Note has been saved."
 #~ msgstr "یادداشت ذخیره شد."
 
 #~ msgid "Sidebar"
 #~ msgstr "نوار کناری"
 
-#~ msgid "Note list"
-#~ msgstr "لیست یادداشت"
-
 #~ msgid "Note title"
 #~ msgstr "موضوع یادداشت"
 

CliClient/locales/fr_FR.po

@@ -137,6 +137,12 @@ msgstr "Entrer le mot de passe maître :"
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
+msgid "Confirm password:"
+msgstr "Confirmer le mot de passe :"
+
+msgid "Passwords do not match!"
+msgstr "Les mots de passe ne correspondent pas !"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -474,14 +480,16 @@ msgid "Cancelling... Please wait."
 msgstr "Annulation... Veuillez attendre."
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> peut être \"add\", \"remove\" ou \"list\" pour assigner ou "
-"enlever l'étiquette [tag] de la [note], our pour lister les notes associées "
-"avec l'étiquette [tag]. La commande `tag list` peut être utilisée pour "
-"lister les étiquettes (utilisez l'option -l pour les options complètes)."
+"<tag-command> peut être \"add\", \"remove\", \"list\" ou \"notetags\" pour "
+"assigner ou enlever l'étiquette [tag] de la [note], pour lister les notes "
+"associées avec l'étiquette [tag], ou pour lister les étiquettes associées "
+"avec [note]. La commande `tag list` peut être utilisée pour lister les "
+"étiquettes (utilisez l'option -l pour les options complètes)."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -592,6 +600,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exporter vers \"%s\" au format \"%s\". Veuillez patienter..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr "Impossible d'exporter les notes : %s"
+
 msgid "&File"
 msgstr "&Fichier"
 
@@ -674,8 +686,14 @@ msgstr "&Affichage"
 msgid "Toggle sidebar"
 msgstr "Basculer barre latérale"
 
+msgid "Layout button sequence"
+msgstr "Ordre des actions du bouton de disposition"
+
+msgid "Toggle note list"
+msgstr "Basculer liste de notes"
+
 msgid "Toggle editor layout"
-msgstr "Basculer l'agencement de l'éditeur"
+msgstr "Basculer la disposition de l'éditeur"
 
 msgid "Focus"
 msgstr "Naviguer"
@@ -736,6 +754,9 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
+msgid "Full Release Notes"
+msgstr "Notes de version complètes"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Le code d'authentification a été copié dans le presse-papiers !"
 
@@ -1021,6 +1042,10 @@ msgstr "La note \"%s\" a été restaurée dans le carnet \"%s\"."
 msgid "This note has no history"
 msgstr "Cette note n'a pas d'historique"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Lien ou message non géré : %s"
+
 msgid "Restore"
 msgstr "Restaurer"
 
@@ -1052,10 +1077,6 @@ msgstr "Copier l'adresse du lien"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Cette pièce jointe n'est pas téléchargée ou pas encore déchiffrée."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Lien ou message non géré : %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1150,6 +1171,9 @@ msgstr "Options"
 msgid "Synchronisation Status"
 msgstr "État de la synchronisation"
 
+msgid "Remove"
+msgstr "Supprimer"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1160,6 +1184,9 @@ msgstr ""
 "\n"
 "Toutes les notes et sous-carnets dans ce carnet seront également effacés."
 
+msgid "Delete"
+msgstr "Supprimer"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Enlever l’étiquette \"%s\" de toutes les notes ?"
@@ -1167,8 +1194,8 @@ msgstr "Enlever l’étiquette \"%s\" de toutes les notes ?"
 msgid "Remove this search from the sidebar?"
 msgstr "Enlever cette recherche de la barre latérale ?"
 
-msgid "Delete"
-msgstr "Supprimer"
+msgid "New sub-notebook"
+msgstr "Nouveau sous-carnet"
 
 msgid "Rename"
 msgstr "Renommer"
@@ -1339,10 +1366,6 @@ msgstr "Arrêté"
 msgid "In progress"
 msgstr "En cours"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "La synchronisation est déjà en cours. État : %s"
-
 msgid "Encrypted"
 msgstr "Chiffré"
 
@@ -1389,6 +1412,18 @@ msgstr ""
 "de synchroniser, sinon tous les fichiers seront supprimés ! Consulter la FAQ "
 "pour plus de détails : %s"
 
+msgid "Keyboard Mode"
+msgstr "Mode de clavier"
+
+msgid "Default"
+msgstr "Défaut"
+
+msgid "Emacs"
+msgstr "Emacs"
+
+msgid "Vim"
+msgstr "Vim"
+
 msgid "Synchronisation target"
 msgstr "Cible de la synchronisation"
 
@@ -1464,12 +1499,38 @@ msgstr "Clair"
 msgid "Dark"
 msgstr "Sombre"
 
+msgid "Dracula"
+msgstr "Dracula"
+
 msgid "Solarised Light"
 msgstr "Solarisé clair"
 
 msgid "Solarised Dark"
 msgstr "Solarisé sombre"
 
+msgid "Nord"
+msgstr "Nord"
+
+msgid "Show note counts"
+msgstr "Afficher le compte des notes"
+
+msgid "Editor"
+msgstr "Éditeur"
+
+msgid "Viewer"
+msgstr "Visionneuse"
+
+msgid "Split View"
+msgstr "Vue fractionnée"
+
+#, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s / %s / %s"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr "%s / %s"
+
 msgid "Uncompleted to-dos on top"
 msgstr "Tâches non-terminées en haut"
 
@@ -1503,6 +1564,9 @@ msgstr "Lors de la création d'une note :"
 msgid "Enable soft breaks"
 msgstr "Activer retours à la ligne \"doux\""
 
+msgid "Enable typographer support"
+msgstr "Activer le typographe"
+
 msgid "Enable math expressions"
 msgstr "Activer les expressions mathématiques"
 
@@ -1612,6 +1676,36 @@ msgstr ""
 "La commande de l'éditeur de texte (peut inclure des options) pour ouvrir et "
 "modifier les notes. Si non-spécifiée, elle sera détectée automatiquement."
 
+msgid "Page size for PDF export"
+msgstr "Taille de page pour l'export PDF"
+
+msgid "A4"
+msgstr "A4"
+
+msgid "Letter"
+msgstr "Lettre"
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A5"
+msgstr "A5"
+
+msgid "Tabloid"
+msgstr "Tabloïde"
+
+msgid "Legal"
+msgstr "Légal"
+
+msgid "Page orientation for PDF export"
+msgstr "Orientation de page pour l'export PDF"
+
+msgid "Portrait"
+msgstr "Portrait"
+
+msgid "Landscape"
+msgstr "Paysage"
+
 msgid "Custom TLS certificates"
 msgstr "Certificats TLS personnalisés"
 
@@ -1999,6 +2093,9 @@ msgstr "Mot de passe :"
 msgid "Password cannot be empty"
 msgstr "Mot de passe ne peut être vide"
 
+msgid "Confirm password cannot be empty"
+msgstr "Le mot de passe de confirmation ne peut être vide"
+
 msgid "Enable"
 msgstr "Activer"
 
@@ -2096,6 +2193,20 @@ msgstr "Se connecter à OneDrive"
 msgid "Search"
 msgstr "Chercher"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "La synchronisation est déjà en cours. État : %s"
+
+#~ msgid "Confirm master password:"
+#~ msgstr "Confirmer le mot de passe maître :"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Entrer le mot de passe maître :"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Paramètre requis manquant : %s"
+
 #~ 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 à "
@@ -2112,9 +2223,6 @@ msgstr "Chercher"
 #~ msgid "Sidebar"
 #~ msgstr "Barre latérale"
 
-#~ msgid "Note list"
-#~ msgstr "Liste de notes"
-
 #~ msgid "Note title"
 #~ msgstr "Titre de la note"
 
@@ -2227,9 +2335,6 @@ msgstr "Chercher"
 #~ "Le chemin du répertoire avec lequel synchroniser lorsque la "
 #~ "synchronisation par système de fichier est activée. Voir `sync.target`."
 
-#~ msgid "Remove?"
-#~ msgstr "Supprimer ?"
-
 #~ msgid "State: %s."
 #~ msgstr "État : %s."
 
@@ -2246,15 +2351,6 @@ msgstr "Chercher"
 #~ msgid "Searches"
 #~ msgstr "Recherches"
 
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Notes de version :\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Importer un carnet Evernote (fichier .enex)."
 
@@ -2322,9 +2418,6 @@ msgstr "Chercher"
 #~ msgid "WebDAV (Beta)"
 #~ msgstr "WebDAV (Bêta)"
 
-#~ msgid "Could not download the update: %s"
-#~ msgstr "Impossible de télécharger la mise à jour : %s"
-
 #~ msgid "New version downloaded - application will quit now and update..."
 #~ msgstr ""
 #~ "La nouvelle version a été téléchargée - le programme va se fermer et se "

CliClient/locales/gl_ES.po

@@ -136,6 +136,14 @@ msgstr "Introducir contrasinal mestre:"
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Introducir contrasinal mestre:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "O contrasinal non pode estar baleiro"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -468,9 +476,10 @@ msgstr "Cancelando... Agarde."
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> pode ser «add», «remove» ou «list» para asignar ou eliminar "
 "[tag] da [note] ou para listar as notas asociadas con [tag]. A orde «list» "
@@ -584,6 +593,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando a «%s» como formato «%s». Agarde..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Ficheiro"
@@ -671,6 +684,13 @@ msgstr "Vista"
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Activar cifrado"
+
 msgid "Toggle editor layout"
 msgstr "Cambiar a disposición do editor"
 
@@ -736,6 +756,9 @@ msgstr "Si"
 msgid "No"
 msgstr "Non"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -1009,6 +1032,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Esta nota foi modificada:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Ligazón ou mensaxe incompatíbeis: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1037,10 +1064,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Ligazón ou mensaxe incompatíbeis: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1134,6 +1157,9 @@ msgstr "Opcións"
 msgid "Synchronisation Status"
 msgstr "Estado da sincronización"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1142,6 +1168,9 @@ msgid ""
 msgstr ""
 "Desexa eliminar o caderno? Tamén se eliminarán todas as notas deste caderno."
 
+msgid "Delete"
+msgstr "Eliminar"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Desexa eliminar esta etiqueta de todas as notas?"
@@ -1149,8 +1178,9 @@ msgstr "Desexa eliminar esta etiqueta de todas as notas?"
 msgid "Remove this search from the sidebar?"
 msgstr "Desexa eliminar esta busca da barra lateral?"
 
-msgid "Delete"
-msgstr "Eliminar"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Novo caderno"
 
 msgid "Rename"
 msgstr "Renomear"
@@ -1322,10 +1352,6 @@ msgstr "Inactivo"
 msgid "In progress"
 msgstr "En proceso"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "A sincronización xa está en proceso. Estado: %s"
-
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1373,6 +1399,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Predeterminado: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Destino da sincronización"
 
@@ -1443,12 +1482,41 @@ msgstr "Claro"
 msgid "Dark"
 msgstr "Escuro"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Mostrar a icona na bandexa"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Edtar"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Vista"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Tarefas sen completar arriba"
 
@@ -1484,6 +1552,9 @@ msgstr "Cando se crea unha nova nota:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Activar cifrado"
@@ -1595,6 +1666,36 @@ msgstr ""
 "Editor a usar para abrir unha nota. Se non se indica ningún tentará detectar "
 "automaticamente o editor predeterminado."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1975,6 +2076,10 @@ msgstr "Contrasinal:"
 msgid "Password cannot be empty"
 msgstr "O contrasinal non pode estar baleiro"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "O contrasinal non pode estar baleiro"
+
 msgid "Enable"
 msgstr "Activar"
 
@@ -2076,6 +2181,21 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "A sincronización xa está en proceso. Estado: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Introducir contrasinal mestre:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Introducir contrasinal mestre:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Falta un argumento requirido: %s"
+
 #~ 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."
 

CliClient/locales/hr_HR.po

@@ -137,6 +137,12 @@ msgstr ""
 msgid "Operation cancelled"
 msgstr ""
 
+msgid "Confirm password:"
+msgstr ""
+
+msgid "Passwords do not match!"
+msgstr ""
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -468,9 +474,10 @@ msgstr "Prekidam... Pričekaj."
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
 "[tag] from [note], or to list the notes associated with [tag]. The command "
@@ -584,6 +591,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Datoteka"
@@ -671,6 +682,13 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Bilješka je promijenjena:"
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -738,6 +756,10 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Obriši bilješke?"
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -1001,6 +1023,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Bilješka je promijenjena:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Nepodržana poveznica ili poruka: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1030,10 +1056,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Nepodržana poveznica ili poruka: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1128,6 +1150,9 @@ msgstr "Opcije"
 msgid "Synchronisation Status"
 msgstr "Status Sinkronizacije"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1136,6 +1161,9 @@ msgid ""
 msgstr ""
 "Obrisati bilježnicu? Sve bilješke u toj bilježnici će također biti obrisane."
 
+msgid "Delete"
+msgstr "Obriši"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Makni ovu oznaku iz svih bilješki?"
@@ -1143,8 +1171,9 @@ msgstr "Makni ovu oznaku iz svih bilješki?"
 msgid "Remove this search from the sidebar?"
 msgstr "Makni ovu pretragu iz izbornika?"
 
-msgid "Delete"
-msgstr "Obriši"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nova bilježnica"
 
 msgid "Rename"
 msgstr "Preimenuj"
@@ -1313,10 +1342,6 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Sinkronizacija je već u toku. Stanje: %s"
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1365,6 +1390,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Default: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Sinkroniziraj sa"
 
@@ -1433,12 +1471,39 @@ msgstr "Svijetla"
 msgid "Dark"
 msgstr "Tamna"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+msgid "Show note counts"
+msgstr ""
+
+#, fuzzy
+msgid "Editor"
+msgstr "Uredi"
+
+msgid "Viewer"
+msgstr ""
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 #, fuzzy
 msgid "Uncompleted to-dos on top"
 msgstr "Prikaži nezavršene zadatke na vrhu liste"
@@ -1479,6 +1544,9 @@ msgstr "Stvara novu bilješku."
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 msgid "Enable math expressions"
 msgstr ""
 
@@ -1586,6 +1654,36 @@ msgstr ""
 "Program za uređivanje koji će biti korišten za uređivanje bilješki. Ako ni "
 "jedan nije odabran, pokušati će se sa default programom."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1963,6 +2061,9 @@ msgstr ""
 msgid "Password cannot be empty"
 msgstr ""
 
+msgid "Confirm password cannot be empty"
+msgstr ""
+
 #, fuzzy
 msgid "Enable"
 msgstr "Onemogućeno"
@@ -2065,6 +2166,17 @@ msgstr "Prijavi se u OneDrive"
 msgid "Search"
 msgstr "Traži"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Sinkronizacija je već u toku. Stanje: %s"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Potvrdi"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Nedostaje obavezni argument: %s"
+
 #, fuzzy
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr ""
@@ -2158,13 +2270,6 @@ msgstr "Traži"
 #~ msgid "Searches"
 #~ msgstr "Pretraživanja"
 
-#, fuzzy
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "Obriši bilješke?"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Uvozi Evernote bilježnicu (.enex datoteku)."
 

CliClient/locales/it_IT.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.3\n"
+"X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -125,13 +125,12 @@ msgstr "Segna un \"Cose-da-fare\" come completato."
 msgid "Note is not a to-do: \"%s\""
 msgstr "La nota non è un \"Cose-da-fare\": \"%s\""
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status`, `decrypt-file` and `target-status`."
 msgstr ""
 "Gestisci la configurazione E2EE. I comandi sono `abilita`, `disabilita`, "
-"`decripta`, `stato` e `stato-target`."
+"`decripta`, `stato`, `decripta-file` e `stato-target`."
 
 msgid "Enter master password:"
 msgstr "Inserisci password principale:"
@@ -139,6 +138,12 @@ msgstr "Inserisci password principale:"
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
+msgid "Confirm password:"
+msgstr "Conferma password:"
+
+msgid "Passwords do not match!"
+msgstr "Le password non combaciano!"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -211,7 +216,6 @@ msgstr ""
 msgid "Shortcuts are not available in CLI mode."
 msgstr "Le scorciatoie non sono disponibili nella modalità CLI."
 
-#, fuzzy
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
 "all` for the complete usage information."
@@ -459,7 +463,7 @@ msgid ""
 "operation."
 msgstr ""
 "Trovato un file di blocco. Se si è certi che non è in corso alcuna "
-"sincronizzazione, è possibile eliminare il file di blocco in \"% s\" e "
+"sincronizzazione, è possibile eliminare il file di blocco in \"%s\" e "
 "riprendere l'operazione."
 
 #, javascript-format
@@ -480,13 +484,15 @@ msgstr "Annullamento... Attendere per favore."
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> può essere \"add\", \"remove\" or \"list\" per assegnare o "
 "rimuovere [tag] da [note], o per mostrare le note associate a [tag]. Il "
-"comando `tag list` può essere usato per mostrare tutte le etichette."
+"comando `tag list` può essere usato per mostrare tutte le etichette (usa -l "
+"per l’opzione lunga)."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -600,6 +606,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Esportazione da \"%s\" come formato \"%s\". Si prega di attendere..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr "Non è possibile esportare le note: %s"
+
 msgid "&File"
 msgstr "&File"
 
@@ -682,6 +692,13 @@ msgstr "&Vista"
 msgid "Toggle sidebar"
 msgstr "Attiva / disattiva barra laterale"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Lista delle note"
+
 msgid "Toggle editor layout"
 msgstr "Attiva / disattiva il layout dell'editor"
 
@@ -731,7 +748,7 @@ msgstr "È disponibile un aggiornamento, vuoi scaricarlo ora?"
 
 #, javascript-format
 msgid "Your version: %s"
-msgstr "Tua versione: %s"
+msgstr "La tua versione: %s"
 
 #, javascript-format
 msgid "New version: %s"
@@ -743,6 +760,9 @@ msgstr "Sì"
 msgid "No"
 msgstr "No"
 
+msgid "Full Release Notes"
+msgstr "Note di rilascio complete"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Il token è stato copiato negli appunti!"
 
@@ -812,7 +832,7 @@ msgstr ""
 "terze parti di accedere a Joplin."
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "Questo aprirà una nuova schermata. Salvare le tue modifiche correnti?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -1024,6 +1044,10 @@ msgstr "La nota \"%s\" è stata ripristinata con successo nel taccuino \"%s\"."
 msgid "This note has no history"
 msgstr "Questa nota non ha cronologia"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Link o Messaggio non supportato: %s"
+
 msgid "Restore"
 msgstr "Ripristina"
 
@@ -1055,10 +1079,6 @@ msgstr "Copia l'indirizzo del link"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Questo allegato non è ancora stato scaricato o decriptato."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Link o Messaggio non supportato: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1078,10 +1098,10 @@ msgid "Error opening note in editor: %s"
 msgstr "Errore durante l'apertura della nota nell'editor: %s"
 
 msgid "strong text"
-msgstr "Testo grasseto"
+msgstr "testo grasseto"
 
 msgid "emphasized text"
-msgstr "Testo Sottolineato"
+msgstr "testo Sottolineato"
 
 msgid "List item"
 msgstr "Lista Elemento"
@@ -1151,6 +1171,9 @@ msgstr "Opzioni"
 msgid "Synchronisation Status"
 msgstr "Stato della Sincronizzazione"
 
+msgid "Remove"
+msgstr "Rimuovi"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1161,6 +1184,9 @@ msgstr ""
 "\n"
 "Anche tutte le note e cartelle di questo taccuino saranno eliminati."
 
+msgid "Delete"
+msgstr "Elimina"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Rimuovere l’etichetta \"%s\" da tutte le note?"
@@ -1168,8 +1194,9 @@ msgstr "Rimuovere l’etichetta \"%s\" da tutte le note?"
 msgid "Remove this search from the sidebar?"
 msgstr "Rimuovere questa ricerca dalla barra laterale?"
 
-msgid "Delete"
-msgstr "Elimina"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nuovo taccuino"
 
 msgid "Rename"
 msgstr "Rinomina"
@@ -1340,10 +1367,6 @@ msgstr "Inattivo"
 msgid "In progress"
 msgstr "In corso"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "La sincronizzazione è già in corso. Stato: %s"
-
 msgid "Encrypted"
 msgstr "Crittografato"
 
@@ -1390,6 +1413,19 @@ msgstr ""
 "contenuto prima di sincronizzare, altrimenti tutti i file saranno rimossi! "
 "Vedi le FAQ per maggiori dettagli: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Predefinito: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Destinazione di sincronizzazione"
 
@@ -1463,12 +1499,41 @@ msgstr "Chiaro"
 msgid "Dark"
 msgstr "Scuro"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Visualizza nella barra delle applicazioni"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Modifica"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&Vista"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "\"Cose-da-fare\" incomplete in cima alla lista"
 
@@ -1502,6 +1567,9 @@ msgstr "Quando si crea una nuova nota:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr "Attiva supporto tipografico"
+
 msgid "Enable math expressions"
 msgstr "Attiva espressioni matematiche"
 
@@ -1512,7 +1580,7 @@ msgid "Enable footnotes"
 msgstr "Attiva note a piè pagina"
 
 msgid "Enable table of contents extension"
-msgstr ""
+msgstr "Abilita l’estensione indice"
 
 msgid "Enable ~sub~ syntax"
 msgstr "Attiva sintassi ~sub~"
@@ -1524,22 +1592,22 @@ msgid "Enable deflist syntax"
 msgstr ""
 
 msgid "Enable abbreviation syntax"
-msgstr ""
+msgstr "Abilita abbreviazioni"
 
 msgid "Enable markdown emoji"
-msgstr ""
+msgstr "Abilita emoji markdown"
 
 msgid "Enable ++insert++ syntax"
 msgstr "Attiva sintassi ++insert++"
 
 msgid "Enable multimarkdown table extension"
-msgstr ""
+msgstr "Abilita estensione tavola dei contenuti"
 
 msgid "Enable Fountain syntax support"
 msgstr "Attiva supporto sintassi Fountain"
 
 msgid "Show tray icon"
-msgstr "Visualizza tray icon"
+msgstr "Visualizza nella barra delle applicazioni"
 
 msgid "Note: Does not work in all desktop environments."
 msgstr "Nota: non funziona in tutti gli ambienti desktop."
@@ -1549,12 +1617,12 @@ msgid ""
 "this setting so that your notes are constantly being synchronised, thus "
 "reducing the number of conflicts."
 msgstr ""
-"Questo consentirà Joplin di essere in esecuzione in background. E’ "
+"Questo consentirà a Joplin di essere in esecuzione in background. E’ "
 "raccomandata l’attivazione di questa impostazione per sincronizzare "
 "costantemente le tue note e quindi ridurre il numero di conflitti."
 
 msgid "Start application minimised in the tray icon"
-msgstr "Avvia applicazione minimizzata nell’icona del vassoio"
+msgstr "Avvia applicazione minimizzata nella barra delle applicazioni"
 
 msgid "Global zoom percentage"
 msgstr "Percentuale di zoom globale"
@@ -1562,9 +1630,8 @@ msgstr "Percentuale di zoom globale"
 msgid "Editor font size"
 msgstr "Editor dimensione caratteri"
 
-#, fuzzy
 msgid "Editor font"
-msgstr "Editor dimensione caratteri"
+msgstr "Editor caratteri"
 
 msgid "Editor font family"
 msgstr "Editor famiglia caratteri"
@@ -1613,6 +1680,36 @@ msgstr ""
 "una nota. Se non ne viene fornita alcuna, cercherà di rilevare "
 "automaticamente l'editor predefinito."
 
+msgid "Page size for PDF export"
+msgstr "Dimensione pagina per l’esportazione in PDF"
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr "Orientamento pagina per l’esportazione in PDF"
+
+msgid "Portrait"
+msgstr "Verticale"
+
+msgid "Landscape"
+msgstr "Orizzontale"
+
 msgid "Custom TLS certificates"
 msgstr "Certificati TLS personalizzati"
 
@@ -1654,7 +1751,7 @@ msgid "%d days"
 msgstr "%d giorni"
 
 msgid "Keep note history for"
-msgstr "Mantieni cronologia nota per"
+msgstr "Mantieni la cronologia note per"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1678,13 +1775,11 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Applicazione"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "La crittografia è:"
+msgstr "Crittografia"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Opzioni Web Clipper"
+msgstr "Web Clipper"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1699,13 +1794,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Cartella di esportazione di Joplin"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Esporta files di Evernote"
+msgstr "Esporta files di Evernote (come Markdown)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Esporta files di Evernote"
+msgstr "Esporta files di Evernote (come HTML)"
 
 msgid "Json Export Directory"
 msgstr "Cartella di esportazione JSON"
@@ -1807,7 +1900,7 @@ msgid "On %s: %s"
 msgstr "Su %s: %s"
 
 msgid "Permission to use camera"
-msgstr "Permesso di usare la fotocamera"
+msgstr "Permesso per usare la fotocamera"
 
 msgid "Your permission to use your camera is required."
 msgstr "E’ richiesto il permesso di usare la fotocamera."
@@ -1911,6 +2004,8 @@ msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
+"Per usare la sincronizzazione del file system è necessario il tuo permesso "
+"di scrittura sulla memoria esterna."
 
 msgid "Encryption Config"
 msgstr "Configurazione Crittografia"
@@ -2001,6 +2096,9 @@ msgstr "Password:"
 msgid "Password cannot be empty"
 msgstr "La password non può essere vuota"
 
+msgid "Confirm password cannot be empty"
+msgstr "La password di conferma non può essere vuota"
+
 msgid "Enable"
 msgstr "Abilitato"
 
@@ -2054,7 +2152,7 @@ msgid "View on map"
 msgstr "Guarda sulla mappa"
 
 msgid "Go to source URL"
-msgstr ""
+msgstr "Vai all'URL"
 
 msgid "Attach..."
 msgstr "Allega..."
@@ -2098,6 +2196,19 @@ msgstr "Accedi a OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "La sincronizzazione è già in corso. Stato: %s"
+
+#~ msgid "Confirm master password:"
+#~ msgstr "Conferma password principale:"
+
+#~ msgid "Confirm password"
+#~ msgstr "Conferma password"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Argomento richiesto mancante: %s"
+
 #~ 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."
@@ -2112,9 +2223,6 @@ msgstr "Cerca"
 #~ msgid "Sidebar"
 #~ msgstr "Barra laterale"
 
-#~ msgid "Note list"
-#~ msgstr "Lista delle note"
-
 #~ msgid "Note title"
 #~ msgstr "Titolo della nota"
 
@@ -2247,13 +2355,6 @@ msgstr "Cerca"
 #~ msgid "Searches"
 #~ msgstr "Ricerche"
 
-#, fuzzy
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "Eliminare le note?"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Importa un file taccuino di Evernote (.enex file)."
 

CliClient/locales/ja_JP.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: AWASHIRO Ikuya <ikunya@gmail.com>\n"
+"Last-Translator: genneko <genneko217@gmail.com>\n"
 "Language-Team: \n"
 "Language: ja_JP\n"
 "MIME-Version: 1.0\n"
@@ -136,6 +136,12 @@ msgstr "マスターパスワードを入力してください:"
 msgid "Operation cancelled"
 msgstr "操作をキャンセルしました"
 
+msgid "Confirm password:"
+msgstr "パスワード(確認用):"
+
+msgid "Passwords do not match!"
+msgstr "パスワードが一致しません!"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -460,14 +466,15 @@ msgid "Cancelling... Please wait."
 msgstr "中止中...お待ちください。"
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> は\"add\", \"remove\", \"list\"のいずれかで、指定した[note]から"
-"[tag]をつけたり外したりできます。あるいは[tag]のついたノートをリストアップし"
-"ます。`tag list`で、すべてのタグを見ることができます(-lオプションでより多くの"
-"情報を表示します)。"
+"<tag-command> は\"add\", \"remove\", \"list\", \"notetags\"のいずれかで、それ"
+"ぞれ、[note]に[tag]を追加、[note]から[tag]を削除、[tag]のついたノートを一覧表"
+"示 (-lオプションでより多くの情報を表示)、[note]についているタグを一覧表示しま"
+"す。単に`tag list`とした場合はすべてのタグを一覧表示します。"
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -578,6 +585,10 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 "\"%s\" を \"%s\" フォーマットにエクスポート中。しばらくお待ちください..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr "ノートをエクスポートできませんでした: %s"
+
 msgid "&File"
 msgstr "&ファイル"
 
@@ -660,6 +671,12 @@ msgstr "&表示"
 msgid "Toggle sidebar"
 msgstr "サイドバーの表示切り替え"
 
+msgid "Layout button sequence"
+msgstr "レイアウトボタンによる切り替え順"
+
+msgid "Toggle note list"
+msgstr "ノート一覧の表示切り替え"
+
 msgid "Toggle editor layout"
 msgstr "エディターレイアウトの表示切り替え"
 
@@ -721,6 +738,9 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
+msgid "Full Release Notes"
+msgstr "リリースノート（完全版）"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "トークンをクリップボードにコピーしました！"
 
@@ -789,7 +809,7 @@ msgstr ""
 "するときにだけ使用します。"
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "新しい画面を開きます。変更を保存しますか?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -828,9 +848,9 @@ msgid ""
 "the data! To enable encryption, please enter your password below."
 msgstr ""
 "暗号化を有効にするとは、*すべて*のノートや添付ファイルを再同期し、同期ター"
-"ゲットに暗号化の状態で送ることを意味します。セキュリティの意味で、パスワード"
-"をなくさないでください。パスワードはデータを復号する*唯一*の方法です！ 暗号化"
-"を有効にするには、下にパスワードを入力してください。"
+"ゲットに暗号化した状態で送ることを意味します。パスワードはなくさないようにし"
+"てください。セキュリティ上、このパスワードがデータを復号する*唯一*の方法にな"
+"るためです！ 暗号化を有効にするには、下にパスワードを入力してください。"
 
 msgid "Disable encryption"
 msgstr "暗号化を無効にする"
@@ -867,8 +887,9 @@ msgid ""
 "as \"active\"). Any of the keys might be used for decryption, depending on "
 "how the notes or notebooks were originally encrypted."
 msgstr ""
-"注意：\"active\"に指定されたマスターキーのみが暗号化に使用されます。暗号化に"
-"使用されたキーに応じて、いずれかのキーが暗号解除のために使用されます。"
+"注意：暗号化に使用されるのはその時点で\"アクティブ\"なマスターキーのみです。"
+"なお、復号時には対象のノートやノートブックを暗号化するときに使ったキーが使用"
+"されます。"
 
 msgid "Missing Master Keys"
 msgstr "マスターキーがありません"
@@ -886,8 +907,8 @@ msgid ""
 "For more information about End-To-End Encryption (E2EE) and advice on how to "
 "enable it please check the documentation:"
 msgstr ""
-"エンドツーエンド暗号化(E2EE)に関する詳細な情報とどのように有効化するのかのア"
-"ドバイスは、次のドキュメントをご覧ください:"
+"エンドツーエンド暗号化(E2EE)に関する詳細な情報と有効化の手順については、次の"
+"ドキュメントをご覧ください:"
 
 msgid "Status"
 msgstr "状態"
@@ -896,13 +917,13 @@ msgid "Encryption is:"
 msgstr "暗号化の状態:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Firefox 拡張機能"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome ウェブストア"
 
 msgid "Get it now:"
-msgstr ""
+msgstr "今すぐ取得:"
 
 msgid "Usage"
 msgstr "使い方"
@@ -997,6 +1018,10 @@ msgstr "ノート \"%s\" のノートブック \"%s\"への復元は成功しま
 msgid "This note has no history"
 msgstr "このノートに履歴はありません"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "次のリンクまたはメッセージはサポートしていません: %s"
+
 msgid "Restore"
 msgstr "復元"
 
@@ -1027,10 +1052,6 @@ msgstr "リンクアドレスをコピー"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "この添付ファイルはダウンロードされていないか、まだ復号されていません。"
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "次のリンクまたはメッセージはサポートしていません: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1123,6 +1144,9 @@ msgstr "オプション"
 msgid "Synchronisation Status"
 msgstr "同期状況"
 
+msgid "Remove"
+msgstr "削除"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1133,6 +1157,9 @@ msgstr ""
 "\n"
 "このノートブックにあるノートとサブノートはすべて消えてしまいます。"
 
+msgid "Delete"
+msgstr "削除"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "すべてのノートからタグ \"%s\" を削除しますか？"
@@ -1140,8 +1167,8 @@ msgstr "すべてのノートからタグ \"%s\" を削除しますか？"
 msgid "Remove this search from the sidebar?"
 msgstr "サイドバーからこの検索を削除しますか？"
 
-msgid "Delete"
-msgstr "削除"
+msgid "New sub-notebook"
+msgstr "新しいサブノートブック"
 
 msgid "Rename"
 msgstr "名前の変更"
@@ -1311,10 +1338,6 @@ msgstr "待機中"
 msgid "In progress"
 msgstr "実行中"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "同期作業はすでに実行中です。状態: %s"
-
 msgid "Encrypted"
 msgstr "暗号化済"
 
@@ -1363,6 +1386,19 @@ msgstr ""
 "ておきましょう。そうしないとすべてのファイルが削除されていまいます！ 詳しくは"
 "次のFAQをご覧ください: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "既定値: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "同期先"
 
@@ -1436,12 +1472,39 @@ msgstr "明るい"
 msgid "Dark"
 msgstr "暗い"
 
+msgid "Dracula"
+msgstr "Dracula"
+
 msgid "Solarised Light"
 msgstr "Solarised (明)"
 
 msgid "Solarised Dark"
 msgstr "Solarised (暗)"
 
+msgid "Nord"
+msgstr "Nord"
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "トレイアイコンの表示"
+
+msgid "Editor"
+msgstr "エディター"
+
+msgid "Viewer"
+msgstr "ビューアー"
+
+msgid "Split View"
+msgstr "分割ビュー"
+
+#, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s / %s / %s"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr "%s / %s"
+
 msgid "Uncompleted to-dos on top"
 msgstr "未完のToDoをリストの上部に表示"
 
@@ -1475,6 +1538,9 @@ msgstr "新しいノートを作成した際:"
 msgid "Enable soft breaks"
 msgstr "ソフトブレークを有効にする"
 
+msgid "Enable typographer support"
+msgstr "Typographer（記号文字）を有効にする"
+
 msgid "Enable math expressions"
 msgstr "数式表現を有効にする"
 
@@ -1534,9 +1600,8 @@ msgstr "全体ズームの割合"
 msgid "Editor font size"
 msgstr "エディターのフォントサイズ"
 
-#, fuzzy
 msgid "Editor font"
-msgstr "エディターのフォントサイズ"
+msgstr "エディターのフォント"
 
 msgid "Editor font family"
 msgstr "エディターのフォントファミリー"
@@ -1583,6 +1648,36 @@ msgstr ""
 "このエディターコマンド（と引数）はノートを開く際に使用されます。空欄の場合は"
 "既定のエディターを自動的に検出します。"
 
+msgid "Page size for PDF export"
+msgstr "エクスポートするPDFのページサイズ"
+
+msgid "A4"
+msgstr "A4"
+
+msgid "Letter"
+msgstr "Letter"
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A5"
+msgstr "A5"
+
+msgid "Tabloid"
+msgstr "Tabloid"
+
+msgid "Legal"
+msgstr "Legal"
+
+msgid "Page orientation for PDF export"
+msgstr "PDFページの向き"
+
+msgid "Portrait"
+msgstr "縦"
+
+msgid "Landscape"
+msgstr "横"
+
 msgid "Custom TLS certificates"
 msgstr "TLS証明書のカスタマイズ"
 
@@ -1604,6 +1699,8 @@ 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 "
@@ -1647,13 +1744,11 @@ msgstr "プラグイン"
 msgid "Application"
 msgstr "アプリケーション"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "暗号化の状態:"
+msgstr "暗号化"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Webクリッパーのオプション"
+msgstr "Webクリッパー"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1668,13 +1763,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin エクスポートディレクトリ"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Evernote エクスポートファイル"
+msgstr "Evernote エクスポートファイル (Markdownとしてインポート)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Evernote エクスポートファイル"
+msgstr "Evernote エクスポートファイル (HTMLとしてインポート)"
 
 msgid "Json Export Directory"
 msgstr "Json エクスポートディレクトリ"
@@ -1965,6 +2058,9 @@ msgstr "パスワード:"
 msgid "Password cannot be empty"
 msgstr "パスワードは空にできません"
 
+msgid "Confirm password cannot be empty"
+msgstr "パスワード(確認用)は空にできません"
+
 msgid "Enable"
 msgstr "有効"
 
@@ -2061,6 +2157,19 @@ msgstr "OneDriveログイン"
 msgid "Search"
 msgstr "検索"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "同期作業はすでに実行中です。状態: %s"
+
+#~ msgid "Confirm master password:"
+#~ msgstr "マスターパスワード(確認用):"
+
+#~ msgid "Confirm password"
+#~ msgstr "パスワード(確認用)"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "引数が足りません：%s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr ""
 #~ "ノートの編集を開始します。エディターを閉じると元の画面に戻ることができま"
@@ -2075,9 +2184,6 @@ msgstr "検索"
 #~ msgid "Sidebar"
 #~ msgstr "サイドバー"
 
-#~ msgid "Note list"
-#~ msgstr "ノートの一覧"
-
 #~ msgid "Note title"
 #~ msgstr "ノートの題名："
 
@@ -2193,13 +2299,6 @@ msgstr "検索"
 #~ msgid "Searches"
 #~ msgstr "検索"
 
-#, fuzzy
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "ノートを削除しますか？"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Evernoteノートブックファイル(.enex)のインポート"
 

CliClient/locales/joplin.pot

@@ -128,6 +128,12 @@ msgstr ""
 msgid "Operation cancelled"
 msgstr ""
 
+msgid "Confirm password:"
+msgstr ""
+
+msgid "Passwords do not match!"
+msgstr ""
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -422,9 +428,10 @@ msgid "Cancelling... Please wait."
 msgstr ""
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 
 #, javascript-format
@@ -515,6 +522,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr ""
 
@@ -597,6 +608,12 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+msgid "Toggle note list"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -658,6 +675,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -912,6 +932,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr ""
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr ""
+
 msgid "Restore"
 msgstr ""
 
@@ -940,10 +964,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1034,6 +1054,9 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1041,6 +1064,9 @@ msgid ""
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr ""
@@ -1048,7 +1074,7 @@ msgstr ""
 msgid "Remove this search from the sidebar?"
 msgstr ""
 
-msgid "Delete"
+msgid "New sub-notebook"
 msgstr ""
 
 msgid "Rename"
@@ -1209,10 +1235,6 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1256,6 +1278,18 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+msgid "Default"
+msgstr ""
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr ""
 
@@ -1324,12 +1358,38 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+msgid "Show note counts"
+msgstr ""
+
+msgid "Editor"
+msgstr ""
+
+msgid "Viewer"
+msgstr ""
+
+msgid "Split View"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s / %s"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr ""
 
@@ -1363,6 +1423,9 @@ msgstr ""
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 msgid "Enable math expressions"
 msgstr ""
 
@@ -1464,6 +1527,36 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1814,6 +1907,9 @@ msgstr ""
 msgid "Password cannot be empty"
 msgstr ""
 
+msgid "Confirm password cannot be empty"
+msgstr ""
+
 msgid "Enable"
 msgstr ""
 

CliClient/locales/ko.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.3\n"
+"X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -137,6 +137,12 @@ msgstr "마스터 키를 넣어주세요:"
 msgid "Operation cancelled"
 msgstr "작업이 중지되었습니다"
 
+msgid "Confirm password:"
+msgstr "비밀번호 확인:"
+
+msgid "Passwords do not match!"
+msgstr "비밀번호가 맞지 않습니다!"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -460,10 +466,12 @@ msgstr "리소스 다운로드 중..."
 msgid "Cancelling... Please wait."
 msgstr "취소하는 중입니다... 잠시만 기다리세요."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "[note]로부터 [tag]를 지우거나 지정할 때, 아니면 [tag]와 관련된 노트의 목록을 "
 "확인할 때 <tag-command>로 \"add\", \"remove\" 또는 \"list\" 를 사용하실 수 있"
@@ -577,6 +585,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "\"%s\"에 \"%s\" 포맷으로 내보내는 중입니다. 잠시만 기다려주세요..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr "내보낼 노트를 찾을수 없습니다: %s"
+
 msgid "&File"
 msgstr "파일"
 
@@ -659,6 +671,13 @@ msgstr "보기"
 msgid "Toggle sidebar"
 msgstr "사이드바 표시 전환"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "노트 목록"
+
 msgid "Toggle editor layout"
 msgstr "편집기 배치 형태 전환"
 
@@ -720,6 +739,9 @@ msgstr "예"
 msgid "No"
 msgstr "아니오"
 
+msgid "Full Release Notes"
+msgstr "전체 릴리즈된 노트들"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "토큰이 클립보드로 복사되었습니다!"
 
@@ -787,7 +809,7 @@ msgstr ""
 "다."
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "이는 새로운 스크린을 열 것입니다. 현재 변경 사안을 저장하시겠습니까?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -894,13 +916,13 @@ msgid "Encryption is:"
 msgstr "암호화는 다음과 같습니다:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Firefox 확장"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome 웹 스토어"
 
 msgid "Get it now:"
-msgstr ""
+msgstr "설치하기:"
 
 msgid "Usage"
 msgstr "사용 방법"
@@ -993,6 +1015,10 @@ msgstr "노트 “%s”가 노트북 “%s”에 성공적으로 복구되었습
 msgid "This note has no history"
 msgstr "이 노트엔 역사가 없습니다"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "지원하지 않는 링크 또는 메세지: %s"
+
 msgid "Restore"
 msgstr "복구"
 
@@ -1023,10 +1049,6 @@ msgstr "링크 주소 복사"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "이 첨부는 아직 다운로드 또는 복호화 되지 않았습니다."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "지원하지 않는 링크 또는 메세지: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1119,6 +1141,9 @@ msgstr "옵션"
 msgid "Synchronisation Status"
 msgstr "동기화 상태"
 
+msgid "Remove"
+msgstr "삭제"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1129,6 +1154,9 @@ msgstr ""
 "\n"
 "이 노트북 안에 있는 모든 노트와 더불어 하위 노트북들도 함께 삭제됩니다."
 
+msgid "Delete"
+msgstr "삭제"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "모든 노트에서 “%s” 태그를 제거할까요?"
@@ -1136,8 +1164,9 @@ msgstr "모든 노트에서 “%s” 태그를 제거할까요?"
 msgid "Remove this search from the sidebar?"
 msgstr "사이드바에서 이 검색 항목을 제거할까요?"
 
-msgid "Delete"
-msgstr "삭제"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "새 노트북"
 
 msgid "Rename"
 msgstr "이름 바꾸기"
@@ -1307,10 +1336,6 @@ msgstr "대기"
 msgid "In progress"
 msgstr "진행 중"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "동기화가 이미 진행되고 있습니다. 상태: %s"
-
 msgid "Encrypted"
 msgstr "암호화됨"
 
@@ -1356,6 +1381,19 @@ msgstr ""
 "주의: 이 위치를 변경하시려면, 동기화 전에 모든 내용들을 복사하였는지 확인해주"
 "세요. 변경중에 모든 파일이 삭제 됩니다! 자세한 정보는 FAQ를 참조해주세요: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "기본값:  %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "동기화 대상"
 
@@ -1429,12 +1467,41 @@ msgstr "밝음"
 msgid "Dark"
 msgstr "어두움"
 
+msgid "Dracula"
+msgstr "Dracula"
+
 msgid "Solarised Light"
 msgstr "Solarized Light"
 
 msgid "Solarised Dark"
 msgstr "Solarized Dark"
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "트레이 아이콘 표시"
+
+#, fuzzy
+msgid "Editor"
+msgstr "편집"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "보기"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "완료되지 않은 '할 일'을 맨 위에"
 
@@ -1468,6 +1535,9 @@ msgstr "새 노트를 만들 때:"
 msgid "Enable soft breaks"
 msgstr "소프트 브레이크 허용"
 
+msgid "Enable typographer support"
+msgstr "typographer 지원 허용"
+
 msgid "Enable math expressions"
 msgstr "수학 정규식 허용"
 
@@ -1527,9 +1597,8 @@ msgstr "전체 확대 비율"
 msgid "Editor font size"
 msgstr "편집기 글꼴 크기"
 
-#, fuzzy
 msgid "Editor font"
-msgstr "편집기 글꼴 크기"
+msgstr "편집기 글꼴"
 
 msgid "Editor font family"
 msgstr "편집기 글꼴 모음"
@@ -1577,6 +1646,36 @@ msgstr ""
 "노트를 여는데 사용할 텍스트 편집기 명령어(인자를 포함할 수 있습니다)를 지정합"
 "니다. 주어진 명령어가 없을 시 기본 편집기를 자동으로 찾을 것입니다."
 
+msgid "Page size for PDF export"
+msgstr "PDF로 내보낼때 페이지 크기"
+
+msgid "A4"
+msgstr "A4"
+
+msgid "Letter"
+msgstr "Letter"
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A5"
+msgstr "A5"
+
+msgid "Tabloid"
+msgstr "타블로이드"
+
+msgid "Legal"
+msgstr "Legal"
+
+msgid "Page orientation for PDF export"
+msgstr "PDF를 내보낼때의 페이지 방향"
+
+msgid "Portrait"
+msgstr "포트레이트"
+
+msgid "Landscape"
+msgstr "랜드스케이프"
+
 msgid "Custom TLS certificates"
 msgstr "사용자 TLS 인증서"
 
@@ -1598,6 +1697,8 @@ 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 "
@@ -1641,13 +1742,11 @@ msgstr "플러그인"
 msgid "Application"
 msgstr "애플리케이션"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "암호화는 다음과 같습니다:"
+msgstr "암호화"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "웹 수집기 옵션"
+msgstr "웹 수집기"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1662,13 +1761,11 @@ msgstr "마크다운"
 msgid "Joplin Export Directory"
 msgstr "Joplin 내보내기 폴더"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "에버노트 내보내기 파일"
+msgstr "에버노트 내보내기 파일 (마크다운으로)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "에버노트 내보내기 파일"
+msgstr "에버노트 내보내기 파일 (HTML 으로)"
 
 msgid "Json Export Directory"
 msgstr "Json 내보내기 폴더"
@@ -1958,7 +2055,10 @@ msgid "Password:"
 msgstr "암호:"
 
 msgid "Password cannot be empty"
-msgstr "암호를 입력해야만 합니다"
+msgstr "암호가 비어져 있으면 안됩니다"
+
+msgid "Confirm password cannot be empty"
+msgstr "비밀번호 확인칸은 비어져 있으면 안됩니다"
 
 msgid "Enable"
 msgstr "활성화"
@@ -2056,6 +2156,19 @@ msgstr "OneDrive 로그인"
 msgid "Search"
 msgstr "검색"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "동기화가 이미 진행되고 있습니다. 상태: %s"
+
+#~ msgid "Confirm master password:"
+#~ msgstr "마스터 키를 넣어주세요:"
+
+#~ msgid "Confirm password"
+#~ msgstr "마스터 키를 넣어주세요"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "필요한 인자가 없습니다: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr "노트 편집을 시작합니다. 프롬프트로 가시려면 편집기를 종료해주세요."
 
@@ -2069,9 +2182,6 @@ msgstr "검색"
 #~ msgid "Sidebar"
 #~ msgstr "사이드바"
 
-#~ msgid "Note list"
-#~ msgstr "노트 목록"
-
 #~ msgid "Note title"
 #~ msgstr "노트 제목"
 

CliClient/locales/nb_NO.po

@@ -137,6 +137,14 @@ msgstr "Skriv inn masterpassordet:"
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Skriv inn masterpassordet:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Passordet kan ikke være tomt"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -381,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 ""
+"Start, stopp eller sjekk API-serveren. For å angi på hvilken port den skal "
+"kjøre,sett api.port konfigurasjonsvariablen. Kommandoer er (%s)."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "Serveren kjører allerede på port %d"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "Serveren kjører på port %d"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "Serveren kjører ikke"
 
 #, javascript-format
 msgid ""
@@ -463,10 +473,12 @@ msgstr "Laster ned ressurser..."
 msgid "Cancelling... Please wait."
 msgstr "Avbryter… Vennligst vent."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> kan være \"legg til\", \"fjern\" eller \"vis liste\" å anvise "
 "eller fjerne [tag] fra [note], eller å liste notater forbundet med [tag]. "
@@ -580,6 +592,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksporterer til \"%s\" i \"%s\" format. Vennligst vent..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "&Fil"
 
@@ -587,13 +603,13 @@ msgid "About Joplin"
 msgstr "Om Joplin"
 
 msgid "Preferences..."
-msgstr ""
+msgstr "Innstillinger..."
 
 msgid "Check for updates..."
 msgstr "Se etter oppdatering..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Maler"
 
 msgid "Import"
 msgstr "Importer"
@@ -612,7 +628,7 @@ msgid "Quit"
 msgstr "Avslutt"
 
 msgid "Close Window"
-msgstr ""
+msgstr "Lukk vindu"
 
 msgid "&Edit"
 msgstr "&Rediger"
@@ -662,6 +678,13 @@ msgstr "&Vis"
 msgid "Toggle sidebar"
 msgstr "Vis/skjul sidepanel"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Notatliste"
+
 msgid "Toggle editor layout"
 msgstr "Bytt editorvisning"
 
@@ -677,15 +700,14 @@ msgstr "&Hjelp"
 msgid "Website and documentation"
 msgstr "Nettsted og dokumentasjon"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin v%s"
+msgstr "Joplin Forum"
 
 msgid "Make a donation"
 msgstr "Gi et bidrag"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Skru på/av utviklingsverktøy"
 
 #, javascript-format
 msgid "Open %s"
@@ -724,6 +746,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nei"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Gjenopprettede notater"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Bevis har blitt kopiert til utklippstavlen!"
 
@@ -792,7 +818,7 @@ msgstr ""
 "tredjepartsapplikasjoner tilgang til Joplin."
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "Dette vil åpne et nytt vindu. Vil du lagre nåværende endringer?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -902,13 +928,13 @@ msgid "Encryption is:"
 msgstr "Kryptering er:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Firefox-utvidelse"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome Web Store"
 
 msgid "Get it now:"
-msgstr ""
+msgstr "Få den nå:"
 
 msgid "Usage"
 msgstr "Bruk"
@@ -942,7 +968,7 @@ msgid "Set alarm:"
 msgstr "Angi alarm:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "Malfiler"
 
 msgid "New note"
 msgstr "Nytt notat"
@@ -965,9 +991,8 @@ msgstr "Noen elementer kan ikke synkroniseres."
 msgid "View them now"
 msgstr "Vis nå"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "Skriv inn masterpassordet:"
+msgstr "En eller flere masternøkler trenger et passord."
 
 msgid "Set the password"
 msgstr "Sett passord"
@@ -986,35 +1011,40 @@ msgstr "Lokasjon"
 msgid "URL"
 msgstr "URL"
 
-#, fuzzy
 msgid "Note History"
-msgstr "Notatliste"
+msgstr "Notathistorikk"
 
 msgid "Markup"
-msgstr ""
+msgstr "Markup"
 
 msgid "Previous versions of this note"
-msgstr ""
+msgstr "Forrige versjon av dette notatet"
 
 msgid "Note properties"
 msgstr "Notategenskaper"
 
 #, javascript-format
 msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
-msgstr ""
+msgstr "Notatet \"%s\" has blitt vellykket gjenopprettet i notatboken \"%s\"."
 
-#, fuzzy
 msgid "This note has no history"
-msgstr "Dette notatet har blitt endret:"
+msgstr "Dette notatet har ingen historikk"
+
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Usupportert lenke eller melding: %s"
 
 msgid "Restore"
-msgstr ""
+msgstr "Gjenopprett"
 
 #, javascript-format
 msgid ""
 "Click \"%s\" to restore the note. It will be copied in the notebook named "
 "\"%s\". The current version of the note will not be replaced or modified."
 msgstr ""
+"Velg \"%s\" for å gjenopprette notatet. Det vil bli kopiert til notatboken"
+"\"%s\". Den nåværende versjonen av notatet vil ikke bli erstattet eller "
+"modifisert."
 
 msgid "Open..."
 msgstr "Åpne..."
@@ -1035,10 +1065,6 @@ msgstr "Kopier linkadresse"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Dette vedlegget er enda ikke lastet ned eller dekryptert."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Usupportert lenke eller melding: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1130,6 +1156,9 @@ msgstr "Generelle innstillinger"
 msgid "Synchronisation Status"
 msgstr "Synkroniseringsstatus"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1141,6 +1170,9 @@ msgstr ""
 "Alle notater og underliggende notatbøker i denne notatboken vil også bli "
 "slettet."
 
+msgid "Delete"
+msgstr "Slett"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Fjern denne merkelappen \"%s\" fra alle notater?"
@@ -1148,8 +1180,9 @@ msgstr "Fjern denne merkelappen \"%s\" fra alle notater?"
 msgid "Remove this search from the sidebar?"
 msgstr "Fjerne dette søket fra sidepanelet?"
 
-msgid "Delete"
-msgstr "Slett"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Ny notatbok"
 
 msgid "Rename"
 msgstr "Gi nytt navn"
@@ -1169,7 +1202,7 @@ msgid "Please select where the sync status should be exported to"
 msgstr "Velg hvor synkroniseringsstatusen skal eksporteres til"
 
 msgid "Retry"
-msgstr ""
+msgstr "Prøv igjen"
 
 msgid "Add or remove tags"
 msgstr "Legg til eller fjern merkelapper"
@@ -1205,9 +1238,11 @@ msgid ""
 "Type a note title to jump to it. Or type # followed by a tag name, or @ "
 "followed by a notebook name."
 msgstr ""
+"Skriv inn tittelen på et notat for å hoppe til det. Eller skriv # etterfulgt "
+"av en merkelapp, eller @ etterfulgt av tittelen på en notatbok."
 
 msgid "Goto Anything..."
-msgstr ""
+msgstr "Hopp til..."
 
 #, javascript-format
 msgid "Usage: %s"
@@ -1317,10 +1352,6 @@ msgstr "Inaktiv"
 msgid "In progress"
 msgstr "Pågår"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Synkronisering pågår allerede. Status: %s"
-
 msgid "Encrypted"
 msgstr "Kryptert"
 
@@ -1367,6 +1398,19 @@ msgstr ""
 "innhold dit før du synkroniserer. Hvis ikke blir alle filer fjernet! Se FAQ "
 "for flere detaljer: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Standard: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Synkroniseringsmål"
 
@@ -1399,25 +1443,28 @@ msgid "WebDAV password"
 msgstr "WebDAV-passord"
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "Nedlastningsoppførsel for vedlegg"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"I \"Manuell\" modus blir vedlegg kun lastet ned når du klikker på de. I "
+"\"Auto\" blir de lastet ned når du åpner notatet. I \"Alltid\" blir "
+"vedleggene lastet ned uansett om du åpner notatet eller ikke."
 
 msgid "Always"
-msgstr ""
+msgstr "Alltid"
 
 msgid "Manual"
-msgstr ""
+msgstr "Manuell"
 
 msgid "Auto"
-msgstr ""
+msgstr "Auto"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "Maksimalt samtidige tilkoblinger"
 
 msgid "Language"
 msgstr "Språk"
@@ -1437,10 +1484,39 @@ msgstr "Lys"
 msgid "Dark"
 msgstr "Mørk"
 
-msgid "Solarised Light"
+msgid "Dracula"
 msgstr ""
 
+msgid "Solarised Light"
+msgstr "Solarisert lys"
+
 msgid "Solarised Dark"
+msgstr "Solarisert mørk"
+
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Vis systemmenyikon"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Rediger"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&Vis"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1471,50 +1547,50 @@ msgid "Focus body"
 msgstr "Fokuser på brødtekst"
 
 msgid "When creating a new note:"
-msgstr "Når du lager et nytt notat:"
+msgstr "Når du oppretter et nytt notat:"
 
-#, fuzzy
 msgid "Enable soft breaks"
-msgstr "Liste over innhold"
+msgstr "Aktiver myke linjeskift"
 
 #, fuzzy
+msgid "Enable typographer support"
+msgstr "Aktiver Fountain syntaksstøtte"
+
 msgid "Enable math expressions"
-msgstr "Aktiver kryptering"
+msgstr "Aktiver matteuttrykk"
 
 msgid "Enable ==mark== syntax"
-msgstr ""
+msgstr "Aktiver ==mark==-syntaks"
 
-#, fuzzy
 msgid "Enable footnotes"
-msgstr "Liste over innhold"
+msgstr "Aktiver fotnoter"
 
-#, fuzzy
 msgid "Enable table of contents extension"
-msgstr "Liste over innhold"
+msgstr "Aktiver liste over innhold-utvidelse"
 
 msgid "Enable ~sub~ syntax"
-msgstr ""
+msgstr "Aktiver ~sub~-syntaks"
 
 msgid "Enable ^sup^ syntax"
-msgstr ""
+msgstr "Aktiver ^sup^-syntaks"
 
 msgid "Enable deflist syntax"
-msgstr ""
+msgstr "Aktiver deflist-syntaks"
 
 msgid "Enable abbreviation syntax"
-msgstr ""
+msgstr "Aktiver forkortelsesyntaks"
 
 msgid "Enable markdown emoji"
-msgstr ""
+msgstr "Aktiver markdown-emoji"
 
 msgid "Enable ++insert++ syntax"
-msgstr ""
+msgstr "Aktiver ++insert++-syntaks"
 
 msgid "Enable multimarkdown table extension"
-msgstr ""
+msgstr "Aktiver multimarkdown-tabellutvidelse"
 
 msgid "Enable Fountain syntax support"
-msgstr ""
+msgstr "Aktiver Fountain syntaksstøtte"
 
 msgid "Show tray icon"
 msgstr "Vis systemmenyikon"
@@ -1540,12 +1616,11 @@ msgstr "Global forstørrelse"
 msgid "Editor font size"
 msgstr "Editorskriftstørrelse"
 
-#, fuzzy
 msgid "Editor font"
-msgstr "Editorskriftstørrelse"
+msgstr "Editorskrift"
 
 msgid "Editor font family"
-msgstr "Editorskrifttype"
+msgstr "Editorskriftfamilie"
 
 msgid ""
 "This must be *monospace* font or it will not work properly. If the font is "
@@ -1590,6 +1665,36 @@ msgstr ""
 "Teksteditor som skal brukes til å åpne et notat. Hvis det ikke er satt vil "
 "den prøve å automatisk velge standardprogram."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Egendefinerte TLS-sertifikater"
 
@@ -1611,25 +1716,28 @@ msgid ""
 "Fail-safe: Do not wipe out local data when sync target is empty (often the "
 "result of a misconfiguration or bug)"
 msgstr ""
+"Feilhåndtering: Ikke slett lokal data når synkroniseringsmålet er tomt (ofte "
+"resultatet av en miskonfigurering eller bug)"
 
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Spesifiser porten som skal brukes av API-serveren. Hvis ikke satt vil en "
+"standardport brukes."
 
-#, fuzzy
 msgid "Enable note history"
-msgstr "Liste over innhold"
+msgstr "Aktiver notathistorikk"
 
 msgid "days"
-msgstr ""
+msgstr "dager"
 
 #, javascript-format
 msgid "%d days"
-msgstr ""
+msgstr "%d dager"
 
 msgid "Keep note history for"
-msgstr ""
+msgstr "Behold notathistorikk i"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1648,18 +1756,16 @@ msgid "Note"
 msgstr "Notat"
 
 msgid "Plugins"
-msgstr ""
+msgstr "Utvidelser"
 
 msgid "Application"
 msgstr "Applikasjon"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "Kryptering er:"
+msgstr "Kryptering"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Web Clipper-innstillinger"
+msgstr "Web Clipper"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1674,13 +1780,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-eksportert katalog"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Evernote-eksportert fil"
+msgstr "Evernote-eksportert fil (Markdown)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Evernote-eksportert fil"
+msgstr "Evernote-eksportert fil (HTML)"
 
 msgid "Json Export Directory"
 msgstr "Json-eksportert katalog"
@@ -1714,7 +1818,7 @@ msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Velg notatbok som notatene skal importeres til."
 
 msgid "Restored Notes"
-msgstr ""
+msgstr "Gjenopprettede notater"
 
 msgid "Items that cannot be synchronised"
 msgstr "Elementer som ikke vil synkronisere"
@@ -1728,23 +1832,25 @@ msgstr ""
 "synkroniseringsmålet. For å finne disse elementene, enten søk etter tittel "
 "eller ID (som vises i parentes over)."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s (%s) could not be uploaded: %s"
-msgstr "Filen kunne ikke åpnes: %s"
+msgstr "%s (%s) ble ikke opplasted: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "Filen kunne ikke åpnes: %s"
+msgstr "Element \"%s\" ble ikke nedlastet: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Elementer som ikke vil synkronisere"
+msgstr "Elementer som ikke kan dekrypteres"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin feilet i å dekryptere disse elementene flere ganger, muligens fordi "
+"de er korrupte eller for store. Disse elementene vil forbli på enheten men "
+"Joplin vil ikke lenger forsøke å dekryptere de."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Synkroniseringsstatus (synkroniserte elementer / totale elementer)"
@@ -1785,13 +1891,11 @@ msgstr "Tillatelse til å bruke kamera"
 msgid "Your permission to use your camera is required."
 msgstr "Tillatelse til å bruke kamera er nødvendig."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "Ingen aktiv notatbok."
+msgstr "Du har ingen notatbøker."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "Oppretter en ny notatbok."
+msgstr "Opprett en notatbok"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Det finnes enda ingen notater. Lag en ved å klikke på (+)-knappen."
@@ -1821,24 +1925,21 @@ msgstr "Velg dato"
 msgid "Confirm"
 msgstr "Bekreft"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Notatbøker"
+msgstr "Notatbok: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Krypterte elementer kan ikke modifiseres"
+msgstr "Krypterte elementer kan ikke få endret navn"
 
-#, fuzzy
 msgid "New Notebook"
 msgstr "Ny notatbok"
 
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#, fuzzy
 msgid "All notes"
-msgstr "notat"
+msgstr "Alle notater"
 
 msgid "Checking... Please wait."
 msgstr "Sjekker… Vennligst vent."
@@ -1881,48 +1982,48 @@ msgid "Type new tags or select from list"
 msgstr "Skriv inn nye merkelapper eller velg fra listen"
 
 msgid "Warning"
-msgstr ""
+msgstr "Advarsel"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
+"For å kunne bruke filsystemsynkronisering behøves din tillatelse til å kunne "
+"skrive til ekstern lagrging."
 
 msgid "Encryption Config"
 msgstr "Krypteringsinnstillinger"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Verktøy"
+msgstr "Verktøy"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Status"
+msgstr "Synkroniseringsstatus"
 
 msgid "Log"
 msgstr "Logg"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Oppretter nytt %s..."
+msgstr "Oppretter rapport..."
 
 msgid "Export Debug Report"
 msgstr "Eksporter feilsøkingsrapport"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Fikser søkeindeks..."
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Fiks søkeindeks"
 
 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 ""
+"Velg dette for å gjenoppbygge søkeindeksen dersom du har problemer med søk. "
+"Det kan ta lang tid avhengig av antall notater."
 
-#, fuzzy
 msgid "More information"
-msgstr "Konfigurasjon"
+msgstr "Mer informasjon"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1975,6 +2076,10 @@ msgstr "Passord:"
 msgid "Password cannot be empty"
 msgstr "Passordet kan ikke være tomt"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Passordet kan ikke være tomt"
+
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -1985,9 +2090,8 @@ msgstr "Denne notatboken kunne ikke lagres: %s"
 msgid "Edit notebook"
 msgstr "Rediger notatbok"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Tittel på notatbok:"
+msgstr "Angi tittel på notatbok"
 
 msgid "Show all"
 msgstr "Vis alle"
@@ -2014,15 +2118,15 @@ msgstr "Joplins mobilapp støtter for tiden ikke denne type linker: %s"
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "Linker med protokoll \"%s\" er ikke støttet"
 
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Bildetypen er ikke støttet: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Oppdatert: %d."
+msgstr "Oppdatert: %s"
 
 msgid "View on map"
 msgstr "Vis på kart"
@@ -2030,13 +2134,11 @@ msgstr "Vis på kart"
 msgid "Go to source URL"
 msgstr "Gå til kilde-URL"
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Søk..."
+msgstr "Legg ved..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Vis avanserte innstillinger"
+msgstr "Velg et alternativ"
 
 msgid "Take photo"
 msgstr "Ta bilde"
@@ -2056,19 +2158,17 @@ msgstr "Konverter til notat"
 msgid "Convert to todo"
 msgstr "Konverter til gjøremål"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Notategenskaper"
+msgstr "Egenskaper"
 
 msgid "Add body"
-msgstr ""
+msgstr "Legg til brødtekst"
 
 msgid "Edit"
 msgstr "Rediger"
 
-#, fuzzy
 msgid "Add title"
-msgstr "tittel"
+msgstr "Legg til tittel"
 
 msgid "Login with OneDrive"
 msgstr "Innlogging med OneDrive"
@@ -2076,6 +2176,21 @@ msgstr "Innlogging med OneDrive"
 msgid "Search"
 msgstr "Søk"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Synkronisering pågår allerede. Status: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Skriv inn masterpassordet:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Skriv inn masterpassordet:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Mangler nødvendig argument: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr ""
 #~ "Notatredigering startet. Lukk editoren for å komme tilbake til "
@@ -2087,9 +2202,6 @@ msgstr "Søk"
 #~ msgid "Sidebar"
 #~ msgstr "Sidepanel"
 
-#~ msgid "Note list"
-#~ msgstr "Notatliste"
-
 #~ msgid "Note title"
 #~ msgstr "Tittel på notat:"
 
@@ -2111,17 +2223,14 @@ msgstr "Søk"
 #~ msgid "Encryption options"
 #~ msgstr "Krypteringsvalg"
 
-#, fuzzy
 #~ msgid "Insert template"
-#~ msgstr "Sett inn dato/tid"
+#~ msgstr "Legg inn mal"
 
-#, fuzzy
 #~ msgid "Open template directory"
-#~ msgstr "Joplin-eksportert katalog"
+#~ msgstr "Åpne malkatalog"
 
-#, fuzzy
 #~ msgid "Revision: %s (%s)"
-#~ msgstr "%s %s (%s)"
+#~ msgstr "Revisjon: %s (%s)"
 
 #~ msgid "%s %s (%s, %s)"
 #~ msgstr "%s %s (%s, %s)"
@@ -2132,13 +2241,11 @@ msgstr "Søk"
 #~ msgid "Clipper Options"
 #~ msgstr "Clipper-innstillinger"
 
-#, fuzzy
 #~ msgid "Information"
-#~ msgstr "Konfigurasjon"
+#~ msgstr "Informasjon"
 
-#, fuzzy
 #~ msgid "Permission to write to external storage"
-#~ msgstr "Tillatelse til å bruke kamera"
+#~ msgstr "Tillatelse til å skrive til ekstern lagring"
 
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Avbryt synkronisering"

CliClient/locales/nl_BE.po

@@ -139,6 +139,14 @@ msgstr "Voeg hoofdsleutel in:"
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Voeg hoofdsleutel in:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Wachtwoord kan niet leeg zijn"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -471,9 +479,10 @@ msgstr "Annuleren.. Even geduld."
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> kan \"add\", \"remove\" of \"list\" zijn om een [tag] toe te "
 "voegen aan een [note] of te verwijderen, of om alle notities geassocieerd "
@@ -591,6 +600,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Bestand"
@@ -678,6 +691,13 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Schakel encryptie in"
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -744,6 +764,10 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Notities verwijderen?"
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -1022,6 +1046,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Deze notitie werd aangepast:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Link of bericht \"%s\" wordt niet ondersteund"
+
 msgid "Restore"
 msgstr ""
 
@@ -1051,10 +1079,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Link of bericht \"%s\" wordt niet ondersteund"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1149,6 +1173,9 @@ msgstr "Opties"
 msgid "Synchronisation Status"
 msgstr "Synchronisatie status"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1158,6 +1185,9 @@ msgstr ""
 "Notitieboek verwijderen? Alle notities in dit notitieboek zullen ook "
 "verwijderd worden."
 
+msgid "Delete"
+msgstr "Verwijderen"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Deze tag verwijderen van alle notities?"
@@ -1165,8 +1195,9 @@ msgstr "Deze tag verwijderen van alle notities?"
 msgid "Remove this search from the sidebar?"
 msgstr "Dit item verwijderen van de zijbalk?"
 
-msgid "Delete"
-msgstr "Verwijderen"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nieuw notitieboek"
 
 msgid "Rename"
 msgstr "Hernoem"
@@ -1338,10 +1369,6 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Synchronisatie is reeds bezig. Status: %s"
-
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1391,6 +1418,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Standaard: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Synchronisatiedoel"
 
@@ -1461,12 +1501,39 @@ msgstr "Licht"
 msgid "Dark"
 msgstr "Donker"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+msgid "Show note counts"
+msgstr ""
+
+#, fuzzy
+msgid "Editor"
+msgstr "Bewerk"
+
+msgid "Viewer"
+msgstr ""
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 #, fuzzy
 msgid "Uncompleted to-dos on top"
 msgstr "Toon onvoltooide to-do's aan de top van de lijsten"
@@ -1506,6 +1573,9 @@ msgstr "Maakt een nieuwe notitie aan."
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Schakel encryptie in"
@@ -1615,6 +1685,36 @@ msgstr ""
 "geen meegegeven wordt, zal het programma de standaard editor proberen te "
 "detecteren. "
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1997,6 +2097,10 @@ msgstr "Wachtwoord:"
 msgid "Password cannot be empty"
 msgstr "Wachtwoord kan niet leeg zijn"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Wachtwoord kan niet leeg zijn"
+
 msgid "Enable"
 msgstr "Activeer"
 
@@ -2098,6 +2202,21 @@ msgstr "Log in met OneDrive"
 msgid "Search"
 msgstr "Zoeken"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Synchronisatie is reeds bezig. Status: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Voeg hoofdsleutel in:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Voeg hoofdsleutel in:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Benodigde argumenten niet voorzien: %s"
+
 #~ 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."
@@ -2194,13 +2313,6 @@ msgstr "Zoeken"
 #~ msgid "Searches"
 #~ msgstr "Zoekopdrachten"
 
-#, fuzzy
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "Notities verwijderen?"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Importeer een Evernote notitieboek (.enex bestand)."
 

CliClient/locales/nl_NL.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
-"Language-Team: Dutch <vistausss@outlook.com>\n"
+"Last-Translator: Robert <metbril@outlook.com>\n"
+"Language-Team: Dutch / Nederlands\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -140,6 +140,14 @@ msgstr "Voer het hoofdwachtwoord in:"
 msgid "Operation cancelled"
 msgstr "Handeling geannuleerd"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Voer het hoofdwachtwoord in:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Wachtwoord mag niet blanco zijn"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -389,17 +397,20 @@ 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 ""
+"Start, stop of controleer de API-server. Stel de api.port "
+"configuratievariabele in om te specificeren op welke poort deze draait. "
+"Commando's zijn (%s)."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "Server draait reeds op poort %d"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "Server draait op poort %d"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "Server draait niet."
 
 #, javascript-format
 msgid ""
@@ -469,10 +480,12 @@ msgstr "Resources downloaden…"
 msgid "Cancelling... Please wait."
 msgstr "Bezig met annuleren... Even geduld."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> kan \"add\", \"remove\" of \"list\" zijn om [tag] toe te "
 "wijzen aan of te verwijderen uit [note] of om de met [tag] geassocieerde "
@@ -590,6 +603,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Bezig met exporteren van \"%s\" in het formaat \"%s\". Even geduld..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "&Bestand"
 
@@ -672,6 +689,13 @@ msgstr "Beel&d"
 msgid "Toggle sidebar"
 msgstr "Zijbalk tonen/verbergen"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Notitielijst"
+
 msgid "Toggle editor layout"
 msgstr "Bewerkindeling tonen/verbergen"
 
@@ -687,9 +711,8 @@ msgstr "&Help"
 msgid "Website and documentation"
 msgstr "Website en documentatie"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin-website"
+msgstr "Joplin-forum"
 
 msgid "Make a donation"
 msgstr "Doneren"
@@ -734,6 +757,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Herstelde notities"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Token is naar het klembord gekopieerd!"
 
@@ -803,7 +830,7 @@ msgstr ""
 "geven tot Joplin."
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "Dit opent een nieuw scherm. Wijzigingen opslaan?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -913,13 +940,13 @@ msgid "Encryption is:"
 msgstr "Gebruikte versleuteling:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Firefox-extensie"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome Web Store"
 
 msgid "Get it now:"
-msgstr ""
+msgstr "Haal nu op:"
 
 msgid "Usage"
 msgstr "Gebruik"
@@ -1018,6 +1045,10 @@ msgstr "De notitie “%s” is succesvol hersteld naar notitieboek “%s”."
 msgid "This note has no history"
 msgstr "Deze notitie heeft geen geschiedenis"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Niet-ondersteunde link of bericht: %s"
+
 msgid "Restore"
 msgstr "Herstel"
 
@@ -1049,10 +1080,6 @@ msgstr "Linkadres kopiëren"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Deze bijlage is niet gedownload of nog niet ontsleuteld."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Niet-ondersteunde link of bericht: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1147,6 +1174,9 @@ msgstr "Opties"
 msgid "Synchronisation Status"
 msgstr "Synchronisatiestatus"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1158,6 +1188,9 @@ msgstr ""
 "Alle notities en sub-notitieboeken in dit notitieboek worden eveneens "
 "verwijderd."
 
+msgid "Delete"
+msgstr "Verwijderen"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Label “%s” verwijderen van alle notities?"
@@ -1165,8 +1198,9 @@ msgstr "Label “%s” verwijderen van alle notities?"
 msgid "Remove this search from the sidebar?"
 msgstr "Deze zoekopdracht verwijderen uit de zijbalk?"
 
-msgid "Delete"
-msgstr "Verwijderen"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nieuw notitieboek"
 
 msgid "Rename"
 msgstr "Naam wijzigen"
@@ -1336,10 +1370,6 @@ msgstr "Inactief"
 msgid "In progress"
 msgstr "Bezig"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "De synchronisatie loopt al. Status: %s"
-
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1386,6 +1416,19 @@ msgstr ""
 "naartoe kopieert voor synchronisatie. Anders worden alle bestanden "
 "verwijderd! Zie de FAQ voor meer details: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Standaard: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Synchronisatiedoel"
 
@@ -1461,12 +1504,41 @@ msgstr "Licht"
 msgid "Dark"
 msgstr "Donker"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr "Solarised Light"
 
 msgid "Solarised Dark"
 msgstr "Solarised Dark"
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Systeemvakpictogram tonen"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Bewerken"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Beel&d"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Niet-afgeronde taken bovenaan"
 
@@ -1500,6 +1572,10 @@ msgstr "Bij het creëren van een nieuwe notitie:"
 msgid "Enable soft breaks"
 msgstr "Inschakelen zacht afbreken"
 
+#, fuzzy
+msgid "Enable typographer support"
+msgstr "Inschakelen ondersteuning voor Fountain syntaxis"
+
 msgid "Enable math expressions"
 msgstr "Inschakelen wiskundige expressies"
 
@@ -1533,9 +1609,8 @@ msgstr "Inschakelen ++insert++ syntaxis"
 msgid "Enable multimarkdown table extension"
 msgstr "Inschakelen multimarkdown tabel extensie"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "Inschakelen ~sub~ syntaxis"
+msgstr "Inschakelen ondersteuning voor Fountain syntaxis"
 
 msgid "Show tray icon"
 msgstr "Systeemvakpictogram tonen"
@@ -1561,9 +1636,8 @@ msgstr "Globaal zoompercentage"
 msgid "Editor font size"
 msgstr "Lettergrootte van bewerker"
 
-#, fuzzy
 msgid "Editor font"
-msgstr "Lettergrootte van bewerker"
+msgstr "Lettertype van bewerker"
 
 msgid "Editor font family"
 msgstr "Lettertype van bewerker"
@@ -1612,6 +1686,36 @@ msgstr ""
 "gebruikt bij het openen van notities. Als er geen wordt opgegeven, dan wordt "
 "getracht de standaard bewerker te achterhalen."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Aangepaste TLS-certificaten"
 
@@ -1634,11 +1738,15 @@ msgid ""
 "Fail-safe: Do not wipe out local data when sync target is empty (often the "
 "result of a misconfiguration or bug)"
 msgstr ""
+"Veiligheidswaarschuwing: Wis lokale gegevens niet wanneer synchronisatiedoel "
+"leeg is (vaak het gevolg van een misconfiguratie of softwarefout)"
 
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Specificeer de door de API-server te gebruiken poort. Indien niet ingesteld, "
+"wordt een standaardwaarde gebruikt."
 
 msgid "Enable note history"
 msgstr "Inschakelen geschiedenis van notities"
@@ -1675,13 +1783,11 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Applicatie"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "Gebruikte versleuteling:"
+msgstr "Versleuteling"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Webclipper-opties"
+msgstr "Webclipper"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1696,13 +1802,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-exportmap"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Evernote-exportbestand"
+msgstr "Evernote-exportbestand (als Markdown)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Evernote-exportbestand"
+msgstr "Evernote-exportbestand (als HTML)"
 
 msgid "Json Export Directory"
 msgstr "JSON-exportmap"
@@ -1811,13 +1915,11 @@ msgstr "Toestemming om de camera te gebruiken"
 msgid "Your permission to use your camera is required."
 msgstr "Je toestemming om de camera te gebruiken is vereist."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "Geen actief notitieboek."
+msgstr "Je hebt nog geen notitieboeken."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "Creëert een nieuw notitieboek."
+msgstr "Creëer een notitieboek"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
@@ -1849,24 +1951,21 @@ msgstr "Datum kiezen"
 msgid "Confirm"
 msgstr "Bevestigen"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Notitieboeken"
+msgstr "Notitieboek: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Versleutelde items kunnen niet worden bewerkt"
+msgstr "Versleutelde notitieboeken kunnen niet worden hernoemd"
 
-#, fuzzy
 msgid "New Notebook"
 msgstr "Nieuw notitieboek"
 
 msgid "Configuration"
 msgstr "Configuratie"
 
-#, fuzzy
 msgid "All notes"
-msgstr "notitie"
+msgstr "Alle notities"
 
 msgid "Checking... Please wait."
 msgstr "Controleren… Even geduld."
@@ -1921,20 +2020,17 @@ msgstr ""
 msgid "Encryption Config"
 msgstr "Versleutelconfiguratie"
 
-#, fuzzy
 msgid "Tools"
-msgstr "E&xtra"
+msgstr "Hulpmiddelen"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Status"
+msgstr "Synchronisatiestatus"
 
 msgid "Log"
 msgstr "Log"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Bezig met creëren van nieuw(e) %s..."
+msgstr "Creëren rapport..."
 
 msgid "Export Debug Report"
 msgstr "Foutopsporingsrapportage exporteren"
@@ -2007,6 +2103,10 @@ msgstr "Wachtwoord:"
 msgid "Password cannot be empty"
 msgstr "Wachtwoord mag niet blanco zijn"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Wachtwoord mag niet blanco zijn"
+
 msgid "Enable"
 msgstr "Inschakelen"
 
@@ -2017,9 +2117,8 @@ msgstr "Het notitieboek kan niet worden opgeslagen: %s"
 msgid "Edit notebook"
 msgstr "Notitieboek bewerken"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Titel van notitieboek:"
+msgstr "Invoeren titel notitieboek"
 
 msgid "Show all"
 msgstr "Alles tonen"
@@ -2052,9 +2151,9 @@ msgstr "Links met protocol “%s” worden niet ondersteund"
 msgid "Unsupported image type: %s"
 msgstr "Niet-ondersteunde afbeeldingssoort: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Bijgewerkt: %d."
+msgstr "Bijgewerkt: %s"
 
 msgid "View on map"
 msgstr "Tonen op kaart"
@@ -2062,13 +2161,11 @@ msgstr "Tonen op kaart"
 msgid "Go to source URL"
 msgstr "Ga naar bron-URL"
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Zoeken..."
+msgstr "Bijvoegen..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Geavanceerde opties tonen"
+msgstr "Kies een optie"
 
 msgid "Take photo"
 msgstr "Foto maken"
@@ -2088,9 +2185,8 @@ msgstr "Omzetten naar notitie"
 msgid "Convert to todo"
 msgstr "Omzetten naar taak"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Eigenschappen van notitie"
+msgstr "Eigenschappen"
 
 msgid "Add body"
 msgstr "Inhoud toevoegen"
@@ -2098,9 +2194,8 @@ msgstr "Inhoud toevoegen"
 msgid "Edit"
 msgstr "Bewerken"
 
-#, fuzzy
 msgid "Add title"
-msgstr "titel"
+msgstr "Toevoegen titel"
 
 msgid "Login with OneDrive"
 msgstr "Inloggen met OneDrive"
@@ -2108,6 +2203,21 @@ msgstr "Inloggen met OneDrive"
 msgid "Search"
 msgstr "Zoeken"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "De synchronisatie loopt al. Status: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Voer het hoofdwachtwoord in:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Voer het hoofdwachtwoord in:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Vereist argument ontbreekt: %s"
+
 #~ 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 "
@@ -2122,9 +2232,6 @@ msgstr "Zoeken"
 #~ msgid "Sidebar"
 #~ msgstr "Zijbalk"
 
-#~ msgid "Note list"
-#~ msgstr "Notitielijst"
-
 #~ msgid "Note title"
 #~ msgstr "Titel van notitie"
 

CliClient/locales/pl_PL.po

@@ -142,6 +142,14 @@ msgstr "Wprowadź hasło główne:"
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Wprowadź hasło główne:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Hasło nie może być puste"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -477,10 +485,12 @@ msgstr "Pobieranie zasobów..."
 msgid "Cancelling... Please wait."
 msgstr "Anulowanie... Proszę czekać."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> może \"add\", \"remove\" lub \"list\" aby przypisać lub usunąć "
 "[tag] z [note], lub wyświetlić listę notatek połączonych z [tag]. Komenda "
@@ -599,6 +609,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksportowanie do \"%s\" jako \"%s\". Proszę czekać..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "&Plik"
 
@@ -681,6 +695,13 @@ msgstr "&Wyświetl"
 msgid "Toggle sidebar"
 msgstr "Przełącz nawigator"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Lista notatek"
+
 msgid "Toggle editor layout"
 msgstr "Przełącz układ edytora"
 
@@ -743,6 +764,10 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Przywrócone notatki"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Token został skopiowany do schowka!"
 
@@ -1023,6 +1048,10 @@ msgstr "Notatka \"%s\" została pomyślnie przywrócona do notatnika \"%s\"."
 msgid "This note has no history"
 msgstr "Notatka nie posiada historii"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Niewspierany odnośnik lub wiadomość: %s"
+
 msgid "Restore"
 msgstr "Przywróć"
 
@@ -1054,10 +1083,6 @@ msgstr "Skopiuj adres odnośnika"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Załącznik nie został jeszcze pobrany lub deszyfrowany."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Niewspierany odnośnik lub wiadomość: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1152,6 +1177,9 @@ msgstr "Opcje"
 msgid "Synchronisation Status"
 msgstr "Status synchronizacji"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1163,6 +1191,9 @@ msgstr ""
 "Wszystkie notatki i notatniki podrzędne zawarte w tym notatniku także "
 "zostaną usunięte."
 
+msgid "Delete"
+msgstr "Usuń"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Usunąć znacznik \"%s\" ze wszystkich notatek?"
@@ -1170,8 +1201,9 @@ msgstr "Usunąć znacznik \"%s\" ze wszystkich notatek?"
 msgid "Remove this search from the sidebar?"
 msgstr "Usunąć wyszukiwanie z nawigatora?"
 
-msgid "Delete"
-msgstr "Usuń"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nowy notatnik"
 
 msgid "Rename"
 msgstr "Zmień nazwę"
@@ -1341,10 +1373,6 @@ msgstr "Spoczynek"
 msgid "In progress"
 msgstr "W trakcie"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Synchronizacja w toku. Stan: %s"
-
 msgid "Encrypted"
 msgstr "Zaszyfrowane"
 
@@ -1393,6 +1421,19 @@ msgstr ""
 "innym wypadku wszystkie pliki będą usunięte! Sprawdź FAQ w celu uzyskania "
 "informacji: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Domyślne: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Serwis synchronizacji"
 
@@ -1467,12 +1508,41 @@ msgstr "Jasny"
 msgid "Dark"
 msgstr "Ciemny"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Pokaż ikonę w zasobniku systemowym"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Edytuj"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&Wyświetl"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Nieukończone zadania na górze"
 
@@ -1506,6 +1576,10 @@ msgstr "Podczas tworzenia nowej notatki:"
 msgid "Enable soft breaks"
 msgstr "Aktywuj miękkie łamanie linii"
 
+#, fuzzy
+msgid "Enable typographer support"
+msgstr "Aktywuj składnię ~sub~"
+
 msgid "Enable math expressions"
 msgstr "Atywuj wyrażenia matematyczne"
 
@@ -1620,6 +1694,36 @@ msgstr ""
 "aby otwierać notatkę. Jeżeli nie zostanie podana, program spróbuje wykryć "
 "domyślny edytor."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Niestandardowe ceryfikaty TLS"
 
@@ -2009,6 +2113,10 @@ msgstr "Hasło:"
 msgid "Password cannot be empty"
 msgstr "Hasło nie może być puste"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Hasło nie może być puste"
+
 msgid "Enable"
 msgstr "Aktywuj"
 
@@ -2111,6 +2219,21 @@ msgstr "Zaloguj z OneDrive"
 msgid "Search"
 msgstr "Wyszukaj"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Synchronizacja w toku. Stan: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Wprowadź hasło główne:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Wprowadź hasło główne:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Brakujący wymagany argument: %s"
+
 #~ 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 "
@@ -2122,9 +2245,6 @@ msgstr "Wyszukaj"
 #~ msgid "Sidebar"
 #~ msgstr "Nawigator"
 
-#~ msgid "Note list"
-#~ msgstr "Lista notatek"
-
 #~ msgid "Note title"
 #~ msgstr "Tytuł notatki"
 

CliClient/locales/pt_BR.po

@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Rafael Teixeira <rto.tinfo@gmail.com>\n"
+"Last-Translator: Marton Paulo <martonpss@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -137,6 +137,12 @@ msgstr "Entre a senha master:"
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
+msgid "Confirm password:"
+msgstr "Confirme a senha:"
+
+msgid "Passwords do not match!"
+msgstr "As senhas não coincidem!"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -381,17 +387,20 @@ 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 ""
+"Inicie, pare ou verifique o servidor da API. Para especificar em qual porta "
+"deve ser executada, defina a variável de configuração api.port. Os comandos "
+"são (%s)."
 
 #, javascript-format
 msgid "Server is already running on port %d"
-msgstr ""
+msgstr "O servidor já está rodando na porta %d"
 
 #, javascript-format
 msgid "Server is running on port %d"
-msgstr ""
+msgstr "O servidor está rodando na porta %d"
 
 msgid "Server is not running."
-msgstr ""
+msgstr "O servidor não está rodando"
 
 #, javascript-format
 msgid ""
@@ -469,14 +478,15 @@ msgid "Cancelling... Please wait."
 msgstr "Cancelando... Aguarde."
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> pode ser \"add\", \"remove\" ou \"list\" para atribuir ou "
-"remover [tag] de [nota], ou para listar as notas associadas a [tag]. O "
-"comando `tag list` pode ser usado para listar todas as tags (use -l para "
-"opção longa)."
+"<tag-command> pode ser \"adicionar\", \"remover\", \"listar\" ou \"tags de "
+"notas\" para atribuir ou remover [tag] de [nota], ou para listar as notas "
+"associadas a [tag]. O comando `tag list` pode ser usado para listar todas as "
+"tags (use -l para opção longa)."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -589,6 +599,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando para \"%s\" com o formato \"%s\". Por favor, aguarde..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr "Não foi possível exportar notas: %s"
+
 msgid "&File"
 msgstr "&Arquivo"
 
@@ -602,7 +616,7 @@ msgid "Check for updates..."
 msgstr "Verificar atualizações..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Modelos"
 
 msgid "Import"
 msgstr "Importar"
@@ -671,6 +685,12 @@ msgstr "&Visualizar"
 msgid "Toggle sidebar"
 msgstr "Alternar barra lateral"
 
+msgid "Layout button sequence"
+msgstr ""
+
+msgid "Toggle note list"
+msgstr "Alternar lista de notas"
+
 msgid "Toggle editor layout"
 msgstr "Alternar layout do editor"
 
@@ -686,9 +706,8 @@ msgstr "&Ajuda"
 msgid "Website and documentation"
 msgstr "Website e documentação"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Site do Joplin"
+msgstr "Fórum Joplin"
 
 msgid "Make a donation"
 msgstr "Fazer uma doação"
@@ -733,6 +752,9 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
+msgid "Full Release Notes"
+msgstr "Notas da versão completas"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Token foi copiado para a área de transferência!"
 
@@ -802,7 +824,7 @@ msgstr ""
 "terceiros acessem o Joplin."
 
 msgid "This will open a new screen. Save your current changes?"
-msgstr ""
+msgstr "Isso abrirá uma nova tela. Salvar seu progresso atual?"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -911,13 +933,13 @@ msgid "Encryption is:"
 msgstr "Encriptação está:"
 
 msgid "Firefox Extension"
-msgstr ""
+msgstr "Extensão Firefox"
 
 msgid "Chrome Web Store"
-msgstr ""
+msgstr "Chrome Web Store"
 
 msgid "Get it now:"
-msgstr ""
+msgstr "Tenha agora:"
 
 msgid "Usage"
 msgstr "Uso"
@@ -950,7 +972,7 @@ msgid "Set alarm:"
 msgstr "Definir alarme:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "Arquivo de modelo:"
 
 msgid "New note"
 msgstr "Nova nota"
@@ -973,9 +995,8 @@ msgstr "Alguns itens não podem ser sincronizados."
 msgid "View them now"
 msgstr "Visualizar agora"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "Entre a senha master:"
+msgstr "Uma ou mais chaves mestras precisam de uma senha."
 
 msgid "Set the password"
 msgstr "Configurar a senha"
@@ -997,7 +1018,7 @@ msgid "Note History"
 msgstr "Histórico da Nota"
 
 msgid "Markup"
-msgstr ""
+msgstr "Marcação"
 
 msgid "Previous versions of this note"
 msgstr "Versões anteriores desta nota"
@@ -1012,6 +1033,10 @@ msgstr "A nota \"%s\" foi restaurada com sucesso no caderno \"%s\"."
 msgid "This note has no history"
 msgstr "Esta nota não tem histórico"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Link ou mensagem não suportada: %s"
+
 msgid "Restore"
 msgstr "Restaurar"
 
@@ -1042,10 +1067,6 @@ msgstr "Copiar endereço do link"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "O anexo ainda não foi baixado ou decriptado."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Link ou mensagem não suportada: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1138,6 +1159,9 @@ msgstr "Opções"
 msgid "Synchronisation Status"
 msgstr "Status de sincronização"
 
+msgid "Remove"
+msgstr "Remover"
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1148,6 +1172,9 @@ msgstr ""
 "\n"
 "Todas as notas e sub-cadernos dentro deste também serão excluídos."
 
+msgid "Delete"
+msgstr "Excluir"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Remover a tag \"%s\" de todas as notas?"
@@ -1155,8 +1182,8 @@ msgstr "Remover a tag \"%s\" de todas as notas?"
 msgid "Remove this search from the sidebar?"
 msgstr "Remover essa pesquisa da barra lateral?"
 
-msgid "Delete"
-msgstr "Excluir"
+msgid "New sub-notebook"
+msgstr "Novo sub-caderno"
 
 msgid "Rename"
 msgstr "Renomear"
@@ -1168,9 +1195,9 @@ msgstr "Cadernos"
 msgid "Decrypting items: %d/%d"
 msgstr "Decriptando itens: %d/%d"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Fetching resources: %d/%d"
-msgstr "Buscando recursos: %d"
+msgstr "Buscando recursos: %d/%d"
 
 msgid "Please select where the sync status should be exported to"
 msgstr ""
@@ -1328,10 +1355,6 @@ msgstr "Inativo"
 msgid "In progress"
 msgstr "Em andamento"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Sincronização já em andamento. Estado: %s"
-
 msgid "Encrypted"
 msgstr "Encriptado"
 
@@ -1379,6 +1402,19 @@ msgstr ""
 "conteúdo para lá antes de sincronizar, do contrário todos os seus arquivos "
 "serão removidos! Veja o FAQ para mais detalhes: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Padrão: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Alvo de sincronização"
 
@@ -1411,7 +1447,7 @@ msgid "WebDAV password"
 msgstr "Senha do WebDAV"
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "Comportamento de download de anexos"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
@@ -1432,7 +1468,7 @@ msgid "Auto"
 msgstr "Automático"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "Máximo de conexões simultâneas"
 
 msgid "Language"
 msgstr "Idioma"
@@ -1452,10 +1488,39 @@ msgstr "Light"
 msgid "Dark"
 msgstr "Dark"
 
+msgid "Dracula"
+msgstr "Drácula"
+
 msgid "Solarised Light"
-msgstr ""
+msgstr "Solarizado Light"
 
 msgid "Solarised Dark"
+msgstr "Solarizado Dark"
+
+msgid "Nord"
+msgstr "Nord"
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Exibir tray icon"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Editar"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&Visualizar"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1491,6 +1556,9 @@ msgstr "Quando criar uma nota nova:"
 msgid "Enable soft breaks"
 msgstr "Habilitar soft breaks"
 
+msgid "Enable typographer support"
+msgstr "Habilitar suporte para tipógrafos"
+
 msgid "Enable math expressions"
 msgstr "Habilitar expressões matemáticas"
 
@@ -1524,9 +1592,8 @@ msgstr "Habilitar sintaxe ++inserir++"
 msgid "Enable multimarkdown table extension"
 msgstr "Habilitar extensão de tabela de multimarkdown"
 
-#, fuzzy
 msgid "Enable Fountain syntax support"
-msgstr "Habilitar sintaxe ~sub~"
+msgstr "Habilitar suporte à sintaxe Fountain"
 
 msgid "Show tray icon"
 msgstr "Exibir tray icon"
@@ -1550,11 +1617,10 @@ msgid "Global zoom percentage"
 msgstr "Porcentagem global do zoom"
 
 msgid "Editor font size"
-msgstr "Tamanho da fonte no Editor"
+msgstr "Tamanho da fonte do editor"
 
-#, fuzzy
 msgid "Editor font"
-msgstr "Tamanho da fonte no Editor"
+msgstr "Fonte do editor"
 
 msgid "Editor font family"
 msgstr "Família de fontes do editor"
@@ -1602,6 +1668,36 @@ msgstr ""
 "nota. Se nenhum for indicado, ele tentará detectar automaticamente o editor "
 "padrão."
 
+msgid "Page size for PDF export"
+msgstr "Tamanho da página para exportação de PDF"
+
+msgid "A4"
+msgstr "A4"
+
+msgid "Letter"
+msgstr "Carta"
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A5"
+msgstr "A5"
+
+msgid "Tabloid"
+msgstr "Tablóide"
+
+msgid "Legal"
+msgstr "Legal"
+
+msgid "Page orientation for PDF export"
+msgstr "Orientação da página para exportação de PDF"
+
+msgid "Portrait"
+msgstr "Retrato"
+
+msgid "Landscape"
+msgstr "Paisagem"
+
 msgid "Custom TLS certificates"
 msgstr "Certificados TLS customizados"
 
@@ -1624,11 +1720,16 @@ msgid ""
 "Fail-safe: Do not wipe out local data when sync target is empty (often the "
 "result of a misconfiguration or bug)"
 msgstr ""
+"À prova de falhas: não limpe os dados locais quando o destino da "
+"sincronização estiver vazio (geralmente o resultado de uma configuração "
+"incorreta ou bug)"
 
 msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Especifique a porta que deve ser usada pelo servidor da API. Se não "
+"definido, um padrão será usado."
 
 msgid "Enable note history"
 msgstr "Habilitar histórico de notas"
@@ -1665,13 +1766,11 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Aplicação"
 
-#, fuzzy
 msgid "Encryption"
-msgstr "Encriptação está:"
+msgstr "Criptografia"
 
-#, fuzzy
 msgid "Web Clipper"
-msgstr "Opções do Web clipper"
+msgstr "Web Clipper"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1686,13 +1785,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Diretório de Exportação do Joplin"
 
-#, fuzzy
 msgid "Evernote Export File (as Markdown)"
-msgstr "Arquivo de Exportação do Evernote"
+msgstr "Arquivo de Exportação do Evernote (Markdown)"
 
-#, fuzzy
 msgid "Evernote Export File (as HTML)"
-msgstr "Arquivo de Exportação do Evernote"
+msgstr "Arquivo de Exportação do Evernote (HTML)"
 
 msgid "Json Export Directory"
 msgstr "Diretório de Exportação JSON"
@@ -1800,13 +1897,11 @@ msgstr "Permissão para utilizar sua câmera"
 msgid "Your permission to use your camera is required."
 msgstr "É necessária a sua permissão para utilizar sua câmera."
 
-#, fuzzy
 msgid "You currently have no notebooks."
-msgstr "Excluir nota selecionada ou notebook."
+msgstr "No momento, você não possui cadernos."
 
-#, fuzzy
 msgid "Create a notebook"
-msgstr "Cria um novo caderno."
+msgstr "Criar um caderno"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Atualmente, não há notas. Crie uma, clicando no botão (+)."
@@ -1900,6 +1995,8 @@ msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
+"Para usar a sincronização do sistema de arquivos, é necessária sua permissão "
+"para gravar no armazenamento externo."
 
 msgid "Encryption Config"
 msgstr "Configuração de Encriptação"
@@ -1913,23 +2010,24 @@ msgstr "Status de sincronização"
 msgid "Log"
 msgstr "Log"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Criando novo %s..."
+msgstr "Criando relatório..."
 
 msgid "Export Debug Report"
 msgstr "Exportar Relatório de Debug"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Corrigindo índice de pesquisa..."
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Corrigir índice de pesquisa"
 
 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 ""
+"Use isso para recriar o índice de pesquisa se houver um problema com a "
+"pesquisa. Pode demorar muito, dependendo do número de notas."
 
 msgid "More information"
 msgstr "Mais informações"
@@ -1988,6 +2086,9 @@ msgstr "Senha:"
 msgid "Password cannot be empty"
 msgstr "Senha não pode ser vazia"
 
+msgid "Confirm password cannot be empty"
+msgstr "Confirme a senha não pode ser vazia"
+
 msgid "Enable"
 msgstr "Habilitar"
 
@@ -2042,9 +2143,8 @@ msgstr "Ver no mapa"
 msgid "Go to source URL"
 msgstr "Ir para a URL de origem"
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Pesquisar..."
+msgstr "Anexar..."
 
 msgid "Choose an option"
 msgstr "Escolha uma opção"
@@ -2067,12 +2167,11 @@ msgstr "Converter para nota"
 msgid "Convert to todo"
 msgstr "Converter para tarefa"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Propriedades da nota"
+msgstr "Propriedades"
 
 msgid "Add body"
-msgstr ""
+msgstr "Adicionar corpo"
 
 msgid "Edit"
 msgstr "Editar"
@@ -2086,6 +2185,21 @@ msgstr "Login com OneDrive"
 msgid "Search"
 msgstr "Procurar"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Sincronização já em andamento. Estado: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Entre a senha master:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Entre a senha master:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Argumento requerido faltando: %s"
+
 #~ 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."
 
@@ -2095,9 +2209,6 @@ msgstr "Procurar"
 #~ msgid "Sidebar"
 #~ msgstr "Barra Lateral"
 
-#~ msgid "Note list"
-#~ msgstr "Lista de notas"
-
 #~ msgid "Note title"
 #~ msgstr "Título da Nota"
 
@@ -2204,15 +2315,6 @@ msgstr "Procurar"
 #~ msgid "Searches"
 #~ msgstr "Pesquisas"
 
-#~ msgid ""
-#~ "Release notes:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Notas da versão:\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Imports an Evernote notebook file (.enex file)."
 #~ msgstr "Importa um arquivo de caderno do Evernote (arquivo .enex)."
 

CliClient/locales/ro.po

@@ -132,6 +132,14 @@ msgstr ""
 msgid "Operation cancelled"
 msgstr "Operațiunea a fost amânată"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Parolă:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Parolă nu poate fi un câmp gol"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -428,9 +436,10 @@ msgid "Cancelling... Please wait."
 msgstr "Se anulează... Vă rugăm să așteptați."
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 
 #, javascript-format
@@ -528,6 +537,10 @@ 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..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Fișier"
@@ -615,6 +628,13 @@ msgstr "Vizualizați"
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Activați criptarea"
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -679,6 +699,9 @@ msgstr "Da"
 msgid "No"
 msgstr "Nu"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -937,6 +960,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Această notiță a fost modificată:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr ""
+
 msgid "Restore"
 msgstr ""
 
@@ -965,10 +992,6 @@ msgstr "Copați adresa link-ului"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1059,6 +1082,9 @@ msgstr "Opțiuni"
 msgid "Synchronisation Status"
 msgstr "Statutul sincronizării"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1066,6 +1092,9 @@ msgid ""
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr ""
 
+msgid "Delete"
+msgstr "Ștergeți"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr ""
@@ -1073,8 +1102,9 @@ msgstr ""
 msgid "Remove this search from the sidebar?"
 msgstr ""
 
-msgid "Delete"
-msgstr "Ștergeți"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Adăugați un nou caiet de notițe"
 
 msgid "Rename"
 msgstr "Redenumiți"
@@ -1237,10 +1267,6 @@ msgstr ""
 msgid "In progress"
 msgstr "În progres"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Criptat"
 
@@ -1284,6 +1310,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Modul implicit: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr ""
 
@@ -1352,12 +1391,41 @@ msgstr "Deschisă"
 msgid "Dark"
 msgstr "Închisă"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Afișați iconița coșul de gunoi"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Editați"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Vizualizați"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr ""
 
@@ -1392,6 +1460,9 @@ msgstr "Când este creată o nouă notiță:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Activați criptarea"
@@ -1496,6 +1567,36 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Certificate TLS cusomizate"
 
@@ -1864,6 +1965,10 @@ msgstr "Parolă:"
 msgid "Password cannot be empty"
 msgstr "Parolă nu poate fi un câmp gol"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Parolă nu poate fi un câmp gol"
+
 msgid "Enable"
 msgstr "Activați"
 
@@ -1966,6 +2071,18 @@ msgstr "Autentificare prin OneDrive"
 msgid "Search"
 msgstr "Caută"
 
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Setați parola"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Confirmați"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Lipsește argumentul necesar: %s"
+
 #~ msgid "Note has been saved."
 #~ msgstr "Notița a fost salvată."
 

CliClient/locales/ru_RU.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.0.6\n"
+"X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -22,8 +22,7 @@ msgstr "Для удаления метки, открепите ее от свя
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr ""
-"Пожалуйста, выберите заметку или блокнот, которые будут удалены в первую "
-"очередь."
+"Пожалуйста, выберите заметку или блокнот, которые будут удалены первыми."
 
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "Для выхода из приложения нажмите Ctrl+D или введите \"exit\""
@@ -103,7 +102,7 @@ msgstr ""
 "конфигурацию."
 
 msgid "Also displays unset and hidden config variables."
-msgstr "Также выводит неустановленные или скрытые переменные конфигурации."
+msgstr "Также показывает неустановленные или скрытые переменные конфигурации."
 
 #, javascript-format
 msgid "%s = %s (%s)"
@@ -127,7 +126,6 @@ msgstr "Отмечает задачу как выполненную."
 msgid "Note is not a to-do: \"%s\""
 msgstr "Заметка не является задачей: «%s»"
 
-#, fuzzy
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status`, `decrypt-file` and `target-status`."
@@ -141,6 +139,14 @@ msgstr "Введите мастер-пароль:"
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Введите мастер-пароль:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Пароль не может быть пустым"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -387,17 +393,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 ""
@@ -473,10 +481,12 @@ msgstr "Загрузка ресурсов..."
 msgid "Cancelling... Please wait."
 msgstr "Отмена... Пожалуйста, подождите."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> может быть \"add\", \"remove\" или \"list\", чтобы назначить "
 "или убрать [tag] с [note], или чтобы вывести список заметок, ассоциированых "
@@ -593,6 +603,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Экспорт в \"%s\" в формате \"%s\". Пожалуйста, подождите..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "&Файл"
 
@@ -600,13 +614,13 @@ msgid "About Joplin"
 msgstr "О Joplin"
 
 msgid "Preferences..."
-msgstr ""
+msgstr "Настройки…"
 
 msgid "Check for updates..."
 msgstr "Проверить обновления..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Шаблоны"
 
 msgid "Import"
 msgstr "Импорт"
@@ -625,7 +639,7 @@ msgid "Quit"
 msgstr "Выход"
 
 msgid "Close Window"
-msgstr ""
+msgstr "Закрыть окно"
 
 msgid "&Edit"
 msgstr "&Правка"
@@ -643,10 +657,10 @@ msgid "Select all"
 msgstr "Выбрать все"
 
 msgid "Bold"
-msgstr "Жирный"
+msgstr "Полужирный"
 
 msgid "Italic"
-msgstr "Наклонный"
+msgstr "Курсивный"
 
 msgid "Link"
 msgstr "Ссылка"
@@ -675,6 +689,13 @@ msgstr "&Вид"
 msgid "Toggle sidebar"
 msgstr "Переключить боковую панель"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Список заметок"
+
 msgid "Toggle editor layout"
 msgstr "Переключить вид редактора"
 
@@ -690,15 +711,14 @@ msgstr "&Помощь"
 msgid "Website and documentation"
 msgstr "Сайт и документация"
 
-#, fuzzy
 msgid "Joplin Forum"
-msgstr "Joplin v%s"
+msgstr "Форум Joplin"
 
 msgid "Make a donation"
-msgstr "Сделать пожертвование"
+msgstr "Пожертвовать"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Включить средства разработки"
 
 #, javascript-format
 msgid "Open %s"
@@ -737,6 +757,10 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Восстановленные заметки"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Токен скопирован в буфер обмена!"
 
@@ -768,7 +792,7 @@ msgstr ""
 "браузера в Joplin."
 
 msgid "In order to use the web clipper, you need to do the following:"
-msgstr "Для того, чтобы использовать веб-клиппер, вам нужно сделать следующее:"
+msgstr "Для использования веб-клиппера вам нужно сделать следующее:"
 
 msgid "Step 1: Enable the clipper service"
 msgstr "Шаг 1: включите службу веб-клиппера"
@@ -778,9 +802,9 @@ 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: установите расширение"
@@ -955,7 +979,7 @@ msgid "Set alarm:"
 msgstr "Установить напоминание:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "Файл шаблона:"
 
 msgid "New note"
 msgstr "Новая заметка"
@@ -978,9 +1002,8 @@ msgstr "Некоторые элементы не могут быть синхр
 msgid "View them now"
 msgstr "Просмотреть их сейчас"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "Введите мастер-пароль:"
+msgstr "Для одного или нескольких мастер-ключей требуется пароль."
 
 msgid "Set the password"
 msgstr "Установить пароль"
@@ -998,35 +1021,39 @@ msgstr "Местоположение"
 msgid "URL"
 msgstr "URL"
 
-#, fuzzy
 msgid "Note History"
-msgstr "Список заметок"
+msgstr "История заметок"
 
 msgid "Markup"
-msgstr ""
+msgstr "Разметка"
 
 msgid "Previous versions of this note"
-msgstr ""
+msgstr "Предыдущая версия заметки"
 
 msgid "Note properties"
 msgstr "Свойства заметки"
 
 #, javascript-format
 msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
-msgstr ""
+msgstr "Заметка “%s” была успешно восстановлена в блокнот “%s”."
 
-#, fuzzy
 msgid "This note has no history"
-msgstr "Эта заметка была изменена:"
+msgstr "Эта заметка не имеет предыдущей версии"
+
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Неподдерживаемая ссылка или сообщение: %s"
 
 msgid "Restore"
-msgstr ""
+msgstr "Восстановить"
 
 #, javascript-format
 msgid ""
 "Click \"%s\" to restore the note. It will be copied in the notebook named "
 "\"%s\". The current version of the note will not be replaced or modified."
 msgstr ""
+"Нажмите “%s”, чтобы восстановить заметку. Она будет скопирована в блокнот "
+"“%s”. Текущая версия заметки не будет заменена или изменена."
 
 msgid "Open..."
 msgstr "Открыть..."
@@ -1047,10 +1074,6 @@ msgstr "Скопировать ссылку"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Это вложение еще не загружено или еще не расшифровано."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Неподдерживаемая ссылка или сообщение: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1144,24 +1167,32 @@ msgstr "Настройки"
 msgid "Synchronisation Status"
 msgstr "Статус синхронизации"
 
-#, fuzzy, javascript-format
+msgid "Remove"
+msgstr ""
+
+#, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr ""
-"Удалить блокнот? Все заметки и вложенные блокноты в этом блокноте также "
-"будут удалены."
+"Удалить блокнот “%s”?\n"
+"\n"
+"Все заметки и вложенные блокноты в этом блокноте также будут удалены."
 
-#, fuzzy, javascript-format
+msgid "Delete"
+msgstr "Удалить"
+
+#, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
-msgstr "Удалить эту метку из всех заметок?"
+msgstr "Удалить метку “%s” из всех заметок?"
 
 msgid "Remove this search from the sidebar?"
 msgstr "Удалить этот поиск из боковой панели?"
 
-msgid "Delete"
-msgstr "Удалить"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Новый блокнот"
 
 msgid "Rename"
 msgstr "Переименовать"
@@ -1182,7 +1213,7 @@ msgstr ""
 "Пожалуйста, выберите, куда должен быть экспортирован статус синхронизации"
 
 msgid "Retry"
-msgstr ""
+msgstr "Повторить попытку"
 
 msgid "Add or remove tags"
 msgstr "Добавить или удалить метки"
@@ -1218,9 +1249,11 @@ msgid ""
 "Type a note title to jump to it. Or type # followed by a tag name, or @ "
 "followed by a notebook name."
 msgstr ""
+"Введите название заметки, чтобы перейти к ней, либо введите #имя_тега или "
+"@имя_блокнота."
 
 msgid "Goto Anything..."
-msgstr ""
+msgstr "Перейти к чему угодно…"
 
 #, javascript-format
 msgid "Usage: %s"
@@ -1330,10 +1363,6 @@ msgstr "Простой"
 msgid "In progress"
 msgstr "Выполнение"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Синхронизация уже выполняется. Состояние: %s"
-
 msgid "Encrypted"
 msgstr "Зашифровано"
 
@@ -1381,6 +1410,19 @@ msgstr ""
 "содержимое перед синхронизацией, в противном случае все файлы будут удалены! "
 "Смотрите FAQ для получения подробной информации: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "По умолчанию: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Цель синхронизации"
 
@@ -1395,7 +1437,7 @@ msgid "Directory to synchronise with (absolute path)"
 msgstr "Каталог синхронизации (абсолютный путь)"
 
 msgid "Nextcloud WebDAV URL"
-msgstr "Nextcloud WebDAV URL"
+msgstr "URL-адрес WebDAV-сервера Nextcloud"
 
 msgid "Nextcloud username"
 msgstr "Имя пользователя Nextcloud"
@@ -1404,7 +1446,7 @@ msgid "Nextcloud password"
 msgstr "Пароль Nextcloud"
 
 msgid "WebDAV URL"
-msgstr "WebDAV URL"
+msgstr "URL-адрес WebDAV"
 
 msgid "WebDAV username"
 msgstr "Имя пользователя WebDAV"
@@ -1413,25 +1455,28 @@ msgid "WebDAV password"
 msgstr "Пароль WebDAV"
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "Правило загрузок вложений"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"В режиме “Ручной” вложения скачиваются, если на них кликнуть. В режиме "
+"“Автоматически”, вложения скачиваются при открытии заметки. В режиме "
+"“Всегда” все заметки скачиваются всегда."
 
 msgid "Always"
-msgstr ""
+msgstr "Всегда"
 
 msgid "Manual"
-msgstr ""
+msgstr "Ручной"
 
 msgid "Auto"
-msgstr ""
+msgstr "Автоматически"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "Максимальное число одновременных соединений"
 
 msgid "Language"
 msgstr "Язык"
@@ -1449,12 +1494,41 @@ msgid "Light"
 msgstr "Светлая"
 
 msgid "Dark"
-msgstr "Темная"
+msgstr "Тёмная"
 
-msgid "Solarised Light"
+msgid "Dracula"
 msgstr ""
 
+msgid "Solarised Light"
+msgstr "Ярко-светлая"
+
 msgid "Solarised Dark"
+msgstr "Ярко-тёмная"
+
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Показывать иконку в трее"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Правка"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&Вид"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1488,44 +1562,47 @@ msgid "When creating a new note:"
 msgstr "При создании новой заметки:"
 
 msgid "Enable soft breaks"
-msgstr ""
+msgstr "Включить мягкие отступы"
 
 #, fuzzy
+msgid "Enable typographer support"
+msgstr "Включить поддержку Fountain"
+
 msgid "Enable math expressions"
-msgstr "Включить шифрование"
+msgstr "Включить математические выражения"
 
 msgid "Enable ==mark== syntax"
-msgstr ""
+msgstr "Включить синтаксис ==mark=="
 
 msgid "Enable footnotes"
-msgstr ""
+msgstr "Включить постраничные сноски"
 
 msgid "Enable table of contents extension"
-msgstr ""
+msgstr "Включить расширение содержания"
 
 msgid "Enable ~sub~ syntax"
-msgstr ""
+msgstr "Включить синтаксис ~sub~"
 
 msgid "Enable ^sup^ syntax"
-msgstr ""
+msgstr "Включить синтаксис ^sup^"
 
 msgid "Enable deflist syntax"
-msgstr ""
+msgstr "Включить синтаксис deflist"
 
 msgid "Enable abbreviation syntax"
-msgstr ""
+msgstr "Включить синтаксис аббревиатур"
 
 msgid "Enable markdown emoji"
-msgstr ""
+msgstr "Включить markdown emoji"
 
 msgid "Enable ++insert++ syntax"
-msgstr ""
+msgstr "Включить синтаксис ++insert++"
 
 msgid "Enable multimarkdown table extension"
-msgstr ""
+msgstr "Включить расширение таблиц multimarkdown"
 
 msgid "Enable Fountain syntax support"
-msgstr ""
+msgstr "Включить поддержку Fountain"
 
 msgid "Show tray icon"
 msgstr "Показывать иконку в трее"
@@ -1603,6 +1680,36 @@ msgstr ""
 "Если не задан, будет произведена попытка автоматического определения "
 "редактора по умолчанию."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Пользовательские сертификаты TLS"
 
@@ -1630,20 +1737,21 @@ msgid ""
 "Specify the port that should be used by the API server. If not set, a "
 "default will be used."
 msgstr ""
+"Укажите порт для работы сервера API. Если не указано, будет использовано "
+"значение по умолчанию."
 
-#, fuzzy
 msgid "Enable note history"
-msgstr "Включить шифрование"
+msgstr "Включить историю заметок"
 
 msgid "days"
-msgstr ""
+msgstr "дни"
 
 #, javascript-format
 msgid "%d days"
-msgstr ""
+msgstr "%d дней"
 
 msgid "Keep note history for"
-msgstr ""
+msgstr "Хранить историю заметки"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1662,7 +1770,7 @@ msgid "Note"
 msgstr "Заметки"
 
 msgid "Plugins"
-msgstr ""
+msgstr "Плагины"
 
 msgid "Application"
 msgstr "Приложение"
@@ -1729,7 +1837,7 @@ msgstr ""
 "Пожалуйста, укажите блокнот, в который должны быть импортированы заметки."
 
 msgid "Restored Notes"
-msgstr ""
+msgstr "Восстановленные заметки"
 
 msgid "Items that cannot be synchronised"
 msgstr "Элементы, которые не могут быть синхронизированы"
@@ -1743,23 +1851,25 @@ msgstr ""
 "синхронизации. Чтобы найти эти элементы, воспользуйтесь поиском по названию "
 "или ID (который указывается в скобках выше)."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s (%s) could not be uploaded: %s"
-msgstr "Этот файл не может быть открыт: %s"
+msgstr "Не удается загрузить файл %s (%s): %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "Этот файл не может быть открыт: %s"
+msgstr "Не удается скачать файл “%s”: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Элементы, которые не могут быть синхронизированы"
+msgstr "Элементы, которые не могут быть расшифрованы"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin не удалось расшифровать эти файлы несколько раз. Возможно они "
+"повреждены или слишком большие. Файлы останутся на устройстве без дальнейших "
+"попыток расшифровать их."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Статус синхронизации (синхронизировано / всего)"
@@ -1800,13 +1910,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 "Сейчас здесь нет заметок. Создайте новую, нажав кнопку (+)."
@@ -1836,24 +1944,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 "Новый блокнот"
 
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#, fuzzy
 msgid "All notes"
-msgstr "заметка"
+msgstr "Все заметки"
 
 msgid "Checking... Please wait."
 msgstr "Проверка... Пожалуйста, подождите."
@@ -1896,48 +2001,48 @@ 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 ""
+"Для использование синхронизации файловой системы, необходимо дать разрешение "
+"на запись."
 
 msgid "Encryption Config"
 msgstr "Конфигурация шифрования"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Сервис"
+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 ""
+"Используйте это, чтобы перестроить индекс поиска, если возникли проблемы с "
+"поиском. Это может занять много времени в зависимости от количества заметок."
 
-#, fuzzy
 msgid "More information"
-msgstr "Конфигурация"
+msgstr "Больше информации"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1992,6 +2097,10 @@ msgstr "Пароль:"
 msgid "Password cannot be empty"
 msgstr "Пароль не может быть пустым"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Пароль не может быть пустым"
+
 msgid "Enable"
 msgstr "Включено"
 
@@ -2002,9 +2111,8 @@ msgstr "Блокнот не может быть сохранен: %s"
 msgid "Edit notebook"
 msgstr "Редактировать блокнот"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Название блокнота:"
+msgstr "Введите название блокнота"
 
 msgid "Show all"
 msgstr "Показать все"
@@ -2033,15 +2141,15 @@ msgstr ""
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "Связь с протоколом “%s” не поддерживается"
 
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Неподдерживаемый формат изображения: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Обновлено: %d."
+msgstr "Обновлено: %s"
 
 msgid "View on map"
 msgstr "Посмотреть на карте"
@@ -2049,13 +2157,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 "Сделать фото"
@@ -2075,19 +2181,17 @@ msgstr "Преобразовать в заметку"
 msgid "Convert to todo"
 msgstr "Преобразовать в задачу"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Свойства заметки"
+msgstr "Свойства"
 
 msgid "Add body"
-msgstr ""
+msgstr "Добавить тело"
 
 msgid "Edit"
 msgstr "Правка"
 
-#, fuzzy
 msgid "Add title"
-msgstr "заголовок"
+msgstr "Добавить заголовок"
 
 msgid "Login with OneDrive"
 msgstr "Войти с OneDrive"
@@ -2095,6 +2199,21 @@ msgstr "Войти с OneDrive"
 msgid "Search"
 msgstr "Поиск"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Синхронизация уже выполняется. Состояние: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Введите мастер-пароль:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Введите мастер-пароль:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Отсутствует обязательный аргумент: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr ""
 #~ "Запуск редактирования заметки. Закройте редактор, чтобы вернуться к "
@@ -2103,12 +2222,12 @@ 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 "Название заметки"
 
@@ -2130,17 +2249,23 @@ msgstr "Поиск"
 #~ msgid "Encryption options"
 #~ msgstr "Настройки шифрования"
 
-#, fuzzy
+#~ msgid "Create note from template"
+#~ msgstr "Создать заметку из шаблона"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "Создать задачу из шаблона"
+
 #~ msgid "Insert template"
-#~ msgstr "Вставить дату и время"
+#~ msgstr "Вставить шаблон"
 
-#, fuzzy
 #~ msgid "Open template directory"
-#~ msgstr "Каталог экспорта Joplin"
+#~ msgstr "Открыть папку с шаблонами"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Обновить шаблоны"
 
-#, fuzzy
 #~ msgid "Revision: %s (%s)"
-#~ msgstr "%s %s (%s)"
+#~ msgstr "Изменения: %s (%s)"
 
 #~ msgid "%s %s (%s, %s)"
 #~ msgstr "%s %s (%s, %s)"
@@ -2151,9 +2276,14 @@ msgstr "Поиск"
 #~ msgid "Clipper Options"
 #~ msgstr "Настройки клиппера"
 
-#, fuzzy
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Обнаружен неизвестный тип файла - пожалуйста, обновите Joplin до "
+#~ "последней версии"
+
 #~ msgid "Information"
-#~ msgstr "Конфигурация"
+#~ msgstr "Информация"
 
 #, fuzzy
 #~ msgid "Permission to write to external storage"

CliClient/locales/sl_SI.po

@@ -137,6 +137,14 @@ msgstr "Vnesite glavno geslo:"
 msgid "Operation cancelled"
 msgstr "Operacija je preklicana"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Vnesite glavno geslo:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Geslo ne more biti prazno"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -469,9 +477,10 @@ msgstr "V preklicu...Prosim počakajte."
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> je lahko \"dodaj\", \"odstrani\" ali \"naštej\", da dodeliš "
 "ali odstraniš [tag] from [note] ali našteje zabeležke povezane z oznako "
@@ -588,6 +597,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Izvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Datoteka"
@@ -675,6 +688,13 @@ msgstr "Pogled"
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Omogoči enkripcijo"
+
 msgid "Toggle editor layout"
 msgstr "Spremeni izgled urejevalnika"
 
@@ -740,6 +760,9 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -1021,6 +1044,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Ta zabeležka je bila spremenjena:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Nepodprta povezava ali sporočilo: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1049,10 +1076,6 @@ msgstr ""
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Nepodprta povezava ali sporočilo: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1146,6 +1169,9 @@ msgstr "Možnosti"
 msgid "Synchronisation Status"
 msgstr "Sinhronizacijski status"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1155,6 +1181,9 @@ msgstr ""
 "Želite izbrisati beležnico? Vse zabeležke znotraj beležke bodo hkrati "
 "izbrisane."
 
+msgid "Delete"
+msgstr "Izbriši"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Odstranite to oznako iz vseh zabeležk?"
@@ -1162,8 +1191,9 @@ msgstr "Odstranite to oznako iz vseh zabeležk?"
 msgid "Remove this search from the sidebar?"
 msgstr "Odstranite ta iskalni niz iz stranske vrstice?"
 
-msgid "Delete"
-msgstr "Izbriši"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Nova beležnica"
 
 msgid "Rename"
 msgstr "Preimenuj"
@@ -1335,10 +1365,6 @@ msgstr "V mirovanju"
 msgid "In progress"
 msgstr "V postopku"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Sinhronizacija je že v postopku. Stanje: %s"
-
 msgid "Encrypted"
 msgstr "Enkriptirano"
 
@@ -1386,6 +1412,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Privzeto: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Sinhronizacijski cilj"
 
@@ -1456,12 +1495,41 @@ msgstr "Svetlo"
 msgid "Dark"
 msgstr "Temno"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Pokaži ikono v območju za obvestila(opravilna vrstica)"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Uredi"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Pogled"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Premakni nedokončane sezname opravil na vrh"
 
@@ -1497,6 +1565,9 @@ msgstr "Ob ustvarjanju nove zabeležke:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Omogoči enkripcijo"
@@ -1608,6 +1679,36 @@ msgstr ""
 "Urejevalnik, ki bo uporabljen za odpiranje zabeležk. Če noben ni izbran, bo "
 "avtomatsko zaznan privzeti urejevalnik."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1988,6 +2089,10 @@ msgstr "Geslo:"
 msgid "Password cannot be empty"
 msgstr "Geslo ne more biti prazno"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Geslo ne more biti prazno"
+
 msgid "Enable"
 msgstr "Omogoči"
 
@@ -2089,6 +2194,21 @@ msgstr "Prijavi se z OneDrive"
 msgid "Search"
 msgstr "Išči"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Sinhronizacija je že v postopku. Stanje: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Vnesite glavno geslo:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Vnesite glavno geslo:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Manjka zahtevani argument %s"
+
 #~ 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 "

CliClient/locales/sr_RS.po

@@ -140,6 +140,14 @@ msgstr "Унесите главну лозинку:"
 msgid "Operation cancelled"
 msgstr "Операција је обустављена"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Унесите главну лозинку:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Лозинка не може бити празна"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -473,10 +481,12 @@ msgstr "Преузимам ресурсе..."
 msgid "Cancelling... Please wait."
 msgstr "Обустављам... Молимо сачекајте."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> може бити \"додај\", \"уклони\" или \"листа\" за додељивање "
 "или уклањање [ознаке]  из [белешке], или да излистате белешке повезане са "
@@ -594,6 +604,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Извозим у \"%s као \"%s\" формат. Молимо вас да сачекате..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "&Фајл"
 
@@ -677,6 +691,13 @@ msgstr "&Приказ"
 msgid "Toggle sidebar"
 msgstr "Бочна трака"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Листа белешки"
+
 msgid "Toggle editor layout"
 msgstr "Промени распоред уредника"
 
@@ -739,6 +760,10 @@ msgstr "Да"
 msgid "No"
 msgstr "Не"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "Повраћене белешке"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Токен је копиран у клипборд!"
 
@@ -1018,6 +1043,10 @@ msgstr "Ова белешка \"%s\" је успешно враћена у бе
 msgid "This note has no history"
 msgstr "Ова белешка нема историју"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Неподржана веза или порука: %s"
+
 msgid "Restore"
 msgstr "Повраћај"
 
@@ -1048,10 +1077,6 @@ msgstr "Копирај адресу везе"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Овај прилог још увек није преузет или дешифрован."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Неподржана веза или порука: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1145,6 +1170,9 @@ msgstr "Опције"
 msgid "Synchronisation Status"
 msgstr "Статус синхронизације"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1155,6 +1183,9 @@ msgstr ""
 "\n"
 "Све белешке и под-бележницe унутар ове бележнице ће такође бити обрисане."
 
+msgid "Delete"
+msgstr "Обриши"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Уклонити ознаку \"%s\" из свих белешки?"
@@ -1162,8 +1193,9 @@ msgstr "Уклонити ознаку \"%s\" из свих белешки?"
 msgid "Remove this search from the sidebar?"
 msgstr "Уклонити ову претраку из бочне траке?"
 
-msgid "Delete"
-msgstr "Обриши"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Нова бележница"
 
 msgid "Rename"
 msgstr "Преименуј"
@@ -1333,10 +1365,6 @@ msgstr "Неактивно"
 msgid "In progress"
 msgstr "У току"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Синхронизација је већ у току. Стање: %s"
-
 msgid "Encrypted"
 msgstr "Шифровано"
 
@@ -1384,6 +1412,19 @@ msgstr ""
 "\n"
 "Видите одељак \"Често постављана питања за више детаља: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Подразумевано: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Одредиште синхронизације"
 
@@ -1458,12 +1499,41 @@ msgstr "Светла"
 msgid "Dark"
 msgstr "Тамна"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Прикажи иконицу апликације на траци"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Уреди"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "&Приказ"
+
+msgid "Split View"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s / %s"
+msgstr ""
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Недовршене ставке задужења"
 
@@ -1497,6 +1567,10 @@ msgstr "У креирању нове белешке."
 msgid "Enable soft breaks"
 msgstr "Омогући меке преломе"
 
+#, fuzzy
+msgid "Enable typographer support"
+msgstr "Омогућу ~sub~ синтаксу"
+
 msgid "Enable math expressions"
 msgstr "Омогући математичке експресије"
 
@@ -1608,6 +1682,36 @@ msgstr ""
 "отварања белешке. Уколико нису унети аргументи\n"
 "програм ће аутоматски покушати да открије подразумеваног уредника."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Прилагођени ТЛС сертификати"
 
@@ -1996,6 +2100,10 @@ msgstr "Лозинка:"
 msgid "Password cannot be empty"
 msgstr "Лозинка не може бити празна"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Лозинка не може бити празна"
+
 msgid "Enable"
 msgstr "Омогући"
 
@@ -2097,6 +2205,21 @@ msgstr "Пријави се са УванДрајвом"
 msgid "Search"
 msgstr "Претрага"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Синхронизација је већ у току. Стање: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Унесите главну лозинку:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Унесите главну лозинку:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Недостаје неопходан аргумент: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr ""
 #~ "Започињете са изменом белешке. Затворите уредника да се вратите назад."
@@ -2107,9 +2230,6 @@ msgstr "Претрага"
 #~ msgid "Sidebar"
 #~ msgstr "Бочна трака"
 
-#~ msgid "Note list"
-#~ msgstr "Листа белешки"
-
 #~ msgid "Note title"
 #~ msgstr "Наслов белешке"
 

CliClient/locales/sv.po

@@ -138,6 +138,14 @@ msgstr "Ange huvudlösenord:"
 msgid "Operation cancelled"
 msgstr "Operation avbruten"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Ange huvudlösenord:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Lösenordet kan inte vara tomt"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -473,10 +481,12 @@ msgstr "Laddar ned resurser..."
 msgid "Cancelling... Please wait."
 msgstr "Avbryter... vänta."
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> kan vara \"lägg till\", \"ta bort\" eller \"lisat\" för att "
 "tilldela eller ta bort [tag] från [note], eller för att lista anteckningarna "
@@ -594,6 +604,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportera till \"%s\" som \"%s\" format. Vänta..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
@@ -679,6 +693,13 @@ msgstr "Visa"
 msgid "Toggle sidebar"
 msgstr "Växla sidofältet"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Anteckningsboken"
+
 msgid "Toggle editor layout"
 msgstr "Växla redigeringslayout"
 
@@ -743,6 +764,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Token har kopierats till urklipp!"
 
@@ -1027,6 +1051,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Denna anteckning har ändrats:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Länk eller meddelande stöds inte: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1055,10 +1083,6 @@ msgstr "Kopiera länkadress"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Denna bilaga är inte nedladdad eller ännu inte dekrypterad."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Länk eller meddelande stöds inte: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1152,6 +1176,9 @@ msgstr "Inställningar"
 msgid "Synchronisation Status"
 msgstr "Synkroniseringstillstånd"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1161,6 +1188,9 @@ msgstr ""
 "Ta bort anteckningsboken? Alla anteckningar och delanteckningsböcker i den "
 "här anteckningsboken tas bort också."
 
+msgid "Delete"
+msgstr "Ta bort"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Ta bort den här taggen från alla anteckningar?"
@@ -1168,8 +1198,9 @@ msgstr "Ta bort den här taggen från alla anteckningar?"
 msgid "Remove this search from the sidebar?"
 msgstr "Ta bort den här sökningen från sidofältet?"
 
-msgid "Delete"
-msgstr "Ta bort"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Ny anteckningsbok"
 
 msgid "Rename"
 msgstr "Byt namn"
@@ -1339,10 +1370,6 @@ msgstr "Inaktiv"
 msgid "In progress"
 msgstr "Pågår"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Synkronisering pågår redan. Tillstånd: %s"
-
 msgid "Encrypted"
 msgstr "Krypterad"
 
@@ -1390,6 +1417,19 @@ msgstr ""
 "innehåll innan du synkroniserar. Annars kommer samtliga filer att raderas. "
 "Läs FAQ för mer information: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Standard: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Synkroniseringsmål"
 
@@ -1460,12 +1500,41 @@ msgstr "Ljus"
 msgid "Dark"
 msgstr "Mörk"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Visa fältikon"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Redigera"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "Visa"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Inte slutförda att-göra högst upp"
 
@@ -1500,6 +1569,9 @@ msgstr "När du skapar en ny anteckning:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Aktivera kryptering"
@@ -1612,6 +1684,36 @@ msgstr ""
 "anteckning. Om inget tillhandahålls försöker det automatiskt identifiera "
 "standardredigeraren."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Anpassade TLS-certifikat"
 
@@ -2005,6 +2107,10 @@ msgstr "Lösenord:"
 msgid "Password cannot be empty"
 msgstr "Lösenordet kan inte vara tomt"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Lösenordet kan inte vara tomt"
+
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -2107,6 +2213,21 @@ msgstr "Logga in med OneDrive"
 msgid "Search"
 msgstr "Sök"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Synkronisering pågår redan. Tillstånd: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Ange huvudlösenord:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Ange huvudlösenord:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Saknade obligatoriskt argument: %s"
+
 #~ 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 "
@@ -2118,9 +2239,6 @@ msgstr "Sök"
 #~ msgid "Sidebar"
 #~ msgstr "Sidofältet"
 
-#~ msgid "Note list"
-#~ msgstr "Anteckningsboken"
-
 #~ msgid "Note title"
 #~ msgstr "Rubriken"
 

CliClient/locales/tr_TR.po

@@ -135,6 +135,14 @@ msgstr "Ana şifreyi girin:"
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Ana şifreyi girin:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "Şifre boş olamaz"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -451,9 +459,10 @@ msgid "Cancelling... Please wait."
 msgstr "İptal ediliyor... Lütfen bekleyin."
 
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 
 #, javascript-format
@@ -563,6 +572,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "\"%s\" den \"%s\" biçiminde dışa aktarılıyor. Lütfen bekleyin..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "Dosya"
@@ -648,6 +661,13 @@ msgstr "İncele"
 msgid "Toggle sidebar"
 msgstr "Kenar çubuğunu aç / kapat"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "Not listesi"
+
 msgid "Toggle editor layout"
 msgstr "Editör düzenini aç / kapat"
 
@@ -712,6 +732,9 @@ msgstr "Evet"
 msgid "No"
 msgstr "Hayır"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Anahtar panoya kopyalandı!"
 
@@ -998,6 +1021,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Bu not değiştirildi:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "Desteklenmeyen bağlantı veya mesaj: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1026,10 +1053,6 @@ msgstr "Bağlantı Adresini Kopyala"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Bu ek henüz indirilmedi veya şifrelenmedi."
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "Desteklenmeyen bağlantı veya mesaj: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1124,6 +1147,9 @@ msgstr "Seçenekler"
 msgid "Synchronisation Status"
 msgstr "Senkronizasyon Durumu"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1132,6 +1158,9 @@ msgid ""
 msgstr ""
 "Not defterini sil? Bu defterdeki tüm notlar ve alt defterler de silinecek."
 
+msgid "Delete"
+msgstr "Sil"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "Bu etiket tüm notlardan kaldırılsın mı?"
@@ -1139,8 +1168,9 @@ msgstr "Bu etiket tüm notlardan kaldırılsın mı?"
 msgid "Remove this search from the sidebar?"
 msgstr "Bu aramayı kenar çubuğundan kaldır?"
 
-msgid "Delete"
-msgstr "Sil"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "Yeni not defteri"
 
 msgid "Rename"
 msgstr "Yeniden adlandır"
@@ -1310,10 +1340,6 @@ msgstr "Boşta"
 msgid "In progress"
 msgstr "Devam etmekte"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "Senkronizasyon zaten devam ediyor. Durum: %s"
-
 msgid "Encrypted"
 msgstr "Şifrelenmiş"
 
@@ -1360,6 +1386,19 @@ msgstr ""
 "kopyaladığınızdan emin olun, aksi takdirde tüm dosyalar kaldırılır! Daha "
 "fazla bilgi için SSS bölümüne bakın: %s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "Varsayılan: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "Senkronizasyon hedefi"
 
@@ -1430,12 +1469,41 @@ msgstr "Aydınlık"
 msgid "Dark"
 msgstr "Karanlık"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "Tepsi simgesini göster"
+
+#, fuzzy
+msgid "Editor"
+msgstr "Düzenle"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "İncele"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "Tamamlanmamış yap-list yukarıda"
 
@@ -1470,6 +1538,9 @@ msgstr "Yeni bir not oluştururken:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "Şifrelemeyi etkinleştir"
@@ -1581,6 +1652,36 @@ msgstr ""
 "Editör komutu (argüman içerebilir) not açmak için kullanılacaktır. Eğer "
 "sağlanmadıysa, varsayılan düzenleyiciyi otomatik olarak algılamaya çalışır."
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "Özel TLS sertifikaları"
 
@@ -1968,6 +2069,10 @@ msgstr "Şifre:"
 msgid "Password cannot be empty"
 msgstr "Şifre boş olamaz"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "Şifre boş olamaz"
+
 msgid "Enable"
 msgstr "Etkinleştir"
 
@@ -2070,15 +2175,27 @@ msgstr "OneDrive ile giriş yapın"
 msgid "Search"
 msgstr "Arama"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "Senkronizasyon zaten devam ediyor. Durum: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "Ana şifreyi girin:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "Ana şifreyi girin:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "Gerekli argüman eksik gözüküyor: %s"
+
 #~ 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ığı"
 

CliClient/locales/zh_CN.po

@@ -134,6 +134,14 @@ msgstr "输入主密码："
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "输入主密码："
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "密码不可为空"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -446,10 +454,12 @@ msgstr "下载资源中..."
 msgid "Cancelling... Please wait."
 msgstr "正在取消... 请稍候。"
 
+#, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. The command `tag list` can be used to "
+"list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> 可以是“add”、“remove”或者“list”， 用于从 [note] 中赋值或删除 "
 "[tag]，或者列出与 [tag] 相关的笔记。`tag list` 命令可以用于列出所有的标签（对"
@@ -556,6 +566,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "从“%s”导出，导出格式为“%s”。请稍等……"
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 msgid "&File"
 msgstr "文件 (&F)"
 
@@ -638,6 +652,13 @@ msgstr "界面 (&V)"
 msgid "Toggle sidebar"
 msgstr "切换边栏"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "笔记列表"
+
 msgid "Toggle editor layout"
 msgstr "切换编辑器布局"
 
@@ -699,6 +720,10 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
+#, fuzzy
+msgid "Full Release Notes"
+msgstr "已恢复的笔记"
+
 msgid "Token has been copied to the clipboard!"
 msgstr "Token 令牌已复制到剪贴板！"
 
@@ -964,6 +989,10 @@ msgstr "笔记“%s”已成功恢复到笔记本“%s”中。"
 msgid "This note has no history"
 msgstr "此笔记没有历史记录"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "不被支持的链接或信息：%s"
+
 msgid "Restore"
 msgstr "恢复"
 
@@ -994,10 +1023,6 @@ msgstr "复制链接地址"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "该附件没有下载或者尚未解密。"
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "不被支持的链接或信息：%s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1088,6 +1113,9 @@ msgstr "选项"
 msgid "Synchronisation Status"
 msgstr "同步状态"
 
+msgid "Remove"
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1098,6 +1126,9 @@ msgstr ""
 "\n"
 "所有在该笔记本内的笔记和下级笔记本也将同时被删除。"
 
+msgid "Delete"
+msgstr "删除"
+
 #, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "从所有笔记中删除标签“%s”？"
@@ -1105,8 +1136,9 @@ msgstr "从所有笔记中删除标签“%s”？"
 msgid "Remove this search from the sidebar?"
 msgstr "从边栏中删除该项搜索？"
 
-msgid "Delete"
-msgstr "删除"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "新建笔记本"
 
 msgid "Rename"
 msgstr "重命名"
@@ -1273,10 +1305,6 @@ msgstr "空闲"
 msgid "In progress"
 msgstr "正在进行"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "已经在同步。状态：%s"
-
 msgid "Encrypted"
 msgstr "已加密"
 
@@ -1322,6 +1350,19 @@ msgstr ""
 "注意：如果您更改该位置，请确保在同步之前将所有内容复制到该位置，否则将删除所"
 "有文件！ 更多详细信息请参阅常见问题解答（FAQ）：%s"
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "默认值: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "同步目标"
 
@@ -1393,12 +1434,41 @@ msgstr "明亮"
 msgid "Dark"
 msgstr "深邃"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr "Solarised Light风格"
 
 msgid "Solarised Dark"
 msgstr "Solarised Dark风格"
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "显示托盘图标"
+
+#, fuzzy
+msgid "Editor"
+msgstr "编辑"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "界面 (&V)"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "将未完成的待办事项置顶"
 
@@ -1432,6 +1502,10 @@ msgstr "当新建笔记时："
 msgid "Enable soft breaks"
 msgstr "启动软中断"
 
+#, fuzzy
+msgid "Enable typographer support"
+msgstr "启用 Fountain 语法支持"
+
 msgid "Enable math expressions"
 msgstr "启用数学表达式"
 
@@ -1540,6 +1614,36 @@ msgstr ""
 "该文本编辑器命令（可能包括参数）将会被用于打开笔记。若未提供将尝试自动检测默"
 "认编辑器。"
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "自定义 TLS 证书"
 
@@ -1911,6 +2015,10 @@ msgstr "密码："
 msgid "Password cannot be empty"
 msgstr "密码不可为空"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "密码不可为空"
+
 msgid "Enable"
 msgstr "启用"
 
@@ -2007,6 +2115,21 @@ msgstr "通过 OneDrive 登录"
 msgid "Search"
 msgstr "搜索"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "已经在同步。状态：%s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "输入主密码："
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "输入主密码："
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "缺失所需参数：%s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr "开始编辑笔记。关闭编辑器将回到提示符。"
 
@@ -2019,9 +2142,6 @@ msgstr "搜索"
 #~ msgid "Sidebar"
 #~ msgstr "边栏"
 
-#~ msgid "Note list"
-#~ msgstr "笔记列表"
-
 #~ msgid "Note title"
 #~ msgstr "笔记标题"
 

CliClient/locales/zh_TW.po

@@ -136,6 +136,14 @@ msgstr "輸入主密碼:"
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
+#, fuzzy
+msgid "Confirm password:"
+msgstr "輸入主密碼:"
+
+#, fuzzy
+msgid "Passwords do not match!"
+msgstr "密碼不能空白"
+
 msgid ""
 "Starting decryption... Please wait as it may take several minutes depending "
 "on how much there is to decrypt."
@@ -447,9 +455,10 @@ msgstr "正在取消中...請稍候。"
 
 #, fuzzy
 msgid ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[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)."
+"<tag-command> can be \"add\", \"remove\", \"list\", or \"notetags\" to "
+"assign or remove [tag] from [note], to list notes associated with [tag], or "
+"to list tags associated with [note]. 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` 可以用"
@@ -556,6 +565,10 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "匯出到 \"%s\" 為 \"%s\" 格式。請稍候..."
 
+#, javascript-format
+msgid "Could not export notes: %s"
+msgstr ""
+
 #, fuzzy
 msgid "&File"
 msgstr "檔案"
@@ -643,6 +656,13 @@ msgstr "檢視"
 msgid "Toggle sidebar"
 msgstr "顯示 / 隱藏側邊欄"
 
+msgid "Layout button sequence"
+msgstr ""
+
+#, fuzzy
+msgid "Toggle note list"
+msgstr "啟用加密"
+
 msgid "Toggle editor layout"
 msgstr "切換編輯器佈局"
 
@@ -708,6 +728,9 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
+msgid "Full Release Notes"
+msgstr ""
+
 msgid "Token has been copied to the clipboard!"
 msgstr ""
 
@@ -978,6 +1001,10 @@ msgstr ""
 msgid "This note has no history"
 msgstr "此記事已被修改:"
 
+#, javascript-format
+msgid "Unsupported link or message: %s"
+msgstr "不支援的鏈接或訊息: %s"
+
 msgid "Restore"
 msgstr ""
 
@@ -1006,10 +1033,6 @@ msgstr "複製鏈接位址"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 
-#, javascript-format
-msgid "Unsupported link or message: %s"
-msgstr "不支援的鏈接或訊息: %s"
-
 #, javascript-format
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
@@ -1100,6 +1123,9 @@ msgstr "選項"
 msgid "Synchronisation Status"
 msgstr "同步狀態"
 
+msgid "Remove"
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1107,6 +1133,9 @@ msgid ""
 "All notes and sub-notebooks within this notebook will also be deleted."
 msgstr "決定刪除記事本？此記事本中的所有記事和子記事本也將被刪除。"
 
+msgid "Delete"
+msgstr "刪除"
+
 #, fuzzy, javascript-format
 msgid "Remove tag \"%s\" from all notes?"
 msgstr "是否從所有記事中刪除此標籤？"
@@ -1114,8 +1143,9 @@ msgstr "是否從所有記事中刪除此標籤？"
 msgid "Remove this search from the sidebar?"
 msgstr "是否從側邊欄中刪除此搜索？"
 
-msgid "Delete"
-msgstr "刪除"
+#, fuzzy
+msgid "New sub-notebook"
+msgstr "新增記事本"
 
 msgid "Rename"
 msgstr "重新命名"
@@ -1282,10 +1312,6 @@ msgstr "閒置"
 msgid "In progress"
 msgstr "進行中"
 
-#, javascript-format
-msgid "Synchronisation is already in progress. State: %s"
-msgstr "同步已在進行中。狀態: %s"
-
 msgid "Encrypted"
 msgstr "已加密"
 
@@ -1329,6 +1355,19 @@ msgid ""
 "more details: %s"
 msgstr ""
 
+msgid "Keyboard Mode"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "預設: %s"
+
+msgid "Emacs"
+msgstr ""
+
+msgid "Vim"
+msgstr ""
+
 msgid "Synchronisation target"
 msgstr "同步目標"
 
@@ -1399,12 +1438,41 @@ msgstr "光亮"
 msgid "Dark"
 msgstr "暗黑"
 
+msgid "Dracula"
+msgstr ""
+
 msgid "Solarised Light"
 msgstr ""
 
 msgid "Solarised Dark"
 msgstr ""
 
+msgid "Nord"
+msgstr ""
+
+#, fuzzy
+msgid "Show note counts"
+msgstr "顯示系統匣圖示"
+
+#, fuzzy
+msgid "Editor"
+msgstr "編輯"
+
+#, fuzzy
+msgid "Viewer"
+msgstr "檢視"
+
+msgid "Split View"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "%s / %s / %s"
+msgstr "%s = %s (%s)"
+
+#, javascript-format
+msgid "%s / %s"
+msgstr ""
+
 msgid "Uncompleted to-dos on top"
 msgstr "最上方顯示未完成的待辦事項"
 
@@ -1439,6 +1507,9 @@ msgstr "當新增記事時:"
 msgid "Enable soft breaks"
 msgstr ""
 
+msgid "Enable typographer support"
+msgstr ""
+
 #, fuzzy
 msgid "Enable math expressions"
 msgstr "啟用加密"
@@ -1547,6 +1618,36 @@ msgstr ""
 "用於開啟筆記的編輯器命令 (可能包括參數)。如果沒有指明，程式將嘗試自動檢測預設"
 "的編輯器。"
 
+msgid "Page size for PDF export"
+msgstr ""
+
+msgid "A4"
+msgstr ""
+
+msgid "Letter"
+msgstr ""
+
+msgid "A3"
+msgstr ""
+
+msgid "A5"
+msgstr ""
+
+msgid "Tabloid"
+msgstr ""
+
+msgid "Legal"
+msgstr ""
+
+msgid "Page orientation for PDF export"
+msgstr ""
+
+msgid "Portrait"
+msgstr ""
+
+msgid "Landscape"
+msgstr ""
+
 msgid "Custom TLS certificates"
 msgstr "自訂 TLS 證書"
 
@@ -1928,6 +2029,10 @@ msgstr "密碼:"
 msgid "Password cannot be empty"
 msgstr "密碼不能空白"
 
+#, fuzzy
+msgid "Confirm password cannot be empty"
+msgstr "密碼不能空白"
+
 msgid "Enable"
 msgstr "啟用"
 
@@ -2029,6 +2134,21 @@ msgstr "以 OneDrive 登錄"
 msgid "Search"
 msgstr "搜尋"
 
+#~ msgid "Synchronisation is already in progress. State: %s"
+#~ msgstr "同步已在進行中。狀態: %s"
+
+#, fuzzy
+#~ msgid "Confirm master password:"
+#~ msgstr "輸入主密碼:"
+
+#, fuzzy
+#~ msgid "Confirm password"
+#~ msgstr "輸入主密碼:"
+
+#, fuzzy
+#~ msgid "Missing required argument: note"
+#~ msgstr "缺少必需參數: %s"
+
 #~ msgid "Starting to edit note. Close the editor to get back to the prompt."
 #~ msgstr "開始編輯記事。如需返回命令行，請關閉編輯器。"
 

CliClient/package.json

@@ -20,7 +20,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.147",
+  "version": "1.0.149",
   "bin": {
     "joplin": "./main.js"
   },
@@ -44,8 +44,8 @@
     "html-minifier": "^3.5.15",
     "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.17",
-    "joplin-turndown-plugin-gfm": "^1.0.9",
+    "joplin-turndown": "^4.0.19",
+    "joplin-turndown-plugin-gfm": "^1.0.11",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "markdown-it": "^8.4.2",
@@ -64,7 +64,7 @@
     "request": "^2.88.0",
     "sax": "^1.2.2",
     "server-destroy": "^1.0.1",
-    "sharp": "^0.22.1",
+    "sharp": "^0.23.2",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^4.0.7",
     "string-padding": "^1.0.2",
@@ -83,7 +83,7 @@
     "yargs-parser": "^7.0.0"
   },
   "devDependencies": {
-    "jasmine": "^2.6.0"
+    "jasmine": "^3.5.0"
   },
   "scripts": {
     "test": "jasmine"

CliClient/run_test.sh

@@ -2,18 +2,13 @@
 START_DIR="$(pwd)"
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$ROOT_DIR/tests-build"
-TEST_FILE="$1"
+FILTER="$1"
 
 rsync -a --exclude "node_modules/" "$ROOT_DIR/tests/" "$BUILD_DIR/"
 rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
 rsync -a "$ROOT_DIR/../ReactNativeClient/locales/" "$BUILD_DIR/locales/"
 mkdir -p "$BUILD_DIR/data"
 
-if [[ $TEST_FILE != "" ]]; then
-	(cd "$ROOT_DIR" && NODE_ENV=testing npm test tests-build/$TEST_FILE.js)
-	exit
-fi
-
 function finish {
 	cd "$START_DIR"
 }
@@ -21,27 +16,9 @@ function finish {
 trap finish EXIT
 
 cd "$ROOT_DIR"
-NODE_ENV=testing npm test tests-build/ArrayUtils.js && \
-NODE_ENV=testing npm test tests-build/encryption.js && \
-NODE_ENV=testing npm test tests-build/EnexToMd.js && \
-NODE_ENV=testing npm test tests-build/HtmlToMd.js && \
-NODE_ENV=testing npm test tests-build/markdownUtils.js && \
-NODE_ENV=testing npm test tests-build/models_BaseItem.js && \
-NODE_ENV=testing npm test tests-build/models_Folder.js && \
-NODE_ENV=testing npm test tests-build/models_ItemChange.js && \
-NODE_ENV=testing npm test tests-build/models_Note.js && \
-NODE_ENV=testing npm test tests-build/models_Resource.js && \
-NODE_ENV=testing npm test tests-build/models_Revision.js && \
-NODE_ENV=testing npm test tests-build/models_Setting.js && \
-NODE_ENV=testing npm test tests-build/models_Tag.js && \
-NODE_ENV=testing npm test tests-build/pathUtils.js && \
-NODE_ENV=testing npm test tests-build/services_InteropService.js && \
-NODE_ENV=testing npm test tests-build/services_KvStore.js && \
-NODE_ENV=testing npm test tests-build/services_ResourceService.js && \
-NODE_ENV=testing npm test tests-build/services_rest_Api.js && \
-NODE_ENV=testing npm test tests-build/services_SearchEngine.js && \
-NODE_ENV=testing npm test tests-build/services_Revision.js && \
-NODE_ENV=testing npm test tests-build/StringUtils.js && \
-NODE_ENV=testing npm test tests-build/TaskQueue.js && \
-NODE_ENV=testing npm test tests-build/synchronizer.js && \
-NODE_ENV=testing npm test tests-build/urlUtils.js
+
+if [[ $FILTER != "" ]]; then
+	npx jasmine --config=tests/support/jasmine.json --filter="$FILTER"
+else
+	npx jasmine --config=tests/support/jasmine.json
+fi

CliClient/tests/HtmlToMd.js

@@ -39,7 +39,7 @@ describe('HtmlToMd', function() {
 			const htmlPath = `${basePath}/${htmlFilename}`;
 			const mdPath = `${basePath}/${filename(htmlFilename)}.md`;
 
-			// if (htmlFilename !== 'table_with_pipe.html') continue;
+			// if (htmlFilename !== 'table_with_header.html') continue;
 
 			const htmlToMdOptions = {};
 
@@ -48,7 +48,7 @@ describe('HtmlToMd', function() {
 				// This is straightforward when the document is still in DOM format, as with the clipper,
 				// but otherwise it would need to be somehow parsed out from the HTML. Here we just
 				// hard code the anchors that we know are in the file.
-				htmlToMdOptions.anchorNames = ['first', 'second'];
+				htmlToMdOptions.anchorNames = ['first', 'second', 'fourth'];
 			}
 
 			const html = await shim.fsDriver().readFile(htmlPath);

CliClient/tests/enex_to_html/attachment.html

@@ -1,5 +1,5 @@
 <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><a href="joplin://21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
   <div>
     <br>
     <br>

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

@@ -4,7 +4,7 @@
       <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>
+    <p><a href=":/9168ee833d03c5ea7c730ac6673978c1">audio test</a></p>
   </div>
   <div>
     <br>

CliClient/tests/enex_to_md/text_formatting_span_italic.html

@@ -0,0 +1,8 @@
+<div><span style="font-style: italic;">singleline italic text with span style font-style: italic;.</span></div><div><br/></div>
+<div><span style="font-style: italic;">multiline italic
+ text with span style font-style: italic;.</span></div><div><br/></div>
+
+<div><span style="font-style: italic;">singleline italic text with span style font-style: italic;</span> next to normal text with leading space.</div><div><br/></div>
+<div><span style="font-style: italic;">singleline italic text with span style font-style: italic; and with trailing space </span>next to normal text.</div><div><br/></div>
+<div><span style="font-style: italic;">singleline italic text with span style font-style: italic;</span><span style="font-style: italic;"> next to more italic text with span style font-style: italic; and with leading space.</span></div><div><br/></div>
+<div><span style="font-style: italic;">singleline italic text with span style font-style: italic; and with trailing space </span><span style="font-style: italic;">next to more italic text with span style font-style: italic;.</span></div>

CliClient/tests/enex_to_md/text_formatting_span_italic.md

@@ -0,0 +1,11 @@
+*singleline italic text with span style font-style: italic;.*
+
+*multiline italic text with span style font-style: italic;.*
+
+*singleline italic text with span style font-style: italic;* next to normal text with leading space.
+
+*singleline italic text with span style font-style: italic; and with trailing space *next to normal text.
+
+*singleline italic text with span style font-style: italic;** next to more italic text with span style font-style: italic; and with leading space.*
+
+*singleline italic text with span style font-style: italic; and with trailing space **next to more italic text with span style font-style: italic;.*

CliClient/tests/html_to_md/anchor_local.html

@@ -1,6 +1,8 @@
 <p><a href="#first">First</a></p>
 <p><a href="#second">Second</a></p>
 <p>Third</p>
+<p><a href="#fourth">Fourth</a></p>
 <p><a name="first"></a>First</p>
 <p><a id="second"></a>Second</p>
-<p><a id="third"></a>Third</p>
+<p><a id="third"></a>Third</p>
+<p><span id="fourth">Fourth</span></p>

CliClient/tests/html_to_md/anchor_local.md

@@ -4,8 +4,12 @@
 
 Third
 
+[Fourth](#fourth)
+
 <a id="first"></a>First
 
 <a id="second"></a>Second
 
-Third
+Third
+
+<a id="fourth"></a>Fourth

CliClient/tests/html_to_md/pre_1.html

@@ -0,0 +1,9 @@
+<pre style="font-family: SFMono-Regular, Consolas, &quot;Liberation Mono&quot;, Menlo, Courier, monospace;">
+<span class="comment"># List issues assigned to you that are labeled "urgent"</span>
+$ <strong>hub issue</strong> -a YOUR_USER -l urgent
+
+<span class="comment"># List the URLs of at most 20 PRs based on "develop" branch:</span>
+$ <strong>hub pr list</strong> -L 20 -b develop --format='%t [%H] | %U%n'
+
+<span class="comment"># Create a GitHub release with notes from a file and copy the URL to clipboard:</span>
+$ <strong>hub release create</strong> -c -F release-notes.txt v2.3.0</pre>

CliClient/tests/html_to_md/pre_1.md

@@ -0,0 +1,10 @@
+```
+# List issues assigned to you that are labeled "urgent"
+$ hub issue -a YOUR_USER -l urgent
+
+# List the URLs of at most 20 PRs based on "develop" branch:
+$ hub pr list -L 20 -b develop --format='%t [%H] | %U%n'
+
+# Create a GitHub release with notes from a file and copy the URL to clipboard:
+$ hub release create -c -F release-notes.txt v2.3.0
+```

CliClient/tests/html_to_md/table_no_header.html

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

CliClient/tests/html_to_md/table_no_header.md

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

CliClient/tests/html_to_md/table_with_header.html

@@ -0,0 +1,14 @@
+<table>
+	<thead>
+		<tr>
+			<th>A</th>
+			<th>B</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>c</td>
+			<td>d</td>
+		</tr>
+	</tbody>
+</table>

CliClient/tests/html_to_md/table_with_header.md

@@ -0,0 +1,3 @@
+| A   | B   |
+| --- | --- |
+| c   | d   |

CliClient/tests/markdownUtils.js

@@ -23,7 +23,7 @@ describe('markdownUtils', function() {
 			['![something](/img/test.png)', '![something](https://test.com/img/test.png)'],
 			['[![something](/img/test.png)](/index.html "Home page")', '[![something](https://test.com/img/test.png)](https://test.com/index.html "Home page")'],
 			['[onelink.com](/jmp/?id=123&u=http://something.com/test)', '[onelink.com](https://test.com/jmp/?id=123&u=http://something.com/test)'],
-			['[![some text](/img/test.png)](/jmp/?s=80&l=related&u=http://example.com "some decription")', '[![some text](https://test.com/img/test.png)](https://test.com/jmp/?s=80&l=related&u=http://example.com "some decription")'],
+			['[![some text](/img/test.png)](/jmp/?s=80&l=related&u=http://example.com "some description")', '[![some text](https://test.com/img/test.png)](https://test.com/jmp/?s=80&l=related&u=http://example.com "some description")'],
 		];
 
 		for (let i = 0; i < testCases.length; i++) {

CliClient/tests/models_Folder.js

@@ -127,4 +127,27 @@ describe('models_Folder', function() {
 		expect(folders[3].id).toBe(f2.id);
 	}));
 
+	it('should add node counts', asyncTest(async () => {
+		let f1 = await Folder.save({ title: 'folder1' });
+		let f2 = await Folder.save({ title: 'folder2', parent_id: f1.id });
+		let f3 = await Folder.save({ title: 'folder3', parent_id: f2.id });
+		let f4 = await Folder.save({ title: 'folder4' });
+
+		let n1 = await Note.save({ title: 'note1', parent_id: f3.id });
+		let n2 = await Note.save({ title: 'note1', parent_id: f3.id });
+		let n3 = await Note.save({ title: 'note1', parent_id: f1.id });
+
+		const folders = await Folder.all();
+		await Folder.addNoteCounts(folders);
+
+		const foldersById = {};
+		folders.forEach((f) => { foldersById[f.id] = f; });
+
+		expect(folders.length).toBe(4);
+		expect(foldersById[f1.id].note_count).toBe(3);
+		expect(foldersById[f2.id].note_count).toBe(2);
+		expect(foldersById[f3.id].note_count).toBe(2);
+		expect(foldersById[f4.id].note_count).toBe(0);
+	}));
+
 });

CliClient/tests/models_Note.js

@@ -92,11 +92,11 @@ describe('models_Note', function() {
 	it('should serialize and unserialize without modifying data', asyncTest(async () => {
 		let folder1 = await Folder.save({ title: 'folder1'});
 		const testCases = [
-			[ {title: '', body:'Body and no title\nSecond line\nThird Line', parent_id: folder1.id},
+			[ {title: '', body: 'Body and no title\nSecond line\nThird Line', parent_id: folder1.id},
 				'', 'Body and no title\nSecond line\nThird Line'],
-			[ {title: 'Note title', body:'Body and title', parent_id: folder1.id},
+			[ {title: 'Note title', body: 'Body and title', parent_id: folder1.id},
 				'Note title', 'Body and title'],
-			[ {title: 'Title and no body', body:'', parent_id: folder1.id},
+			[ {title: 'Title and no body', body: '', parent_id: folder1.id},
 				'Title and no body', ''],
 		];
 

CliClient/tests/models_Tag.js

@@ -59,4 +59,42 @@ describe('models_Tag', function() {
 		expect(tags.length).toBe(0);
 	}));
 
+	it('should return tags with note counts', 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 2nd note', parent_id: folder1.id });
+		await Tag.setNoteTagsByTitles(note1.id, ['un']);
+		await Tag.setNoteTagsByTitles(note2.id, ['un']);
+
+		let tags = await Tag.allWithNotes();
+		expect(tags.length).toBe(1);
+		expect(tags[0].note_count).toBe(2);
+
+		await Note.delete(note1.id);
+
+		tags = await Tag.allWithNotes();
+		expect(tags.length).toBe(1);
+		expect(tags[0].note_count).toBe(1);
+
+		await Note.delete(note2.id);
+
+		tags = await Tag.allWithNotes();
+		expect(tags.length).toBe(0);
+	}));
+
+	it('should load individual tags with note count', 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 2nd note', parent_id: folder1.id });
+		let tag = await Tag.save({ title: 'mytag'});
+		await Tag.addNote(tag.id, note1.id);
+
+		let tagWithCount = await Tag.loadWithCount(tag.id);
+		expect(tagWithCount.note_count).toBe(1);
+
+		await Tag.addNote(tag.id, note2.id);
+		tagWithCount = await Tag.loadWithCount(tag.id);
+		expect(tagWithCount.note_count).toBe(2);
+	}));
+
 });

CliClient/tests/services_rest_Api.js

@@ -279,7 +279,7 @@ describe('services_rest_Api', function() {
 		const response = await api.route('GET', 'notes', { token: 'mytoken' });
 		expect(response.length).toBe(0);
 
-		hasThrown = await checkThrowAsync(async () => await api.route('POST', 'notes', null, JSON.stringify({title:'testing'})));
+		hasThrown = await checkThrowAsync(async () => await api.route('POST', 'notes', null, JSON.stringify({title: 'testing'})));
 		expect(hasThrown).toBe(true);
 	}));
 

CliClient/tests/support/jasmine.json

@@ -1,11 +1,9 @@
 {
-  "spec_dir": "spec",
+  "spec_dir": "tests-build",
   "spec_files": [
-    "**/*[sS]pec.js"
-  ],
-  "helpers": [
-    "helpers/**/*.js"
+    "*.js",
+    "!test-utils.js"
   ],
   "stopSpecOnExpectationFailure": true,
-  "random": false
+  "random": true
 }

CliClient/tests/synchronizer.js

@@ -892,10 +892,12 @@ describe('Synchronizer', function() {
 
 		await synchronizer().start();
 
-		const fetcher = new ResourceFetcher(() => { return {
+		const fetcher = new ResourceFetcher(() => {
+			return {
 			// Simulate a failed download
-			get: () => { return new Promise((resolve, reject) => { reject(new Error('did not work')); }); },
-		}; });
+				get: () => { return new Promise((resolve, reject) => { reject(new Error('did not work')); }); },
+			};
+		});
 		fetcher.queueDownload_(resource1.id);
 		await fetcher.waitForAllFinished();
 
@@ -1025,8 +1027,8 @@ describe('Synchronizer', function() {
 		// If we try to disable encryption now, it should throw an error because some items are
 		// currently encrypted. They must be decrypted first so that they can be sent as
 		// plain text to the sync target.
-		//let hasThrown = await checkThrowAsync(async () => await encryptionService().disableEncryption());
-		//expect(hasThrown).toBe(true);
+		// let hasThrown = await checkThrowAsync(async () => await encryptionService().disableEncryption());
+		// expect(hasThrown).toBe(true);
 
 		// Now supply the password, and decrypt the items
 		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
@@ -1504,4 +1506,39 @@ describe('Synchronizer', function() {
 		expect((await Note.all()).length).toBe(11);
 	}));
 
+	it('should not sync if client sync version is lower than target', asyncTest(async () => {
+		// This should work - syncing two clients with same supported sync target version
+		await synchronizer().start();
+		await switchClient(2);
+		await synchronizer().start();
+
+		// This should not work - syncing two clients, but one of them has not been upgraded yet to the latest sync version
+		await switchClient(1);
+		Setting.setConstant('syncVersion', 2);
+		await synchronizer().start();
+
+		await switchClient(2);
+		Setting.setConstant('syncVersion', 1);
+		const hasThrown = await checkThrowAsync(async () => synchronizer().start({ throwOnError: true }));
+		expect(hasThrown).toBe(true);
+	}));
+
+	it('should not sync when target is locked', asyncTest(async () => {
+		await synchronizer().start();
+		await synchronizer().acquireLock_();
+
+		await switchClient(2);
+		const hasThrown = await checkThrowAsync(async () => synchronizer().start({ throwOnError: true }));
+		expect(hasThrown).toBe(true);
+	}));
+
+	it('should clear a lock if it was created by the same app as the current one', asyncTest(async () => {
+		await synchronizer().start();
+		await synchronizer().acquireLock_();
+		expect((await synchronizer().lockFiles_()).length).toBe(1);
+		await synchronizer().start({ throwOnError: true });
+		expect((await synchronizer().lockFiles_()).length).toBe(0);
+	}));
+
+
 });

CliClient/tests/test-utils.js

@@ -24,6 +24,8 @@ const BaseService = require('lib/services/BaseService.js');
 const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { time } = require('lib/time-utils.js');
 const { shimInit } = require('lib/shim-init-node.js');
+const { shim } = require('lib/shim.js');
+const { uuid } = require('lib/uuid.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
 const SyncTargetMemory = require('lib/SyncTargetMemory.js');
 const SyncTargetFilesystem = require('lib/SyncTargetFilesystem.js');
@@ -48,8 +50,15 @@ let kvStores_ = [];
 let fileApi_ = null;
 let currentClient_ = 1;
 
+// The line `process.on('unhandledRejection'...` in all the test files is going to
+// make it throw this error. It's not too big a problem so disable it for now.
+// https://stackoverflow.com/questions/9768444/possible-eventemitter-memory-leak-detected
+process.setMaxListeners(0);
+
 shimInit();
 
+shim.setIsTestingEnv(true);
+
 const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;
 Resource.fsDriver_ = fsDriver;
@@ -69,11 +78,11 @@ SyncTargetRegistry.addClass(SyncTargetDropbox);
 
 // const syncTargetId_ = SyncTargetRegistry.nameToId("nextcloud");
 const syncTargetId_ = SyncTargetRegistry.nameToId('memory');
-//const syncTargetId_ = SyncTargetRegistry.nameToId('filesystem');
+// const syncTargetId_ = SyncTargetRegistry.nameToId('filesystem');
 // const syncTargetId_ = SyncTargetRegistry.nameToId('dropbox');
 const syncDir = `${__dirname}/../tests/sync`;
 
-const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 100;//400;
+const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 100;// 400;
 
 console.info(`Testing with sync target: ${SyncTargetRegistry.idToName(syncTargetId_)}`);
 
@@ -137,6 +146,7 @@ async function switchClient(id) {
 
 	await Setting.load();
 
+	if (!Setting.value('clientId')) Setting.setValue('clientId', uuid.create());
 	Setting.setValue('sync.wipeOutFailSafe', false); // To keep things simple, always disable fail-safe unless explicitely set in the test itself
 }
 
@@ -180,6 +190,7 @@ async function setupDatabase(id = null) {
 	if (databases_[id]) {
 		await clearDatabase(id);
 		await Setting.load();
+		if (!Setting.value('clientId')) Setting.setValue('clientId', uuid.create());
 		return;
 	}
 
@@ -197,6 +208,7 @@ async function setupDatabase(id = null) {
 
 	BaseModel.db_ = databases_[id];
 	await Setting.load();
+	if (!Setting.value('clientId')) Setting.setValue('clientId', uuid.create());
 }
 
 function resourceDir(id = null) {
@@ -283,7 +295,7 @@ async function loadEncryptionMasterKey(id = null, useExisting = false) {
 		masterKey = await MasterKey.save(masterKey);
 	} else { // Use the one already available
 		const masterKeys = await MasterKey.all();
-		if (!masterKeys.length) throw new Error('No mater key available');
+		if (!masterKeys.length) throw new Error('No master key available');
 		masterKey = masterKeys[0];
 	}
 

CliClient/tests/urlUtils.js

@@ -25,7 +25,7 @@ describe('urlUtils', function() {
 		expect(urlUtils.prependBaseUrl('', 'http://example.com/something')).toBe('http://example.com/something');
 		expect(urlUtils.prependBaseUrl('testing.html', '')).toBe('testing.html');
 
-		// It shouldn't prepend anyting for these:
+		// It shouldn't prepend anything for these:
 		expect(urlUtils.prependBaseUrl('mailto:emailme@example.com', 'http://example.com')).toBe('mailto:emailme@example.com');
 		expect(urlUtils.prependBaseUrl('javascript:var%20testing=true', 'http://example.com')).toBe('javascript:var%20testing=true');
 		expect(urlUtils.prependBaseUrl('http://alreadyabsolute.com', 'http://example.com')).toBe('http://alreadyabsolute.com');

Clipper/joplin-webclipper/background.js

@@ -57,6 +57,7 @@ browser_.runtime.onMessage.addListener(async (command) => {
 		const imageDataUrl = await browserCaptureVisibleTabs(null);
 		const content = Object.assign({}, command.content);
 		content.image_data_url = imageDataUrl;
+		if ('url' in content) content.source_url = content.url;
 
 		const newArea = Object.assign({}, command.content.crop_rect);
 		newArea.x *= zoom;

Clipper/joplin-webclipper/content_scripts/index.js

@@ -83,14 +83,18 @@
 	}
 
 	function getAnchorNames(element) {
-		const anchors = element.getElementsByTagName('a');
 		const output = [];
-		for (let i = 0; i < anchors.length; i++) {
-			const anchor = anchors[i];
-			if (anchor.id) {
-				output.push(anchor.id);
-			} else if (anchor.name) {
-				output.push(anchor.name);
+		// Anchor names are normally in A tags but can be in SPAN too
+		// https://github.com/laurent22/joplin-turndown/commit/45f4ee6bf15b8804bdc2aa1d7ecb2f8cb594b8e5#diff-172b8b2bc3ba160589d3a7eeb4913687R232
+		for (const tagName of ['a', 'span']) {
+			const anchors = element.getElementsByTagName(tagName);
+			for (let i = 0; i < anchors.length; i++) {
+				const anchor = anchors[i];
+				if (anchor.id) {
+					output.push(anchor.id);
+				} else if (anchor.name) {
+					output.push(anchor.name);
+				}
 			}
 		}
 		return output;
@@ -134,11 +138,17 @@
 					const src = absoluteUrl(imageSrc(node));
 					node.setAttribute('src', src);
 					if (!(src in imageIndexes)) imageIndexes[src] = 0;
-					const imageSize = imageSizes[src][imageIndexes[src]];
-					imageIndexes[src]++;
-					if (imageSize && convertToMarkup === 'markdown') {
-						node.width = imageSize.width;
-						node.height = imageSize.height;
+
+					if (!imageSizes[src]) {
+						// This seems to concern dynamic images that don't really such as Gravatar, etc.
+						console.warn('Found an image for which the size had not been fetched:', src);
+					} else {
+						const imageSize = imageSizes[src][imageIndexes[src]];
+						imageIndexes[src]++;
+						if (imageSize && convertToMarkup === 'markdown') {
+							node.width = imageSize.width;
+							node.height = imageSize.height;
+						}
 					}
 				}
 
@@ -423,7 +433,7 @@
 					const content = {
 						title: pageTitle(),
 						crop_rect: selectionArea,
-						url: pageLocationOrigin() + location.pathname,
+						url: pageLocationOrigin() + location.pathname + location.search,
 						parent_id: command.parent_id,
 						tags: command.tags,
 					};

Clipper/joplin-webclipper/popup/package-lock.json

@@ -1765,9 +1765,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
         }
       }
     },
@@ -5176,9 +5176,19 @@
       }
     },
     "eslint-utils": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q=="
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+          "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
+        }
+      }
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
@@ -6233,9 +6243,9 @@
           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
         },
         "micromatch": {
           "version": "3.1.10",
@@ -6329,13 +6339,13 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
       },
       "dependencies": {
         "abbrev": {
@@ -6354,7 +6364,7 @@
           "optional": true
         },
         "are-we-there-yet": {
-          "version": "1.1.4",
+          "version": "1.1.5",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -6377,7 +6387,7 @@
           }
         },
         "chownr": {
-          "version": "1.0.1",
+          "version": "1.1.1",
           "bundled": true,
           "optional": true
         },
@@ -6402,15 +6412,15 @@
           "optional": true
         },
         "debug": {
-          "version": "2.6.9",
+          "version": "4.1.1",
           "bundled": true,
           "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "deep-extend": {
-          "version": "0.5.1",
+          "version": "0.6.0",
           "bundled": true,
           "optional": true
         },
@@ -6453,7 +6463,7 @@
           }
         },
         "glob": {
-          "version": "7.1.2",
+          "version": "7.1.3",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -6471,11 +6481,11 @@
           "optional": true
         },
         "iconv-lite": {
-          "version": "0.4.21",
+          "version": "0.4.24",
           "bundled": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "^2.1.0"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "ignore-walk": {
@@ -6532,16 +6542,16 @@
           "optional": true
         },
         "minipass": {
-          "version": "2.2.4",
+          "version": "2.3.5",
           "bundled": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
           }
         },
         "minizlib": {
-          "version": "1.1.0",
+          "version": "1.2.1",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -6557,32 +6567,32 @@
           }
         },
         "ms": {
-          "version": "2.0.0",
+          "version": "2.1.1",
           "bundled": true,
           "optional": true
         },
         "needle": {
-          "version": "2.2.0",
+          "version": "2.3.0",
           "bundled": true,
           "optional": true,
           "requires": {
-            "debug": "^2.1.2",
+            "debug": "^4.1.0",
             "iconv-lite": "^0.4.4",
             "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.10.0",
+          "version": "0.12.0",
           "bundled": true,
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
             "mkdirp": "^0.5.1",
-            "needle": "^2.2.0",
+            "needle": "^2.2.1",
             "nopt": "^4.0.1",
             "npm-packlist": "^1.1.6",
             "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
+            "rc": "^1.2.7",
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
             "tar": "^4"
@@ -6598,12 +6608,12 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.3",
+          "version": "1.0.6",
           "bundled": true,
           "optional": true
         },
         "npm-packlist": {
-          "version": "1.1.10",
+          "version": "1.4.1",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -6670,11 +6680,11 @@
           "optional": true
         },
         "rc": {
-          "version": "1.2.7",
+          "version": "1.2.8",
           "bundled": true,
           "optional": true,
           "requires": {
-            "deep-extend": "^0.5.1",
+            "deep-extend": "^0.6.0",
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
@@ -6702,15 +6712,15 @@
           }
         },
         "rimraf": {
-          "version": "2.6.2",
+          "version": "2.6.3",
           "bundled": true,
           "optional": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.1.3"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
+          "version": "5.1.2",
           "bundled": true,
           "optional": true
         },
@@ -6725,7 +6735,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.5.0",
+          "version": "5.7.0",
           "bundled": true,
           "optional": true
         },
@@ -6771,16 +6781,16 @@
           "optional": true
         },
         "tar": {
-          "version": "4.4.1",
+          "version": "4.4.8",
           "bundled": true,
           "optional": true,
           "requires": {
-            "chownr": "^1.0.1",
+            "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.2.4",
-            "minizlib": "^1.1.0",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
             "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.2"
           }
         },
@@ -6790,11 +6800,11 @@
           "optional": true
         },
         "wide-align": {
-          "version": "1.1.2",
+          "version": "1.1.3",
           "bundled": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "^1.0.2 || 2"
           }
         },
         "wrappy": {
@@ -6803,7 +6813,7 @@
           "optional": true
         },
         "yallist": {
-          "version": "3.0.2",
+          "version": "3.0.3",
           "bundled": true,
           "optional": true
         }
@@ -6981,11 +6991,11 @@
       "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="
     },
     "handlebars": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz",
-      "integrity": "sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
+      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
       "requires": {
-        "async": "^2.5.0",
+        "neo-async": "^2.6.0",
         "optimist": "^0.6.1",
         "source-map": "^0.6.1",
         "uglify-js": "^3.1.4"
@@ -7809,9 +7819,9 @@
           "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w=="
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
         },
         "strip-ansi": {
           "version": "5.0.0",
@@ -8988,9 +8998,9 @@
       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
     "js-yaml": {
-      "version": "3.12.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-      "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -9305,9 +9315,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash-es": {
       "version": "4.17.10",
@@ -9725,9 +9735,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -13302,6 +13312,487 @@
             "jsonfile": "^4.0.0",
             "universalify": "^0.1.0"
           }
+        },
+        "fsevents": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+          "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+          "optional": true,
+          "requires": {
+            "nan": "^2.9.2",
+            "node-pre-gyp": "^0.10.0"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "2.6.9",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "deep-extend": {
+              "version": "0.5.1",
+              "bundled": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.21",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": "^2.1.0"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.2.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.1",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.1.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.2.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "debug": "^2.1.2",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.10.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.0",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.1.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.0.3",
+              "bundled": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.1.10",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.7",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.5.1",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.0.5"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.5.0",
+              "bundled": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.0.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.2.4",
+                "minizlib": "^1.1.0",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.1",
+                "yallist": "^3.0.2"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.0.2",
+              "bundled": true,
+              "optional": true
+            }
+          }
         }
       }
     },
@@ -13898,9 +14389,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
         }
       }
     },
@@ -14519,9 +15010,9 @@
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -15218,9 +15709,9 @@
           "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w=="
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
         },
         "string-width": {
           "version": "3.0.0",
@@ -15588,35 +16079,14 @@
       }
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "uniq": {

Clipper/joplin-webclipper/popup/src/randomClipperPort.js

@@ -1,20 +1,22 @@
 function randomClipperPort(state, env) {
-	const startPorts = {
-		prod: 41184,
-		dev: 27583,
-	};
-
-	const startPort = env === 'prod' ? startPorts.prod : startPorts.dev;
-
 	if (!state) {
 		state = { offset: 0 };
 	} else {
 		state.offset++;
 	}
 
-	state.port = startPort + state.offset;
+	state.port = startPort(env) + state.offset;
 
 	return state;
 }
 
-module.exports = { randomClipperPort };
+function startPort(env) {
+	const startPorts = {
+		prod: 41184,
+		dev: 27583,
+	};
+
+	return env === 'prod' ? startPorts.prod : startPorts.dev;
+}
+
+module.exports = { randomClipperPort, startPort };

ElectronClient/app/ElectronAppWrapper.js

@@ -56,6 +56,9 @@ class ElectronAppWrapper {
 			webPreferences: {
 				nodeIntegration: true,
 			},
+			// We start with a hidden window, which is then made visible depending on the showTrayIcon setting
+			// https://github.com/laurent22/joplin/issues/2031
+			show: false,
 		};
 
 		// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098
@@ -87,7 +90,7 @@ class ElectronAppWrapper {
 			// user clicks on the icon in the task bar).
 
 			// On Windows and Linux, the app is closed when the window is closed *except* if the tray icon is used. In which
-			// case the app must be explicitely closed with Ctrl+Q or by right-clicking on the tray icon and selecting "Exit".
+			// case the app must be explicitly closed with Ctrl+Q or by right-clicking on the tray icon and selecting "Exit".
 
 			if (process.platform === 'darwin') {
 				if (this.willQuitApp_) {
@@ -138,7 +141,7 @@ class ElectronAppWrapper {
 	}
 
 	// This method is used in macOS only to hide the whole app (and not just the main window)
-	// including the menu bar. This follows the macOS way of hidding an app.
+	// including the menu bar. This follows the macOS way of hiding an app.
 	hide() {
 		this.electronApp_.hide();
 	}

ElectronClient/app/InteropServiceHelper.js

@@ -36,9 +36,13 @@ class InteropServiceHelper {
 		if (options.sourceNoteIds) exportOptions.sourceNoteIds = options.sourceNoteIds;
 
 		const service = new InteropService();
-		const result = await service.export(exportOptions);
 
-		console.info('Export result: ', result);
+		try {
+			const result = await service.export(exportOptions);
+			console.info('Export result: ', result);
+		} catch (error) {
+			bridge().showErrorMessageBox(_('Could not export notes: %s', error.message));
+		}
 
 		dispatch({
 			type: 'WINDOW_COMMAND',

ElectronClient/app/app.js

@@ -44,6 +44,7 @@ const appDefaultState = Object.assign({}, defaultState, {
 	windowCommand: null,
 	noteVisiblePanes: ['editor', 'viewer'],
 	sidebarVisibility: true,
+	noteListVisibility: true,
 	windowContentSize: bridge().windowContentSize(),
 	watchedNoteFiles: [],
 	lastEditorScrollPercents: {},
@@ -121,19 +122,31 @@ class Application extends BaseApplication {
 			case 'NOTE_VISIBLE_PANES_TOGGLE':
 
 				{
-					let panes = state.noteVisiblePanes.slice();
-					if (panes.length === 2) {
-						panes = ['editor'];
-					} else if (panes.indexOf('editor') >= 0) {
-						panes = ['viewer'];
-					} else if (panes.indexOf('viewer') >= 0) {
-						panes = ['editor', 'viewer'];
-					} else {
-						panes = ['editor', 'viewer'];
-					}
+					const getNextLayout = (currentLayout) => {
+						currentLayout = panes.length === 2 ? 'both' : currentLayout[0];
+
+						let paneOptions;
+						if (state.settings.layoutButtonSequence === Setting.LAYOUT_EDITOR_VIEWER) {
+							paneOptions = ['editor', 'viewer'];
+						} else if (state.settings.layoutButtonSequence === Setting.LAYOUT_EDITOR_SPLIT) {
+							paneOptions = ['editor', 'both'];
+						} else if (state.settings.layoutButtonSequence === Setting.LAYOUT_VIEWER_SPLIT) {
+							paneOptions = ['viewer', 'both'];
+						} else {
+							paneOptions = ['editor', 'viewer', 'both'];
+						}
+
+						const currentLayoutIndex = paneOptions.indexOf(currentLayout);
+						const nextLayoutIndex = currentLayoutIndex === paneOptions.length - 1 ? 0 : currentLayoutIndex + 1;
+
+						let nextLayout = paneOptions[nextLayoutIndex];
+						return nextLayout === 'both' ? ['editor', 'viewer'] : [nextLayout];
+					};
 
 					newState = Object.assign({}, state);
-					newState.noteVisiblePanes = panes;
+
+					let panes = state.noteVisiblePanes.slice();
+					newState.noteVisiblePanes = getNextLayout(panes);
 				}
 				break;
 
@@ -154,6 +167,16 @@ class Application extends BaseApplication {
 				newState.sidebarVisibility = action.visibility;
 				break;
 
+			case 'NOTELIST_VISIBILITY_TOGGLE':
+				newState = Object.assign({}, state);
+				newState.noteListVisibility = !state.noteListVisibility;
+				break;
+
+			case 'NOTELIST_VISIBILITY_SET':
+				newState = Object.assign({}, state);
+				newState.noteListVisibility = action.visibility;
+				break;
+
 			case 'NOTE_FILE_WATCHER_ADD':
 
 				if (newState.watchedNoteFiles.indexOf(action.id) < 0) {
@@ -196,7 +219,6 @@ class Application extends BaseApplication {
 				break;
 
 			case 'NOTE_DEVTOOLS_TOGGLE':
-
 				newState = Object.assign({}, state);
 				newState.noteDevToolsVisible = !newState.noteDevToolsVisible;
 				break;
@@ -246,10 +268,19 @@ class Application extends BaseApplication {
 			Setting.setValue('sidebarVisibility', newState.sidebarVisibility);
 		}
 
+		if (['NOTELIST_VISIBILITY_TOGGLE', 'NOTELIST_VISIBILITY_SET'].indexOf(action.type) >= 0) {
+			Setting.setValue('noteListVisibility', newState.noteListVisibility);
+		}
+
 		if (action.type.indexOf('NOTE_SELECT') === 0 || action.type.indexOf('FOLDER_SELECT') === 0) {
 			this.updateMenuItemStates();
 		}
 
+		if (action.type === 'NOTE_DEVTOOLS_TOGGLE') {
+			const menuItem = Menu.getApplicationMenu().getMenuItemById('help:toggleDevTools');
+			menuItem.checked = newState.noteDevToolsVisible;
+		}
+
 		return result;
 	}
 
@@ -418,15 +449,15 @@ class Application extends BaseApplication {
 			},
 		});
 
-		/* We need a dummy entry, otherwise the ternary operator to show a
-		 * menu item only on a specific OS does not work. */
+		// We need a dummy entry, otherwise the ternary operator to show a
+		// menu item only on a specific OS does not work.
 		const noItem = {
 			type: 'separator',
 			visible: false,
 		};
 
 		const syncStatusItem = {
-			label: _('Synchronisation status'),
+			label: _('Synchronisation Status'),
 			click: () => {
 				this.dispatch({
 					type: 'NAV_GO',
@@ -470,6 +501,18 @@ class Application extends BaseApplication {
 			},
 		};
 
+		const newSubNotebookItem = {
+			label: _('New sub-notebook'),
+			screens: ['Main'],
+			click: () => {
+				this.dispatch({
+					type: 'WINDOW_COMMAND',
+					name: 'newSubNotebook',
+					activeFolderId: Setting.value('activeFolderId'),
+				});
+			},
+		};
+
 		const printItem = {
 			label: _('Print'),
 			accelerator: 'CommandOrControl+P',
@@ -565,6 +608,9 @@ class Application extends BaseApplication {
 				'',
 				'Copyright © 2016-2019 Laurent Cozic',
 				_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
+				'',
+				_('Client ID: %s', Setting.value('clientId')),
+				_('Sync Version: %s', Setting.value('syncVersion')),
 			];
 			if (gitInfo) {
 				message.push(`\n${gitInfo}`);
@@ -576,13 +622,13 @@ class Application extends BaseApplication {
 		}
 
 		const rootMenuFile = {
-			/* Using a dummy entry for macOS here, because first menu
-			 * becomes 'Joplin' and we need a nenu called 'File' later. */
+			// Using a dummy entry for macOS here, because first menu
+			// becomes 'Joplin' and we need a nenu called 'File' later.
 			label: shim.isMac() ? '&JoplinMainMenu' : _('&File'),
-			/* `&` before one of the char in the label name mean, that
-			 * <Alt + F> will open this menu. It's needed becase electron
-			 * opens the first menu on Alt press if no hotkey assigned.
-			 * Issue: https://github.com/laurent22/joplin/issues/934 */
+			// `&` before one of the char in the label name mean, that
+			// <Alt + F> will open this menu. It's needed becase electron
+			// opens the first menu on Alt press if no hotkey assigned.
+			// Issue: https://github.com/laurent22/joplin/issues/934
 			submenu: [{
 				label: _('About Joplin'),
 				visible: shim.isMac() ? true : false,
@@ -610,7 +656,8 @@ class Application extends BaseApplication {
 			},
 			shim.isMac() ? noItem : newNoteItem,
 			shim.isMac() ? noItem : newTodoItem,
-			shim.isMac() ? noItem : newNotebookItem, {
+			shim.isMac() ? noItem : newNotebookItem,
+			shim.isMac() ? noItem : newSubNotebookItem, {
 				type: 'separator',
 				visible: shim.isMac() ? false : true,
 			}, {
@@ -665,7 +712,8 @@ class Application extends BaseApplication {
 			submenu: [
 				newNoteItem,
 				newTodoItem,
-				newNotebookItem, {
+				newNotebookItem,
+				newSubNotebookItem, {
 					label: _('Close Window'),
 					platforms: ['darwin'],
 					accelerator: 'Command+W',
@@ -690,6 +738,17 @@ class Application extends BaseApplication {
 			],
 		};
 
+		const layoutButtonSequenceOptions = Object.entries(Setting.enumOptions('layoutButtonSequence')).map(([layoutKey, layout]) => ({
+			label: layout,
+			screens: ['Main'],
+			type: 'checkbox',
+			checked: Setting.value('layoutButtonSequence') == layoutKey,
+			click: () => {
+				Setting.setValue('layoutButtonSequence', layoutKey);
+				this.refreshMenu();
+			},
+		}));
+
 		const rootMenus = {
 			edit: {
 				id: 'edit',
@@ -843,6 +902,22 @@ class Application extends BaseApplication {
 							name: 'toggleSidebar',
 						});
 					},
+				}, {
+					type: 'separator',
+					screens: ['Main'],
+				}, {
+					label: _('Layout button sequence'),
+					screens: ['Main'],
+					submenu: layoutButtonSequenceOptions,
+				}, {
+					label: _('Toggle note list'),
+					screens: ['Main'],
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'toggleNoteList',
+						});
+					},
 				}, {
 					label: _('Toggle editor layout'),
 					screens: ['Main'],
@@ -864,6 +939,14 @@ class Application extends BaseApplication {
 					label: Setting.settingMetadata('folders.sortOrder.field').label(),
 					screens: ['Main'],
 					submenu: sortFolderItems,
+				}, {
+					label: Setting.settingMetadata('showNoteCounts').label(),
+					type: 'checkbox',
+					checked: Setting.value('showNoteCounts'),
+					screens: ['Main'],
+					click: () => {
+						Setting.setValue('showNoteCounts', !Setting.value('showNoteCounts'));
+					},
 				}, {
 					label: Setting.settingMetadata('uncompletedTodosOnTop').label(),
 					type: 'checkbox',
@@ -898,13 +981,13 @@ class Application extends BaseApplication {
 				submenu: [{
 					label: _('Website and documentation'),
 					accelerator: 'F1',
-					click () { bridge().openExternal('https://joplinapp.org'); },
+					click() { bridge().openExternal('https://joplinapp.org'); },
 				}, {
 					label: _('Joplin Forum'),
-					click () { bridge().openExternal('https://discourse.joplinapp.org'); },
+					click() { bridge().openExternal('https://discourse.joplinapp.org'); },
 				}, {
 					label: _('Make a donation'),
-					click () { bridge().openExternal('https://joplinapp.org/donate/'); },
+					click() { bridge().openExternal('https://joplinapp.org/donate/'); },
 				}, {
 					label: _('Check for updates...'),
 					visible: shim.isMac() ? false : true,
@@ -913,6 +996,8 @@ class Application extends BaseApplication {
 					type: 'separator',
 					screens: ['Main'],
 				}, {
+					id: 'help:toggleDevTools',
+					type: 'checkbox',
 					label: _('Toggle development tools'),
 					visible: true,
 					click: () => {
@@ -1175,7 +1260,9 @@ class Application extends BaseApplication {
 		}, 1000 * 60 * 60);
 
 		if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
-			bridge().window().hide();
+			// Keep it hidden
+		} else {
+			bridge().window().show();
 		}
 
 		ResourceService.runInBackground();

ElectronClient/app/checkForUpdates.js

@@ -93,6 +93,18 @@ async function fetchLatestRelease(options) {
 	};
 }
 
+function truncateText(text, length) {
+	let truncated = text.substring(0, length);
+	const lastNewLine = truncated.lastIndexOf('\n');
+	// Cut off at a line break unless we'd be cutting off half the text
+	if (lastNewLine > length / 2) {
+		truncated = `${truncated.substring(0, lastNewLine)}\n...`;
+	} else {
+		truncated = `${truncated.trim()}...`;
+	}
+	return truncated;
+}
+
 function checkForUpdates(inBackground, window, logFilePath, options) {
 	if (isCheckingForUpdate_) {
 		autoUpdateLogger_.info('checkForUpdates: Skipping check because it is already running');
@@ -126,16 +138,21 @@ function checkForUpdates(inBackground, window, logFilePath, options) {
 				buttons: [_('OK')],
 			});
 		} else {
-			const releaseNotes = release.notes.trim() ? `\n\n${release.notes.trim()}` : '';
+			const fullReleaseNotes = release.notes.trim() ? `\n\n${release.notes.trim()}` : '';
+			const MAX_RELEASE_NOTES_LENGTH = 1000;
+			const truncateReleaseNotes = fullReleaseNotes.length > MAX_RELEASE_NOTES_LENGTH;
+			const releaseNotes = truncateReleaseNotes ? truncateText(fullReleaseNotes, MAX_RELEASE_NOTES_LENGTH) : fullReleaseNotes;
+
 			const newVersionString = release.prerelease ? _('%s (pre-release)', release.version) : release.version;
 
 			const buttonIndex = dialog.showMessageBox(parentWindow_, {
 				type: 'info',
 				message: `${_('An update is available, do you want to download it now?')}\n\n${_('Your version: %s', packageInfo.version)}\n${_('New version: %s', newVersionString)}${releaseNotes}`,
-				buttons: [_('Yes'), _('No')],
+				buttons: [_('Yes'), _('No')].concat(truncateReleaseNotes ? [_('Full Release Notes')] : []),
 			});
 
 			if (buttonIndex === 0) require('electron').shell.openExternal(release.downloadUrl ? release.downloadUrl : release.pageUrl);
+			if (buttonIndex === 2) require('electron').shell.openExternal(release.pageUrl);
 		}
 	}).catch(error => {
 		autoUpdateLogger_.error(error);

ElectronClient/app/compile-package-info.js

@@ -22,8 +22,7 @@ let hash;
 try {
 	branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
 	hash   = execSync('git log --pretty="%h" -1').toString().trim();
-}
-catch(err) {
+} catch (err) {
 	console.warn('Could not get git info', err);
 }
 if (typeof branch !== 'undefined' && typeof hash !== 'undefined') {

ElectronClient/app/gui/ConfigMenuBar.jsx

@@ -28,7 +28,7 @@ function ConfigMenuBar(props) {
 			key={section.name}
 			iconName={Setting.sectionNameToIcon(section.name)}
 			label={Setting.sectionNameToLabel(section.name)}
-			onClick={() => { props.onSelectionChange({ section: section });}}
+			onClick={() => { props.onSelectionChange({ section: section }); }}
 		/>);
 	}
 

ElectronClient/app/gui/ConfigScreen.jsx

@@ -478,7 +478,7 @@ class ConfigScreenComponent extends React.Component {
 			borderTopColor: theme.dividerColor,
 		};
 
-		const screenComp = this.state.screenName ? <div style={{overflow: 'scroll', flex:1}}>{this.screenFromName(this.state.screenName)}</div> : null;
+		const screenComp = this.state.screenName ? <div style={{overflow: 'scroll', flex: 1}}>{this.screenFromName(this.state.screenName)}</div> : null;
 
 		if (screenComp) containerStyle.display = 'none';
 

ElectronClient/app/gui/Header.jsx

@@ -161,11 +161,13 @@ class HeaderComponent extends React.Component {
 		const inputStyle = {
 			display: 'flex',
 			flex: 1,
+			marginLeft: 10,
 			paddingLeft: 6,
 			paddingRight: 6,
 			paddingTop: 1, // vertical alignment with buttons
 			paddingBottom: 0, // vertical alignment with buttons
 			height: style.fontSize * 2,
+			width: 300,
 			color: style.color,
 			fontSize: style.fontSize,
 			fontFamily: style.fontFamily,

ElectronClient/app/gui/MainScreen.jsx

@@ -69,6 +69,12 @@ class MainScreenComponent extends React.Component {
 		});
 	}
 
+	toggleNoteList() {
+		this.props.dispatch({
+			type: 'NOTELIST_VISIBILITY_TOGGLE',
+		});
+	}
+
 	async doCommand(command) {
 		if (!command) return;
 
@@ -102,7 +108,7 @@ class MainScreenComponent extends React.Component {
 			} else {
 				await createNewNote(null, true);
 			}
-		} else if (command.name === 'newNotebook') {
+		} else if (command.name === 'newNotebook' || (command.name === 'newSubNotebook' && command.activeFolderId)) {
 			this.setState({
 				promptOptions: {
 					label: _('Notebook title:'),
@@ -111,6 +117,7 @@ class MainScreenComponent extends React.Component {
 							let folder = null;
 							try {
 								folder = await Folder.save({ title: answer }, { userSideValidation: true });
+								if (command.name === 'newSubNotebook') folder = await Folder.moveToFolder(folder.id, command.activeFolderId);
 							} catch (error) {
 								bridge().showErrorMessageBox(error.message);
 							}
@@ -244,8 +251,19 @@ class MainScreenComponent extends React.Component {
 			this.toggleVisiblePanes();
 		} else if (command.name === 'toggleSidebar') {
 			this.toggleSidebar();
+		} else if (command.name === 'toggleNoteList') {
+			this.toggleNoteList();
 		} else if (command.name === 'showModalMessage') {
-			this.setState({ modalLayer: { visible: true, message: command.message } });
+			this.setState({
+				modalLayer: {
+					visible: true,
+					message:
+						<div className="modal-message">
+							<div id="loading-animation" />
+							<div className="text">{command.message}</div>
+						</div>,
+				},
+			});
 		} else if (command.name === 'hideModalMessage') {
 			this.setState({ modalLayer: { visible: false, message: '' } });
 		} else if (command.name === 'editAlarm') {
@@ -321,8 +339,8 @@ class MainScreenComponent extends React.Component {
 		}
 	}
 
-	styles(themeId, width, height, messageBoxVisible, isSidebarVisible, sidebarWidth, noteListWidth) {
-		const styleKey = [themeId, width, height, messageBoxVisible, +isSidebarVisible, sidebarWidth, noteListWidth].join('_');
+	styles(themeId, width, height, messageBoxVisible, isSidebarVisible, isNoteListVisible, sidebarWidth, noteListWidth) {
+		const styleKey = [themeId, width, height, messageBoxVisible, +isSidebarVisible, +isNoteListVisible, sidebarWidth, noteListWidth].join('_');
 		if (styleKey === this.styleKey_) return this.styles_;
 
 		const theme = themeStyle(themeId);
@@ -371,6 +389,12 @@ class MainScreenComponent extends React.Component {
 			verticalAlign: 'top',
 		};
 
+		if (isNoteListVisible === false) {
+			this.styles_.noteList.width = 0;
+			this.styles_.noteList.display = 'none';
+			this.styles_.verticalResizer.display = 'none';
+		}
+
 		this.styles_.noteText = {
 			width: Math.floor(width - this.styles_.sideBar.width - this.styles_.noteList.width - 10),
 			height: rowHeight,
@@ -411,7 +435,8 @@ class MainScreenComponent extends React.Component {
 		const notes = this.props.notes;
 		const messageBoxVisible = this.props.hasDisabledSyncItems || this.props.showMissingMasterKeyMessage;
 		const sidebarVisibility = this.props.sidebarVisibility;
-		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible, sidebarVisibility, this.props.sidebarWidth, this.props.noteListWidth);
+		const noteListVisibility = this.props.noteListVisibility;
+		const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible, sidebarVisibility, noteListVisibility, this.props.sidebarWidth, this.props.noteListWidth);
 		const onConflictFolder = this.props.selectedFolderId === Folder.conflictFolderId();
 
 		const headerItems = [];
@@ -425,6 +450,15 @@ class MainScreenComponent extends React.Component {
 			},
 		});
 
+		headerItems.push({
+			title: _('Toggle note list'),
+			iconName: 'fa-align-justify',
+			iconRotation: noteListVisibility ? 0 : 90,
+			onClick: () => {
+				this.doCommand({ name: 'toggleNoteList' });
+			},
+		});
+
 		headerItems.push({
 			title: _('New note'),
 			iconName: 'fa-file-o',
@@ -539,6 +573,7 @@ class MainScreenComponent extends React.Component {
 		const modalLayerStyle = Object.assign({}, styles.modalLayer, { display: this.state.modalLayer.visible ? 'block' : 'none' });
 
 		const notePropertiesDialogOptions = this.state.notePropertiesDialogOptions;
+		const keyboardMode = Setting.value('editor.keyboardMode');
 
 		return (
 			<div style={style}>
@@ -554,7 +589,7 @@ class MainScreenComponent extends React.Component {
 				<VerticalResizer style={styles.verticalResizer} onDrag={this.sidebar_onDrag} />
 				<NoteList style={styles.noteList} />
 				<VerticalResizer style={styles.verticalResizer} onDrag={this.noteList_onDrag} />
-				<NoteText style={styles.noteText} visiblePanes={this.props.noteVisiblePanes} noteDevToolsVisible={this.props.noteDevToolsVisible} />
+				<NoteText style={styles.noteText} keyboardMode={keyboardMode} visiblePanes={this.props.noteVisiblePanes} noteDevToolsVisible={this.props.noteDevToolsVisible} />
 
 				{pluginDialog}
 			</div>
@@ -568,6 +603,7 @@ const mapStateToProps = state => {
 		windowCommand: state.windowCommand,
 		noteVisiblePanes: state.noteVisiblePanes,
 		sidebarVisibility: state.sidebarVisibility,
+		noteListVisibility: state.noteListVisibility,
 		folders: state.folders,
 		notes: state.notes,
 		hasDisabledSyncItems: state.hasDisabledSyncItems,

ElectronClient/app/gui/NoteList.jsx

@@ -30,11 +30,16 @@ class NoteListComponent extends React.Component {
 
 		const itemHeight = 34;
 
+		// Note: max-width is used to specifically prevent horizontal scrolling on Linux when the scrollbar is present in the note list.
+		// Pull request: https://github.com/laurent22/joplin/pull/2062
+		const itemWidth = '100%';
+
 		let style = {
 			root: {
 				backgroundColor: theme.backgroundColor,
 			},
 			listItem: {
+				maxWidth: itemWidth,
 				height: itemHeight,
 				boxSizing: 'border-box',
 				display: 'flex',

ElectronClient/app/gui/NotePropertiesDialog.jsx

@@ -106,7 +106,7 @@ class NotePropertiesDialog extends React.Component {
 
 		this.styles_.controlBox = {
 			marginBottom: '1em',
-			color: 'black', //This will apply for the calendar
+			color: 'black', // This will apply for the calendar
 		};
 
 		this.styles_.button = {

ElectronClient/app/gui/NoteRevisionViewer.jsx

@@ -7,13 +7,15 @@ const HelpButton = require('./HelpButton.min');
 const BaseModel = require('lib/BaseModel');
 const Revision = require('lib/models/Revision');
 const Note = require('lib/models/Note');
+const urlUtils = require('lib/urlUtils');
 const Setting = require('lib/models/Setting');
 const RevisionService = require('lib/services/RevisionService');
 const shared = require('lib/components/shared/note-screen-shared.js');
 const MarkupToHtml = require('lib/renderers/MarkupToHtml');
 const { time } = require('lib/time-utils.js');
 const ReactTooltip = require('react-tooltip');
-const { substrWithEllipsis } = require('lib/string-utils');
+const { urlDecode, substrWithEllipsis } = require('lib/string-utils');
+const { bridge } = require('electron').remote.require('./bridge');
 
 class NoteRevisionViewerComponent extends React.PureComponent {
 	constructor() {
@@ -32,6 +34,7 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 		this.revisionList_onChange = this.revisionList_onChange.bind(this);
 		this.importButton_onClick = this.importButton_onClick.bind(this);
 		this.backButton_click = this.backButton_click.bind(this);
+		this.webview_ipcMessage = this.webview_ipcMessage.bind(this);
 	}
 
 	style() {
@@ -121,11 +124,42 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 			codeTheme: theme.codeThemeCss,
 			userCss: this.props.customCss ? this.props.customCss : '',
 			resources: await shared.attachedResources(noteBody),
+			postMessageSyntax: 'ipcProxySendToHost',
 		});
 
 		this.viewerRef_.current.wrappedInstance.send('setHtml', result.html, { cssFiles: result.cssFiles });
 	}
 
+	async webview_ipcMessage(event) {
+		// For the revision view, we only suppport a minimal subset of the IPC messages.
+		// For example, we don't need interactive checkboxes or sync between viewer and editor view.
+		// We try to get most links work though, except for internal (joplin://) links.
+
+		const msg = event.channel ? event.channel : '';
+		const args = event.args;
+
+		if (msg !== 'percentScroll') console.info(`Got ipc-message: ${msg}`, args);
+
+		try {
+			if (msg.indexOf('joplin://') === 0) {
+				throw new Error(_('Unsupported link or message: %s', msg));
+			} else if (urlUtils.urlProtocol(msg)) {
+				if (msg.indexOf('file://') === 0) {
+					require('electron').shell.openExternal(urlDecode(msg));
+				} else {
+					require('electron').shell.openExternal(msg);
+				}
+			} else if (msg.indexOf('#') === 0) {
+				// This is an internal anchor, which is handled by the WebView so skip this case
+			} else {
+				console.warn(`Unsupported message in revision view: ${msg}`);
+			}
+		} catch (error) {
+			console.warn(error);
+			bridge().showErrorMessageBox(error.message);
+		}
+	}
+
 	render() {
 		const theme = themeStyle(this.props.theme);
 		const style = this.style();
@@ -149,7 +183,7 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 		const titleInput = (
 			<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 10, borderWidth: 1, borderBottomStyle: 'solid', borderColor: theme.dividerColor, paddingBottom: 10 }}>
 				<button onClick={this.backButton_click} style={Object.assign({}, theme.buttonStyle, { marginRight: 10, height: theme.inputStyle.height })}>
-					{`⬅ ${_('Back')}`}
+					<i style={theme.buttonIconStyle} className={'fa fa-chevron-left'}></i>{_('Back')}
 				</button>
 				<input readOnly type="text" style={style.titleInput} value={this.state.note ? this.state.note.title : ''} />
 				<select disabled={!this.state.revisions.length} value={this.state.currentRevId} style={style.revisionList} onChange={this.revisionList_onChange}>
@@ -162,7 +196,7 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 			</div>
 		);
 
-		const viewer = <NoteTextViewer viewerStyle={{ display: 'flex', flex: 1 }} ref={this.viewerRef_} onDomReady={this.viewer_domReady} />;
+		const viewer = <NoteTextViewer viewerStyle={{ display: 'flex', flex: 1 }} ref={this.viewerRef_} onDomReady={this.viewer_domReady} onIpcMessage={this.webview_ipcMessage} />;
 
 		return (
 			<div style={style.root}>

ElectronClient/app/gui/NoteText.jsx

@@ -48,6 +48,10 @@ require('brace/theme/chrome');
 require('brace/theme/solarized_light');
 require('brace/theme/solarized_dark');
 require('brace/theme/twilight');
+require('brace/theme/dracula');
+require('brace/theme/chaos');
+require('brace/keybinding/vim');
+require('brace/keybinding/emacs');
 
 const NOTE_TAG_BAR_FEATURE_ENABLED = false;
 
@@ -99,6 +103,7 @@ class NoteTextComponent extends React.Component {
 		this.selectionRange_ = null;
 		this.lastComponentUpdateNoteId_ = null;
 		this.noteSearchBar_ = React.createRef();
+		this.isPrinting_ = false;
 
 		// Complicated but reliable method to get editor content height
 		// https://github.com/ajaxorg/ace/issues/2046
@@ -237,6 +242,14 @@ class NoteTextComponent extends React.Component {
 				this.selectionRange_ = null;
 			} else {
 				this.selectionRange_ = ranges[0];
+				if (process.platform === 'linux') {
+					const textRange = this.textOffsetSelection();
+					if (textRange.start != textRange.end) {
+						clipboard.writeText(this.state.note.body.slice(
+							Math.min(textRange.start, textRange.end),
+							Math.max(textRange.end, textRange.start)), 'selection');
+					}
+				}
 			}
 		};
 
@@ -690,10 +703,13 @@ class NoteTextComponent extends React.Component {
 	}
 
 	async noteRevisionViewer_onBack() {
-		this.setState({ showRevisions: false });
-
-		this.lastSetHtml_ = '';
-		this.scheduleReloadNote(this.props);
+		// When coming back from the revision viewer, the webview has been
+		// unmounted so will need to reload. We set webviewReady to false
+		// to make sure everything is reloaded as expected.
+		this.setState({ showRevisions: false, webviewReady: false }, () => {
+			this.lastSetHtml_ = '';
+			this.scheduleReloadNote(this.props);
+		});
 	}
 
 	title_changeText(event) {
@@ -1191,13 +1207,19 @@ class NoteTextComponent extends React.Component {
 			throw new Error(_('Only one note can be printed or exported to PDF at a time.'));
 		}
 
+		// Concurrent print calls are disallowed to avoid incorrect settings being restored upon completion
+		if (this.isPrinting_) {
+			return;
+		}
+
+		this.isPrinting_ = true;
 		const previousBody = this.state.note.body;
 		const tempBody = `${this.title_(this.state.note.title)}\n\n${previousBody}`;
 
 		const previousTheme = Setting.value('theme');
 		Setting.setValue('theme', Setting.THEME_LIGHT);
 		this.lastSetHtml_ = '';
-		await this.updateHtml(this.state.note.markup_language, tempBody, { useCustomCss: false });
+		await this.updateHtml(this.state.note.markup_language, tempBody, { useCustomCss: true });
 		this.forceUpdate();
 
 		const restoreSettings = async () => {
@@ -1209,7 +1231,7 @@ class NoteTextComponent extends React.Component {
 
 		setTimeout(() => {
 			if (target === 'pdf') {
-				this.webviewRef_.current.wrappedInstance.printToPDF({ printBackground: true }, (error, data) => {
+				this.webviewRef_.current.wrappedInstance.printToPDF({ printBackground: true, pageSize: Setting.value('export.pdfPageSize'), landscape: Setting.value('export.pdfPageOrientation') === 'landscape' }, (error, data) => {
 					restoreSettings();
 
 					if (error) {
@@ -1222,6 +1244,7 @@ class NoteTextComponent extends React.Component {
 				this.webviewRef_.current.wrappedInstance.print({ printBackground: true });
 				restoreSettings();
 			}
+			this.isPrinting_ = false;
 		}, 100);
 	}
 
@@ -1369,9 +1392,16 @@ class NoteTextComponent extends React.Component {
 
 			const r = this.selectionRange_;
 
+			// Because some insertion strings will have newlines, we'll need to account for them
+			const str1Split = string1.split(/\r?\n/);
+
+			// Add the number of newlines to the row
+			// and add the length of the final line to the column (for strings with no newlines this is the string length)
 			const newRange = {
-				start: { row: r.start.row, column: r.start.column + string1.length },
-				end: { row: r.end.row, column: r.end.column + string1.length },
+				start: { row: r.start.row + str1Split.length - 1,
+					column: r.start.column + str1Split[str1Split.length - 1].length },
+				end: { row: r.end.row + str1Split.length - 1,
+					column: r.end.column + str1Split[str1Split.length - 1].length },
 			};
 
 			if (replacementText) {
@@ -1444,7 +1474,18 @@ class NoteTextComponent extends React.Component {
 	}
 
 	commandTextCode() {
-		this.wrapSelectionWithStrings('`', '`');
+		const selection = this.textOffsetSelection();
+		let string = this.state.note.body.substr(selection.start, selection.end - selection.start);
+
+		// Look for newlines
+		let match = string.match(/\r?\n/);
+
+		if (match && match.length > 0) {
+			// Follow the same newline style
+			this.wrapSelectionWithStrings(`\`\`\`${match[0]}`, `${match[0]}\`\`\``);
+		} else {
+			this.wrapSelectionWithStrings('`', '`');
+		}
 	}
 
 	commandTemplate(value) {
@@ -1524,7 +1565,7 @@ class NoteTextComponent extends React.Component {
 		menu.popup(bridge().window());
 	}
 
-	createToolbarItems(note) {
+	createToolbarItems(note, editorIsVisible) {
 		const toolbarItems = [];
 		if (note && this.state.folder && ['Search', 'Tag'].includes(this.props.notesParentType)) {
 			toolbarItems.push({
@@ -1559,7 +1600,7 @@ class NoteTextComponent extends React.Component {
 			});
 		}
 
-		if (note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN) {
+		if (note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN && editorIsVisible) {
 			toolbarItems.push({
 				tooltip: _('Bold'),
 				iconName: 'fa-bold',
@@ -1791,6 +1832,10 @@ class NoteTextComponent extends React.Component {
 		const theme = themeStyle(this.props.theme);
 		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
 		const isTodo = note && !!note.is_todo;
+		var keyboardMode = this.props.keyboardMode;
+		if (keyboardMode === 'default' || !keyboardMode) {
+			keyboardMode = null;
+		}
 
 		const borderWidth = 1;
 
@@ -1821,7 +1866,7 @@ class NoteTextComponent extends React.Component {
 		if (this.props.selectedNoteIds.length > 1) {
 			return this.renderMultiNotes(rootStyle);
 		} else if (!note || !!note.encryption_applied) {
-			//|| (note && !this.props.newNote && this.props.noteId && note.id !== this.props.noteId)) { // note.id !== props.noteId is when the note has not been loaded yet, and the previous one is still in the state
+			// || (note && !this.props.newNote && this.props.noteId && note.id !== this.props.noteId)) { // note.id !== props.noteId is when the note has not been loaded yet, and the previous one is still in the state
 			return this.renderNoNotes(rootStyle);
 		}
 
@@ -1961,7 +2006,8 @@ class NoteTextComponent extends React.Component {
 			}
 		}
 
-		const toolbarItems = this.createToolbarItems(note);
+		const editorIsVisible = visiblePanes.indexOf('editor') >= 0;
+		const toolbarItems = this.createToolbarItems(note, editorIsVisible);
 
 		const toolbar = <Toolbar style={toolbarStyle} items={toolbarItems} />;
 
@@ -2004,6 +2050,16 @@ class NoteTextComponent extends React.Component {
 		delete editorRootStyle.width;
 		delete editorRootStyle.height;
 		delete editorRootStyle.fontSize;
+		const onBeforeLoad = (ace) => {
+			const save = () => {
+				this.saveIfNeeded();
+			};
+			const VimApi = ace.acequire('ace/keyboard/vim');
+			if (VimApi.CodeMirror && VimApi.CodeMirror.Vim) {
+				VimApi.CodeMirror.Vim.defineEx('write', 'w', save);
+			}
+		};
+		const onLoad = () => {};
 		const editor = (
 			<AceEditor
 				value={body}
@@ -2035,6 +2091,9 @@ class NoteTextComponent extends React.Component {
 				editorProps={{ $blockScrolling: Infinity }}
 				// This is buggy (gets outside the container)
 				highlightActiveLine={false}
+				keyboardHandler={keyboardMode}
+				onBeforeLoad={onBeforeLoad}
+				onLoad={onLoad}
 			/>
 		);
 

ElectronClient/app/gui/Root.jsx

@@ -53,6 +53,11 @@ async function initialize() {
 		type: 'SIDEBAR_VISIBILITY_SET',
 		visibility: Setting.value('sidebarVisibility'),
 	});
+
+	store.dispatch({
+		type: 'NOTELIST_VISIBILITY_SET',
+		visibility: Setting.value('noteListVisibility'),
+	});
 }
 
 class RootComponent extends React.Component {

ElectronClient/app/gui/SideBar.jsx

@@ -190,6 +190,10 @@ class SideBarComponent extends React.Component {
 				marginBottom: 10,
 				wordWrap: 'break-word',
 			},
+			noteCount: {
+				paddingLeft: 5,
+				opacity: 0.5,
+			},
 		};
 
 		style.tagItem = Object.assign({}, style.listItem);
@@ -260,16 +264,18 @@ class SideBarComponent extends React.Component {
 	}
 
 	async itemContextMenu(event) {
-		const itemId = event.target.getAttribute('data-id');
+		const itemId = event.currentTarget.getAttribute('data-id');
 		if (itemId === Folder.conflictFolderId()) return;
 
-		const itemType = Number(event.target.getAttribute('data-type'));
+		const itemType = Number(event.currentTarget.getAttribute('data-type'));
 		if (!itemId || !itemType) throw new Error('No data on element');
 
 		let deleteMessage = '';
+		let buttonLabel = _('Remove');
 		if (itemType === BaseModel.TYPE_FOLDER) {
 			const folder = await Folder.load(itemId);
 			deleteMessage = _('Delete notebook "%s"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.', substrWithEllipsis(folder.title, 0, 32));
+			buttonLabel = _('Delete');
 		} else if (itemType === BaseModel.TYPE_TAG) {
 			const tag = await Tag.load(itemId);
 			deleteMessage = _('Remove tag "%s" from all notes?', substrWithEllipsis(tag.title, 0, 32));
@@ -284,11 +290,29 @@ class SideBarComponent extends React.Component {
 			item = BaseModel.byId(this.props.folders, itemId);
 		}
 
+		if (itemType === BaseModel.TYPE_FOLDER && !item.encryption_applied) {
+			menu.append(
+				new MenuItem({
+					label: _('New sub-notebook'),
+					click: () => {
+						this.props.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'newSubNotebook',
+							activeFolderId: itemId,
+						});
+					},
+				})
+			);
+		}
+
 		menu.append(
 			new MenuItem({
-				label: _('Delete'),
+				label: buttonLabel,
 				click: async () => {
-					const ok = bridge().showConfirmMessageBox(deleteMessage);
+					const ok = bridge().showConfirmMessageBox(deleteMessage, {
+						buttons: [buttonLabel, _('Cancel')],
+						defaultId: 1,
+					});
 					if (!ok) return;
 
 					if (itemType === BaseModel.TYPE_FOLDER) {
@@ -411,6 +435,10 @@ class SideBarComponent extends React.Component {
 		return this.anchorItemRefs[type][id];
 	}
 
+	noteCountElement(count) {
+		return <div style={this.style().noteCount}>({count})</div>;
+	}
+
 	folderItem(folder, selected, hasChildren, depth) {
 		let style = Object.assign({}, this.style().listItem);
 		if (folder.id === Folder.conflictFolderId()) style = Object.assign(style, this.style().conflictFolder);
@@ -437,6 +465,7 @@ class SideBarComponent extends React.Component {
 		);
 
 		const anchorRef = this.anchorItemRef('folder', folder.id);
+		const noteCount = folder.note_count ? this.noteCountElement(folder.note_count) : '';
 
 		return (
 			<div className="list-item-container" style={containerStyle} key={folder.id} onDragStart={this.onFolderDragStart_} onDragOver={this.onFolderDragOver_} onDrop={this.onFolderDrop_} draggable={true} folderid={folder.id}>
@@ -455,7 +484,7 @@ class SideBarComponent extends React.Component {
 					}}
 					onDoubleClick={this.onFolderToggleClick_}
 				>
-					{itemTitle}
+					{itemTitle} {noteCount}
 				</a>
 			</div>
 		);
@@ -466,6 +495,7 @@ class SideBarComponent extends React.Component {
 		if (selected) style = Object.assign(style, this.style().listItemSelected);
 
 		const anchorRef = this.anchorItemRef('tag', tag.id);
+		const noteCount = Setting.value('showNoteCounts') ? this.noteCountElement(tag.note_count) : '';
 
 		return (
 			<a
@@ -483,7 +513,7 @@ class SideBarComponent extends React.Component {
 					this.tagItem_click(tag);
 				}}
 			>
-				{Tag.displayTitle(tag)}
+				{Tag.displayTitle(tag)} {noteCount}
 			</a>
 		);
 	}
@@ -787,6 +817,7 @@ const mapStateToProps = state => {
 		resourceFetcher: state.resourceFetcher,
 		windowCommand: state.windowCommand,
 		sidebarVisibility: state.sidebarVisibility,
+		noteListVisibility: state.noteListVisibility,
 	};
 };
 

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

@@ -8,7 +8,7 @@
 			overflow: hidden;
 		}
 
-		#content {
+		#joplin-container-content {
 			/* Needs this in case the content contains elements with absolute positioning */
 			/* Without this they would just stay at a fixed position when scrolling */
 			position: relative;
@@ -36,10 +36,10 @@
 	</style>
 </head>
 
-<body id="body">
-	<div id="styleContainer"></div>
-	<div id="markScriptContainer"></div>
-	<div id="content" ondragstart="return false;" ondrop="return false;"></div>
+<body id="joplin-container-body">
+	<div id="joplin-container-styleContainer"></div>
+	<div id="joplin-container-markScriptContainer"></div>
+	<div id="joplin-container-content" ondragstart="return false;" ondrop="return false;"></div>
 	<script src="./lib.js"></script>
 
 	<script>
@@ -48,7 +48,7 @@
 	}
 
 	try {
-		const contentElement = document.getElementById('content');
+		const contentElement = document.getElementById('joplin-container-content');
 
 		const ipc = {};
 
@@ -74,7 +74,7 @@
 				const link = document.createElement('link');
 				link.rel = 'stylesheet';
 				link.href = f;
-				document.getElementById('styleContainer').appendChild(link);
+				document.getElementById('joplin-container-styleContainer').appendChild(link);
 			}
 		}
 
@@ -161,7 +161,7 @@
 			}
 		}
 
-		let ignoreNextScrollEvent = false;
+		let lastScrollEventTime = 0;
 		ipc.setPercentScroll = (event) => {
 			const percent = event.percent;
 
@@ -170,7 +170,7 @@
 				checkScrollIID_ = null;
 			}
 
-			ignoreNextScrollEvent = true;
+			lastScrollEventTime = Date.now();
 			setPercentScroll(percent);
 		}
 
@@ -205,7 +205,7 @@
 			// TODO: Add support for scriptType on mobile and CLI
 
 			if (!mark_) {
-				mark_ = new Mark(document.getElementById('content'), {
+				mark_ = new Mark(document.getElementById('joplin-container-content'), {
 					exclude: ['img'],
 					acrossElements: true,
 				});
@@ -270,7 +270,7 @@
 				};
 
 				script.src = '../../node_modules/mark.js/dist/mark.min.js';
-				document.getElementById('markScriptContainer').appendChild(script);
+				document.getElementById('joplin-container-markScriptContainer').appendChild(script);
 				markLoaded_ = true;
 			} else {
 				setMarkers(keywords, options);
@@ -283,8 +283,8 @@
 
 		// The body element needs to have a fixed height for the content to be scrollable
 		function updateBodyHeight() {
-			document.getElementById('body').style.height = window.innerHeight + 'px';
-			document.getElementById('content').style.height = window.innerHeight + 'px';
+			document.getElementById('joplin-container-body').style.height = window.innerHeight + 'px';
+			document.getElementById('joplin-container-content').style.height = window.innerHeight + 'px';
 		}
 
 		function currentPercentScroll() {
@@ -293,10 +293,18 @@
 		}
 
 		contentElement.addEventListener('scroll', webviewLib.logEnabledEventHandler(e => {
-			if (ignoreNextScrollEvent) {
-				ignoreNextScrollEvent = false;
+			// If the last scroll event was done by the user, lastScrollEventTime is set and
+			// we can use that to skip the event handling. We skip it because in that case
+			// the scroll position has already been updated. Also we add a 200ms interval
+			// because otherwise it's most likely a glitch where we called ipc.setPercentScroll
+			// but the scroll event listener has not been called.
+			if (lastScrollEventTime && Date.now() - lastScrollEventTime < 200) {
+				lastScrollEventTime = 0;
 				return;
 			}
+
+			lastScrollEventTime = 0;
+
 			const percent = currentPercentScroll();
 			setPercentScroll(percent);
 			

ElectronClient/app/gui/style/theme/nord.js

@@ -0,0 +1,84 @@
+const nord = ['#2e3440', '#3b4252', '#434c5e', '#4c566a', '#d8dee9', '#e5e9f0', '#eceff4', '#8fbcbb', '#88c0d0', '#81a1c1', '#5e81ac', '#bf616a', '#d08770', '#ebcb8b', '#a3be8c', '#b48ead'];
+
+// DOCUMENTATION of Nord as of Oct 3
+// 0 #2e3440 :     Base component color of "Polar Night".
+// Used for texts, backgrounds, carets and structuring characters like curly- and square brackets.
+// 1 #3b4252 :     Lighter shade color of the base component color.
+// Used as a lighter background color for UI elements like status bars.
+// 2 #434c5e :     Lighter shade color of the base component color.
+// Used as line highlighting in the editor.
+// In the UI scope it may be used as selection- and highlight color.
+// 3 #4c566a :     Lighter shade color of the base component color.
+// Used for comments, invisibles, indent- and wrap guide marker.
+// In the UI scope used as pseudoclass color for disabled elements.
+// 4 #d8dee9 :     Base component color of "Snow Storm".
+// Main color for text, variables, constants and attributes.
+// In the UI scope used as semi-light background depending on the theme shading design.
+// 5 #e5e9f0 :     Lighter shade color of the base component color.
+// Used as a lighter background color for UI elements like status bars.
+// Used as semi-light background depending on the theme shading design.
+// 6 #eceff4 :     Lighter shade color of the base component color.
+// Used for punctuations, carets and structuring characters like curly- and square brackets.
+// In the UI scope used as background, selection- and highlight color depending on the theme shading design.
+// 7 #8fbcbb :     Bluish core color.
+// Used for classes, types and documentation tags.
+// 8 #88c0d0 :     Bluish core accent color.
+// Represents the accent color of the color palette.
+// Main color for primary UI elements and methods/functions.
+// 9 #81a1c1 :     Bluish core color.
+// Used for language-specific syntactic/reserved support characters and keywords, operators, tags, units and
+// punctuations like (semi)colons,commas and braces.
+// 10 #5e81ac :    Bluish core color.
+// Used for markup doctypes, import/include/require statements, pre-processor statements and at-rules (`@`).
+// 11 #bf616a :    Colorful component color.
+// Used for errors, git/diff deletion and linter marker.
+// 12 #d08770 :    Colorful component color.
+// Used for annotations.
+// 13 #ebcb8b :    Colorful component color.
+// Used for escape characters, regular expressions and markup entities.
+// In the UI scope used for warnings and git/diff renamings.
+// 14 #a3be8c :    Colorful component color.
+// Main color for strings and attribute values.
+// In the UI scope used for git/diff additions and success visualizations.
+// 15 #b48ead :    Colorful component color.
+// Used for numbers.
+// 2e3440 === rbga(46, 52, 64, 1)
+
+const nordStyle = {
+	backgroundColor: nord[0],
+	backgroundColorTransparent: 'rgba(46, 52, 64, 0.9)',
+	oddBackgroundColor: nord[1],
+	color: nord[5], // For regular text
+	colorError: nord[11],
+	colorWarn: nord[12],
+	colorFaded: nord[4], // For less important text;
+	colorBright: nord[6], // For important text;
+	dividerColor: nord[10],
+	selectedColor: nord[9],
+	urlColor: nord[8],
+
+	backgroundColor2: nord[2],
+	depthColor: 'rgb(200, 200, 200, OPACITY)',
+	color2: nord[8],
+	selectedColor2: nord[10],
+	colorError2: nord[11],
+
+	raisedBackgroundColor: nord[2],
+	raisedColor: nord[7],
+
+	warningBackgroundColor: nord[13],
+
+	htmlColor: nord[4],
+	htmlBackgroundColor: nord[1],
+	htmlDividerColor: nord[2],
+	htmlLinkColor: nord[10],
+	htmlTableBackgroundColor: nord[0],
+	htmlCodeBackgroundColor: nord[0],
+	htmlCodeBorderColor: nord[2],
+	htmlCodeColor: nord[13],
+
+	editorTheme: 'chaos',
+	codeThemeCss: 'atom-one-dark-reasonable.css',
+};
+
+module.exports = nordStyle;