Android release v1.0.306

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

This reverts commit 50b66cceca.

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

This reverts commit c7c57ab2a5.

* Fix the .md importer

* Add comment re future refactor

* Rm importerClass for .md importer

* Fix EnexToMd module name

.eslintignore

@@ -0,0 +1,47 @@
+*.min.js
+.git/
+.github/
+_mydocs/
+_releases/
+Assets/
+CliClient/build
+CliClient/locales
+CliClient/node_modules
+CliClient/tests-build
+CliClient/tests/enex_to_md
+CliClient/tests/html_to_md
+CliClient/tests/logs
+CliClient/tests/support
+CliClient/tests/sync
+CliClient/tests/tmp
+Clipper/joplin-webclipper/content_scripts/JSDOMParser.js
+Clipper/joplin-webclipper/content_scripts/Readability-readerable.js
+Clipper/joplin-webclipper/content_scripts/Readability.js
+Clipper/joplin-webclipper/dist
+Clipper/joplin-webclipper/icons
+Clipper/joplin-webclipper/popup/build
+Clipper/joplin-webclipper/popup/node_modules
+docs/
+ElectronClient/app/dist
+ElectronClient/app/lib
+ElectronClient/app/lib/vendor/sjcl-rn.js
+ElectronClient/app/lib/vendor/sjcl.js
+ElectronClient/app/locales
+ElectronClient/app/node_modules
+highlight.pack.js
+node_modules/
+ReactNativeClient/android
+ReactNativeClient/ios
+ReactNativeClient/lib/vendor/
+ReactNativeClient/lib/welcomeAssets.js
+ReactNativeClient/locales
+ReactNativeClient/node_modules
+readme/
+Tools/node_modules
+Tools/PortableAppsLauncher
+Server/.git/
+Server/.github/
+Server/docs/
+Server/dist/
+Server/bin/
+Server/node_modules/

.eslintrc.js

@@ -0,0 +1,62 @@
+module.exports = {
+	'env': {
+		'browser': true,
+		'es6': true,
+		'node': true,
+	},
+	"parser": "@typescript-eslint/parser",
+	'extends': ['eslint:recommended'],
+	'globals': {
+		'Atomics': 'readonly',
+		'SharedArrayBuffer': 'readonly',
+
+		// Jasmine variables
+		'expect': 'readonly',
+		'describe': 'readonly',
+		'it': 'readonly',
+		'beforeEach': 'readonly',
+		'jasmine': 'readonly',
+
+		// React Native variables
+		'__DEV__': 'readonly',
+
+		// Clipper variables
+		'browserSupportsPromises_': true,
+		'chrome': 'readonly',
+		'browser': 'readonly',
+	},
+	'parserOptions': {
+		'ecmaVersion': 2018,
+		"ecmaFeatures": {
+			"jsx": true,
+	    },
+	    "sourceType": "module",
+	},
+	'rules': {
+		"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-constant-condition": 0,
+		"no-prototype-builtins": 0,
+		"space-in-parens": ["error", "never"],
+		"semi": ["error", "always"],
+		"eol-last": ["error", "always"],
+		"quotes": ["error", "single"],
+		"indent": ["error", "tab"],
+		"comma-dangle": ["error", "always-multiline"],
+		"no-trailing-spaces": "error",
+		"linebreak-style": ["error", "unix"],
+		// This error is always a false positive so far since it detects
+		// possible race conditions in contexts where we know it cannot happen.
+		"require-atomic-updates": 0,
+		"prefer-template": ["error"],
+		"template-curly-spacing": ["error", "never"]
+	},
+	"plugins": [
+		"react",
+		"@typescript-eslint",
+	],
+};

.github/FUNDING.yml

@@ -1,4 +1,5 @@
 # These are supported funding model platforms
 
 patreon: joplin
+github: laurent22
 custom: https://joplinapp.org/donate/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: "🐛 Bug Report"
 about: Report a reproducible bug or regression in Joplin.
 title: ''
-labels: 'bug'
+labels: ':bug: bug'
 
 ---
 
@@ -12,6 +12,11 @@ labels: 'bug'
   Please test using the latest Joplin release to make sure your issue has not already been fixed.
 -->
 
+<!--
+  IMPORTANT: If you are reporting a clipper bug, please include an example URL that shows the issue.
+  Without the URL the issue is likely to be closed.
+-->
+
 ## Environment
 
 Joplin version:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,33 +1,20 @@
----
-name: Feature request
-about: Suggest a feature for Joplin.
-title: '[Feature request] '
-labels: 'feature request'
-
----
-
-<!--
-  Please search open issues first - many features have already been requested!
--->
-
-## Has it been discussed in the forum? Link to topic.
-<!--
-  Feature requests should be discussed in the forum first. https://discourse.joplinapp.org
-  Please provide a link to the topic.
--->
-
-
-## Is your feature request related to a problem? Please describe.
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-
-## Describe the solution you'd like
-<!-- A clear and concise description of what you want to happen. -->
-
-
-## Describe alternatives you've considered
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-
-## Additional context
-<!-- Add any other context or screenshots about the feature request here. -->
+---
+name: Feature request
+about: Report an accepted feature request.
+title: '[Feature request] '
+labels: ':four_leaf_clover: 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,7 +2,7 @@
 name: "🤔 Questions and Help"
 about: The issue tracker is not for questions. Please ask questions on https://discourse.joplinapp.org/.
 title: 'Question: '
-labels: 'question'
+labels: ':question: question'
 
 ---
 

.github/stale.yml

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

.gitignore

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

.travis.yml

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

BUILD.md

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

CONTRIBUTING.md

@@ -40,10 +40,7 @@ Building the apps is relatively easy - please [see the build instructions](https
 
 ## Coding style
 
-There are only two rules, but not following them means the pull request will not be accepted (it can be accepted once the issues are fixed):
-
-- **Please use tabs, NOT spaces.**
-- **Please do not add or remove optional characters, such as spaces or colons.** Please setup your editor so that it only changes what you are working on and is not making automated changes elsewhere. The reason for this is that small white space changes make diff hard to read and can cause needless conflicts.
+Coding style is enforced by a pre-commit hook that runs eslint. This hook is installed whenever running `npm install` on any of the application directory. If for some reason the pre-commit hook didn't get installed, you can manually install it by running `npm install` at the root of the repository.
 
 ## Unit tests
 
@@ -54,7 +51,20 @@ The tests are under CliClient/tests. To get them running, you first need to buil
     cd CliClient
     npm i
 
-Then to run all the test units:
+To run the test units, you must have an instance of the cli app running. In a first window navigate into `CliClient` and run:
+
+```sh
+./run.sh
+```
+
+> If you get an error like `Error: Cannot find module '../locales/index.js'`, this means you must (a) rebuild translations or (b) take > them from one of the other apps. To do option b, you can run the following command to copy them from the `ReactNativeClient` directory:> 
+>
+> ```sh
+> cd .. # Return to the root of the project
+> rsync -aP ./ReactNativeClient/locales/ ./CliClient/build/locales/
+> ```
+
+Then run the tests in a second window. To run all the test units:
 
     ./run_test.sh
 

CliClient/.eslintrc.js

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

CliClient/app/ResourceServer.js

@@ -1,14 +1,11 @@
-const { _ } = require('lib/locale.js');
 const { Logger } = require('lib/logger.js');
-const Resource = require('lib/models/Resource.js');
 const { netUtils } = require('lib/net-utils.js');
 
-const http = require("http");
-const urlParser = require("url");
+const http = require('http');
+const urlParser = require('url');
 const enableServerDestroy = require('server-destroy');
 
 class ResourceServer {
-
 	constructor() {
 		this.server_ = null;
 		this.logger_ = new Logger();
@@ -31,7 +28,7 @@ class ResourceServer {
 
 	baseUrl() {
 		if (!this.port_) return '';
-		return 'http://127.0.0.1:' + this.port_;
+		return `http://127.0.0.1:${this.port_}`;
 	}
 
 	setLinkHandler(handler) {
@@ -40,7 +37,7 @@ class ResourceServer {
 
 	async start() {
 		this.port_ = await netUtils.findAvailablePort([9167, 9267, 8167, 8267]);
-		if (!this.port_) {	
+		if (!this.port_) {
 			this.logger().error('Could not find available port to start resource server. Please report the error at https://github.com/laurent22/joplin');
 			return;
 		}
@@ -48,16 +45,15 @@ class ResourceServer {
 		this.server_ = http.createServer();
 
 		this.server_.on('request', async (request, response) => {
-
-			const writeResponse = (message) => {
+			const writeResponse = message => {
 				response.write(message);
 				response.end();
-			}
+			};
 
 			const url = urlParser.parse(request.url, true);
 			let resourceId = url.pathname.split('/');
 			if (resourceId.length < 2) {
-				writeResponse('Error: could not get resource ID from path name: ' + url.pathname);
+				writeResponse(`Error: could not get resource ID from path name: ${url.pathname}`);
 				return;
 			}
 			resourceId = resourceId[1];
@@ -66,9 +62,10 @@ class ResourceServer {
 
 			try {
 				const done = await this.linkHandler_(resourceId, response);
-				if (!done) throw new Error('Unhandled resource: ' + resourceId);
+				if (!done) throw new Error(`Unhandled resource: ${resourceId}`);
 			} catch (error) {
 				response.setHeader('Content-Type', 'text/plain');
+				// eslint-disable-next-line require-atomic-updates
 				response.statusCode = 400;
 				response.write(error.message);
 			}
@@ -76,7 +73,7 @@ class ResourceServer {
 			response.end();
 		});
 
-		this.server_.on('error', (error) => {
+		this.server_.on('error', error => {
 			this.logger().error('Resource server:', error);
 		});
 
@@ -91,7 +88,6 @@ class ResourceServer {
 		if (this.server_) this.server_.destroy();
 		this.server_ = null;
 	}
-
 }
 
-module.exports = ResourceServer;
+module.exports = ResourceServer;

CliClient/app/app-gui.js

@@ -5,13 +5,12 @@ const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
 const Resource = require('lib/models/Resource.js');
-const { cliUtils } = require('./cli-utils.js');
 const { reducer, defaultState } = require('lib/reducer.js');
 const { splitCommandString } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
 const { _ } = require('lib/locale.js');
 const Entities = require('html-entities').AllHtmlEntities;
-const htmlentities = (new Entities()).encode;
+const htmlentities = new Entities().encode;
 
 const chalk = require('chalk');
 const tk = require('terminal-kit');
@@ -20,12 +19,10 @@ const Renderer = require('tkwidgets/framework/Renderer.js');
 const DecryptionWorker = require('lib/services/DecryptionWorker');
 
 const BaseWidget = require('tkwidgets/BaseWidget.js');
-const ListWidget = require('tkwidgets/ListWidget.js');
 const TextWidget = require('tkwidgets/TextWidget.js');
 const HLayoutWidget = require('tkwidgets/HLayoutWidget.js');
 const VLayoutWidget = require('tkwidgets/VLayoutWidget.js');
 const ReduxRootWidget = require('tkwidgets/ReduxRootWidget.js');
-const RootWidget = require('tkwidgets/RootWidget.js');
 const WindowWidget = require('tkwidgets/WindowWidget.js');
 
 const NoteWidget = require('./gui/NoteWidget.js');
@@ -37,7 +34,6 @@ const StatusBarWidget = require('./gui/StatusBarWidget.js');
 const ConsoleWidget = require('./gui/ConsoleWidget.js');
 
 class AppGui {
-
 	constructor(app, store, keymap) {
 		try {
 			this.app_ = app;
@@ -50,12 +46,12 @@ class AppGui {
 			// Some keys are directly handled by the tkwidget framework
 			// so they need to be remapped in a different way.
 			this.tkWidgetKeys_ = {
-				'focus_next': 'TAB',
-				'focus_previous': 'SHIFT_TAB',
-				'move_up': 'UP',
-				'move_down': 'DOWN',
-				'page_down': 'PAGE_DOWN',
-				'page_up': 'PAGE_UP',
+				focus_next: 'TAB',
+				focus_previous: 'SHIFT_TAB',
+				move_up: 'UP',
+				move_down: 'DOWN',
+				page_down: 'PAGE_DOWN',
+				page_up: 'PAGE_UP',
 			};
 
 			this.renderer_ = null;
@@ -64,7 +60,7 @@ class AppGui {
 
 			this.renderer_ = new Renderer(this.term(), this.rootWidget_);
 
-			this.app_.on('modelAction', async (event) => {
+			this.app_.on('modelAction', async event => {
 				await this.handleModelAction(event.action);
 			});
 
@@ -83,7 +79,7 @@ class AppGui {
 			reg.setupRecurrentSync();
 			DecryptionWorker.instance().scheduleStart();
 		} catch (error) {
-			this.fullScreen(false);
+			if (this.term_) { this.fullScreen(false); }
 			console.error(error);
 			process.exit(1);
 		}
@@ -134,7 +130,7 @@ class AppGui {
 		};
 		folderList.name = 'folderList';
 		folderList.vStretch = true;
-		folderList.on('currentItemChange', async (event) => {
+		folderList.on('currentItemChange', async event => {
 			const item = folderList.currentItem;
 
 			if (item === '-') {
@@ -169,7 +165,7 @@ class AppGui {
 				});
 			}
 		});
-		this.rootWidget_.connect(folderList, (state) => {
+		this.rootWidget_.connect(folderList, state => {
 			return {
 				selectedFolderId: state.selectedFolderId,
 				selectedTagId: state.selectedTagId,
@@ -196,7 +192,7 @@ class AppGui {
 				id: note ? note.id : null,
 			});
 		});
-		this.rootWidget_.connect(noteList, (state) => {
+		this.rootWidget_.connect(noteList, state => {
 			return {
 				selectedNoteId: state.selectedNoteIds.length ? state.selectedNoteIds[0] : null,
 				items: state.notes,
@@ -210,7 +206,7 @@ class AppGui {
 			borderBottomWidth: 1,
 			borderLeftWidth: 1,
 		};
-		this.rootWidget_.connect(noteText, (state) => {
+		this.rootWidget_.connect(noteText, state => {
 			return {
 				noteId: state.selectedNoteIds.length ? state.selectedNoteIds[0] : null,
 				notes: state.notes,
@@ -225,7 +221,7 @@ class AppGui {
 			borderLeftWidth: 1,
 			borderRightWidth: 1,
 		};
-		this.rootWidget_.connect(noteMetadata, (state) => {
+		this.rootWidget_.connect(noteMetadata, state => {
 			return { noteId: state.selectedNoteIds.length ? state.selectedNoteIds[0] : null };
 		});
 		noteMetadata.hide();
@@ -292,7 +288,7 @@ class AppGui {
 		if (!cmd) return;
 		const isConfigPassword = cmd.indexOf('config ') >= 0 && cmd.indexOf('password') >= 0;
 		if (isConfigPassword) return;
-		this.stdout(chalk.cyan.bold('> ' + cmd));	
+		this.stdout(chalk.cyan.bold(`> ${cmd}`));
 	}
 
 	setupKeymap(keymap) {
@@ -301,7 +297,7 @@ class AppGui {
 		for (let i = 0; i < keymap.length; i++) {
 			const item = Object.assign({}, keymap[i]);
 
-			if (!item.command) throw new Error('Missing command for keymap item: ' + JSON.stringify(item));
+			if (!item.command) throw new Error(`Missing command for keymap item: ${JSON.stringify(item)}`);
 
 			if (!('type' in item)) item.type = 'exec';
 
@@ -408,7 +404,7 @@ class AppGui {
 	activeListItem() {
 		const widget = this.widget('mainWindow').focusedWidget;
 		if (!widget) return null;
-		
+
 		if (widget.name == 'noteList' || widget.name == 'folderList') {
 			return widget.currentItem;
 		}
@@ -430,25 +426,21 @@ class AppGui {
 	}
 
 	async processFunctionCommand(cmd) {
-
 		if (cmd === 'activate') {
-
 			const w = this.widget('mainWindow').focusedWidget;
 			if (w.name === 'folderList') {
 				this.widget('noteList').focus();
 			} else if (w.name === 'noteList' || w.name === 'noteText') {
 				this.processPromptCommand('edit $n');
 			}
-
 		} else if (cmd === 'delete') {
-
 			if (this.widget('folderList').hasFocus) {
 				const item = this.widget('folderList').selectedJoplinItem;
 
 				if (!item) return;
 
 				if (item.type_ === BaseModel.TYPE_FOLDER) {
-					await this.processPromptCommand('rmbook ' + item.id);
+					await this.processPromptCommand(`rmbook ${item.id}`);
 				} else if (item.type_ === BaseModel.TYPE_TAG) {
 					this.stdout(_('To delete a tag, untag the associated notes.'));
 				} else if (item.type_ === BaseModel.TYPE_SEARCH) {
@@ -462,9 +454,7 @@ class AppGui {
 			} else {
 				this.stdout(_('Please select the note or notebook to be deleted first.'));
 			}
-
 		} else if (cmd === 'toggle_console') {
-
 			if (!this.consoleIsShown()) {
 				this.showConsole();
 				this.minimizeConsole();
@@ -475,22 +465,15 @@ class AppGui {
 					this.maximizeConsole();
 				}
 			}
-
 		} else if (cmd === 'toggle_metadata') {
-
 			this.toggleNoteMetadata();
-
 		} else if (cmd === 'enter_command_line_mode') {
-
 			const cmd = await this.widget('statusBar').prompt();
 			if (!cmd) return;
 			this.addCommandToConsole(cmd);
-			await this.processPromptCommand(cmd);			
-
+			await this.processPromptCommand(cmd);
 		} else {
-
-			throw new Error('Unknown command: ' + cmd);
-
+			throw new Error(`Unknown command: ${cmd}`);
 		}
 	}
 
@@ -501,7 +484,7 @@ class AppGui {
 
 		// this.logger().debug('Got command: ' + cmd);
 
-		try {			
+		try {
 			let note = this.widget('noteList').currentItem;
 			let folder = this.widget('folderList').currentItem;
 			let args = splitCommandString(cmd);
@@ -511,7 +494,7 @@ class AppGui {
 					args[i] = note ? note.id : '';
 				} else if (args[i] == '$b') {
 					args[i] = folder ? folder.id : '';
-				} else  if (args[i] == '$c') {
+				} else if (args[i] == '$c') {
 					const item = this.activeListItem();
 					args[i] = item ? item.id : '';
 				}
@@ -523,7 +506,7 @@ class AppGui {
 		}
 
 		this.widget('console').scrollBottom();
-		
+
 		// Invalidate so that the screen is redrawn in case inputting a command has moved
 		// the GUI up (in particular due to autocompletion), it's moved back to the right position.
 		this.widget('root').invalidate();
@@ -603,17 +586,17 @@ class AppGui {
 	async setupResourceServer() {
 		const linkStyle = chalk.blue.underline;
 		const noteTextWidget = this.widget('noteText');
-		const resourceIdRegex = /^:\/[a-f0-9]+$/i
+		const resourceIdRegex = /^:\/[a-f0-9]+$/i;
 		const noteLinks = {};
 
 		const hasProtocol = function(s, protocols) {
 			if (!s) return false;
 			s = s.trim().toLowerCase();
 			for (let i = 0; i < protocols.length; i++) {
-				if (s.indexOf(protocols[i] + '://') === 0) return true;
+				if (s.indexOf(`${protocols[i]}://`) === 0) return true;
 			}
 			return false;
-		}
+		};
 
 		// By default, before the server is started, only the regular
 		// URLs appear in blue.
@@ -637,29 +620,31 @@ class AppGui {
 			const link = noteLinks[path];
 
 			if (link.type === 'url') {
-				response.writeHead(302, { 'Location': link.url });
+				response.writeHead(302, { Location: link.url });
 				return true;
 			}
 
 			if (link.type === 'item') {
 				const itemId = link.id;
 				let item = await BaseItem.loadItemById(itemId);
-				if (!item) throw new Error('No item with ID ' + itemId); // Should be nearly impossible
+				if (!item) throw new Error(`No item with ID ${itemId}`); // Should be nearly impossible
 
 				if (item.type_ === BaseModel.TYPE_RESOURCE) {
 					if (item.mime) response.setHeader('Content-Type', item.mime);
 					response.write(await Resource.content(item));
 				} else if (item.type_ === BaseModel.TYPE_NOTE) {
-					const html = [`
+					const html = [
+						`
 						<!DOCTYPE html>
 						<html class="client-nojs" lang="en" dir="ltr">
 						<head><meta charset="UTF-8"/></head><body>
-					`];
-					html.push('<pre>' + htmlentities(item.title) + '\n\n' + htmlentities(item.body) + '</pre>');
+					`,
+					];
+					html.push(`<pre>${htmlentities(item.title)}\n\n${htmlentities(item.body)}</pre>`);
 					html.push('</body></html>');
 					response.write(html.join(''));
 				} else {
-					throw new Error('Unsupported item type: ' + item.type_);
+					throw new Error(`Unsupported item type: ${item.type_}`);
 				}
 
 				return true;
@@ -679,7 +664,7 @@ class AppGui {
 					noteLinks[index] = {
 						type: 'item',
 						id: url.substr(2),
-					};					
+					};
 				} else if (hasProtocol(url, ['http', 'https', 'file', 'ftp'])) {
 					noteLinks[index] = {
 						type: 'url',
@@ -691,7 +676,7 @@ class AppGui {
 					return url;
 				}
 
-				return linkStyle(this.resourceServer_.baseUrl() + '/' + index);
+				return linkStyle(`${this.resourceServer_.baseUrl()}/${index}`);
 			},
 		};
 	}
@@ -710,8 +695,7 @@ class AppGui {
 
 			term.grabInput();
 
-			term.on('key', async (name, matches, data) => {
-
+			term.on('key', async (name) => {
 				// -------------------------------------------------------------------------
 				// Handle special shortcuts
 				// -------------------------------------------------------------------------
@@ -729,13 +713,13 @@ class AppGui {
 					return;
 				}
 
-				if (name === 'CTRL_C' ) {
+				if (name === 'CTRL_C') {
 					const cmd = this.app().currentCommand();
 					if (!cmd || !cmd.cancellable() || this.commandCancelCalled_) {
 						this.stdout(_('Press Ctrl+D or type "exit" to exit the application'));
 					} else {
 						this.commandCancelCalled_ = true;
-						await cmd.cancel()
+						await cmd.cancel();
 						this.commandCancelCalled_ = false;
 					}
 					return;
@@ -744,8 +728,8 @@ class AppGui {
 				// -------------------------------------------------------------------------
 				// Build up current shortcut
 				// -------------------------------------------------------------------------
-				
-				const now = (new Date()).getTime();
+
+				const now = new Date().getTime();
 
 				if (now - this.lastShortcutKeyTime_ > 800 || this.isSpecialKey(name)) {
 					this.currentShortcutKeys_ = [name];
@@ -793,7 +777,7 @@ class AppGui {
 					} else if (keymapItem.type === 'tkwidgets') {
 						this.widget('root').handleKey(this.tkWidgetKeys_[keymapItem.command]);
 					} else {
-						throw new Error('Unknown command type: ' + JSON.stringify(keymapItem));
+						throw new Error(`Unknown command type: ${JSON.stringify(keymapItem)}`);
 					}
 				}
 
@@ -813,7 +797,6 @@ class AppGui {
 			process.exit(1);
 		});
 	}
-
 }
 
 AppGui.INPUT_MODE_NORMAL = 1;

CliClient/app/app.js

@@ -1,10 +1,5 @@
 const { BaseApplication } = require('lib/BaseApplication');
-const { createStore, applyMiddleware } = require('redux');
-const { reducer, defaultState } = require('lib/reducer.js');
-const { JoplinDatabase } = require('lib/joplin-database.js');
-const { Database } = require('lib/database.js');
 const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
-const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const ResourceService = require('lib/services/ResourceService');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
@@ -12,21 +7,15 @@ const BaseItem = require('lib/models/BaseItem.js');
 const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
 const Setting = require('lib/models/Setting.js');
-const { Logger } = require('lib/logger.js');
-const { sprintf } = require('sprintf-js');
 const { reg } = require('lib/registry.js');
 const { fileExtension } = require('lib/path-utils.js');
-const { shim } = require('lib/shim.js');
-const { _, setLocale, defaultLocale, closestSupportedLocale } = require('lib/locale.js');
-const os = require('os');
+const { _ } = require('lib/locale.js');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
 const Cache = require('lib/Cache');
-const WelcomeUtils = require('lib/WelcomeUtils');
 const RevisionService = require('lib/services/RevisionService');
 
 class Application extends BaseApplication {
-
 	constructor() {
 		super();
 
@@ -75,7 +64,7 @@ class Application extends BaseApplication {
 			// const response = await cliUtils.promptMcq(msg, answers);
 			// if (!response) return null;
 
-			return output[response - 1];
+			// return output[response - 1];
 		} else {
 			return output.length ? output[0] : null;
 		}
@@ -97,10 +86,12 @@ class Application extends BaseApplication {
 		const parent = options.parent ? options.parent : app().currentFolder();
 		const ItemClass = BaseItem.itemClass(type);
 
-		if (type == BaseModel.TYPE_NOTE && pattern.indexOf('*') >= 0) { // Handle it as pattern
+		if (type == BaseModel.TYPE_NOTE && pattern.indexOf('*') >= 0) {
+			// Handle it as pattern
 			if (!parent) throw new Error(_('No notebook selected.'));
 			return await Note.previews(parent.id, { titlePattern: pattern });
-		} else { // Single item
+		} else {
+			// Single item
 			let item = null;
 			if (type == BaseModel.TYPE_NOTE) {
 				if (!parent) throw new Error(_('No notebook has been specified.'));
@@ -126,15 +117,15 @@ class Application extends BaseApplication {
 	}
 
 	setupCommand(cmd) {
-		cmd.setStdout((text) => {
+		cmd.setStdout(text => {
 			return this.stdout(text);
 		});
 
-		cmd.setDispatcher((action) => {
+		cmd.setDispatcher(action => {
 			if (this.store()) {
 				return this.store().dispatch(action);
 			} else {
-				return (action) => {};
+				return () => {};
 			}
 		});
 
@@ -145,10 +136,10 @@ class Application extends BaseApplication {
 			if (!options.answers) options.answers = options.booleanAnswerDefault === 'y' ? [_('Y'), _('n')] : [_('N'), _('y')];
 
 			if (options.type == 'boolean') {
-				message += ' (' + options.answers.join('/') + ')';
+				message += ` (${options.answers.join('/')})`;
 			}
 
-			let answer = await this.gui().prompt('', message + ' ', options);
+			let answer = await this.gui().prompt('', `${message} `, options);
 
 			if (options.type === 'boolean') {
 				if (answer === null) return false; // Pressed ESCAPE
@@ -185,12 +176,12 @@ class Application extends BaseApplication {
 
 	commands(uiType = null) {
 		if (!this.allCommandsLoaded_) {
-			fs.readdirSync(__dirname).forEach((path) => {
+			fs.readdirSync(__dirname).forEach(path => {
 				if (path.indexOf('command-') !== 0) return;
-				const ext = fileExtension(path)
+				const ext = fileExtension(path);
 				if (ext != 'js') return;
 
-				let CommandClass = require('./' + path);
+				let CommandClass = require(`./${path}`);
 				let cmd = new CommandClass();
 				if (!cmd.enabled()) return;
 				cmd = this.setupCommand(cmd);
@@ -257,7 +248,7 @@ class Application extends BaseApplication {
 
 		let CommandClass = null;
 		try {
-			CommandClass = require(__dirname + '/command-' + name + '.js');
+			CommandClass = require(`${__dirname}/command-${name}.js`);
 		} catch (error) {
 			if (error.message && error.message.indexOf('Cannot find module') >= 0) {
 				let e = new Error(_('No such command: %s', name));
@@ -276,19 +267,27 @@ class Application extends BaseApplication {
 
 	dummyGui() {
 		return {
-			isDummy: () => { return true; },
-			prompt: (initialText = '', promptString = '', options = null) => { return cliUtils.prompt(initialText, promptString, options); },
+			isDummy: () => {
+				return true;
+			},
+			prompt: (initialText = '', promptString = '', options = null) => {
+				return cliUtils.prompt(initialText, promptString, options);
+			},
 			showConsole: () => {},
 			maximizeConsole: () => {},
-			stdout: (text) => { console.info(text); },
-			fullScreen: (b=true) => {},
+			stdout: text => {
+				console.info(text);
+			},
+			fullScreen: () => {},
 			exit: () => {},
-			showModalOverlay: (text) => {},
+			showModalOverlay: () => {},
 			hideModalOverlay: () => {},
-			stdoutMaxWidth: () => { return 100; },
+			stdoutMaxWidth: () => {
+				return 100;
+			},
 			forceRender: () => {},
 			termSaveState: () => {},
-			termRestoreState: (state) => {},
+			termRestoreState: () => {},
 		};
 	}
 
@@ -300,7 +299,7 @@ class Application extends BaseApplication {
 
 		let outException = null;
 		try {
-			if (this.gui().isDummy() && !this.activeCommand_.supportsUi('cli')) throw new Error(_('The command "%s" is only available in GUI mode', this.activeCommand_.name()));			
+			if (this.gui().isDummy() && !this.activeCommand_.supportsUi('cli')) throw new Error(_('The command "%s" is only available in GUI mode', this.activeCommand_.name()));
 			const cmdArgs = cliUtils.makeCommandArgs(this.activeCommand_, argv);
 			await this.activeCommand_.action(cmdArgs);
 		} catch (error) {
@@ -316,24 +315,24 @@ class Application extends BaseApplication {
 
 	async loadKeymaps() {
 		const defaultKeyMap = [
-			{ "keys": [":"], "type": "function", "command": "enter_command_line_mode" },
-			{ "keys": ["TAB"], "type": "function", "command": "focus_next" },
-			{ "keys": ["SHIFT_TAB"], "type": "function", "command": "focus_previous" },
-			{ "keys": ["UP"], "type": "function", "command": "move_up" },
-			{ "keys": ["DOWN"], "type": "function", "command": "move_down" },
-			{ "keys": ["PAGE_UP"], "type": "function", "command": "page_up" },
-			{ "keys": ["PAGE_DOWN"], "type": "function", "command": "page_down" },
-			{ "keys": ["ENTER"], "type": "function", "command": "activate" },
-			{ "keys": ["DELETE", "BACKSPACE"], "type": "function", "command": "delete" },
-			{ "keys": [" "], "command": "todo toggle $n" },
-			{ "keys": ["tc"], "type": "function", "command": "toggle_console" },
-			{ "keys": ["tm"], "type": "function", "command": "toggle_metadata" },
-			{ "keys": ["/"], "type": "prompt", "command": "search \"\"", "cursorPosition": -2 },
-			{ "keys": ["mn"], "type": "prompt", "command": "mknote \"\"", "cursorPosition": -2 },
-			{ "keys": ["mt"], "type": "prompt", "command": "mktodo \"\"", "cursorPosition": -2 },
-			{ "keys": ["mb"], "type": "prompt", "command": "mkbook \"\"", "cursorPosition": -2 },
-			{ "keys": ["yn"], "type": "prompt", "command": "cp $n \"\"", "cursorPosition": -2 },
-			{ "keys": ["dn"], "type": "prompt", "command": "mv $n \"\"", "cursorPosition": -2 }
+			{ keys: [':'], type: 'function', command: 'enter_command_line_mode' },
+			{ keys: ['TAB'], type: 'function', command: 'focus_next' },
+			{ keys: ['SHIFT_TAB'], type: 'function', command: 'focus_previous' },
+			{ keys: ['UP'], type: 'function', command: 'move_up' },
+			{ keys: ['DOWN'], type: 'function', command: 'move_down' },
+			{ keys: ['PAGE_UP'], type: 'function', command: 'page_up' },
+			{ keys: ['PAGE_DOWN'], type: 'function', command: 'page_down' },
+			{ keys: ['ENTER'], type: 'function', command: 'activate' },
+			{ keys: ['DELETE', 'BACKSPACE'], type: 'function', command: 'delete' },
+			{ keys: [' '], command: 'todo toggle $n' },
+			{ keys: ['tc'], type: 'function', command: 'toggle_console' },
+			{ keys: ['tm'], type: 'function', command: 'toggle_metadata' },
+			{ keys: ['/'], type: 'prompt', command: 'search ""', cursorPosition: -2 },
+			{ keys: ['mn'], type: 'prompt', command: 'mknote ""', cursorPosition: -2 },
+			{ keys: ['mt'], type: 'prompt', command: 'mktodo ""', cursorPosition: -2 },
+			{ keys: ['mb'], type: 'prompt', command: 'mkbook ""', cursorPosition: -2 },
+			{ keys: ['yn'], type: 'prompt', command: 'cp $n ""', cursorPosition: -2 },
+			{ keys: ['dn'], type: 'prompt', command: 'mv $n ""', cursorPosition: -2 },
 		];
 
 		// Filter the keymap item by command so that items in keymap.json can override
@@ -341,10 +340,10 @@ class Application extends BaseApplication {
 		const itemsByCommand = {};
 
 		for (let i = 0; i < defaultKeyMap.length; i++) {
-			itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i]
+			itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i];
 		}
 
-		const filePath = Setting.value('profileDir') + '/keymap.json';
+		const filePath = `${Setting.value('profileDir')}/keymap.json`;
 		if (await fs.pathExists(filePath)) {
 			try {
 				let configString = await fs.readFile(filePath, 'utf-8');
@@ -356,7 +355,7 @@ class Application extends BaseApplication {
 				}
 			} catch (error) {
 				let msg = error.message ? error.message : '';
-				msg = 'Could not load keymap ' + filePath + '\n' + msg;
+				msg = `Could not load keymap ${filePath}\n${msg}`;
 				error.message = msg;
 				throw error;
 			}
@@ -374,7 +373,7 @@ class Application extends BaseApplication {
 	async start(argv) {
 		argv = await super.start(argv);
 
-		cliUtils.setStdout((object) => {
+		cliUtils.setStdout(object => {
 			return this.stdout(object);
 		});
 
@@ -385,6 +384,8 @@ class Application extends BaseApplication {
 
 			this.currentFolder_ = await Folder.load(Setting.value('activeFolderId'));
 
+			await this.applySettingsSideEffects();
+
 			try {
 				await this.execCommand(argv);
 			} catch (error) {
@@ -401,7 +402,8 @@ class Application extends BaseApplication {
 			// Need to call exit() explicitely, otherwise Node wait for any timeout to complete
 			// https://stackoverflow.com/questions/18050095
 			process.exit(0);
-		} else { // Otherwise open the GUI
+		} else {
+			// Otherwise open the GUI
 			this.initRedux();
 
 			const keymap = await this.loadKeymaps();
@@ -421,7 +423,7 @@ class Application extends BaseApplication {
 			const tags = await Tag.allWithNotes();
 
 			ResourceService.runInBackground();
-			
+
 			RevisionService.instance().runInBackground();
 
 			this.dispatch({
@@ -435,7 +437,6 @@ class Application extends BaseApplication {
 			});
 		}
 	}
-
 }
 
 let application_ = null;
@@ -446,4 +447,4 @@ function app() {
 	return application_;
 }
 
-module.exports = { app };
+module.exports = { app };

CliClient/app/autocompletion.js

@@ -14,11 +14,11 @@ async function handleAutocompletionPromise(line) {
 	//should look for commmands it could be
 	if (words.length == 1) {
 		if (names.indexOf(words[0]) === -1) {
-			let x = names.filter((n) => n.indexOf(words[0]) === 0);
+			let x = names.filter(n => n.indexOf(words[0]) === 0);
 			if (x.length === 1) {
-				return x[0] + ' ';
+				return `${x[0]} `;
 			}
-			return x.length > 0 ? x.map((a) => a + ' ') : line;
+			return x.length > 0 ? x.map(a => `${a} `) : line;
 		} else {
 			return line;
 		}
@@ -34,9 +34,9 @@ async function handleAutocompletionPromise(line) {
 	let next = words.length > 1 ? words[words.length - 1] : '';
 	let l = [];
 	if (next[0] === '-') {
-		for (let i = 0; i<metadata.options.length; i++) {
+		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
+			//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);
@@ -55,44 +55,43 @@ async function handleAutocompletionPromise(line) {
 		if (l.length === 0) {
 			return line;
 		}
-		let ret = l.map(a=>toCommandLine(a));
-		ret.prefix = toCommandLine(words.slice(0, -1)) + ' ';
+		let ret = l.map(a => toCommandLine(a));
+		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
-	const positionalArgs = words.filter((a)=>a.indexOf('-') !== 0).length - 1;
+	const positionalArgs = words.filter(a => a.indexOf('-') !== 0).length - 1;
 
 	let cmdUsage = yargParser(metadata.usage)['_'];
 	cmdUsage.splice(0, 1);
 
 	if (cmdUsage.length >= positionalArgs) {
-
 		let argName = cmdUsage[positionalArgs - 1];
 		argName = cliUtils.parseCommandArg(argName).name;
 
 		const currentFolder = app().currentFolder();
 
 		if (argName == 'note' || argName == 'note-pattern') {
-			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
-			l.push(...notes.map((n) => n.title));
+			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: `${next}*` }) : [];
+			l.push(...notes.map(n => n.title));
 		}
 
 		if (argName == 'notebook') {
-			const folders = await Folder.search({ titlePattern: next + '*' });
-			l.push(...folders.map((n) => n.title));
+			const folders = await Folder.search({ titlePattern: `${next}*` });
+			l.push(...folders.map(n => n.title));
 		}
 
 		if (argName == 'item') {
-			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
-			const folders = await Folder.search({ titlePattern: next + '*' });
-			l.push(...notes.map((n) => n.title), folders.map((n) => n.title));
+			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: `${next}*` }) : [];
+			const folders = await Folder.search({ titlePattern: `${next}*` });
+			l.push(...notes.map(n => n.title), folders.map(n => n.title));
 		}
 
 		if (argName == 'tag') {
-			let tags = await Tag.search({ titlePattern: next + '*' });
-			l.push(...tags.map((n) => n.title));
+			let tags = await Tag.search({ titlePattern: `${next}*` });
+			l.push(...tags.map(n => n.title));
 		}
 
 		if (argName == 'file') {
@@ -113,12 +112,11 @@ async function handleAutocompletionPromise(line) {
 	if (l.length === 1) {
 		return toCommandLine([...words.slice(0, -1), l[0]]);
 	} else if (l.length > 1) {
-		let ret = l.map(a=>toCommandLine(a));
-		ret.prefix = toCommandLine(words.slice(0, -1)) + ' ';
+		let ret = l.map(a => toCommandLine(a));
+		ret.prefix = `${toCommandLine(words.slice(0, -1))} `;
 		return ret;
 	}
 	return line;
-
 }
 function handleAutocompletion(str, callback) {
 	handleAutocompletionPromise(str).then(function(res) {
@@ -127,22 +125,24 @@ function handleAutocompletion(str, callback) {
 }
 function toCommandLine(args) {
 	if (Array.isArray(args)) {
-		return args.map(function(a) {
-			if(a.indexOf('"') !== -1 || a.indexOf(' ') !== -1) {
-				return "'" + a + "'";
-			} else if (a.indexOf("'") !== -1) {
-				return '"' + a + '"';
-			} else {
-				return a;
-			}
-		}).join(' ');
+		return args
+			.map(function(a) {
+				if (a.indexOf('"') !== -1 || a.indexOf(' ') !== -1) {
+					return `'${a}'`;
+				} else if (a.indexOf('\'') !== -1) {
+					return `"${a}"`;
+				} else {
+					return a;
+				}
+			})
+			.join(' ');
 	} else {
-		if(args.indexOf('"') !== -1 || args.indexOf(' ') !== -1) {
-			return "'" + args + "' ";
-		} else if (args.indexOf("'") !== -1) {
-			return '"' + args + '" ';
+		if (args.indexOf('"') !== -1 || args.indexOf(' ') !== -1) {
+			return `'${args}' `;
+		} else if (args.indexOf('\'') !== -1) {
+			return `"${args}" `;
 		} else {
-			return args + ' ';
+			return `${args} `;
 		}
 	}
 }
@@ -151,9 +151,9 @@ function getArguments(line) {
 	let inDoubleQuotes = false;
 	let currentWord = '';
 	let parsed = [];
-	for(let i = 0; i<line.length; i++) {
-		if(line[i] === '"') {
-			if(inDoubleQuotes) {
+	for (let i = 0; i < line.length; i++) {
+		if (line[i] === '"') {
+			if (inDoubleQuotes) {
 				inDoubleQuotes = false;
 				//maybe push word to parsed?
 				//currentWord += '"';
@@ -161,8 +161,8 @@ function getArguments(line) {
 				inDoubleQuotes = true;
 				//currentWord += '"';
 			}
-		} else if(line[i] === "'") {
-			if(inSingleQuotes) {
+		} else if (line[i] === '\'') {
+			if (inSingleQuotes) {
 				inSingleQuotes = false;
 				//maybe push word to parsed?
 				//currentWord += "'";
@@ -170,8 +170,7 @@ function getArguments(line) {
 				inSingleQuotes = true;
 				//currentWord += "'";
 			}
-		} else if (/\s/.test(line[i]) &&
-			!(inDoubleQuotes || inSingleQuotes)) {
+		} else if (/\s/.test(line[i]) && !(inDoubleQuotes || inSingleQuotes)) {
 			if (currentWord !== '') {
 				parsed.push(currentWord);
 				currentWord = '';

CliClient/app/base-command.js

@@ -2,7 +2,6 @@ const { _ } = require('lib/locale.js');
 const { reg } = require('lib/registry.js');
 
 class BaseCommand {
-
 	constructor() {
 		this.stdout_ = null;
 		this.prompt_ = null;
@@ -20,7 +19,7 @@ class BaseCommand {
 		throw new Error('Description not defined');
 	}
 
-	async action(args) {
+	async action() {
 		throw new Error('Action not defined');
 	}
 
@@ -93,7 +92,6 @@ class BaseCommand {
 	logger() {
 		return reg.logger();
 	}
-
 }
 
-module.exports = { BaseCommand };
+module.exports = { BaseCommand };

CliClient/app/build-doc.js

@@ -1,7 +1,7 @@
 const fs = require('fs-extra');
-const { fileExtension, basename, dirname } = require('lib/path-utils.js');
+const { fileExtension, dirname } = require('lib/path-utils.js');
 const wrap_ = require('word-wrap');
-const { _, setLocale, languageCode } = require('lib/locale.js');
+const { languageCode } = require('lib/locale.js');
 
 const rootDir = dirname(dirname(__dirname));
 const MAX_WIDTH = 78;
@@ -22,14 +22,14 @@ function renderOptions(options) {
 		let option = options[i];
 		const flag = option[0];
 		const indent = INDENT + INDENT + ' '.repeat(optionColWidth + 2);
-		
+
 		let r = wrap(option[1], indent);
 		r = r.substr(flag.length + (INDENT + INDENT).length);
 		r = INDENT + INDENT + flag + r;
 		output.push(r);
 	}
 
-	return output.join("\n");
+	return output.join('\n');
 }
 
 function renderCommand(cmd) {
@@ -44,17 +44,17 @@ function renderCommand(cmd) {
 		output.push('');
 		output.push(optionString);
 	}
-	return output.join("\n");
+	return output.join('\n');
 }
 
 function getCommands() {
 	let output = [];
-	fs.readdirSync(__dirname).forEach((path) => {
+	fs.readdirSync(__dirname).forEach(path => {
 		if (path.indexOf('command-') !== 0) return;
-		const ext = fileExtension(path)
+		const ext = fileExtension(path);
 		if (ext != 'js') return;
 
-		let CommandClass = require('./' + path);
+		let CommandClass = require(`./${path}`);
 		let cmd = new CommandClass();
 		if (!cmd.enabled()) return;
 		if (cmd.hidden()) return;
@@ -87,14 +87,14 @@ function getHeader() {
 	let description = [];
 	description.push('Joplin is a note taking and to-do application, which can handle a large number of notes organised into notebooks.');
 	description.push('The notes are searchable, can be copied, tagged and modified with your own text editor.');
-	description.push("\n\n");
+	description.push('\n\n');
 	description.push('The notes can be synchronised with various target including the file system (for example with a network directory) or with Microsoft OneDrive.');
-	description.push("\n\n");
+	description.push('\n\n');
 	description.push('Notes exported from Evenotes via .enex files can be imported into Joplin, including the formatted content, resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.).');
 
 	output.push(wrap(description.join(''), INDENT));
 
-	return output.join("\n");
+	return output.join('\n');
 }
 
 function getFooter() {
@@ -102,18 +102,18 @@ function getFooter() {
 
 	output.push('WEBSITE');
 	output.push('');
-	output.push(INDENT + 'https://joplinapp.org');
+	output.push(`${INDENT}https://joplinapp.org`);
 
 	output.push('');
 
 	output.push('LICENSE');
 	output.push('');
-	let filePath = rootDir + '/LICENSE_' + languageCode();
-	if (!fs.existsSync(filePath)) filePath = rootDir + '/LICENSE';
+	let filePath = `${rootDir}/LICENSE_${languageCode()}`;
+	if (!fs.existsSync(filePath)) filePath = `${rootDir}/LICENSE`;
 	const licenseText = fs.readFileSync(filePath, 'utf8');
 	output.push(wrap(licenseText, INDENT));
 
-	return output.join("\n");
+	return output.join('\n');
 }
 
 async function main() {
@@ -128,12 +128,12 @@ async function main() {
 	}
 
 	const headerText = getHeader();
-	const commandsText = commandBlocks.join("\n\n");
+	const commandsText = commandBlocks.join('\n\n');
 	const footerText = getFooter();
 
-	console.info(headerText + "\n\n" + 'USAGE' + "\n\n" + commandsText + "\n\n" + footerText);
+	console.info(`${headerText}\n\n` + 'USAGE' + `\n\n${commandsText}\n\n${footerText}`);
 }
 
-main().catch((error) => {
+main().catch(error => {
 	console.error(error);
-});
+});

CliClient/app/cli-integration-tests.js

@@ -1,4 +1,4 @@
-"use strict"
+'use strict';
 
 const fs = require('fs-extra');
 const { Logger } = require('lib/logger.js');
@@ -10,14 +10,14 @@ const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Setting = require('lib/models/Setting.js');
 const { sprintf } = require('sprintf-js');
-const exec = require('child_process').exec
+const exec = require('child_process').exec;
 
 process.on('unhandledRejection', (reason, p) => {
 	console.error('Unhandled promise rejection', p, 'reason:', reason);
 });
 
-const baseDir = dirname(__dirname) + '/tests/cli-integration';
-const joplinAppPath = __dirname + '/main.js';
+const baseDir = `${dirname(__dirname)}/tests/cli-integration`;
+const joplinAppPath = `${__dirname}/main.js`;
 
 const logger = new Logger();
 logger.addTarget('console');
@@ -32,17 +32,17 @@ db.setLogger(dbLogger);
 
 function createClient(id) {
 	return {
-		'id': id,
-		'profileDir': baseDir + '/client' + id,
+		id: id,
+		profileDir: `${baseDir}/client${id}`,
 	};
 }
 
 const client = createClient(1);
 
-function execCommand(client, command, options = {}) {
-	let exePath = 'node ' + joplinAppPath;
-	let cmd = exePath + ' --update-geolocation-disabled --env dev --profile ' + client.profileDir + ' ' + command;
-	logger.info(client.id + ': ' + command);
+function execCommand(client, command) {
+	let exePath = `node ${joplinAppPath}`;
+	let cmd = `${exePath} --update-geolocation-disabled --env dev --profile ${client.profileDir} ${command}`;
+	logger.info(`${client.id}: ${command}`);
 
 	return new Promise((resolve, reject) => {
 		exec(cmd, (error, stdout, stderr) => {
@@ -72,14 +72,7 @@ function assertEquals(expected, real) {
 }
 
 async function clearDatabase() {
-	await db.transactionExecBatch([
-		'DELETE FROM folders',
-		'DELETE FROM notes',
-		'DELETE FROM tags',
-		'DELETE FROM note_tags',
-		'DELETE FROM resources',
-		'DELETE FROM deleted_items',
-	]);
+	await db.transactionExecBatch(['DELETE FROM folders', 'DELETE FROM notes', 'DELETE FROM tags', 'DELETE FROM note_tags', 'DELETE FROM resources', 'DELETE FROM deleted_items']);
 }
 
 const testUnits = {};
@@ -101,7 +94,7 @@ testUnits.testFolders = async () => {
 
 	folders = await Folder.all();
 	assertEquals(0, folders.length);
-}
+};
 
 testUnits.testNotes = async () => {
 	await execCommand(client, 'mkbook nb1');
@@ -121,16 +114,16 @@ testUnits.testNotes = async () => {
 	notes = await Note.all();
 	assertEquals(2, notes.length);
 
-	await execCommand(client, "rm -f 'blabla*'");
+	await execCommand(client, 'rm -f \'blabla*\'');
 
 	notes = await Note.all();
 	assertEquals(2, notes.length);
 
-	await execCommand(client, "rm -f 'n*'");
+	await execCommand(client, 'rm -f \'n*\'');
 
 	notes = await Note.all();
 	assertEquals(0, notes.length);
-}
+};
 
 testUnits.testCat = async () => {
 	await execCommand(client, 'mkbook nb1');
@@ -145,7 +138,7 @@ testUnits.testCat = async () => {
 
 	r = await execCommand(client, 'cat -v mynote');
 	assertTrue(r.indexOf(note.id) >= 0);
-}
+};
 
 testUnits.testConfig = async () => {
 	await execCommand(client, 'config editor vim');
@@ -159,7 +152,7 @@ testUnits.testConfig = async () => {
 	let r = await execCommand(client, 'config');
 	assertTrue(r.indexOf('editor') >= 0);
 	assertTrue(r.indexOf('subl') >= 0);
-}
+};
 
 testUnits.testCp = async () => {
 	await execCommand(client, 'mkbook nb2');
@@ -180,7 +173,7 @@ testUnits.testCp = async () => {
 	notes = await Note.previews(f2.id);
 	assertEquals(1, notes.length);
 	assertEquals(notesF1[0].title, notes[0].title);
-}
+};
 
 testUnits.testLs = async () => {
 	await execCommand(client, 'mkbook nb1');
@@ -190,7 +183,7 @@ testUnits.testLs = async () => {
 
 	assertTrue(r.indexOf('note1') >= 0);
 	assertTrue(r.indexOf('note2') >= 0);
-}
+};
 
 testUnits.testMv = async () => {
 	await execCommand(client, 'mkbook nb2');
@@ -210,21 +203,21 @@ testUnits.testMv = async () => {
 	await execCommand(client, 'mknote note2');
 	await execCommand(client, 'mknote note3');
 	await execCommand(client, 'mknote blabla');
-	await execCommand(client, "mv 'note*' nb2");
+	await execCommand(client, 'mv \'note*\' nb2');
 
 	notes1 = await Note.previews(f1.id);
 	notes2 = await Note.previews(f2.id);
 
 	assertEquals(1, notes1.length);
 	assertEquals(4, notes2.length);
-}
+};
 
-async function main(argv) {
+async function main() {
 	await fs.remove(baseDir);
 
 	logger.info(await execCommand(client, 'version'));
 
-	await db.open({ name: client.profileDir + '/database.sqlite' });
+	await db.open({ name: `${client.profileDir}/database.sqlite` });
 	BaseModel.db_ = db;
 	await Setting.load();
 
@@ -237,13 +230,13 @@ async function main(argv) {
 
 		await clearDatabase();
 		let testName = n.substr(4).toLowerCase();
-		process.stdout.write(testName + ': ');
+		process.stdout.write(`${testName}: `);
 		await testUnits[n]();
 		console.info('');
 	}
 }
 
-main(process.argv).catch((error) => {
+main(process.argv).catch(error => {
 	console.info('');
 	logger.error(error);
-});
+});

CliClient/app/cli-utils.js

@@ -5,7 +5,7 @@ const stringPadding = require('string-padding');
 
 const cliUtils = {};
 
-cliUtils.printArray = function(logFunction, rows, headers = null) {
+cliUtils.printArray = function(logFunction, rows) {
 	if (!rows.length) return '';
 
 	const ALIGN_LEFT = 0;
@@ -16,7 +16,7 @@ cliUtils.printArray = function(logFunction, rows, headers = null) {
 
 	for (let i = 0; i < rows.length; i++) {
 		let row = rows[i];
-		
+
 		for (let j = 0; j < row.length; j++) {
 			let item = row[j];
 			let width = item ? item.toString().length : 0;
@@ -26,7 +26,6 @@ cliUtils.printArray = function(logFunction, rows, headers = null) {
 		}
 	}
 
-	let lines = [];
 	for (let row = 0; row < rows.length; row++) {
 		let line = [];
 		for (let col = 0; col < colWidths.length; col++) {
@@ -37,7 +36,7 @@ cliUtils.printArray = function(logFunction, rows, headers = null) {
 		}
 		logFunction(line.join(' '));
 	}
-}
+};
 
 cliUtils.parseFlags = function(flags) {
 	let output = {};
@@ -56,10 +55,10 @@ cliUtils.parseFlags = function(flags) {
 		}
 	}
 	return output;
-}
+};
 
 cliUtils.parseCommandArg = function(arg) {
-	if (arg.length <= 2) throw new Error('Invalid command arg: ' + arg);
+	if (arg.length <= 2) throw new Error(`Invalid command arg: ${arg}`);
 
 	const c1 = arg[0];
 	const c2 = arg[arg.length - 1];
@@ -70,9 +69,9 @@ cliUtils.parseCommandArg = function(arg) {
 	} else if (c1 == '[' && c2 == ']') {
 		return { required: false, name: name };
 	} else {
-		throw new Error('Invalid command arg: ' + arg);
+		throw new Error(`Invalid command arg: ${arg}`);
 	}
-}
+};
 
 cliUtils.makeCommandArgs = function(cmd, argv) {
 	let cmdUsage = cmd.usage();
@@ -83,9 +82,8 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 	let booleanFlags = [];
 	let aliases = {};
 	for (let i = 0; i < options.length; i++) {
-		if (options[i].length != 2) throw new Error('Invalid options: ' + options[i]);
+		if (options[i].length != 2) throw new Error(`Invalid options: ${options[i]}`);
 		let flags = options[i][0];
-		let text = options[i][1];
 
 		flags = cliUtils.parseFlags(flags);
 
@@ -125,27 +123,27 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 	output.options = argOptions;
 
 	return output;
-}
+};
 
 cliUtils.promptMcq = function(message, answers) {
 	const readline = require('readline');
 
 	const rl = readline.createInterface({
 		input: process.stdin,
-		output: process.stdout
+		output: process.stdout,
 	});
 
-	message += "\n\n";
+	message += '\n\n';
 	for (let n in answers) {
 		if (!answers.hasOwnProperty(n)) continue;
-		message += _('%s: %s', n, answers[n]) + "\n";
+		message += `${_('%s: %s', n, answers[n])}\n`;
 	}
 
-	message += "\n";
+	message += '\n';
 	message += _('Your choice: ');
 
 	return new Promise((resolve, reject) => {
-		rl.question(message, (answer) => {
+		rl.question(message, answer => {
 			rl.close();
 
 			if (!(answer in answers)) {
@@ -156,7 +154,7 @@ cliUtils.promptMcq = function(message, answers) {
 			resolve(answer);
 		});
 	});
-}
+};
 
 cliUtils.promptConfirm = function(message, answers = null) {
 	if (!answers) answers = [_('Y'), _('n')];
@@ -164,23 +162,24 @@ cliUtils.promptConfirm = function(message, answers = null) {
 
 	const rl = readline.createInterface({
 		input: process.stdin,
-		output: process.stdout
+		output: process.stdout,
 	});
 
-	message += ' (' + answers.join('/') + ')';
+	message += ` (${answers.join('/')})`;
 
-	return new Promise((resolve, reject) => {
-		rl.question(message + ' ', (answer) => {
+	return new Promise((resolve) => {
+		rl.question(`${message} `, answer => {
 			const ok = !answer || answer.toLowerCase() == answers[0].toLowerCase();
 			rl.close();
 			resolve(ok);
 		});
 	});
-}
+};
 
 // Note: initialText is there to have the same signature as statusBar.prompt() so that
 // it can be a drop-in replacement, however initialText is not used (and cannot be
 // with readline.question?).
+// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
 cliUtils.prompt = function(initialText = '', promptString = ':', options = null) {
 	if (!options) options = {};
 
@@ -189,10 +188,9 @@ cliUtils.prompt = function(initialText = '', promptString = ':', options = null)
 
 	const mutableStdout = new Writable({
 		write: function(chunk, encoding, callback) {
-			if (!this.muted)
-			process.stdout.write(chunk, encoding);
+			if (!this.muted) process.stdout.write(chunk, encoding);
 			callback();
-		}
+		},
 	});
 
 	const rl = readline.createInterface({
@@ -201,18 +199,18 @@ cliUtils.prompt = function(initialText = '', promptString = ':', options = null)
 		terminal: true,
 	});
 
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve) => {
 		mutableStdout.muted = false;
 
-		rl.question(promptString, (answer) => {
+		rl.question(promptString, answer => {
 			rl.close();
-			if (!!options.secure) this.stdout_('');
+			if (options.secure) this.stdout_('');
 			resolve(answer);
 		});
 
 		mutableStdout.muted = !!options.secure;
 	});
-}
+};
 
 let redrawStarted_ = false;
 let redrawLastLog_ = null;
@@ -220,7 +218,7 @@ let redrawLastUpdateTime_ = 0;
 
 cliUtils.setStdout = function(v) {
 	this.stdout_ = v;
-}
+};
 
 cliUtils.redraw = function(s) {
 	const now = time.unixMs();
@@ -233,8 +231,8 @@ cliUtils.redraw = function(s) {
 		redrawLastLog_ = s;
 	}
 
-   redrawStarted_ = true;
-}
+	redrawStarted_ = true;
+};
 
 cliUtils.redrawDone = function() {
 	if (!redrawStarted_) return;
@@ -245,6 +243,6 @@ cliUtils.redrawDone = function() {
 
 	redrawLastLog_ = null;
 	redrawStarted_ = false;
-}
+};
 
-module.exports = { cliUtils };
+module.exports = { cliUtils };

CliClient/app/command-apidoc.js

@@ -1,19 +1,12 @@
 const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale.js');
-const { cliUtils } = require('./cli-utils.js');
-const EncryptionService = require('lib/services/EncryptionService');
-const DecryptionWorker = require('lib/services/DecryptionWorker');
-const MasterKey = require('lib/models/MasterKey');
 const BaseItem = require('lib/models/BaseItem');
 const BaseModel = require('lib/BaseModel');
-const Setting = require('lib/models/Setting.js');
 const { toTitleCase } = require('lib/string-utils.js');
 const { reg } = require('lib/registry.js');
 const markdownUtils = require('lib/markdownUtils');
 const { Database } = require('lib/database.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'apidoc';
 	}
@@ -23,18 +16,22 @@ class Command extends BaseCommand {
 	}
 
 	createPropertiesTable(tableFields) {
-  		const headers = [
-  			{ name: 'name', label: 'Name' },
-  			{ name: 'type', label: 'Type', filter: (value) => {
-  				return Database.enumName('fieldType', value);
-  			}},
-  			{ name: 'description', label: 'Description' },
-  		];
-		
-		return markdownUtils.createMarkdownTable(headers, tableFields); 
+		const headers = [
+			{ name: 'name', label: 'Name' },
+			{
+				name: 'type',
+				label: 'Type',
+				filter: value => {
+					return Database.enumName('fieldType', value);
+				},
+			},
+			{ name: 'description', label: 'Description' },
+		];
+
+		return markdownUtils.createMarkdownTable(headers, tableFields);
 	}
 
-	async action(args) {
+	async action() {
 		const models = [
 			{
 				type: BaseModel.TYPE_NOTE,
@@ -70,8 +67,8 @@ class Command extends BaseCommand {
 		lines.push('}');
 		lines.push('```');
 		lines.push('');
-		
-		lines.push('# Authorisation')
+
+		lines.push('# Authorisation');
 		lines.push('');
 		lines.push('To prevent unauthorised applications from accessing the API, the calls must be authentified. To do so, you must provide a token as a query parameter for each API call. You can get this token from the Joplin desktop application, on the Web Clipper Options screen.');
 		lines.push('');
@@ -171,7 +168,7 @@ class Command extends BaseCommand {
 				// });
 			}
 
-			lines.push('# ' + toTitleCase(tableName));
+			lines.push(`# ${toTitleCase(tableName)}`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_FOLDER) {
@@ -184,9 +181,9 @@ class Command extends BaseCommand {
 			lines.push(this.createPropertiesTable(tableFields));
 			lines.push('');
 
-			lines.push('## GET /' + tableName);
+			lines.push(`## GET /${tableName}`);
 			lines.push('');
-			lines.push('Gets all ' + tableName);
+			lines.push(`Gets all ${tableName}`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_FOLDER) {
@@ -194,9 +191,9 @@ class Command extends BaseCommand {
 				lines.push('');
 			}
 
-			lines.push('## GET /' + tableName + '/:id');
+			lines.push(`## GET /${tableName}/:id`);
 			lines.push('');
-			lines.push('Gets ' + singular + ' with ID :id');
+			lines.push(`Gets ${singular} with ID :id`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_TAG) {
@@ -227,9 +224,9 @@ class Command extends BaseCommand {
 				lines.push('');
 			}
 
-			lines.push('## POST /' + tableName);
+			lines.push(`## POST /${tableName}`);
 			lines.push('');
-			lines.push('Creates a new ' + singular);
+			lines.push(`Creates a new ${singular}`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_RESOURCE) {
@@ -273,14 +270,14 @@ class Command extends BaseCommand {
 				lines.push('');
 			}
 
-			lines.push('## PUT /' + tableName + '/:id');
+			lines.push(`## PUT /${tableName}/:id`);
 			lines.push('');
-			lines.push('Sets the properties of the ' + singular + ' with ID :id');
+			lines.push(`Sets the properties of the ${singular} with ID :id`);
 			lines.push('');
 
-			lines.push('## DELETE /' + tableName + '/:id');
+			lines.push(`## DELETE /${tableName}/:id`);
 			lines.push('');
-			lines.push('Deletes the ' + singular + ' with ID :id');
+			lines.push(`Deletes the ${singular} with ID :id`);
 			lines.push('');
 
 			if (model.type === BaseModel.TYPE_TAG) {
@@ -293,7 +290,6 @@ class Command extends BaseCommand {
 
 		this.stdout(lines.join('\n'));
 	}
-
 }
 
 module.exports = Command;

CliClient/app/command-attach.js

@@ -3,10 +3,8 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
 const { shim } = require('lib/shim.js');
-const fs = require('fs-extra');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'attach <note> <file>';
 	}
@@ -26,7 +24,6 @@ class Command extends BaseCommand {
 
 		await shim.attachFileToNote(note, localFilePath);
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-cat.js

@@ -2,11 +2,9 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'cat <note>';
 	}
@@ -16,9 +14,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		return [
-			['-v, --verbose', _('Displays the complete information about note.')],
-		];
+		return [['-v, --verbose', _('Displays the complete information about note.')]];
 	}
 
 	async action(args) {
@@ -30,10 +26,13 @@ class Command extends BaseCommand {
 		const content = args.options.verbose ? await Note.serialize(item) : await Note.serializeForEdit(item);
 		this.stdout(content);
 
-		app().gui().showConsole();
-		app().gui().maximizeConsole();
+		app()
+			.gui()
+			.showConsole();
+		app()
+			.gui()
+			.maximizeConsole();
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-config.js

@@ -4,25 +4,22 @@ const { app } = require('./app.js');
 const Setting = require('lib/models/Setting.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'config [name] [value]';
 	}
 
 	description() {
-		return _("Gets or sets a config value. If [value] is not provided, it will show the value of [name]. If neither [name] nor [value] is provided, it will list the current configuration.");
+		return _('Gets or sets a config value. If [value] is not provided, it will show the value of [name]. If neither [name] nor [value] is provided, it will list the current configuration.');
 	}
 
 	options() {
-		return [
-			['-v, --verbose', _('Also displays unset and hidden config variables.')],
-		];
+		return [['-v, --verbose', _('Also displays unset and hidden config variables.')]];
 	}
 
 	async action(args) {
 		const verbose = args.options.verbose;
 
-		const renderKeyValue = (name) => {
+		const renderKeyValue = name => {
 			const md = Setting.settingMetadata(name);
 			let value = Setting.value(name);
 			if (typeof value === 'object' || Array.isArray(value)) value = JSON.stringify(value);
@@ -33,7 +30,7 @@ class Command extends BaseCommand {
 			} else {
 				return _('%s = %s', name, value);
 			}
-		}
+		};
 
 		if (!args.name && !args.value) {
 			let keys = Setting.keys(!verbose, 'cli');
@@ -43,15 +40,23 @@ class Command extends BaseCommand {
 				if (!verbose && !value) continue;
 				this.stdout(renderKeyValue(keys[i]));
 			}
-			app().gui().showConsole();
-			app().gui().maximizeConsole();
+			app()
+				.gui()
+				.showConsole();
+			app()
+				.gui()
+				.maximizeConsole();
 			return;
 		}
 
 		if (args.name && !args.value) {
 			this.stdout(renderKeyValue(args.name));
-			app().gui().showConsole();
-			app().gui().maximizeConsole();
+			app()
+				.gui()
+				.showConsole();
+			app()
+				.gui()
+				.maximizeConsole();
 			return;
 		}
 
@@ -64,7 +69,6 @@ class Command extends BaseCommand {
 
 		await Setting.saveAll();
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-cp.js

@@ -2,11 +2,9 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'cp <note> [notebook]';
 	}
@@ -33,7 +31,6 @@ class Command extends BaseCommand {
 			Note.updateGeolocation(newNote.id);
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-done.js

@@ -2,12 +2,10 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'done <note>';
 	}
@@ -35,7 +33,6 @@ class Command extends BaseCommand {
 	async action(args) {
 		await Command.handleAction(this, args, true);
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-dump.js

@@ -1,12 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
-const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'dump';
 	}
@@ -19,7 +16,7 @@ class Command extends BaseCommand {
 		return true;
 	}
 
-	async action(args) {
+	async action() {
 		let items = [];
 		let folders = await Folder.all();
 		for (let i = 0; i < folders.length; i++) {
@@ -35,10 +32,9 @@ class Command extends BaseCommand {
 		}
 
 		items = items.concat(tags);
-		
+
 		this.stdout(JSON.stringify(items));
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-e2ee.js

@@ -1,9 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { _ } = require('lib/locale.js');
-const { cliUtils } = require('./cli-utils.js');
 const EncryptionService = require('lib/services/EncryptionService');
 const DecryptionWorker = require('lib/services/DecryptionWorker');
-const MasterKey = require('lib/models/MasterKey');
 const BaseItem = require('lib/models/BaseItem');
 const Setting = require('lib/models/Setting.js');
 const { shim } = require('lib/shim');
@@ -12,7 +10,6 @@ const imageType = require('image-type');
 const readChunk = require('read-chunk');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'e2ee <command> [path]';
 	}
@@ -35,7 +32,7 @@ class Command extends BaseCommand {
 
 		const options = args.options;
 
-		const askForMasterKey = async (error) => {
+		const askForMasterKey = async error => {
 			const masterKeyId = error.masterKeyId;
 			const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
 			if (!password) {
@@ -45,7 +42,7 @@ class Command extends BaseCommand {
 			Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
 			await EncryptionService.instance().loadMasterKeysFromSettings();
 			return true;
-		}
+		};
 
 		if (args.command === 'enable') {
 			const password = options.password ? options.password.toString() : await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
@@ -100,13 +97,13 @@ class Command extends BaseCommand {
 			while (true) {
 				try {
 					const outputDir = options.output ? options.output : require('os').tmpdir();
-					let outFile = outputDir + '/' + pathUtils.filename(args.path) + '.' + Date.now() + '.bin'; 
+					let outFile = `${outputDir}/${pathUtils.filename(args.path)}.${Date.now()}.bin`;
 					await EncryptionService.instance().decryptFile(args.path, outFile);
 					const buffer = await readChunk(outFile, 0, 64);
 					const detectedType = imageType(buffer);
 
 					if (detectedType) {
-						const newOutFile = outFile + '.' + detectedType.ext;
+						const newOutFile = `${outFile}.${detectedType.ext}`;
 						await shim.fsDriver().move(outFile, newOutFile);
 						outFile = newOutFile;
 					}
@@ -128,19 +125,17 @@ class Command extends BaseCommand {
 
 		if (args.command === 'target-status') {
 			const fs = require('fs-extra');
-			const pathUtils = require('lib/path-utils.js');
-			const fsDriver = new (require('lib/fs-driver-node.js').FsDriverNode)();
 
 			const targetPath = args.path;
 			if (!targetPath) throw new Error('Please specify the sync target path.');
 
 			const dirPaths = function(targetPath) {
 				let paths = [];
-				fs.readdirSync(targetPath).forEach((path) => {
+				fs.readdirSync(targetPath).forEach(path => {
 					paths.push(path);
 				});
 				return paths;
-			}
+			};
 
 			let itemCount = 0;
 			let resourceCount = 0;
@@ -155,7 +150,7 @@ class Command extends BaseCommand {
 
 			for (let i = 0; i < paths.length; i++) {
 				const path = paths[i];
-				const fullPath = targetPath + '/' + path;
+				const fullPath = `${targetPath}/${path}`;
 				const stat = await fs.stat(fullPath);
 
 				// this.stdout(fullPath);
@@ -165,7 +160,7 @@ class Command extends BaseCommand {
 					for (let j = 0; j < resourcePaths.length; j++) {
 						const resourcePath = resourcePaths[j];
 						resourceCount++;
-						const fullResourcePath = fullPath + '/' + resourcePath;
+						const fullResourcePath = `${fullPath}/${resourcePath}`;
 						const isEncrypted = await EncryptionService.instance().fileIsEncrypted(fullResourcePath);
 						if (isEncrypted) {
 							encryptedResourceCount++;
@@ -199,9 +194,9 @@ class Command extends BaseCommand {
 				}
 			}
 
-			this.stdout('Encrypted items: ' + encryptedItemCount + '/' + itemCount);
-			this.stdout('Encrypted resources: ' + encryptedResourceCount + '/' + resourceCount);
-			this.stdout('Other items (never encrypted): ' + otherItemCount);
+			this.stdout(`Encrypted items: ${encryptedItemCount}/${itemCount}`);
+			this.stdout(`Encrypted resources: ${encryptedResourceCount}/${resourceCount}`);
+			this.stdout(`Other items (never encrypted): ${otherItemCount}`);
 
 			if (options.verbose) {
 				this.stdout('');
@@ -224,7 +219,6 @@ class Command extends BaseCommand {
 			return;
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-edit.js

@@ -3,15 +3,11 @@ const { BaseCommand } = require('./base-command.js');
 const { uuid } = require('lib/uuid.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Setting = require('lib/models/Setting.js');
 const BaseModel = require('lib/BaseModel.js');
-const { cliUtils } = require('./cli-utils.js');
-const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'edit <note>';
 	}
@@ -21,20 +17,19 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let watcher = null;
 		let tempFilePath = null;
 
 		const onFinishedEditing = async () => {
 			if (tempFilePath) fs.removeSync(tempFilePath);
-		}
+		};
 
 		const textEditorPath = () => {
 			if (Setting.value('editor')) return Setting.value('editor');
 			if (process.env.EDITOR) return process.env.EDITOR;
 			throw new Error(_('No text editor is defined. Please set it using `config editor <editor-path>`'));
-		}
+		};
 
-		try {		
+		try {
 			// -------------------------------------------------------------------------
 			// Load note or create it if it doesn't exist
 			// -------------------------------------------------------------------------
@@ -65,7 +60,7 @@ class Command extends BaseCommand {
 
 			const originalContent = await Note.serializeForEdit(note);
 
-			tempFilePath = Setting.value('tempDir') + '/' + uuid.create() + '.md';
+			tempFilePath = `${Setting.value('tempDir')}/${uuid.create()}.md`;
 			editorArgs.push(tempFilePath);
 
 			await fs.writeFile(tempFilePath, originalContent);
@@ -76,18 +71,30 @@ 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 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
@@ -107,13 +114,11 @@ class Command extends BaseCommand {
 			});
 
 			await onFinishedEditing();
-
-		} catch(error) {
+		} catch (error) {
 			await onFinishedEditing();
 			throw error;
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-exit.js

@@ -3,7 +3,6 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'exit';
 	}
@@ -16,10 +15,9 @@ class Command extends BaseCommand {
 		return ['gui'];
 	}
 
-	async action(args) {
+	async action() {
 		await app().exit();
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

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

@@ -1,13 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
-const { Database } = require('lib/database.js');
 const { app } = require('./app.js');
 const Setting = require('lib/models/Setting.js');
-const { _ } = require('lib/locale.js');
 const { ReportService } = require('lib/services/report.js');
 const fs = require('fs-extra');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'export-sync-status';
 	}
@@ -20,17 +17,20 @@ class Command extends BaseCommand {
 		return true;
 	}
 
-	async action(args) {
+	async action() {
 		const service = new ReportService();
 		const csv = await service.basicItemList({ format: 'csv' });
-		const filePath = Setting.value('profileDir') + '/syncReport-' + (new Date()).getTime() + '.csv';
+		const filePath = `${Setting.value('profileDir')}/syncReport-${new Date().getTime()}.csv`;
 		await fs.writeFileSync(filePath, csv);
-		this.stdout('Sync status exported to ' + filePath);
+		this.stdout(`Sync status exported to ${filePath}`);
 
-		app().gui().showConsole();
-		app().gui().maximizeConsole();
+		app()
+			.gui()
+			.showConsole();
+		app()
+			.gui()
+			.maximizeConsole();
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-export.js

@@ -1,14 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const InteropService = require('lib/services/InteropService.js');
 const BaseModel = require('lib/BaseModel.js');
-const Note = require('lib/models/Note.js');
-const { reg } = require('lib/registry.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const fs = require('fs-extra');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'export <path>';
 	}
@@ -19,17 +15,14 @@ class Command extends BaseCommand {
 
 	options() {
 		const service = new InteropService();
-		const formats = service.modules()
+		const formats = service
+			.modules()
 			.filter(m => m.type === 'exporter')
-			.map(m => m.format + (m.description ? ' (' + m.description + ')' : ''));
+			.map(m => m.format + (m.description ? ` (${m.description})` : ''));
 
-		return [
-			['--format <format>', _('Destination format: %s', formats.join(', '))],
-			['--note <note>', _('Exports only the given note.')],
-			['--notebook <notebook>', _('Exports only the given notebook.')],
-		];
+		return [['--format <format>', _('Destination format: %s', formats.join(', '))], ['--note <note>', _('Exports only the given note.')], ['--notebook <notebook>', _('Exports only the given notebook.')]];
 	}
-	
+
 	async action(args) {
 		let exportOptions = {};
 		exportOptions.path = args.path;
@@ -37,25 +30,20 @@ class Command extends BaseCommand {
 		exportOptions.format = args.options.format ? args.options.format : 'jex';
 
 		if (args.options.note) {
-
 			const notes = await app().loadItems(BaseModel.TYPE_NOTE, args.options.note, { parent: app().currentFolder() });
 			if (!notes.length) throw new Error(_('Cannot find "%s".', args.options.note));
-			exportOptions.sourceNoteIds = notes.map((n) => n.id);
-
+			exportOptions.sourceNoteIds = notes.map(n => n.id);
 		} else if (args.options.notebook) {
-
 			const folders = await app().loadItems(BaseModel.TYPE_FOLDER, args.options.notebook);
 			if (!folders.length) throw new Error(_('Cannot find "%s".', args.options.notebook));
-			exportOptions.sourceFolderIds = folders.map((n) => n.id);
-
+			exportOptions.sourceFolderIds = folders.map(n => n.id);
 		}
 
 		const service = new InteropService();
 		const result = await service.export(exportOptions);
 
-		result.warnings.map((w) => this.stdout(w));
+		result.warnings.map(w => this.stdout(w));
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-geoloc.js

@@ -2,11 +2,9 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'geoloc <note>';
 	}
@@ -23,9 +21,10 @@ class Command extends BaseCommand {
 		const url = Note.geolocationUrl(item);
 		this.stdout(url);
 
-		app().gui().showConsole();
+		app()
+			.gui()
+			.showConsole();
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-help.js

@@ -1,14 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { renderCommandHelp } = require('./help-utils.js');
-const { Database } = require('lib/database.js');
-const Setting = require('lib/models/Setting.js');
-const { wrap } = require('lib/string-utils.js');
 const { _ } = require('lib/locale.js');
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'help [command]';
 	}
@@ -28,7 +24,7 @@ class Command extends BaseCommand {
 			output.push(command);
 		}
 
-		output.sort((a, b) => a.name() < b.name() ? -1 : +1);
+		output.sort((a, b) => (a.name() < b.name() ? -1 : +1));
 
 		return output;
 	}
@@ -40,31 +36,37 @@ class Command extends BaseCommand {
 			this.stdout(_('For information on how to customise the shortcuts please visit %s', 'https://joplinapp.org/terminal/#shortcuts'));
 			this.stdout('');
 
-			if (app().gui().isDummy()) {
+			if (
+				app()
+					.gui()
+					.isDummy()
+			) {
 				throw new Error(_('Shortcuts are not available in CLI mode.'));
 			}
 
-			const keymap = app().gui().keymap();
+			const keymap = app()
+				.gui()
+				.keymap();
 
 			let rows = [];
 
 			for (let i = 0; i < keymap.length; i++) {
 				const item = keymap[i];
-				const keys = item.keys.map((k) => k === ' ' ? '(SPACE)' : k);
+				const keys = item.keys.map(k => (k === ' ' ? '(SPACE)' : k));
 				rows.push([keys.join(', '), item.command]);
 			}
 
 			cliUtils.printArray(this.stdout.bind(this), rows);
 		} else if (args.command === 'all') {
 			const commands = this.allCommands();
-			const output = commands.map((c) => renderCommandHelp(c));
+			const output = commands.map(c => renderCommandHelp(c));
 			this.stdout(output.join('\n\n'));
 		} else if (args.command) {
 			const command = app().findCommandByName(args['command']);
 			if (!command) throw new Error(_('Cannot find "%s".', args.command));
 			this.stdout(renderCommandHelp(command, stdoutWidth));
 		} else {
-			const commandNames = this.allCommands().map((a) => a.name());
+			const commandNames = this.allCommands().map(a => a.name());
 
 			this.stdout(_('Type `help [command]` for more information about a command; or type `help all` for the complete usage information.'));
 			this.stdout('');
@@ -82,10 +84,13 @@ class Command extends BaseCommand {
 			this.stdout(_('For the list of keyboard shortcuts and config options, type `help keymap`'));
 		}
 
-		app().gui().showConsole();
-		app().gui().maximizeConsole();
+		app()
+			.gui()
+			.showConsole();
+		app()
+			.gui()
+			.maximizeConsole();
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-import.js

@@ -1,17 +1,11 @@
 const { BaseCommand } = require('./base-command.js');
 const InteropService = require('lib/services/InteropService.js');
 const BaseModel = require('lib/BaseModel.js');
-const Note = require('lib/models/Note.js');
-const { filename, basename, fileExtension } = require('lib/path-utils.js');
-const { importEnex } = require('lib/import-enex');
 const { cliUtils } = require('./cli-utils.js');
-const { reg } = require('lib/registry.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const fs = require('fs-extra');
 
 class Command extends BaseCommand {
-	
 	usage() {
 		return 'import <path> [notebook]';
 	}
@@ -22,14 +16,14 @@ class Command extends BaseCommand {
 
 	options() {
 		const service = new InteropService();
-		const formats = service.modules().filter(m => m.type === 'importer').map(m => m.format);
+		const formats = service
+			.modules()
+			.filter(m => m.type === 'importer')
+			.map(m => m.format);
 
-		return [
-			['--format <format>', _('Source format: %s', (['auto'].concat(formats)).join(', '))],
-			['-f, --force', _('Do not ask for confirmation.')],
-		];
+		return [['--format <format>', _('Source format: %s', ['auto'].concat(formats).join(', '))], ['-f, --force', _('Do not ask for confirmation.')]];
 	}
-	
+
 	async action(args) {
 		let folder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
 
@@ -44,7 +38,7 @@ class Command extends BaseCommand {
 
 		// onProgress/onError supported by Enex import only
 
-		importOptions.onProgress = (progressState) => {
+		importOptions.onProgress = progressState => {
 			let line = [];
 			line.push(_('Found: %d.', progressState.loaded));
 			line.push(_('Created: %d.', progressState.created));
@@ -56,20 +50,21 @@ class Command extends BaseCommand {
 			cliUtils.redraw(lastProgress);
 		};
 
-		importOptions.onError = (error) => {
+		importOptions.onError = error => {
 			let s = error.trace ? error.trace : error.toString();
 			this.stdout(s);
 		};
 
-		app().gui().showConsole();
+		app()
+			.gui()
+			.showConsole();
 		this.stdout(_('Importing notes...'));
 		const service = new InteropService();
 		const result = await service.import(importOptions);
-		result.warnings.map((w) => this.stdout(w));
+		result.warnings.map(w => this.stdout(w));
 		cliUtils.redrawDone();
 		if (lastProgress) this.stdout(_('The notes have been imported: %s', lastProgress));
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-ls.js

@@ -10,7 +10,6 @@ const { time } = require('lib/time-utils.js');
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'ls [note-pattern]';
 	}
@@ -24,14 +23,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		return [
-			['-n, --limit <num>', _('Displays only the first top <num> notes.')],
-			['-s, --sort <field>', _('Sorts the item by <field> (eg. title, updated_time, created_time).')],
-			['-r, --reverse', _('Reverses the sorting order.')],
-			['-t, --type <type>', _('Displays only the items of the specific type(s). Can be `n` for notes, `t` 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.')],
-			['-f, --format <format>', _('Either "text" or "json"')],
-			['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE')],
-		];
+		return [['-n, --limit <num>', _('Displays only the first top <num> notes.')], ['-s, --sort <field>', _('Sorts the item by <field> (eg. title, updated_time, created_time).')], ['-r, --reverse', _('Reverses the sorting order.')], ['-t, --type <type>', _('Displays only the items of the specific type(s). Can be `n` for notes, `t` 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.')], ['-f, --format <format>', _('Either "text" or "json"')], ['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE')]];
 	}
 
 	async action(args) {
@@ -98,14 +90,14 @@ class Command extends BaseCommand {
 
 				let title = item.title;
 				if (!shortIdShown && (seenTitles.indexOf(item.title) >= 0 || !item.title)) {
-					title += ' (' + BaseModel.shortId(item.id) + ')';
+					title += ` (${BaseModel.shortId(item.id)})`;
 				} else {
 					seenTitles.push(item.title);
 				}
 
 				if (hasTodos) {
 					if (item.is_todo) {
-						row.push(sprintf('[%s]', !!item.todo_completed ? 'X' : ' '));
+						row.push(sprintf('[%s]', item.todo_completed ? 'X' : ' '));
 					} else {
 						row.push('   ');
 					}
@@ -118,9 +110,7 @@ class Command extends BaseCommand {
 
 			cliUtils.printArray(this.stdout.bind(this), rows);
 		}
-
 	}
-
 }
 
 module.exports = Command;

CliClient/app/command-mkbook.js

@@ -2,10 +2,8 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const Folder = require('lib/models/Folder.js');
-const { reg } = require('lib/registry.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'mkbook <new-notebook>';
 	}
@@ -15,10 +13,9 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		let folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });		
+		let folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });
 		app().switchCurrentFolder(folder);
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-mknote.js

@@ -4,7 +4,6 @@ const { _ } = require('lib/locale.js');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'mknote <new-note>';
 	}
@@ -26,7 +25,6 @@ class Command extends BaseCommand {
 
 		app().switchCurrentFolder(app().currentFolder());
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-mktodo.js

@@ -4,7 +4,6 @@ const { _ } = require('lib/locale.js');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'mktodo <new-todo>';
 	}
@@ -27,7 +26,6 @@ class Command extends BaseCommand {
 
 		app().switchCurrentFolder(app().currentFolder());
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-mv.js

@@ -6,7 +6,6 @@ const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'mv <note> [notebook]';
 	}
@@ -18,7 +17,7 @@ class Command extends BaseCommand {
 	async action(args) {
 		const pattern = args['note'];
 		const destination = args['notebook'];
-		
+
 		const folder = await Folder.loadByField('title', destination);
 		if (!folder) throw new Error(_('Cannot find "%s".', destination));
 
@@ -29,7 +28,6 @@ class Command extends BaseCommand {
 			await Note.moveToFolder(notes[i].id, folder.id);
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-ren.js

@@ -6,7 +6,6 @@ const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'ren <item> <name>';
 	}
@@ -35,7 +34,6 @@ class Command extends BaseCommand {
 			await Note.save(newItem);
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-rmbook.js

@@ -1,14 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseItem = require('lib/models/BaseItem.js');
 const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
 const BaseModel = require('lib/BaseModel.js');
-const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'rmbook <notebook>';
 	}
@@ -18,9 +14,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		return [
-			['-f, --force', _('Deletes the notebook without asking for confirmation.')],
-		];
+		return [['-f, --force', _('Deletes the notebook without asking for confirmation.')]];
 	}
 
 	async action(args) {
@@ -34,7 +28,6 @@ class Command extends BaseCommand {
 
 		await Folder.delete(folder.id);
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-rmnote.js

@@ -1,14 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const BaseModel = require('lib/BaseModel.js');
-const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'rmnote <note-pattern>';
 	}
@@ -18,9 +14,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		return [
-			['-f, --force', _('Deletes the notes without asking for confirmation.')],
-		];
+		return [['-f, --force', _('Deletes the notes without asking for confirmation.')]];
 	}
 
 	async action(args) {
@@ -32,10 +26,9 @@ class Command extends BaseCommand {
 
 		const ok = force ? true : await this.prompt(notes.length > 1 ? _('%d notes match this pattern. Delete them?', notes.length) : _('Delete note?'), { booleanAnswerDefault: 'n' });
 		if (!ok) return;
-		let ids = notes.map((n) => n.id);
+		let ids = notes.map(n => n.id);
 		await Note.batchDelete(ids);
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-search.js

@@ -1,15 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
-const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const { sprintf } = require('sprintf-js');
-const { time } = require('lib/time-utils.js');
 const { uuid } = require('lib/uuid.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'search <pattern> [notebook]';
 	}
@@ -50,7 +45,6 @@ class Command extends BaseCommand {
 			id: searchId,
 		});
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-server.js

@@ -0,0 +1,57 @@
+const { BaseCommand } = require('./base-command.js');
+const { _ } = require('lib/locale.js');
+const Setting = require('lib/models/Setting.js');
+const { Logger } = require('lib/logger.js');
+const { shim } = require('lib/shim');
+
+class Command extends BaseCommand {
+
+	usage() {
+		return 'server <command>';
+	}
+
+	description() {
+		return `${_('Start, stop or check the API server. To specify on which port it should run, set the api.port config variable. Commands are (%s).', ['start', 'stop', 'status'].join('|'))} This is an experimental feature - use at your own risks! It is recommended that the server runs off its own separate profile so that no two CLI instances access that profile at the same time. Use --profile to specify the profile path.`;
+	}
+
+	async action(args) {
+		const command = args.command;
+
+		const ClipperServer = require('lib/ClipperServer');
+		const stdoutFn = (s) => this.stdout(s);
+		const clipperLogger = new Logger();
+		clipperLogger.addTarget('file', { path: `${Setting.value('profileDir')}/log-clipper.txt` });
+		clipperLogger.addTarget('console', { console: {
+			info: stdoutFn,
+			warn: stdoutFn,
+			error: stdoutFn,
+		}});
+		ClipperServer.instance().setDispatch(() => {});
+		ClipperServer.instance().setLogger(clipperLogger);
+
+		const pidPath = `${Setting.value('profileDir')}/clipper-pid.txt`;
+		const runningOnPort = await ClipperServer.instance().isRunning();
+
+		if (command === 'start') {
+			if (runningOnPort) {
+				this.stdout(_('Server is already running on port %d', runningOnPort));
+			} else {
+				await shim.fsDriver().writeFile(pidPath, process.pid.toString(), 'utf-8');
+				await ClipperServer.instance().start(); // Never exit
+			}
+		} else if (command === 'status') {
+			this.stdout(runningOnPort ? _('Server is running on port %d', runningOnPort) : _('Server is not running.'));
+		} else if (command === 'stop') {
+			if (!runningOnPort) {
+				this.stdout(_('Server is not running.'));
+				return;
+			}
+			const pid = await shim.fsDriver().readFile(pidPath);
+			if (!pid) return;
+			process.kill(pid, 'SIGTERM');
+		}
+	}
+
+}
+
+module.exports = Command;

CliClient/app/command-set.js

@@ -3,12 +3,9 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
 const { Database } = require('lib/database.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
-const BaseItem = require('lib/models/BaseItem.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'set <note> <name> [value]';
 	}
@@ -19,7 +16,7 @@ class Command extends BaseCommand {
 		for (let i = 0; i < fields.length; i++) {
 			const f = fields[i];
 			if (f.name === 'id') continue;
-			s.push(f.name + ' (' + Database.enumName('fieldType', f.type) + ')');
+			s.push(`${f.name} (${Database.enumName('fieldType', f.type)})`);
 		}
 
 		return _('Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s', s.join(', '));
@@ -45,7 +42,6 @@ class Command extends BaseCommand {
 			await Note.save(newNote);
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-status.js

@@ -1,12 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
-const { Database } = require('lib/database.js');
 const { app } = require('./app.js');
 const Setting = require('lib/models/Setting.js');
 const { _ } = require('lib/locale.js');
 const { ReportService } = require('lib/services/report.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'status';
 	}
@@ -15,7 +13,7 @@ class Command extends BaseCommand {
 		return _('Displays summary about the notes and notebooks.');
 	}
 
-	async action(args) {
+	async action() {
 		let service = new ReportService();
 		let report = await service.status(Setting.value('sync.target'));
 
@@ -24,7 +22,7 @@ class Command extends BaseCommand {
 
 			if (i > 0) this.stdout('');
 
-			this.stdout('# ' + section.title);
+			this.stdout(`# ${section.title}`);
 			this.stdout('');
 
 			for (let n in section.body) {
@@ -34,10 +32,13 @@ class Command extends BaseCommand {
 			}
 		}
 
-		app().gui().showConsole();
-		app().gui().maximizeConsole();
+		app()
+			.gui()
+			.showConsole();
+		app()
+			.gui()
+			.maximizeConsole();
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-sync.js

@@ -3,7 +3,6 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const { OneDriveApiNodeUtils } = require('./onedrive-api-node-utils.js');
 const Setting = require('lib/models/Setting.js');
-const BaseItem = require('lib/models/BaseItem.js');
 const ResourceFetcher = require('lib/services/ResourceFetcher');
 const { Synchronizer } = require('lib/synchronizer.js');
 const { reg } = require('lib/registry.js');
@@ -14,7 +13,6 @@ const fs = require('fs-extra');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry');
 
 class Command extends BaseCommand {
-
 	constructor() {
 		super();
 		this.syncTargetId_ = null;
@@ -31,9 +29,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		return [
-			['--target <target>', _('Sync to provided target (defaults to sync.target config value)')],
-		];
+		return [['--target <target>', _('Sync to provided target (defaults to sync.target config value)')]];
 	}
 
 	static lockFile(filePath) {
@@ -66,21 +62,25 @@ class Command extends BaseCommand {
 		const syncTarget = reg.syncTarget(this.syncTargetId_);
 		const syncTargetMd = SyncTargetRegistry.idToMetadata(this.syncTargetId_);
 
-		if (this.syncTargetId_ === 3 || this.syncTargetId_ === 4) { // OneDrive
+		if (this.syncTargetId_ === 3 || this.syncTargetId_ === 4) {
+			// OneDrive
 			this.oneDriveApiUtils_ = new OneDriveApiNodeUtils(syncTarget.api());
 			const auth = await this.oneDriveApiUtils_.oauthDance({
-				log: (...s) => { return this.stdout(...s); }
+				log: (...s) => {
+					return this.stdout(...s);
+				},
 			});
 			this.oneDriveApiUtils_ = null;
-			
-			Setting.setValue('sync.' + this.syncTargetId_ + '.auth', auth ? JSON.stringify(auth) : null);
+
+			Setting.setValue(`sync.${this.syncTargetId_}.auth`, auth ? JSON.stringify(auth) : null);
 			if (!auth) {
 				this.stdout(_('Authentication was not completed (did not receive an authentication token).'));
 				return false;
 			}
 
 			return true;
-		} else if (syncTargetMd.name === 'dropbox') { // Dropbox
+		} else if (syncTargetMd.name === 'dropbox') {
+			// Dropbox
 			const api = await syncTarget.api();
 			const loginUrl = api.loginUrl();
 			this.stdout(_('To allow Joplin to synchronise with Dropbox, please follow the steps below:'));
@@ -93,7 +93,7 @@ class Command extends BaseCommand {
 			}
 
 			const response = await api.execAuthToken(authCode);
-			Setting.setValue('sync.' + this.syncTargetId_ + '.auth', response.access_token);
+			Setting.setValue(`sync.${this.syncTargetId_}.auth`, response.access_token);
 			api.setAuthToken(response.access_token);
 			return true;
 		}
@@ -117,8 +117,8 @@ class Command extends BaseCommand {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
-		const lockFilePath = require('os').tmpdir() + '/synclock_' + md5(escape(Setting.value('profileDir'))); // https://github.com/pvorb/node-md5/issues/41
-		if (!await fs.pathExists(lockFilePath)) await fs.writeFile(lockFilePath, 'synclock');
+		const lockFilePath = `${require('os').tmpdir()}/synclock_${md5(escape(Setting.value('profileDir')))}`; // https://github.com/pvorb/node-md5/issues/41
+		if (!(await fs.pathExists(lockFilePath))) await fs.writeFile(lockFilePath, 'synclock');
 
 		try {
 			if (await Command.isLocked(lockFilePath)) throw new Error(_('Synchronisation is already in progress.'));
@@ -147,22 +147,26 @@ class Command extends BaseCommand {
 
 			const syncTarget = reg.syncTarget(this.syncTargetId_);
 
-			if (!await syncTarget.isAuthenticated()) {
-				app().gui().showConsole();
-				app().gui().maximizeConsole();
+			if (!(await syncTarget.isAuthenticated())) {
+				app()
+					.gui()
+					.showConsole();
+				app()
+					.gui()
+					.maximizeConsole();
 
 				const authDone = await this.doAuth();
 				if (!authDone) return cleanUp();
 			}
-			
+
 			const sync = await syncTarget.synchronizer();
 
 			let options = {
-				onProgress: (report) => {
+				onProgress: report => {
 					let lines = Synchronizer.reportToLines(report);
 					if (lines.length) cliUtils.redraw(lines.join(' '));
 				},
-				onMessage: (msg) => {
+				onMessage: msg => {
 					cliUtils.redrawDone();
 					this.stdout(msg);
 				},
@@ -174,7 +178,7 @@ class Command extends BaseCommand {
 
 			this.stdout(_('Starting synchronisation...'));
 
-			const contextKey = 'sync.' + this.syncTargetId_ + '.context';
+			const contextKey = `sync.${this.syncTargetId_}.context`;
 			let context = Setting.value(contextKey);
 
 			context = context ? JSON.parse(context) : {};
@@ -237,7 +241,6 @@ class Command extends BaseCommand {
 	cancellable() {
 		return true;
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-tag.js

@@ -6,7 +6,6 @@ const BaseModel = require('lib/BaseModel.js');
 const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'tag <tag-command> [tag] [note]';
 	}
@@ -16,9 +15,7 @@ class Command extends BaseCommand {
 	}
 
 	options() {
-		return [
-			['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE')],
-		];
+		return [['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE')]];
 	}
 
 	async action(args) {
@@ -50,7 +47,7 @@ class Command extends BaseCommand {
 		} else if (command == 'list') {
 			if (tag) {
 				let notes = await Tag.notes(tag.id);
-				notes.map((note) => {
+				notes.map(note => {
 					let line = '';
 					if (options.long) {
 						line += BaseModel.shortId(note.id);
@@ -61,7 +58,7 @@ class Command extends BaseCommand {
 					if (note.is_todo) {
 						line += '[';
 						if (note.todo_completed) {
-						   line += 'X';
+							line += 'X';
 						} else {
 							line += ' ';
 						}
@@ -74,13 +71,14 @@ class Command extends BaseCommand {
 				});
 			} else {
 				let tags = await Tag.all();
-				tags.map((tag) => { this.stdout(tag.title); });
+				tags.map(tag => {
+					this.stdout(tag.title);
+				});
 			}
 		} else {
 			throw new Error(_('Invalid command: "%s"', command));
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-todo.js

@@ -2,12 +2,10 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'todo <todo-command> <note-pattern>';
 	}
@@ -39,12 +37,11 @@ class Command extends BaseCommand {
 				}
 			} else if (action == 'clear') {
 				toSave.is_todo = 0;
-			}			
+			}
 
 			await Note.save(toSave);
 		}
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-undone.js

@@ -1,15 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
-const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const { time } = require('lib/time-utils.js');
 
 const CommandDone = require('./command-done.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'undone <note>';
 	}
@@ -21,7 +15,6 @@ class Command extends BaseCommand {
 	async action(args) {
 		await CommandDone.handleAction(this, args, false);
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-use.js

@@ -2,10 +2,8 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'use <notebook>';
 	}
@@ -14,10 +12,6 @@ class Command extends BaseCommand {
 		return _('Switches to [notebook] - all further operations will happen within this notebook.');
 	}
 
-	autocomplete() {
-		return { data: autocompleteFolders };
-	}
-
 	compatibleUis() {
 		return ['cli'];
 	}
@@ -27,7 +21,6 @@ class Command extends BaseCommand {
 		if (!folder) throw new Error(_('Cannot find "%s".', args['notebook']));
 		app().switchCurrentFolder(folder);
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/command-version.js

@@ -3,7 +3,6 @@ const Setting = require('lib/models/Setting.js');
 const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {
-
 	usage() {
 		return 'version';
 	}
@@ -12,11 +11,10 @@ class Command extends BaseCommand {
 		return _('Displays version information');
 	}
 
-	async action(args) {
+	async action() {
 		const p = require('./package.json');
 		this.stdout(_('%s %s (%s)', p.name, p.version, Setting.value('env')));
 	}
-
 }
 
-module.exports = Command;
+module.exports = Command;

CliClient/app/gui/ConsoleWidget.js

@@ -1,7 +1,6 @@
 const TextWidget = require('tkwidgets/TextWidget.js');
 
 class ConsoleWidget extends TextWidget {
-
 	constructor() {
 		super();
 		this.lines_ = [];
@@ -16,7 +15,7 @@ class ConsoleWidget extends TextWidget {
 	}
 
 	get lastLine() {
-		return this.lines_.length ? this.lines_[this.lines_.length-1] : '';
+		return this.lines_.length ? this.lines_[this.lines_.length - 1] : '';
 	}
 
 	addLine(line) {
@@ -40,13 +39,12 @@ class ConsoleWidget extends TextWidget {
 			if (this.lines_.length > this.maxLines_) {
 				this.lines_.splice(0, this.lines_.length - this.maxLines_);
 			}
-			this.text = this.lines_.join("\n");
+			this.text = this.lines_.join('\n');
 			this.updateText_ = false;
 		}
 
 		super.render();
 	}
-
 }
 
-module.exports = ConsoleWidget;
+module.exports = ConsoleWidget;

CliClient/app/gui/FolderListWidget.js

@@ -5,7 +5,6 @@ const ListWidget = require('tkwidgets/ListWidget.js');
 const _ = require('lib/locale.js')._;
 
 class FolderListWidget extends ListWidget {
-
 	constructor() {
 		super();
 
@@ -20,19 +19,19 @@ class FolderListWidget extends ListWidget {
 		this.updateItems_ = false;
 		this.trimItemTitle = false;
 
-		this.itemRenderer = (item) => {
+		this.itemRenderer = item => {
 			let output = [];
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
 				output.push(' '.repeat(this.folderDepth(this.folders, item.id)) + Folder.displayTitle(item));
 			} else if (item.type_ === Tag.modelType()) {
-				output.push('[' + Folder.displayTitle(item) + ']');
+				output.push(`[${Folder.displayTitle(item)}]`);
 			} else if (item.type_ === BaseModel.TYPE_SEARCH) {
 				output.push(_('Search:'));
 				output.push(item.title);
 			}
-			
+
 			return output.join(' ');
 		};
 	}
@@ -45,7 +44,6 @@ class FolderListWidget extends ListWidget {
 			output++;
 			folderId = folder.parent_id;
 		}
-		throw new Error('unreachable');
 	}
 
 	get selectedFolderId() {
@@ -54,7 +52,7 @@ class FolderListWidget extends ListWidget {
 
 	set selectedFolderId(v) {
 		this.selectedFolderId_ = v;
-		this.updateIndexFromSelectedItemId()
+		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
@@ -64,7 +62,7 @@ class FolderListWidget extends ListWidget {
 
 	set selectedSearchId(v) {
 		this.selectedSearchId_ = v;
-		this.updateIndexFromSelectedItemId()
+		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
@@ -74,7 +72,7 @@ class FolderListWidget extends ListWidget {
 
 	set selectedTagId(v) {
 		this.selectedTagId_ = v;
-		this.updateIndexFromSelectedItemId()
+		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
@@ -84,7 +82,7 @@ class FolderListWidget extends ListWidget {
 
 	set notesParentType(v) {
 		this.notesParentType_ = v;
-		this.updateIndexFromSelectedItemId()
+		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
@@ -95,7 +93,7 @@ class FolderListWidget extends ListWidget {
 	set searches(v) {
 		this.searches_ = v;
 		this.updateItems_ = true;
-		this.updateIndexFromSelectedItemId()
+		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
@@ -106,7 +104,7 @@ class FolderListWidget extends ListWidget {
 	set tags(v) {
 		this.tags_ = v;
 		this.updateItems_ = true;
-		this.updateIndexFromSelectedItemId()
+		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
@@ -117,7 +115,7 @@ class FolderListWidget extends ListWidget {
 	set folders(v) {
 		this.folders_ = v;
 		this.updateItems_ = true;
-		this.updateIndexFromSelectedItemId()
+		this.updateIndexFromSelectedItemId();
 		this.invalidate();
 	}
 
@@ -128,7 +126,7 @@ class FolderListWidget extends ListWidget {
 		}
 		return false;
 	}
-	
+
 	render() {
 		if (this.updateItems_) {
 			this.logger().debug('Rebuilding items...', this.notesParentType, this.selectedJoplinItemId, this.selectedSearchId);
@@ -136,7 +134,7 @@ class FolderListWidget extends ListWidget {
 			const previousParentType = this.notesParentType;
 
 			let newItems = [];
-			const orderFolders = (parentId) => {
+			const orderFolders = parentId => {
 				for (let i = 0; i < this.folders.length; i++) {
 					const f = this.folders[i];
 					const folderParentId = f.parent_id ? f.parent_id : '';
@@ -145,7 +143,7 @@ class FolderListWidget extends ListWidget {
 						if (this.folderHasChildren_(this.folders, f.id)) orderFolders(f.id);
 					}
 				}
-			}
+			};
 
 			orderFolders('');
 
@@ -162,7 +160,7 @@ class FolderListWidget extends ListWidget {
 			this.items = newItems;
 
 			this.notesParentType = previousParentType;
-			this.updateIndexFromSelectedItemId(wasSelectedItemId)
+			this.updateIndexFromSelectedItemId(wasSelectedItemId);
 			this.updateItems_ = false;
 		}
 
@@ -174,7 +172,7 @@ class FolderListWidget extends ListWidget {
 		if (this.notesParentType === 'Folder') return this.selectedFolderId;
 		if (this.notesParentType === 'Tag') return this.selectedTagId;
 		if (this.notesParentType === 'Search') return this.selectedSearchId;
-		throw new Error('Unknown parent type: ' + this.notesParentType);
+		throw new Error(`Unknown parent type: ${this.notesParentType}`);
 	}
 
 	get selectedJoplinItem() {
@@ -188,7 +186,6 @@ class FolderListWidget extends ListWidget {
 		const index = this.itemIndexByKey('id', itemId);
 		this.currentIndex = index >= 0 ? index : 0;
 	}
-
 }
 
-module.exports = FolderListWidget;
+module.exports = FolderListWidget;

CliClient/app/gui/NoteListWidget.js

@@ -2,17 +2,16 @@ const Note = require('lib/models/Note.js');
 const ListWidget = require('tkwidgets/ListWidget.js');
 
 class NoteListWidget extends ListWidget {
-
 	constructor() {
 		super();
 		this.selectedNoteId_ = 0;
 
 		this.updateIndexFromSelectedNoteId_ = false;
 
-		this.itemRenderer = (note) => {
+		this.itemRenderer = note => {
 			let label = Note.displayTitle(note); // + ' ' + note.id;
 			if (note.is_todo) {
-				label = '[' + (note.todo_completed ? 'X' : ' ') + '] ' + label;
+				label = `[${note.todo_completed ? 'X' : ' '}] ${label}`;
 			}
 			return label;
 		};
@@ -32,7 +31,6 @@ class NoteListWidget extends ListWidget {
 
 		super.render();
 	}
-
 }
 
-module.exports = NoteListWidget;
+module.exports = NoteListWidget;

CliClient/app/gui/NoteMetadataWidget.js

@@ -2,7 +2,6 @@ const Note = require('lib/models/Note.js');
 const TextWidget = require('tkwidgets/TextWidget.js');
 
 class NoteMetadataWidget extends TextWidget {
-
 	constructor() {
 		super();
 		this.noteId_ = 0;
@@ -30,7 +29,6 @@ class NoteMetadataWidget extends TextWidget {
 			this.text = this.note_ ? await Note.minimalSerializeForDisplay(this.note_) : '';
 		}
 	}
-
 }
 
-module.exports = NoteMetadataWidget;
+module.exports = NoteMetadataWidget;

CliClient/app/gui/NoteWidget.js

@@ -3,7 +3,6 @@ const TextWidget = require('tkwidgets/TextWidget.js');
 const { _ } = require('lib/locale.js');
 
 class NoteWidget extends TextWidget {
-
 	constructor() {
 		super();
 		this.noteId_ = 0;
@@ -44,11 +43,11 @@ class NoteWidget extends TextWidget {
 		} else if (this.noteId_) {
 			this.doAsync('loadNote', async () => {
 				this.note_ = await Note.load(this.noteId_);
-				
+
 				if (this.note_ && this.note_.encryption_applied) {
 					this.text = _('One or more items are currently encrypted and you may need to supply a master password. To do so please type `e2ee decrypt`. If you have already supplied the password, the encrypted items are being decrypted in the background and will be available soon.');
 				} else {
-					this.text = this.note_ ? this.note_.title + "\n\n" + this.note_.body : '';
+					this.text = this.note_ ? `${this.note_.title}\n\n${this.note_.body}` : '';
 				}
 
 				if (this.lastLoadedNoteId_ !== this.noteId_) this.scrollTop = 0;
@@ -59,7 +58,6 @@ class NoteWidget extends TextWidget {
 			this.scrollTop = 0;
 		}
 	}
-
 }
 
-module.exports = NoteWidget;
+module.exports = NoteWidget;

CliClient/app/gui/StatusBarWidget.js

@@ -5,7 +5,6 @@ const stripAnsi = require('strip-ansi');
 const { handleAutocompletion } = require('../autocompletion.js');
 
 class StatusBarWidget extends BaseWidget {
-
 	constructor() {
 		super();
 
@@ -75,7 +74,7 @@ class StatusBarWidget extends BaseWidget {
 		super.render();
 
 		const doSaveCursor = !this.promptActive;
-		
+
 		if (doSaveCursor) this.term.saveCursor();
 
 		this.innerClear();
@@ -87,14 +86,13 @@ class StatusBarWidget extends BaseWidget {
 
 		//const textStyle = this.promptActive ? (s) => s : chalk.bgBlueBright.white;
 		//const textStyle = (s) => s;
-		const textStyle = this.promptActive ? (s) => s : chalk.gray;
+		const textStyle = this.promptActive ? s => s : chalk.gray;
 
 		this.term.drawHLine(this.absoluteInnerX, this.absoluteInnerY, this.innerWidth, textStyle(' '));
 
 		this.term.moveTo(this.absoluteInnerX, this.absoluteInnerY);
 
 		if (this.promptActive) {
-
 			this.term.write(textStyle(this.promptState_.promptString));
 
 			if (this.inputEventEmitter_) {
@@ -113,8 +111,8 @@ class StatusBarWidget extends BaseWidget {
 				history: this.history,
 				default: this.promptState_.initialText,
 				autoComplete: handleAutocompletion,
-				autoCompleteHint : true,
-				autoCompleteMenu : true,
+				autoCompleteHint: true,
+				autoCompleteMenu: true,
 			};
 
 			if ('cursorPosition' in this.promptState_) options.cursorPosition = this.promptState_.cursorPosition;
@@ -153,19 +151,15 @@ class StatusBarWidget extends BaseWidget {
 				// Only callback once everything has been cleaned up and reset
 				resolveFn(resolveResult);
 			});
-
 		} else {
-
 			for (let i = 0; i < this.items_.length; i++) {
 				const s = this.items_[i].substr(0, this.innerWidth - 1);
 				this.term.write(textStyle(s));
 			}
-
 		}
 
 		if (doSaveCursor) this.term.restoreCursor();
 	}
-
 }
 
 module.exports = StatusBarWidget;

CliClient/app/help-utils.js

@@ -1,10 +1,7 @@
-const fs = require('fs-extra');
 const { wrap } = require('lib/string-utils.js');
 const Setting = require('lib/models/Setting.js');
-const { fileExtension, basename, dirname } = require('lib/path-utils.js');
-const { _, setLocale, languageCode } = require('lib/locale.js');
+const { _ } = require('lib/locale.js');
 
-const rootDir = dirname(dirname(__dirname));
 const MAX_WIDTH = 78;
 const INDENT = '    ';
 
@@ -16,14 +13,14 @@ function renderTwoColumnData(options, baseIndent, width) {
 		let option = options[i];
 		const flag = option[0];
 		const indent = baseIndent + INDENT + ' '.repeat(optionColWidth + 2);
-		
+
 		let r = wrap(option[1], indent, width);
 		r = r.substr(flag.length + (baseIndent + INDENT).length);
 		r = baseIndent + INDENT + flag + r;
 		output.push(r);
 	}
 
-	return output.join("\n");
+	return output.join('\n');
 }
 
 function renderCommandHelp(cmd, width = null) {
@@ -44,7 +41,7 @@ function renderCommandHelp(cmd, width = null) {
 	}
 
 	if (cmd.name() === 'config') {
-		const renderMetadata = (md) => {
+		const renderMetadata = md => {
 			let desc = [];
 
 			if (md.label) {
@@ -63,17 +60,17 @@ function renderCommandHelp(cmd, width = null) {
 
 			if ('value' in md) {
 				if (md.type === Setting.TYPE_STRING) {
-					defaultString = md.value ? '"' + md.value + '"' : null;
+					defaultString = md.value ? `"${md.value}"` : null;
 				} else if (md.type === Setting.TYPE_INT) {
 					defaultString = (md.value ? md.value : 0).toString();
 				} else if (md.type === Setting.TYPE_BOOL) {
-					defaultString = (md.value === true ? 'true' : 'false');
+					defaultString = md.value === true ? 'true' : 'false';
 				}
 			}
-			
+
 			if (defaultString !== null) desc.push(_('Default: %s', defaultString));
 
-			return [md.key, desc.join("\n")];
+			return [md.key, desc.join('\n')];
 		};
 
 		output.push('');
@@ -83,7 +80,7 @@ function renderCommandHelp(cmd, width = null) {
 		let keysValues = [];
 		const keys = Setting.keys(true, 'cli');
 		for (let i = 0; i < keys.length; i++) {
-			if (keysValues.length) keysValues.push(['','']);
+			if (keysValues.length) keysValues.push(['', '']);
 			const md = Setting.settingMetadata(keys[i]);
 			if (!md.label) continue;
 			keysValues.push(renderMetadata(md));
@@ -91,8 +88,8 @@ function renderCommandHelp(cmd, width = null) {
 
 		output.push(renderTwoColumnData(keysValues, baseIndent, width));
 	}
-	
-	return output.join("\n");
+
+	return output.join('\n');
 }
 
 function getOptionColWidth(options) {
@@ -104,4 +101,4 @@ function getOptionColWidth(options) {
 	return output;
 }
 
-module.exports = { renderCommandHelp };
+module.exports = { renderCommandHelp };

CliClient/app/main.js

@@ -9,7 +9,7 @@ require('app-module-path').addPath(__dirname);
 const compareVersion = require('compare-version');
 const nodeVersion = process && process.versions && process.versions.node ? process.versions.node : '0.0.0';
 if (compareVersion(nodeVersion, '8.0.0') < 0) {
-	console.error('Joplin requires Node 8+. Detected version ' + nodeVersion);
+	console.error(`Joplin requires Node 8+. Detected version ${nodeVersion}`);
 	process.exit(1);
 }
 
@@ -53,25 +53,25 @@ shimInit();
 
 const application = app();
 
-if (process.platform === "win32") {
-	var rl = require("readline").createInterface({
+if (process.platform === 'win32') {
+	var rl = require('readline').createInterface({
 		input: process.stdin,
-		output: process.stdout
+		output: process.stdout,
 	});
 
-	rl.on("SIGINT", function () {
-		process.emit("SIGINT");
+	rl.on('SIGINT', function() {
+		process.emit('SIGINT');
 	});
 }
 
-process.stdout.on('error', function( err ) {
+process.stdout.on('error', function(err) {
 	// https://stackoverflow.com/questions/12329816/error-write-epipe-when-piping-node-output-to-head#15884508
-	if (err.code == "EPIPE") {
+	if (err.code == 'EPIPE') {
 		process.exit(0);
 	}
 });
 
-application.start(process.argv).catch((error) => {
+application.start(process.argv).catch(error => {
 	if (error.code == 'flagError') {
 		console.error(error.message);
 		console.error(_('Type `joplin help` for usage information.'));
@@ -81,4 +81,4 @@ application.start(process.argv).catch((error) => {
 	}
 
 	process.exit(1);
-});
+});

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

@@ -1,13 +1,11 @@
 const { _ } = require('lib/locale.js');
 const { netUtils } = require('lib/net-utils.js');
 
-const http = require("http");
-const urlParser = require("url");
-const FormData = require('form-data');
+const http = require('http');
+const urlParser = require('url');
 const enableServerDestroy = require('server-destroy');
 
 class OneDriveApiNodeUtils {
-
 	constructor(api) {
 		this.api_ = api;
 		this.oauthServer_ = null;
@@ -46,9 +44,9 @@ class OneDriveApiNodeUtils {
 		const port = await netUtils.findAvailablePort(this.possibleOAuthDancePorts(), 0);
 		if (!port) throw new Error(_('All potential ports are in use - please report the issue at %s', 'https://github.com/laurent22/joplin'));
 
-		let authCodeUrl = this.api().authCodeUrl('http://localhost:' + port);
+		let authCodeUrl = this.api().authCodeUrl(`http://localhost:${port}`);
 
-		return new Promise((resolve, reject) => {			
+		return new Promise((resolve, reject) => {
 			this.oauthServer_ = http.createServer();
 			let errorMessage = null;
 
@@ -56,7 +54,7 @@ class OneDriveApiNodeUtils {
 				const url = urlParser.parse(request.url, true);
 
 				if (url.pathname === '/auth') {
-					response.writeHead(302, { 'Location': authCodeUrl });
+					response.writeHead(302, { Location: authCodeUrl });
 					response.end();
 					return;
 				}
@@ -64,10 +62,10 @@ class OneDriveApiNodeUtils {
 				const query = url.query;
 
 				const writeResponse = (code, message) => {
-					response.writeHead(code, {"Content-Type": "text/html"});
+					response.writeHead(code, { 'Content-Type': 'text/html' });
 					response.write(this.makePage(message));
 					response.end();
-				}
+				};
 
 				// After the response has been received, don't destroy the server right
 				// away or the browser might display a connection reset error (even
@@ -77,21 +75,24 @@ class OneDriveApiNodeUtils {
 						this.oauthServer_.destroy();
 						this.oauthServer_ = null;
 					}, 1000);
-				}
+				};
 
 				if (!query.code) return writeResponse(400, '"code" query parameter is missing');
 
-				this.api().execTokenRequest(query.code, 'http://localhost:' + port.toString()).then(() => {
-					writeResponse(200, _('The application has been authorised - you may now close this browser tab.'));
-					targetConsole.log('');
-					targetConsole.log(_('The application has been successfully authorised.'));
-					waitAndDestroy();
-				}).catch((error) => {
-					writeResponse(400, error.message);
-					targetConsole.log('');
-					targetConsole.log(error.message);
-					waitAndDestroy();
-				});
+				this.api()
+					.execTokenRequest(query.code, `http://localhost:${port.toString()}`)
+					.then(() => {
+						writeResponse(200, _('The application has been authorised - you may now close this browser tab.'));
+						targetConsole.log('');
+						targetConsole.log(_('The application has been successfully authorised.'));
+						waitAndDestroy();
+					})
+					.catch(error => {
+						writeResponse(400, error.message);
+						targetConsole.log('');
+						targetConsole.log(error.message);
+						waitAndDestroy();
+					});
 			});
 
 			this.oauthServer_.on('close', () => {
@@ -113,10 +114,9 @@ class OneDriveApiNodeUtils {
 
 			targetConsole.log(_('Please open the following URL in your browser to authenticate the application. The application will create a directory in "Apps/Joplin" and will only read and write files in this directory. It will have no access to any files outside this directory nor to any other personal data. No data will be shared with any third party.'));
 			targetConsole.log('');
-			targetConsole.log('http://127.0.0.1:' + port + '/auth');
+			targetConsole.log(`http://127.0.0.1:${port}/auth`);
 		});
 	}
-
 }
 
-module.exports = { OneDriveApiNodeUtils };
+module.exports = { OneDriveApiNodeUtils };

CliClient/build.sh

@@ -5,5 +5,6 @@ BUILD_DIR="$ROOT_DIR/build"
 
 rsync -a --exclude "node_modules/" "$ROOT_DIR/app/" "$BUILD_DIR/"
 rsync -a --delete "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
+rsync -a --delete "$ROOT_DIR/../ReactNativeClient/locales/" "$BUILD_DIR/locales/"
 cp "$ROOT_DIR/package.json" "$BUILD_DIR"
 chmod 755 "$BUILD_DIR/main.js"

CliClient/locales/ar.po

@@ -169,16 +169,6 @@ msgstr "لا يوجد دفتر ملاحظات نشط."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "الملاحظة: \"%s\" غير موجودة. تريد إنشائها؟"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "بدء تحرير الملاحظة. أغلق المحرر للعودة إلى المحث."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "حدث خطأ أثناء فتح الملاحظة: %s في المحرر"
-
-msgid "Note has been saved."
-msgstr "تم حفظ الملاحظة."
-
 msgid "Exits the application."
 msgstr "الخروج من التطبيق."
 
@@ -385,6 +375,23 @@ msgstr "حذف الملاحظة؟"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "يبحث عن الـ <pattern> (نمط) المعطى في كل الملاحظات."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -517,10 +524,6 @@ msgstr "أكتب `joplin help` لمعلومات الاستخدام."
 msgid "Fatal error:"
 msgstr "خطأ فادح:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "تم التصريح للتطبيق - يمكنك الآن إغلاق تبويب المستعرض هذا."
@@ -572,74 +575,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "التصدير إلى \"%s\" بتنسيق \"%s\". فضلاً انتظر..."
 
-msgid "Sidebar"
-msgstr "الشريط الجانبي"
-
-msgid "Note list"
-msgstr "قائمة ملاحظات"
-
-msgid "Note title"
-msgstr "عنوان الملاحظة"
-
-msgid "Note body"
-msgstr "متن الملاحظة"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "الاستيراد من \"%s\" بتنسيق \"%s\". فضلاً انتظر..."
-
-msgid "PDF File"
-msgstr "ملف PDF"
-
-msgid "Synchronisation status"
-msgstr "حالة المزامنة"
-
-msgid "New note"
-msgstr "ملاحظة جديدة"
-
-msgid "New to-do"
-msgstr "قائمة جديدة للمهام"
-
-msgid "New notebook"
-msgstr "دفتر ملاحظات جديد"
-
-msgid "Print"
-msgstr "اطبع"
-
-msgid "General Options"
-msgstr "الخيارات العامة"
-
-msgid "Encryption options"
-msgstr "خيارات التشفير"
-
-msgid "Web clipper options"
-msgstr "خيارات Web clipper"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "إدراج التاريخ والوقت"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "دليل تصدير بيانات Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&ملف"
 
@@ -737,6 +672,10 @@ msgstr "م&ساعدة"
 msgid "Website and documentation"
 msgstr "موقع الويب و التوثيق"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin نسخة %s"
+
 msgid "Make a donation"
 msgstr "تبرَّع"
 
@@ -845,6 +784,9 @@ msgstr ""
 "هذا الرمز المميز للتصريح مطلوب فقط للسماح لتطبيقات طرف ثالث للوصول إلى "
 "Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "الملاحظات و الإعدادات مخزّنة في: %s"
@@ -855,6 +797,9 @@ msgstr "فحص ضبط المزامنة"
 msgid "Browse..."
 msgstr "استعراض..."
 
+msgid "Back"
+msgstr "عودة"
+
 msgid "Apply"
 msgstr "تطبيق"
 
@@ -935,8 +880,8 @@ msgstr ""
 "فيما بعد عبر المزامنة."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "يرجى الرجوع إلى التوثيق للمزيد من المعلومات عن التشفير من الطرف للطرف (E2EE) "
 "و طرق تفعيله."
@@ -947,12 +892,18 @@ msgstr "الحالة"
 msgid "Encryption is:"
 msgstr "التشفير هو:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "الاستخدام"
 
-msgid "Back"
-msgstr "عودة"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -982,6 +933,15 @@ msgstr "ضبط منبّه:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "ملاحظة جديدة"
+
+msgid "New to-do"
+msgstr "قائمة جديدة للمهام"
+
+msgid "New notebook"
+msgstr "دفتر ملاحظات جديد"
+
 msgid "Layout"
 msgstr "تخطيط"
 
@@ -1078,6 +1038,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "يمكن طباعة ملاحظة واحدة فقط أو تصديرها إلى PDF كل مرة."
 
+msgid "PDF File"
+msgstr "ملف PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "حدث خطأ أثناء فتح الملاحظة: %s في المحرر"
+
 msgid "strong text"
 msgstr "نص مشدَّد"
 
@@ -1152,12 +1119,6 @@ msgstr "خيارات"
 msgid "Synchronisation Status"
 msgstr "حالة المزامنة"
 
-msgid "Encryption Options"
-msgstr "خيارات التشفير"
-
-msgid "Clipper Options"
-msgstr "خيارات Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1181,6 +1142,17 @@ msgstr "حذف"
 msgid "Rename"
 msgstr "إعادة تسمية"
 
+msgid "Notebooks"
+msgstr "دفاتر ملاحظات"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "فك تشفير العناصر: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "جلب الموارد: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "فضلاً اختر أين سيتم تصدير حالة المزامنة"
 
@@ -1337,10 +1309,6 @@ msgstr "قيد التقدم"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "المزامنة قيد التقدم بالفعل. الحال: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "مشفّر"
 
@@ -1456,10 +1424,10 @@ msgstr "فاتحة"
 msgid "Dark"
 msgstr "غامقة"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1530,6 +1498,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "إظهار أيقونة لوحة النظام"
 
@@ -1553,6 +1524,10 @@ msgstr "نسبة التكبير العمومية"
 msgid "Editor font size"
 msgstr "حجم خط المحرّر"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "حجم خط المحرّر"
+
 msgid "Editor font family"
 msgstr "نوع خط المحرّر"
 
@@ -1615,6 +1590,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "تجاهل أخطاء شهادات TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "تفعيل التشفير"
@@ -1651,6 +1636,14 @@ msgstr ""
 msgid "Application"
 msgstr "التطبيق"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "التشفير هو:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "خيارات Web clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "الوسم \"%s\" موجود بالفعل. فضلاً إختر اسماً مختلفاً."
@@ -1664,7 +1657,12 @@ msgstr "تنسيق Markdown"
 msgid "Joplin Export Directory"
 msgstr "دليل تصدير بيانات Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "ملف Evernote المصدَّر"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "ملف Evernote المصدَّر"
 
 msgid "Json Export Directory"
@@ -1770,6 +1768,14 @@ msgstr "الإذن باستخدام الكاميرا"
 msgid "Your permission to use your camera is required."
 msgstr "إذنك باستخدام كاميرا الجوال مطلوب."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "لا يوجد دفتر ملاحظات نشط."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "ينشئ دفتر ملاحظات جديد."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "لا توجد ملاحظات حالياً. أنشئ واحدة بالضغط على زر (+)."
 
@@ -1813,21 +1819,10 @@ msgstr "دفتر ملاحظات جديد"
 msgid "Configuration"
 msgstr "الضبط"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "فك تشفير العناصر: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "جلب الموارد: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "ملاحظة"
 
-msgid "Notebooks"
-msgstr "دفاتر ملاحظات"
-
 msgid "Checking... Please wait."
 msgstr "التحقق جارٍ... فضلاً انتظر."
 
@@ -1874,10 +1869,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "الضبط"
-
 msgid "Encryption Config"
 msgstr "ضبط التشفير"
 
@@ -2065,6 +2056,64 @@ msgstr "تسجيل الدخول عبر OneDrive"
 msgid "Search"
 msgstr "بحث"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "بدء تحرير الملاحظة. أغلق المحرر للعودة إلى المحث."
+
+#~ msgid "Note has been saved."
+#~ msgstr "تم حفظ الملاحظة."
+
+#~ msgid "Sidebar"
+#~ msgstr "الشريط الجانبي"
+
+#~ msgid "Note list"
+#~ msgstr "قائمة ملاحظات"
+
+#~ msgid "Note title"
+#~ msgstr "عنوان الملاحظة"
+
+#~ msgid "Note body"
+#~ msgstr "متن الملاحظة"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "الاستيراد من \"%s\" بتنسيق \"%s\". فضلاً انتظر..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "حالة المزامنة"
+
+#~ msgid "Print"
+#~ msgstr "اطبع"
+
+#~ msgid "General Options"
+#~ msgstr "الخيارات العامة"
+
+#~ msgid "Encryption options"
+#~ msgstr "خيارات التشفير"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "إدراج التاريخ والوقت"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "دليل تصدير بيانات Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "خيارات التشفير"
+
+#~ msgid "Clipper Options"
+#~ msgstr "خيارات Clipper"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "الضبط"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "الإذن باستخدام الكاميرا"
@@ -2110,6 +2159,3 @@ msgstr "بحث"
 
 #~ msgid "Remove?"
 #~ msgstr "إزالة ؟"
-
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin نسخة %s"

CliClient/locales/bg_BG.po

@@ -174,18 +174,6 @@ msgstr "Няма активна тетрадка."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Бележката не съществува:\"%s\". Да я създам ли?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Започваме редакция на бележката. Затворете редактора за да се върнете към "
-"командния ред."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Грешка при отварянето на бележката в редактор: %s"
-
-msgid "Note has been saved."
-msgstr "Бележката бе запазена."
-
 msgid "Exits the application."
 msgstr "Напуска приложението."
 
@@ -392,6 +380,23 @@ msgstr "Да изтрия ли бележката?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Търси всред всички бележки за зададения <шаблон>."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -531,10 +536,6 @@ msgstr "Въведете `joplin help` за информация за употр
 msgid "Fatal error:"
 msgstr "Фатална грешка:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Приложението бе оторизирано - може да затворите таба в браузъра."
@@ -589,74 +590,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Експортирам към \"%s\" във формат \"%s\". Моля изчакайте..."
 
-msgid "Sidebar"
-msgstr "Страничен панел"
-
-msgid "Note list"
-msgstr "Списък бележки"
-
-msgid "Note title"
-msgstr "Заглавие на бележката"
-
-msgid "Note body"
-msgstr "Съдържание на бележката"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Импортирам от \"%s\" във формат \"%s\". Моля изчакайте..."
-
-msgid "PDF File"
-msgstr "PDF файл"
-
-msgid "Synchronisation status"
-msgstr "Състояние на синхронизацията"
-
-msgid "New note"
-msgstr "Нова бележка"
-
-msgid "New to-do"
-msgstr "Нова задача"
-
-msgid "New notebook"
-msgstr "Нова тетрадка"
-
-msgid "Print"
-msgstr "Принтиране"
-
-msgid "General Options"
-msgstr "Общи настройки"
-
-msgid "Encryption options"
-msgstr "Настройки за криптиране"
-
-msgid "Web clipper options"
-msgstr "Настройки на уеб клипера"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Постави датата и часа"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin експорт директория"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "Файл(&F)"
 
@@ -754,6 +687,10 @@ msgstr "Помощ (&H)"
 msgid "Website and documentation"
 msgstr "Уебсайт и документация"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin експорт файл"
+
 msgid "Make a donation"
 msgstr "Искам да направя дарение"
 
@@ -866,6 +803,9 @@ msgstr ""
 "Оторизационният жетон е необходим само ако искате да дадете достъп до Joplin "
 "на приложения от трети страни."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Бележките и настройките са запазени в: %s"
@@ -876,6 +816,9 @@ msgstr "Провери настройките за синхронизация"
 msgid "Browse..."
 msgstr "Търсене..."
 
+msgid "Back"
+msgstr "Назад"
+
 msgid "Apply"
 msgstr "Приложи"
 
@@ -958,8 +901,8 @@ msgstr ""
 "ще бъдат свалени тепърва чрез синхронизация."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "За повече информация относно криптирането от край до край (E2EE) и за съвети "
 "относно как да го пуснете, вижте документацията:"
@@ -970,12 +913,18 @@ msgstr "Статус"
 msgid "Encryption is:"
 msgstr "Криптирането е:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Употреба"
 
-msgid "Back"
-msgstr "Назад"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1006,6 +955,15 @@ msgstr "Задаване на аларма:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Нова бележка"
+
+msgid "New to-do"
+msgstr "Нова задача"
+
+msgid "New notebook"
+msgstr "Нова тетрадка"
+
 msgid "Layout"
 msgstr "Разположеня"
 
@@ -1107,6 +1065,13 @@ msgstr ""
 "Принтирането и експортирането към PDF не може да бъде извършено с повече от "
 "една бележка."
 
+msgid "PDF File"
+msgstr "PDF файл"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Грешка при отварянето на бележката в редактор: %s"
+
 msgid "strong text"
 msgstr "силно наблегнат текст"
 
@@ -1181,12 +1146,6 @@ msgstr "Конфигурация"
 msgid "Synchronisation Status"
 msgstr "Статус на синхронизацията"
 
-msgid "Encryption Options"
-msgstr "Конфигурация на криптирането"
-
-msgid "Clipper Options"
-msgstr "Конфигурация на клипера"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1210,6 +1169,17 @@ msgstr "Изтрий"
 msgid "Rename"
 msgstr "Преименувай"
 
+msgid "Notebooks"
+msgstr "Тетрадки"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Декриптиране на обекти: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Взимане на ресурси: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Моля изберете къде да бъде експортиран статуса на синхронизацията"
 
@@ -1368,11 +1338,6 @@ msgstr "В момента върви"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизация вече се извършва. Статус: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Неизвестен тип на свален обект - моля обновете Joplin до най-новата версия"
-
 msgid "Encrypted"
 msgstr "Криптирана"
 
@@ -1492,10 +1457,10 @@ msgstr "Светла"
 msgid "Dark"
 msgstr "Тъмна"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1564,6 +1529,10 @@ msgstr "Пусни синтаксис ++вметка++"
 msgid "Enable multimarkdown table extension"
 msgstr "Пусни разширението за multimarkdown таблици"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Пусни синтаксис ~ниско~"
+
 msgid "Show tray icon"
 msgstr "Покажи иконка до часовника"
 
@@ -1588,6 +1557,10 @@ msgstr "Процент за глобално уголемяване"
 msgid "Editor font size"
 msgstr "Размер на шрифта на редактора"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Размер на шрифта на редактора"
+
 msgid "Editor font family"
 msgstr "Шрифт на редактора"
 
@@ -1654,6 +1627,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Игнорирай грешки в TLS сертификати"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "Пусни история за бележките"
 
@@ -1690,6 +1673,14 @@ msgstr "Разширения"
 msgid "Application"
 msgstr "Приложение"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Криптирането е:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Настройки на уеб клипера"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Тагът \"%s\" вече съществува. Моля изберете друго име."
@@ -1703,7 +1694,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin експорт директория"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote експорт файл"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote експорт файл"
 
 msgid "Json Export Directory"
@@ -1812,6 +1808,14 @@ msgstr "Разрешение за употреба на камерата"
 msgid "Your permission to use your camera is required."
 msgstr "Трябва да разрешените употребата на камерата."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Няма активна тетрадка."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Създава нова тетрадка."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "В момента няма бележки. Натиснете бутон (+) за да създадете бележка."
 
@@ -1855,21 +1859,10 @@ msgstr "Нова тетрадка"
 msgid "Configuration"
 msgstr "Настройки"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Декриптиране на обекти: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Взимане на ресурси: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "бележка"
 
-msgid "Notebooks"
-msgstr "Тетрадки"
-
 msgid "Checking... Please wait."
 msgstr "Проверявам... Моля изчакайте."
 
@@ -1919,10 +1912,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Още информация"
-
 msgid "Encryption Config"
 msgstr "Настройки за криптиране"
 
@@ -2113,6 +2102,71 @@ msgstr "Вписване в OneDrive"
 msgid "Search"
 msgstr "Търсене"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Започваме редакция на бележката. Затворете редактора за да се върнете към "
+#~ "командния ред."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Бележката бе запазена."
+
+#~ msgid "Sidebar"
+#~ msgstr "Страничен панел"
+
+#~ msgid "Note list"
+#~ msgstr "Списък бележки"
+
+#~ msgid "Note title"
+#~ msgstr "Заглавие на бележката"
+
+#~ msgid "Note body"
+#~ msgstr "Съдържание на бележката"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Импортирам от \"%s\" във формат \"%s\". Моля изчакайте..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Състояние на синхронизацията"
+
+#~ msgid "Print"
+#~ msgstr "Принтиране"
+
+#~ msgid "General Options"
+#~ msgstr "Общи настройки"
+
+#~ msgid "Encryption options"
+#~ msgstr "Настройки за криптиране"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Постави датата и часа"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin експорт директория"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Конфигурация на криптирането"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Конфигурация на клипера"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Неизвестен тип на свален обект - моля обновете Joplin до най-новата версия"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Още информация"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Разрешение за употреба на камерата"

CliClient/locales/ca.po

@@ -1,14 +1,17 @@
 # Catalan Joplin Translation.
-# Copyright (C) 2018 Joan Montané
+# Copyright (C) 2019 Joan Montané, Josep Maria Planell
 # This file is distributed under the same license as the Joplin-CLI package.
-# Joan Montané <jmontane@softcatala.org>, 2018.
+#
+# Translators:
+# Josep Maria Planell <planell.josep@gmail.com>, 2019
+# Joan Montané <jmontane@softcatala.org>, 2019
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: jmontane, 2018\n"
+"Last-Translator: jmontane, 2019\n"
 "Language-Team: jmontane@softcatala.org\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +68,7 @@ msgstr "No es pot canviar l'element xifrat"
 
 #, javascript-format
 msgid "Missing required argument: %s"
-msgstr "Manca un argument requerit: 1%s"
+msgstr "Manca un argument requerit: %s"
 
 #, javascript-format
 msgid "%s: %s"
@@ -175,18 +178,6 @@ msgstr "No hi ha cap bloc de notes actiu."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "No existeix «%s». Voleu crear-lo?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"S'està iniciant l'edició del a nota. Tanqueu l'editor per a tornar a "
-"l'indicador."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "S'ha produït un error en obrir la nota amb l'editor: %s"
-
-msgid "Note has been saved."
-msgstr "S'ha desat la nota."
-
 msgid "Exits the application."
 msgstr "Surt de l'aplicació"
 
@@ -287,7 +278,7 @@ msgstr "Creades: %d."
 
 #, javascript-format
 msgid "Updated: %d."
-msgstr "Acualitzades: %d."
+msgstr "Actualitzades: %d."
 
 #, javascript-format
 msgid "Skipped: %d."
@@ -394,6 +385,23 @@ msgstr "Voleu suprimir la nota?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Cerca el patró <pattern> en totes les notes."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -474,8 +482,9 @@ msgid ""
 "`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 "
-"[tag] de la [nota], o per a llistar les notes associades amb [tag]. L'ordre "
-"«tag list» es pot usar per a llistar totes les etiquetes."
+"l'[etiqueta] de la [nota], o per a llistar les notes associades amb "
+"l'[etiqueta]. L'ordre «tag list» es pot usar per a llistar totes les "
+"etiquetes."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -534,10 +543,6 @@ msgstr "Escriviu «joplin help» per a obtenir informació d'ús."
 msgid "Fatal error:"
 msgstr "Error fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -594,75 +599,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "S'està exportant a «%s» com a format «%s». Espereu..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Títol del bloc de notes:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Blocs de notes"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "S'està important des de «%s» com a format «%s». Espereu..."
-
-msgid "PDF File"
-msgstr "Fitxer PDF"
-
-msgid "Synchronisation status"
-msgstr "Estat de la sincronització"
-
-msgid "New note"
-msgstr "Nota nova"
-
-msgid "New to-do"
-msgstr "Llistat de tasques pendents nou"
-
-msgid "New notebook"
-msgstr "Bloc de notes nou"
-
-msgid "Print"
-msgstr "Imprimeix"
-
-msgid "General Options"
-msgstr "Opcions generals"
-
-msgid "Encryption options"
-msgstr "Opcions del xifratge"
-
-msgid "Web clipper options"
-msgstr "Opcions del desa-retalls de webs"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Directori d'exportació del Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fitxer"
@@ -716,22 +652,22 @@ msgid "Select all"
 msgstr "Seleccioneu una data"
 
 msgid "Bold"
-msgstr ""
+msgstr "Negreta"
 
 msgid "Italic"
-msgstr ""
+msgstr "Cursiva"
 
 msgid "Link"
 msgstr ""
 
 msgid "Code"
-msgstr ""
+msgstr "Codi"
 
 msgid "Insert Date Time"
-msgstr ""
+msgstr "Insereix la data i hora"
 
 msgid "Edit in external editor"
-msgstr ""
+msgstr "Edita en un editor extern"
 
 msgid "Tags"
 msgstr "Etiquetes"
@@ -768,6 +704,10 @@ msgstr "Ajuda"
 msgid "Website and documentation"
 msgstr "Lloc web i documentació"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Fitxer d'exportació del Joplin"
+
 msgid "Make a donation"
 msgstr "Donatius"
 
@@ -879,6 +819,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes i la configuració es desen a: %s"
@@ -889,8 +832,11 @@ msgstr "Comprova la configuració de la sincronització"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Enrere"
+
 msgid "Apply"
-msgstr ""
+msgstr "Aplica"
 
 msgid "Submit"
 msgstr "Tramet"
@@ -971,8 +917,8 @@ msgstr ""
 "sincrontizació."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Per a més informació sobre el xifratge d'extrem a extrem (E2EE) i consells "
 "sobre com activar-lo, llegiu la documentació:"
@@ -983,13 +929,19 @@ msgstr "Estat"
 msgid "Encryption is:"
 msgstr "El xifratge és:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Ús: %s"
 
-msgid "Back"
-msgstr "Enrere"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1019,6 +971,15 @@ msgstr "Estableix una alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nota nova"
+
+msgid "New to-do"
+msgstr "Llistat de tasques pendents nou"
+
+msgid "New notebook"
+msgstr "Bloc de notes nou"
+
 msgid "Layout"
 msgstr "Disposició"
 
@@ -1053,9 +1014,8 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#, fuzzy
 msgid "Note History"
-msgstr "Blocs de notes"
+msgstr ""
 
 msgid "Markup"
 msgstr ""
@@ -1086,9 +1046,9 @@ msgstr ""
 msgid "Open..."
 msgstr "Obre..."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "This file could not be opened: %s"
-msgstr "No s'ha pogut desar el bloc de notes: %s"
+msgstr "Aquest fitxer no s'ha pogut obrir: %s"
 
 msgid "Save as..."
 msgstr "Anomena i desa..."
@@ -1097,7 +1057,7 @@ msgid "Copy path to clipboard"
 msgstr "Copia el camí al porta-retalls"
 
 msgid "Copy Link Address"
-msgstr ""
+msgstr "Copia l'adreça de l'enllaç"
 
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
@@ -1117,17 +1077,24 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "Fitxer PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "S'ha produït un error en obrir la nota amb l'editor: %s"
+
 msgid "strong text"
-msgstr ""
+msgstr "text en negreta"
 
 msgid "emphasized text"
-msgstr ""
+msgstr "text amb èmfasi"
 
 msgid "List item"
-msgstr ""
+msgstr "Element de llista"
 
 msgid "Insert Hyperlink"
-msgstr ""
+msgstr "insereix un enllaç"
 
 msgid "Attach file"
 msgstr "Adjunta un fitxer"
@@ -1140,29 +1107,28 @@ msgid "In: %s"
 msgstr "A: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Enllaç"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "Llista numerada"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "Llista de pics"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "Casella de verificació"
 
 msgid "Heading"
-msgstr ""
+msgstr "Capçalera"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "Línia horitzontal"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "Feu-hi clic per a aturar l'edició externa"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "S'està cancel·lant..."
+msgstr "S'està vigilant..."
 
 msgid "to-do"
 msgstr "Tasques pendents"
@@ -1192,12 +1158,6 @@ msgstr "Opcions"
 msgid "Synchronisation Status"
 msgstr "Estat de la sincronització"
 
-msgid "Encryption Options"
-msgstr "Opcions de xifratge"
-
-msgid "Clipper Options"
-msgstr "Opcions del desa-retalls"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1220,6 +1180,17 @@ msgstr "Suprimeix"
 msgid "Rename"
 msgstr "Canvia el nom"
 
+msgid "Notebooks"
+msgstr "Blocs de notes"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "S'estan desxifrant els elements: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Elements obtinguts: %d/%d."
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccioneu on s'hauria d'exportar l'estat de la sincronització"
 
@@ -1229,13 +1200,12 @@ msgstr ""
 msgid "Add or remove tags"
 msgstr "Afegeix o suprimeix etiquetes"
 
-#, fuzzy
 msgid "Duplicate"
-msgstr "Surt de l'aplicació"
+msgstr "Duplica"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s - Copy"
-msgstr "Copia"
+msgstr "%s - Còpia"
 
 msgid "Switch between note and to-do type"
 msgstr "Alterna entre el tipus nota i tasques pendents"
@@ -1379,10 +1349,6 @@ msgstr "En progés"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronització ja és en procés. Estat: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Xifrat"
 
@@ -1496,10 +1462,10 @@ msgstr "Clar"
 msgid "Dark"
 msgstr "Fosc"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1570,6 +1536,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostra la icona a la safata"
 
@@ -1592,6 +1561,10 @@ msgstr "Percentatge de zoom global"
 msgid "Editor font size"
 msgstr "Tipus de lletra de l'editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Tipus de lletra de l'editor"
+
 msgid "Editor font family"
 msgstr "Tipus de lletra de l'editor"
 
@@ -1628,20 +1601,19 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d hores"
 
-#, fuzzy
 msgid "Text editor command"
-msgstr "Editor de text"
+msgstr "Ordre de l'editor de text"
 
-#, 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 ""
-"L'editor que s'usarà per a obrir una nota. Si no s'indica cap, intentarà "
-"detectar automàticament l'editor predeterminat."
+"L'ordre de l'editor (que pot incloure arguments) que s'usarà per a obrir una "
+"nota. Si no se'n proporciona cap, l'editor predeterminat es detectarà "
+"automàticament."
 
 msgid "Custom TLS certificates"
-msgstr ""
+msgstr "Certificats TLS personalitzats"
 
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
@@ -1649,8 +1621,23 @@ msgid ""
 "pem. Note that if you make changes to the TLS settings, you must save your "
 "changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
+"Una llista separada per comes de camins a directoris d'on carregar els "
+"certificats, o el camí a fitxers de certificats concrets. Per exemple, "
+"el_meu/dir_cert, /altres/personalitzat.pem. Tingueu en compte que si feu "
+"canvis en la configuració TLS, cal que els deseu abans de fer clic a "
+"«Comprova la configuració de la sincronització»."
 
 msgid "Ignore TLS certificate errors"
+msgstr "Ignora els errors de certificat TLS"
+
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
 msgstr ""
 
 #, fuzzy
@@ -1693,6 +1680,14 @@ msgstr ""
 msgid "Application"
 msgstr "Surt de l'aplicació"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "El xifratge és:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opcions del desa-retalls de webs"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1706,7 +1701,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Directori d'exportació del Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Fitxer d'exportació de l'Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Fitxer d'exportació de l'Evernote"
 
 #, fuzzy
@@ -1758,11 +1758,11 @@ msgstr ""
 
 #, fuzzy, javascript-format
 msgid "%s (%s) could not be uploaded: %s"
-msgstr "No s'ha pogut desar el bloc de notes: %s"
+msgstr "Aquest fitxer no s'ha pogut obrir: %s"
 
 #, fuzzy, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "No s'ha pogut desar el bloc de notes: %s"
+msgstr "Aquest fitxer no s'ha pogut obrir: %s"
 
 #, fuzzy
 msgid "Items that cannot be decrypted"
@@ -1813,6 +1813,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "No hi ha cap bloc de notes actiu."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Crea un bloc de notes nou."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Ara mateix no hi ha cap nota. Creeu-ne una fent clic en el botó (+)."
 
@@ -1857,20 +1865,9 @@ msgstr "Bloc de notes nou"
 msgid "Configuration"
 msgstr "Configuració"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Elements obtinguts: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Recursos: %d/%d"
-
 #, fuzzy
 msgid "All notes"
-msgstr "nota"
-
-msgid "Notebooks"
-msgstr "Blocs de notes"
+msgstr "Voleu suprimir les notes?"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1900,7 +1897,7 @@ msgstr ""
 
 #, fuzzy, javascript-format
 msgid "Decrypted items: %s / %s"
-msgstr "Elements obtinguts: %d/%d."
+msgstr "S'estan desxifrant els elements: %d/%d"
 
 msgid "New tags:"
 msgstr "Etiquetes noves:"
@@ -1916,14 +1913,9 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuració"
-
 msgid "Encryption Config"
 msgstr "Configuració del xifratge"
 
-#, fuzzy
 msgid "Tools"
 msgstr "Eines"
 
@@ -2058,7 +2050,7 @@ msgstr "Tipus d'imatge no admesa: %s"
 
 #, fuzzy, javascript-format
 msgid "Updated: %s"
-msgstr "Acualitzades: %d."
+msgstr "Actualitzades: %d."
 
 msgid "View on map"
 msgstr "Mostra-ho al mapa"
@@ -2112,6 +2104,84 @@ msgstr "Inicia sessió amb OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "S'està iniciant l'edició del a nota. Tanqueu l'editor per a tornar a "
+#~ "l'indicador."
+
+#~ msgid "Note has been saved."
+#~ msgstr "S'ha desat la nota."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Títol del bloc de notes:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Blocs de notes"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "S'està important des de «%s» com a format «%s». Espereu..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Estat de la sincronització"
+
+#~ msgid "Print"
+#~ msgstr "Imprimeix"
+
+#~ msgid "General Options"
+#~ msgstr "Opcions generals"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opcions del xifratge"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Insereix la data i hora"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Directori d'exportació del Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opcions de xifratge"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opcions del desa-retalls"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuració"
+
+#~ msgid "Separate each tag by a comma."
+#~ msgstr "Separeu les etiquetes amb comes."
+
+#~ msgid "Some items cannot be decrypted."
+#~ msgstr "Alguns elements no s'han pogut desxifrar."
+
+#~ msgid "State: %s."
+#~ msgstr "Estat: %s."
+
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Ja existeix un bloc de notes amb aquest títol: «%s»"
+
+#~ msgid ""
+#~ "The path to synchronise with when file system synchronisation is enabled. "
+#~ "See `sync.target`."
+#~ msgstr ""
+#~ "El camí on sincronitzar en activar la sincronització del sistema. Vegeu "
+#~ "«sync.target»."
+
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Cancel·la la sincronització"
 
@@ -2138,29 +2208,3 @@ msgstr "Cerca"
 
 #~ msgid "Welcome"
 #~ msgstr "Benvingut"
-
-#~ msgid "Separate each tag by a comma."
-#~ msgstr "Separeu les etiquetes amb comes."
-
-#~ msgid "Some items cannot be decrypted."
-#~ msgstr "Alguns elements no s'han pogut desxifrar."
-
-#~ msgid "%s (%s): %s"
-#~ msgstr "%s (%s): %s"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "El camí on sincronitzar en activar la sincronització del sistema. Vegeu "
-#~ "«sync.target»."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Lloc web del Joplin"
-
-#~ msgid "State: %s."
-#~ msgstr "Estat: %s"
-
-#~ msgid "A notebook with this title already exists: \"%s\""
-#~ msgstr "Ja existeix un bloc de notes amb aquest títol: «%s»"

CliClient/locales/cs_CZ.po

@@ -174,17 +174,6 @@ msgstr "Není vybrán žádný zápisník."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Poznámka \"%s\" neexistuje. Chcete ji vytvořit?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Začínám s úpravou poznámky. Pro návrat do příkazové řádky ukončete editor."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Chyba při otevírání poznámky v editoru: %s"
-
-msgid "Note has been saved."
-msgstr "Poznámka uložena."
-
 msgid "Exits the application."
 msgstr "Ukončí aplikaci."
 
@@ -385,6 +374,23 @@ msgstr "Smazat poznámku?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Hledá <zadání> ve všech poznámkách."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -523,10 +529,6 @@ msgstr "Zadejte `joplin help` pro nápovědu."
 msgid "Fatal error:"
 msgstr "Fatální chyba:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikace byla autorizována, tento tab můžete zavřít."
@@ -578,75 +580,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportuji do \"%s\" jako formát \"%s\". Chvíli strpení..."
 
-msgid "Sidebar"
-msgstr "Postranní lišta"
-
-msgid "Note list"
-msgstr "Seznam položek"
-
-msgid "Note title"
-msgstr "Název zápisníku"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Zápisník"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importuji z \"%s\" jako formát \"%s\". Chvíli strpení..."
-
-msgid "PDF File"
-msgstr "PDF soubor"
-
-msgid "Synchronisation status"
-msgstr "Stav synchronizace"
-
-msgid "New note"
-msgstr "Nová poznámka"
-
-msgid "New to-do"
-msgstr "Nové to-do"
-
-msgid "New notebook"
-msgstr "Nový zápisník"
-
-msgid "Print"
-msgstr "Tisk"
-
-msgid "General Options"
-msgstr "Obecná nastavení"
-
-msgid "Encryption options"
-msgstr "Nastavení šifrování"
-
-msgid "Web clipper options"
-msgstr "Web clipper volby"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Vložit datum a čas"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Složka pro export"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Soubor"
@@ -750,6 +683,10 @@ msgstr "Nápověda"
 msgid "Website and documentation"
 msgstr "Web a dokumentace"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Web Joplinu"
+
 msgid "Make a donation"
 msgstr "Přispět"
 
@@ -861,6 +798,9 @@ msgstr ""
 "Tento autorizační token je potřeba pouze pro povolení komunikace Joplin s "
 "aplikacemi třetích stran."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Poznámky a nastavení uloženo v: %s"
@@ -871,6 +811,9 @@ msgstr "Zkontrolujte nastavení synchronizace"
 msgid "Browse..."
 msgstr "Procházet..."
 
+msgid "Back"
+msgstr "Zpět"
+
 msgid "Apply"
 msgstr "Použít"
 
@@ -950,8 +893,8 @@ msgstr ""
 "staženy při synchronizaci."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Pro více informací o End-To-End šifrování (E2EE) a návod jak je povolit "
 "náhledněte do dokumentace:"
@@ -962,12 +905,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Šifrování je:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Použití: %s"
 
-msgid "Back"
-msgstr "Zpět"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -997,6 +946,15 @@ msgstr "Nastavit alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nová poznámka"
+
+msgid "New to-do"
+msgstr "Nové to-do"
+
+msgid "New notebook"
+msgstr "Nový zápisník"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1092,6 +1050,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Pouze jedna poznámka může být zároveň vytištěna nebo exportována do PDF."
 
+msgid "PDF File"
+msgstr "PDF soubor"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Chyba při otevírání poznámky v editoru: %s"
+
 msgid "strong text"
 msgstr "tučný text"
 
@@ -1167,13 +1132,6 @@ msgstr "Nastavení"
 msgid "Synchronisation Status"
 msgstr "Stav synchronizace"
 
-msgid "Encryption Options"
-msgstr "Nastavení šifrování"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Obecná nastavení"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1194,6 +1152,17 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "Přejmenovat"
 
+msgid "Notebooks"
+msgstr "Zápisníky"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Rozšifrované položky: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Stahování zdrojů: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Prosím vyberte, kam má být stav synchronizace exportován"
 
@@ -1355,10 +1324,6 @@ msgstr "Probíhá"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronizace již probíhá. Stav: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Zašifrováno"
 
@@ -1475,10 +1440,10 @@ msgstr "Světlý"
 msgid "Dark"
 msgstr "Tmavý"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1547,6 +1512,10 @@ 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"
+
 msgid "Show tray icon"
 msgstr "Zobrazovat ikonu v panelu"
 
@@ -1570,6 +1539,10 @@ msgstr "Globální zoom"
 msgid "Editor font size"
 msgstr "Rodina písma v editoru"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Rodina písma v editoru"
+
 msgid "Editor font family"
 msgstr "Rodina písma v editoru"
 
@@ -1633,6 +1606,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorovat chyby TLS certifikátu"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Povolit poznámky pod čarou"
@@ -1669,6 +1652,14 @@ msgstr "Rozšíření"
 msgid "Application"
 msgstr "Aplikace"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Šifrování je:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web clipper volby"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Tag \"%s\" již existuje. Zvolte jiný název."
@@ -1682,7 +1673,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Složka pro export"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Soubor Evernote Exportu"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Soubor Evernote Exportu"
 
 msgid "Json Export Directory"
@@ -1788,6 +1784,14 @@ 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."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Vytvoří 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 (+)."
 
@@ -1831,21 +1835,10 @@ msgstr "Nový zápisník"
 msgid "Configuration"
 msgstr "Nastavení"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Rozšifrované položky: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Stahování zdrojů: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "poznámka"
 
-msgid "Notebooks"
-msgstr "Zápisníky"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Zastavuji, chvíli strpení."
@@ -1895,10 +1888,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Nastavení"
-
 msgid "Encryption Config"
 msgstr "Nastavení šifrování"
 
@@ -2088,6 +2077,67 @@ msgstr "Přihlásit se pomocí OneDrive"
 msgid "Search"
 msgstr "Hledání"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Začínám s úpravou poznámky. Pro návrat do příkazové řádky ukončete editor."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Poznámka uložena."
+
+#~ msgid "Sidebar"
+#~ msgstr "Postranní lišta"
+
+#~ msgid "Note list"
+#~ msgstr "Seznam položek"
+
+#~ msgid "Note title"
+#~ msgstr "Název zápisníku"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Zápisník"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importuji z \"%s\" jako formát \"%s\". Chvíli strpení..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Stav synchronizace"
+
+#~ msgid "Print"
+#~ msgstr "Tisk"
+
+#~ msgid "General Options"
+#~ msgstr "Obecná nastavení"
+
+#~ msgid "Encryption options"
+#~ msgstr "Nastavení šifrování"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Vložit datum a čas"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Složka pro export"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Nastavení šifrování"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Obecná nastavení"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Nastavení"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Oprávnění použít kameru"
@@ -2134,10 +2184,6 @@ msgstr "Hledání"
 #~ "Cesta ke složce, se kterou synchronizovat, pokud je cílem synchronizace "
 #~ "místní souborový systém. Viz `sync.target`."
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Web Joplinu"
-
 #~ msgid "State: %s."
 #~ msgstr "Stav: %s."
 

CliClient/locales/da_DK.po

@@ -174,18 +174,6 @@ msgstr "Ingen aktiv notesbog."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Note eksisterer ikke: \"%s\".  Skal den oprettes?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Noteredigering startet. Luk redigering for at komme tilbage til kommando "
-"prompten."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fejl ved åbning af note i editor: %s"
-
-msgid "Note has been saved."
-msgstr "Note gemt."
-
 msgid "Exits the application."
 msgstr "Forlad/luk program."
 
@@ -390,6 +378,23 @@ msgstr "Slet note?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Søger efter <pattern> mønster i alle noter."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -525,10 +530,6 @@ msgstr "Tast `Joplin help` for alm. info."
 msgid "Fatal error:"
 msgstr "Kritisk fejl:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Denne app er godkendt - du kan nu lukke dette faneblad."
@@ -581,75 +582,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksporterer til \"%s\" som \"%s\"-format. Vent venligst..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Notesbogs titel:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Notesbøger"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importerer fra \"%s\" som \"%s\"-format. Vent venligst..."
-
-msgid "PDF File"
-msgstr "PDF fil"
-
-msgid "Synchronisation status"
-msgstr "Synkroniserings status"
-
-msgid "New note"
-msgstr "Ny note"
-
-msgid "New to-do"
-msgstr "Ny opgave"
-
-msgid "New notebook"
-msgstr "Ny notesbog"
-
-msgid "Print"
-msgstr "Udskriv"
-
-msgid "General Options"
-msgstr "Generelle indstillinger"
-
-msgid "Encryption options"
-msgstr "Krypterings muligheder"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin eksport mappe"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
@@ -755,6 +687,10 @@ msgstr "Hjælp"
 msgid "Website and documentation"
 msgstr "Joplins hjemmeside og dokumentation"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin hjemmeside"
+
 msgid "Make a donation"
 msgstr "Giv en donation"
 
@@ -859,6 +795,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Noter og indstillinger er gemt i: %s"
@@ -869,6 +808,9 @@ msgstr "Check synkroniserings Indstillinger"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Tilbage"
+
 msgid "Apply"
 msgstr ""
 
@@ -950,8 +892,8 @@ msgstr ""
 "(på et eller andet tidspunkt) via synkroniseringen."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Se dokumentationen for nærmere oplysninger om End-To-End-kryptering (E2EE) "
 "og vejledning om hvordan det skal opsættes_"
@@ -962,13 +904,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Kryptering er:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Forbrug: %s"
 
-msgid "Back"
-msgstr "Tilbage"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -999,6 +947,15 @@ msgstr "Indstil alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Ny note"
+
+msgid "New to-do"
+msgstr "Ny opgave"
+
+msgid "New notebook"
+msgstr "Ny notesbog"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1094,6 +1051,13 @@ msgstr "Denne note er tom. Klik på \"%s\" for at starte editor og rette noten."
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "PDF fil"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fejl ved åbning af note i editor: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1169,13 +1133,6 @@ msgstr "Muligheder"
 msgid "Synchronisation Status"
 msgstr "Synkroniserings status"
 
-msgid "Encryption Options"
-msgstr "Krypterings indstillinger"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Generelle indstillinger"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1196,6 +1153,17 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "Omdøb"
 
+msgid "Notebooks"
+msgstr "Notesbøger"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Hentede emner: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Ressourcer: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Vælg hvor sync status skal eksporteres til"
 
@@ -1356,10 +1324,6 @@ msgstr "I gang"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering er allerede i gang: Tilstand: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Krypteret"
 
@@ -1477,10 +1441,10 @@ msgstr "Lyst"
 msgid "Dark"
 msgstr "Mørkt"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1552,6 +1516,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Vis ikon på bundbjælke"
 
@@ -1574,6 +1541,10 @@ msgstr "Global zoom procent"
 msgid "Editor font size"
 msgstr "Rediger skrifttype"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Rediger skrifttype"
+
 msgid "Editor font family"
 msgstr "Rediger skrifttype"
 
@@ -1635,6 +1606,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Start kryptering"
@@ -1675,6 +1656,13 @@ msgstr ""
 msgid "Application"
 msgstr "Forlad/luk program."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Kryptering er:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1688,7 +1676,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin eksport mappe"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote eksport fil"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote eksport fil"
 
 #, fuzzy
@@ -1795,6 +1788,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ingen aktiv notesbog."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Opretter en ny notesbog."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Der er ingen noter. Opret note ved at klikke på (+) knappen."
 
@@ -1840,21 +1841,10 @@ msgstr "Ny notesbog"
 msgid "Configuration"
 msgstr "Indstillinger"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Hentede emner: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Ressourcer: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "note"
 
-msgid "Notebooks"
-msgstr "Notesbøger"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Annullerer...  Vent venligst."
@@ -1899,10 +1889,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Indstillinger"
-
 msgid "Encryption Config"
 msgstr "Krypterings indstillinger"
 
@@ -2088,6 +2074,59 @@ msgstr "Log på med OneDrive"
 msgid "Search"
 msgstr "Søg"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Noteredigering startet. Luk redigering for at komme tilbage til kommando "
+#~ "prompten."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Note gemt."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Notesbogs titel:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Notesbøger"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importerer fra \"%s\" som \"%s\"-format. Vent venligst..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synkroniserings status"
+
+#~ msgid "Print"
+#~ msgstr "Udskriv"
+
+#~ msgid "General Options"
+#~ msgstr "Generelle indstillinger"
+
+#~ msgid "Encryption options"
+#~ msgstr "Krypterings muligheder"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin eksport mappe"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Krypterings indstillinger"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Generelle indstillinger"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Indstillinger"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Afbryd synkronisering"
 
@@ -2130,10 +2169,6 @@ msgstr "Søg"
 #~ "Sti til synkronisering, når filsystem synkronisering er slået til. Se "
 #~ "`sync.target`."
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin hjemmeside"
-
 #~ msgid "State: %s."
 #~ msgstr "Tilstand: %s."
 

CliClient/locales/de_DE.po

@@ -178,18 +178,6 @@ msgstr "Kein aktives Notizbuch."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notiz \"%s\" existiert nicht. Soll sie erstellt werden?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Beginne die Notiz zu bearbeiten. Schließe das Textverarbeitungsprogramm, um "
-"zurück zum Terminal zu gelangen."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fehler beim Öffnen der Notiz im Editor: %s"
-
-msgid "Note has been saved."
-msgstr "Die Notiz wurde gespeichert."
-
 msgid "Exits the application."
 msgstr "Beendet das Programm."
 
@@ -403,6 +391,23 @@ msgstr "Notiz löschen?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Sucht nach dem angegebenen <pattern> in allen Notizen."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -544,12 +549,6 @@ msgstr "Gib `joplin help` ein um die Nutzungsstatistik anzuzeigen."
 msgid "Fatal error:"
 msgstr "Schwerwiegender Fehler:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-"Alle potentielle Port-Nummern sind in Verwendung - bitte melde dieses "
-"Problem auf %s"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -605,72 +604,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportiere „%s“ ins „%s“-Format. Bitte warten..."
 
-msgid "Sidebar"
-msgstr "Seitenleiste"
-
-msgid "Note list"
-msgstr "Notizen-Liste"
-
-msgid "Note title"
-msgstr "Notiz-Titel"
-
-msgid "Note body"
-msgstr "Notiz-Text"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importiere „%s“ als „%s“-Format. Bitte warten..."
-
-msgid "PDF File"
-msgstr "PDF-Datei"
-
-msgid "Synchronisation status"
-msgstr "Status der Synchronisation"
-
-msgid "New note"
-msgstr "Neue Notiz"
-
-msgid "New to-do"
-msgstr "Neues To-Do"
-
-msgid "New notebook"
-msgstr "Neues Notizbuch"
-
-msgid "Print"
-msgstr "Drucken"
-
-msgid "General Options"
-msgstr "Allgemeine Einstellungen"
-
-msgid "Encryption options"
-msgstr "Verschlüsselungsoptionen"
-
-msgid "Web clipper options"
-msgstr "Web-Clipper Optionen"
-
-msgid "Create note from template"
-msgstr "Erstelle Notiz von Vorlage"
-
-msgid "Create to-do from template"
-msgstr "Erstelle To-Do von Vorlage"
-
-msgid "Insert template"
-msgstr "Vorlage einfügen"
-
-msgid "Open template directory"
-msgstr "Öffne Vorlagen Verzeichnis"
-
-msgid "Refresh templates"
-msgstr "Aktualisiere Vorlagen"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "Revision: %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Datei"
 
@@ -768,6 +701,10 @@ msgstr "&Hilfe"
 msgid "Website and documentation"
 msgstr "Webseite und Dokumentation"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin v%s"
+
 msgid "Make a donation"
 msgstr "Spenden"
 
@@ -882,6 +819,9 @@ msgstr ""
 "Dieses Autorisierung-Token wird nur benötigt, um Drittanbieter-Anwendungen "
 "Zugriff auf Joplin zu gewähren."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notizen und Einstellungen werden gespeichert in: %s"
@@ -892,6 +832,9 @@ msgstr "Überprüfen der Synchronisationseinstellungen"
 msgid "Browse..."
 msgstr "Durchsuche..."
 
+msgid "Back"
+msgstr "Zurück"
+
 msgid "Apply"
 msgstr "Anwenden"
 
@@ -973,8 +916,8 @@ msgstr ""
 "Die Hauptschlüssel dieser IDs werden für die Verschlüsselung einiger ..."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Weitere Informationen zur Ende-zu-Ende-Verschlüsselung (E2EE) und Hinweise "
 "zur Aktivierung findest du in der Dokumentation (auf Englisch):"
@@ -985,13 +928,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Die Verschlüsselung ist:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 # 'Nutzung', 'Gebrauch', or 'Verwendung' - depends on the context
 msgid "Usage"
 msgstr "Nutzung"
 
-msgid "Back"
-msgstr "Zurück"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1023,6 +972,15 @@ msgstr "Alarm erstellen:"
 msgid "Template file:"
 msgstr "Vorlagen-Datei:"
 
+msgid "New note"
+msgstr "Neue Notiz"
+
+msgid "New to-do"
+msgstr "Neues To-Do"
+
+msgid "New notebook"
+msgstr "Neues Notizbuch"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1125,6 +1083,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Nur eine Notiz kann gedruckt oder als PDF exportiert werden."
 
+msgid "PDF File"
+msgstr "PDF-Datei"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fehler beim Öffnen der Notiz im Editor: %s"
+
 msgid "strong text"
 msgstr "Fetter Text"
 
@@ -1199,12 +1164,6 @@ msgstr "Optionen"
 msgid "Synchronisation Status"
 msgstr "Synchronisations-Status"
 
-msgid "Encryption Options"
-msgstr "Verschlüsselungsoptionen"
-
-msgid "Clipper Options"
-msgstr "Clipper-Einstellungen"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1228,6 +1187,17 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
+msgid "Notebooks"
+msgstr "Notizbücher"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Entschlüsselte Objekte: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Ressourcen abrufen: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll"
@@ -1387,10 +1357,6 @@ msgstr "In Bearbeitung"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronisation ist bereits im Gange. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr "Unbekannter Eintrags-Typ heruntergeladen - bitte aktualisiere Joplin"
-
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
@@ -1513,11 +1479,11 @@ msgstr "Hell"
 msgid "Dark"
 msgstr "Dunkel"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr "Solarized Hell"
 
-msgid "Solarized Dark"
-msgstr "Solarized Dunkel"
+msgid "Solarised Dark"
+msgstr "Solarised Dark"
 
 msgid "Uncompleted to-dos on top"
 msgstr "Zeige unvollständige To-Dos an oberster Stelle"
@@ -1585,6 +1551,10 @@ msgstr "Aktiviere ++insert++ Syntax"
 msgid "Enable multimarkdown table extension"
 msgstr "Aktiviere multimarkdown Tabellen Erweiterung"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Aktiviere ~sub~ Syntax"
+
 msgid "Show tray icon"
 msgstr "Zeige Tray-Icon"
 
@@ -1609,6 +1579,10 @@ msgstr "Zoomstufe der Benutzeroberfläche"
 msgid "Editor font size"
 msgstr "Schriftgröße im Editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Schriftgröße im Editor"
+
 msgid "Editor font family"
 msgstr "Schriftfamilie im Editor"
 
@@ -1673,6 +1647,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoriere TLS-Zertifikatfehler"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "Aktiviere Notizen-Verlauf"
 
@@ -1709,6 +1693,14 @@ msgstr "Zusatzprogramme"
 msgid "Application"
 msgstr "Applikation"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Die Verschlüsselung ist:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web-Clipper Optionen"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1723,7 +1715,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin Export Verzeichnis"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote Export Datei"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote Export Datei"
 
 msgid "Json Export Directory"
@@ -1833,6 +1830,14 @@ 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."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Erstellt ein neues Notizbuch."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Momentan existieren noch keine Notizen. Erstelle eine, indem du auf den (+) "
@@ -1876,20 +1881,9 @@ msgstr "Neues Notizbuch"
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Entschlüsselte Objekte: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Ressourcen abrufen: %d/%d"
-
 msgid "All notes"
 msgstr "Alle Notizen"
 
-msgid "Notebooks"
-msgstr "Notizbücher"
-
 msgid "Checking... Please wait."
 msgstr "Überprüfe… Bitte warten."
 
@@ -1941,9 +1935,6 @@ msgstr ""
 "Deine Erlaubnis auf externen Speicher zu schreiben ist notwendig um "
 "Synchronisation mit dem Dateisystem zu verwenden."
 
-msgid "Information"
-msgstr "Information"
-
 msgid "Encryption Config"
 msgstr "Verschlüsselungskonfiguration"
 
@@ -2129,6 +2120,81 @@ msgstr "Mit OneDrive anmelden"
 msgid "Search"
 msgstr "Suchen"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Beginne die Notiz zu bearbeiten. Schließe das Textverarbeitungsprogramm, "
+#~ "um zurück zum Terminal zu gelangen."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Die Notiz wurde gespeichert."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "Alle potentielle Port-Nummern sind in Verwendung - bitte melde dieses "
+#~ "Problem auf %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Seitenleiste"
+
+#~ msgid "Note list"
+#~ msgstr "Notizen-Liste"
+
+#~ msgid "Note title"
+#~ msgstr "Notiz-Titel"
+
+#~ msgid "Note body"
+#~ msgstr "Notiz-Text"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importiere „%s“ als „%s“-Format. Bitte warten..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status der Synchronisation"
+
+#~ msgid "Print"
+#~ msgstr "Drucken"
+
+#~ msgid "General Options"
+#~ msgstr "Allgemeine Einstellungen"
+
+#~ msgid "Encryption options"
+#~ msgstr "Verschlüsselungsoptionen"
+
+#~ msgid "Create note from template"
+#~ msgstr "Erstelle Notiz von Vorlage"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "Erstelle To-Do von Vorlage"
+
+#~ msgid "Insert template"
+#~ msgstr "Vorlage einfügen"
+
+#~ msgid "Open template directory"
+#~ msgstr "Öffne Vorlagen Verzeichnis"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Aktualisiere Vorlagen"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Revision: %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Verschlüsselungsoptionen"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper-Einstellungen"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Unbekannter Eintrags-Typ heruntergeladen - bitte aktualisiere Joplin"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Berechtigung zur Verwendung der Kamera"
@@ -2181,9 +2247,6 @@ msgstr "Suchen"
 #~ "Der Pfad, mit dem synchronisiert werden soll, wenn die Dateisystem-"
 #~ "Synchronisation aktiviert ist. Siehe `sync.target`."
 
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"
-
 #~ msgid "Remove?"
 #~ msgstr "Löschen?"
 
@@ -2242,9 +2305,6 @@ msgstr "Suchen"
 #~ msgid "Exit the application."
 #~ msgstr "Das Programm verlassen."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Die/das momentan ausgewählte Notiz(-buch) löschen."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Ein To-Do als abgeschlossen / nicht abgeschlossen markieren"
 

CliClient/locales/en_GB.po

@@ -160,16 +160,6 @@ msgstr ""
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr ""
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
-msgid "Note has been saved."
-msgstr ""
-
 msgid "Exits the application."
 msgstr ""
 
@@ -353,6 +343,23 @@ msgstr ""
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -470,10 +477,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -512,72 +515,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr ""
-
-msgid "Synchronisation status"
-msgstr ""
-
-msgid "New note"
-msgstr ""
-
-msgid "New to-do"
-msgstr ""
-
-msgid "New notebook"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr ""
 
@@ -675,6 +612,9 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Joplin Forum"
+msgstr ""
+
 msgid "Make a donation"
 msgstr ""
 
@@ -778,6 +718,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -788,6 +731,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -856,8 +802,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -866,10 +812,16 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
 msgstr ""
 
 #, javascript-format
@@ -901,6 +853,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr ""
+
+msgid "New to-do"
+msgstr ""
+
+msgid "New notebook"
+msgstr ""
+
 msgid "Layout"
 msgstr ""
 
@@ -992,6 +953,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr ""
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1066,12 +1034,6 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
-msgid "Encryption Options"
-msgstr ""
-
-msgid "Clipper Options"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1092,6 +1054,17 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+msgid "Notebooks"
+msgstr ""
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1240,10 +1213,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1355,10 +1324,10 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1427,6 +1396,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1448,6 +1420,9 @@ msgstr ""
 msgid "Editor font size"
 msgstr ""
 
+msgid "Editor font"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1502,6 +1477,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr ""
 
@@ -1537,6 +1522,12 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1550,7 +1541,10 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1650,6 +1644,12 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+msgid "You currently have no notebooks."
+msgstr ""
+
+msgid "Create a notebook"
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 
@@ -1691,20 +1691,9 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr ""
-
 msgid "All notes"
 msgstr ""
 
-msgid "Notebooks"
-msgstr ""
-
 msgid "Checking... Please wait."
 msgstr ""
 
@@ -1746,9 +1735,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr ""
-
 msgid "Encryption Config"
 msgstr ""
 

CliClient/locales/en_US.po

@@ -161,16 +161,6 @@ msgstr ""
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr ""
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
-msgid "Note has been saved."
-msgstr ""
-
 msgid "Exits the application."
 msgstr ""
 
@@ -354,6 +344,23 @@ msgstr ""
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -475,10 +482,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -518,72 +521,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr ""
-
-msgid "Synchronisation status"
-msgstr "Synchronization status"
-
-msgid "New note"
-msgstr ""
-
-msgid "New to-do"
-msgstr ""
-
-msgid "New notebook"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr ""
 
@@ -681,6 +618,9 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Joplin Forum"
+msgstr ""
+
 msgid "Make a donation"
 msgstr ""
 
@@ -786,6 +726,9 @@ msgstr ""
 "This authorization token is only needed to allow third-party applications to "
 "access Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -796,6 +739,9 @@ msgstr "Check synchronization configuration"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -874,8 +820,8 @@ msgstr ""
 "they will eventually be downloaded via synchronization."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -884,10 +830,16 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
 msgstr ""
 
 #, javascript-format
@@ -919,6 +871,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr ""
+
+msgid "New to-do"
+msgstr ""
+
+msgid "New notebook"
+msgstr ""
+
 msgid "Layout"
 msgstr ""
 
@@ -1010,6 +971,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr ""
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1084,12 +1052,6 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr "Synchronization Status"
 
-msgid "Encryption Options"
-msgstr ""
-
-msgid "Clipper Options"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1110,6 +1072,17 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+msgid "Notebooks"
+msgstr ""
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1260,10 +1233,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronization is already in progress. State: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1377,11 +1346,11 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Solarized Light"
-msgstr ""
+msgid "Solarised Light"
+msgstr "Solarized Light"
 
-msgid "Solarized Dark"
-msgstr ""
+msgid "Solarised Dark"
+msgstr "Solarized Dark"
 
 msgid "Uncompleted to-dos on top"
 msgstr ""
@@ -1449,6 +1418,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1473,6 +1445,9 @@ msgstr ""
 msgid "Editor font size"
 msgstr ""
 
+msgid "Editor font"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1527,6 +1502,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr ""
 
@@ -1562,6 +1547,12 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1575,7 +1566,10 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1675,6 +1669,12 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+msgid "You currently have no notebooks."
+msgstr ""
+
+msgid "Create a notebook"
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 
@@ -1716,20 +1716,9 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr ""
-
 msgid "All notes"
 msgstr ""
 
-msgid "Notebooks"
-msgstr ""
-
 msgid "Checking... Please wait."
 msgstr ""
 
@@ -1776,9 +1765,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr ""
-
 msgid "Encryption Config"
 msgstr ""
 
@@ -1956,5 +1942,8 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#~ msgid "Synchronisation status"
+#~ msgstr "Synchronization status"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Cancel synchronization"

CliClient/locales/es_ES.po

@@ -179,17 +179,6 @@ msgstr "No hay libreta activa."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "La nota no existe: \"%s\". ¿Crearla?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Iniciando la edición de una nota. Cierre el editor para regresar al prompt."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Error abriendo la nota en el editor: %s"
-
-msgid "Note has been saved."
-msgstr "La nota ha sido guardada."
-
 msgid "Exits the application."
 msgstr "Sale de la aplicación."
 
@@ -396,6 +385,23 @@ msgstr "¿Eliminar nota?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Buscar el patrón <pattern> en todas las notas."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -533,10 +539,6 @@ msgstr "Escriba `joplin help` para mostrar información de uso."
 msgid "Fatal error:"
 msgstr "Error fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -593,74 +595,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando el formato de \"%s\" a \"%s\". Por favor espere..."
 
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-msgid "Note list"
-msgstr "Lista de notas"
-
-msgid "Note title"
-msgstr "Titulo de nota"
-
-msgid "Note body"
-msgstr "Cuerpo de nota"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
-
-msgid "PDF File"
-msgstr "Archivo PDF"
-
-msgid "Synchronisation status"
-msgstr "Estado de la sincronización"
-
-msgid "New note"
-msgstr "Nueva nota"
-
-msgid "New to-do"
-msgstr "Nueva lista de tareas"
-
-msgid "New notebook"
-msgstr "Nueva libreta"
-
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opciones generales"
-
-msgid "Encryption options"
-msgstr "Opciones de cifrado"
-
-msgid "Web clipper options"
-msgstr "Opciones de recorte web"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Introduce fecha"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Directorio para exportar de Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Archivo"
 
@@ -758,6 +692,10 @@ msgstr "&Ayuda"
 msgid "Website and documentation"
 msgstr "Sitio web y documentación"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin v%s"
+
 msgid "Make a donation"
 msgstr "Hacer una donación"
 
@@ -870,6 +808,9 @@ msgstr ""
 "Este token de autorización se necesita solamente para permitir a "
 "aplicaciones de terceros acceder a Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Las notas y los ajustes se guardan en: %s"
@@ -880,6 +821,9 @@ msgstr "Comprobar sincronización"
 msgid "Browse..."
 msgstr "Explorar..."
 
+msgid "Back"
+msgstr "Atrás"
+
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -961,8 +905,8 @@ msgstr ""
 "través de la sincronización."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Para más información acerca del cifrado extremo a extremo (E2EE) y "
 "advertencias de como habilitarlo por favor revise la documentación:"
@@ -973,12 +917,18 @@ msgstr "Estado"
 msgid "Encryption is:"
 msgstr "El cifrado está:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Uso"
 
-msgid "Back"
-msgstr "Atrás"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1008,6 +958,15 @@ msgstr "Ajustar alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nueva nota"
+
+msgid "New to-do"
+msgstr "Nueva lista de tareas"
+
+msgid "New notebook"
+msgstr "Nueva libreta"
+
 msgid "Layout"
 msgstr "Diseño"
 
@@ -1106,6 +1065,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Solo una nota puede ser impresa o exportada a PDF a la vez."
 
+msgid "PDF File"
+msgstr "Archivo PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Error abriendo la nota en el editor: %s"
+
 msgid "strong text"
 msgstr "texto destacado"
 
@@ -1180,12 +1146,6 @@ msgstr "Opciones"
 msgid "Synchronisation Status"
 msgstr "Estado de la sincronización"
 
-msgid "Encryption Options"
-msgstr "Opciones de cifrado"
-
-msgid "Clipper Options"
-msgstr "Opciones de recorte"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1209,6 +1169,17 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
+msgid "Notebooks"
+msgstr "Libretas"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Descifrando elementos: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Obteniendo refuersos: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccione a dónde se debería exportar el estado de sincronización"
 
@@ -1367,12 +1338,6 @@ msgstr "En progreso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronización ya está en progreso. Estado: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Se ha descargado un elemento de tipo desconocido - actualice Joplin a la "
-"última versión"
-
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1495,10 +1460,10 @@ msgstr "Claro"
 msgid "Dark"
 msgstr "Oscuro"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1567,6 +1532,10 @@ 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~"
+
 msgid "Show tray icon"
 msgstr "Mostrar icono en la bandeja"
 
@@ -1591,6 +1560,10 @@ msgstr "Establecer el porcentaje de aumento de la aplicación"
 msgid "Editor font size"
 msgstr "Editar tamaño de fuente"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editar tamaño de fuente"
+
 msgid "Editor font family"
 msgstr "Fuente del editor"
 
@@ -1656,6 +1629,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorar errores en certificados TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "Habilitar historial de notas"
 
@@ -1691,6 +1674,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Aplicación"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "El cifrado está:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opciones de recorte web"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "La etiqueta \"%s\" ya existe. Por favor, busque un nuevo nombre."
@@ -1704,7 +1695,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Directorio para exportar de Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Archivo exportado de Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Archivo exportado de Evernote"
 
 msgid "Json Export Directory"
@@ -1810,6 +1806,14 @@ 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."
+
+#, fuzzy
+msgid "Create a notebook"
+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 (+)."
 
@@ -1853,21 +1857,10 @@ msgstr "Nueva libreta"
 msgid "Configuration"
 msgstr "Configuración"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Descifrando elementos: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Obteniendo refuersos: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "¿Desea eliminar notas?"
 
-msgid "Notebooks"
-msgstr "Libretas"
-
 msgid "Checking... Please wait."
 msgstr "Comprobando... Por favor espere."
 
@@ -1916,10 +1909,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuración"
-
 msgid "Encryption Config"
 msgstr "Configuración de cifrado"
 
@@ -2112,6 +2101,72 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Iniciando la edición de una nota. Cierre el editor para regresar al "
+#~ "prompt."
+
+#~ msgid "Note has been saved."
+#~ msgstr "La nota ha sido guardada."
+
+#~ msgid "Sidebar"
+#~ msgstr "Barra lateral"
+
+#~ msgid "Note list"
+#~ msgstr "Lista de notas"
+
+#~ msgid "Note title"
+#~ msgstr "Titulo de nota"
+
+#~ msgid "Note body"
+#~ msgstr "Cuerpo de nota"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Estado de la sincronización"
+
+#~ msgid "Print"
+#~ msgstr "Imprimir"
+
+#~ msgid "General Options"
+#~ msgstr "Opciones generales"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opciones de cifrado"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Introduce fecha"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Directorio para exportar de Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opciones de cifrado"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opciones de recorte"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Se ha descargado un elemento de tipo desconocido - actualice Joplin a la "
+#~ "última versión"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuración"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Permiso para usar tu cámara"
@@ -2159,9 +2214,6 @@ msgstr "Buscar"
 #~ "La ruta a la que sincronizar cuando se activa la sincronización con "
 #~ "sistema de archivos. Vea «sync.target»."
 
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"
-
 #~ msgid "Remove?"
 #~ msgstr "¿Borrar?"
 
@@ -2224,9 +2276,6 @@ msgstr "Buscar"
 #~ msgid "Cancel the current command."
 #~ msgstr "Cancelar el comando actual."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Eliminar la nota o libreta seleccionada."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Marca una tarea como completada/no completada"
 

CliClient/locales/eu.po

@@ -175,16 +175,6 @@ msgstr "Ez dago koadernorik aukeratuta."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Ez dago oharrik: \"%s\". Sortu?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Oharra editatzearen hasiera. Itxi editorea prompt-era bueltatzeko."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Errorea editorean oharra zabaltzean: %s"
-
-msgid "Note has been saved."
-msgstr "Oharra gorde da."
-
 msgid "Exits the application."
 msgstr "Irten aplikaziotik."
 
@@ -391,6 +381,23 @@ msgstr "Oharra ezabatu?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Emandako <pattern> bilatzen du ohar guztietan."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -529,10 +536,6 @@ msgstr "Erakutsi erabilera datuak."
 msgid "Fatal error:"
 msgstr "Aio! Agur! :_( "
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikazioak baimena hartu du - Orain fitxa hau zarratu dezakezu."
@@ -587,75 +590,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Koadernoaren izenburua: "
-
-#, fuzzy
-msgid "Note body"
-msgstr "Koadernoak"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-#, fuzzy
-msgid "PDF File"
-msgstr "Fitxategia"
-
-msgid "Synchronisation status"
-msgstr "Sinkronizazioaren egoera"
-
-msgid "New note"
-msgstr "Ohar berria"
-
-msgid "New to-do"
-msgstr "Zeregin berria"
-
-msgid "New notebook"
-msgstr "Koaderno berria"
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr "Ezarpenak"
-
-msgid "Encryption options"
-msgstr "Zifratzeko aukerak"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fitxategia"
@@ -760,6 +694,10 @@ msgstr "Laguntza"
 msgid "Website and documentation"
 msgstr "Web orria eta dokumentazioa (en)"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Evernotetik esportatutako fitxategiak"
+
 #, fuzzy
 msgid "Make a donation"
 msgstr "Web orria eta dokumentazioa (en)"
@@ -866,6 +804,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Oharrak eta ezarpenak hemen daude gordeta: %s"
@@ -877,6 +818,9 @@ msgstr "Sinkronizazioa utzi"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Atzera"
+
 msgid "Apply"
 msgstr ""
 
@@ -957,8 +901,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -967,13 +911,19 @@ msgstr "Egoera"
 msgid "Encryption is:"
 msgstr "Zifratua  da:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Erabili: %s"
 
-msgid "Back"
-msgstr "Atzera"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1006,6 +956,15 @@ msgstr "Ezarri alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Ohar berria"
+
+msgid "New to-do"
+msgstr "Zeregin berria"
+
+msgid "New notebook"
+msgstr "Koaderno berria"
+
 msgid "Layout"
 msgstr "Diseinua"
 
@@ -1102,6 +1061,14 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+#, fuzzy
+msgid "PDF File"
+msgstr "Fitxategia"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Errorea editorean oharra zabaltzean: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1180,13 +1147,6 @@ msgstr "Aukerak"
 msgid "Synchronisation Status"
 msgstr "Sinkronizazioaren egoera"
 
-msgid "Encryption Options"
-msgstr "Zifratzeko aukerak"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Ezarpenak"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1207,6 +1167,17 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
+msgid "Notebooks"
+msgstr "Koadernoak"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Itemak eskuratuta: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Baliabideak: %d/%d"
+
 #, fuzzy
 msgid "Please select where the sync status should be exported to"
 msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
@@ -1368,10 +1339,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizazioa hasita dago. Egoera: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Zifratuta"
 
@@ -1494,10 +1461,10 @@ msgstr "Argia"
 msgid "Dark"
 msgstr "Iluna"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 #, fuzzy
@@ -1573,6 +1540,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1596,6 +1566,10 @@ msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
 msgid "Editor font size"
 msgstr "Oharra editatu."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Oharra editatu."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1654,6 +1628,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Zifratua gaitu"
@@ -1694,6 +1678,13 @@ msgstr ""
 msgid "Application"
 msgstr "Irten aplikaziotik"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Zifratua  da:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1709,7 +1700,11 @@ msgid "Joplin Export Directory"
 msgstr ""
 
 #, fuzzy
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernotetik esportatutako fitxategiak"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernotetik esportatutako fitxategiak"
 
 #, fuzzy
@@ -1814,6 +1809,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ezabatu aukeratutako oharra edo koadernoa"
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Koaderno berria sortzen du."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Ez dago oharrik. Sortu bat (+) botoian klik eginaz."
 
@@ -1859,21 +1862,10 @@ msgstr "Koaderno berria"
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Itemak eskuratuta: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Baliabideak: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "Ohar berria"
 
-msgid "Notebooks"
-msgstr "Koadernoak"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Bertan behera uzten... itxaron, mesedez."
@@ -1918,10 +1910,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfigurazioa"
-
 msgid "Encryption Config"
 msgstr "Zifratze Ezarpenak"
 
@@ -2108,6 +2096,47 @@ msgstr "Login with OneDrive"
 msgid "Search"
 msgstr "Bilatu"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "Oharra editatzearen hasiera. Itxi editorea prompt-era bueltatzeko."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Oharra gorde da."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Koadernoaren izenburua: "
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Koadernoak"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Sinkronizazioaren egoera"
+
+#~ msgid "General Options"
+#~ msgstr "Ezarpenak"
+
+#~ msgid "Encryption options"
+#~ msgstr "Zifratzeko aukerak"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Zifratzeko aukerak"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Ezarpenak"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfigurazioa"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Sinkronizazioa utzi"
 
@@ -2200,9 +2229,6 @@ msgstr "Bilatu"
 #~ msgid "Cancel the current command."
 #~ msgstr "Utzi uneko komandoa"
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Ezabatu aukeratutako oharra edo koadernoa"
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Zeregina eginda / ez-eginda markatu"
 

CliClient/locales/fa.po

@@ -162,16 +162,6 @@ msgstr "دفترچه‌ی فعالی وجود ندارد."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr ""
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
-msgid "Note has been saved."
-msgstr "یادداشت ذخیره شد."
-
 msgid "Exits the application."
 msgstr "خروح از نرم‌افزار."
 
@@ -356,6 +346,23 @@ msgstr "پاک کردن یادداشت؟"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -475,10 +482,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -517,75 +520,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr "نوار کناری"
-
-msgid "Note list"
-msgstr "لیست یادداشت"
-
-msgid "Note title"
-msgstr "موضوع یادداشت"
-
-msgid "Note body"
-msgstr "بدنه ی یادداشت"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr "فایل PDF"
-
-#, fuzzy
-msgid "Synchronisation status"
-msgstr "وضعیت سینک"
-
-msgid "New note"
-msgstr "یادداشت جدید"
-
-msgid "New to-do"
-msgstr "فهرست کارهای جدید"
-
-msgid "New notebook"
-msgstr "دفترچه جدید"
-
-msgid "Print"
-msgstr "پرینت"
-
-msgid "General Options"
-msgstr "تنظیمات کلی"
-
-msgid "Encryption options"
-msgstr "تنظیمات رمزنگاری"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "وارد کردن تاریخ و ساعت"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "فولدر خروجی Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s، %s)"
-
 msgid "&File"
 msgstr ""
 
@@ -684,6 +618,10 @@ msgstr "&کمک"
 msgid "Website and documentation"
 msgstr ""
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "فایل خروجی Joplin"
+
 msgid "Make a donation"
 msgstr ""
 
@@ -787,6 +725,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -797,6 +738,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "بازگشت"
+
 msgid "Apply"
 msgstr "اعمال"
 
@@ -866,8 +810,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -876,11 +820,17 @@ msgstr "وضعیت"
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
-msgstr "بازگشت"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
+msgstr ""
 
 #, javascript-format
 msgid ""
@@ -911,6 +861,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "یادداشت جدید"
+
+msgid "New to-do"
+msgstr "فهرست کارهای جدید"
+
+msgid "New notebook"
+msgstr "دفترچه جدید"
+
 msgid "Layout"
 msgstr ""
 
@@ -1005,6 +964,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "فایل PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1085,12 +1051,6 @@ msgstr "گزینه ها"
 msgid "Synchronisation Status"
 msgstr ""
 
-msgid "Encryption Options"
-msgstr "گزینه های رمزنگاری"
-
-msgid "Clipper Options"
-msgstr "تنظیمات کلیپر"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1111,6 +1071,17 @@ msgstr "پاک کردن"
 msgid "Rename"
 msgstr "تغییر نام"
 
+msgid "Notebooks"
+msgstr "دفترچه ها"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "آیتم های دریافت شده: %d از %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1259,10 +1230,6 @@ msgstr "درحال انجام"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "سینک کردن در حال انجام است. وضعیت: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "رمزنگاری شده"
 
@@ -1376,10 +1343,10 @@ msgstr "روشن"
 msgid "Dark"
 msgstr "تیره"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1448,6 +1415,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1469,6 +1439,10 @@ msgstr "درصد برزگنمایی کلی"
 msgid "Editor font size"
 msgstr "سایز فونت ویرایشگر"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "سایز فونت ویرایشگر"
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1524,6 +1498,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "فعال سایز ثبت تاریخچه ی یادداشت"
 
@@ -1559,6 +1543,13 @@ msgstr "پلاگین ها"
 msgid "Application"
 msgstr "نرم‌افزار"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "رمزنگاری: %s"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "برچسب «%s» وجود دارد. لطفا نام دیگری انتخاب کنی"
@@ -1572,7 +1563,12 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr "فولدر خروجی Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "فولدر خروجی Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "فولدر خروجی Evernote"
 
 msgid "Json Export Directory"
@@ -1672,6 +1668,14 @@ msgstr "اجازه برای استفاده از دوربین"
 msgid "Your permission to use your camera is required."
 msgstr "اجازه ی شما برای استفاده از دوربین شما نیاز است."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "دفترچه‌ی فعالی وجود ندارد."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "ایجاد دفترچه جدید."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 
@@ -1714,21 +1718,10 @@ msgstr "دفترچه جدید"
 msgid "Configuration"
 msgstr "تنظیمات"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "آیتم های دریافت شده: %d از %d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "یادداشت"
 
-msgid "Notebooks"
-msgstr "دفترچه ها"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "در حال چک کرد... لطفا صبر کنید."
@@ -1771,10 +1764,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "تنظیمات"
-
 msgid "Encryption Config"
 msgstr "تنظیمات رمزنگاری"
 
@@ -1959,6 +1948,59 @@ msgstr "ورود با OneDrive"
 msgid "Search"
 msgstr "جستجو"
 
+#~ msgid "Note has been saved."
+#~ msgstr "یادداشت ذخیره شد."
+
+#~ msgid "Sidebar"
+#~ msgstr "نوار کناری"
+
+#~ msgid "Note list"
+#~ msgstr "لیست یادداشت"
+
+#~ msgid "Note title"
+#~ msgstr "موضوع یادداشت"
+
+#~ msgid "Note body"
+#~ msgstr "بدنه ی یادداشت"
+
+#, fuzzy
+#~ msgid "Synchronisation status"
+#~ msgstr "وضعیت سینک"
+
+#~ msgid "Print"
+#~ msgstr "پرینت"
+
+#~ msgid "General Options"
+#~ msgstr "تنظیمات کلی"
+
+#~ msgid "Encryption options"
+#~ msgstr "تنظیمات رمزنگاری"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "وارد کردن تاریخ و ساعت"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "فولدر خروجی Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s، %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "گزینه های رمزنگاری"
+
+#~ msgid "Clipper Options"
+#~ msgstr "تنظیمات کلیپر"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "تنظیمات"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "اجازه برای استفاده از دوربین"

CliClient/locales/fr_FR.po

@@ -173,18 +173,6 @@ msgstr "Aucun carnet actif."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Cette note n'existe pas : \"%s\". La créer ?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Édition de la note en cours. Fermez l'éditeur de texte pour retourner à "
-"l'invite de commande."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Erreur lors de l'ouverture de la note dans l'éditeur de texte : %s"
-
-msgid "Note has been saved."
-msgstr "La note a été enregistrée."
-
 msgid "Exits the application."
 msgstr "Quitter le logiciel."
 
@@ -389,6 +377,26 @@ msgstr "Supprimer la note ?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Chercher le motif <pattern> dans toutes les notes."
 
+#, javascript-format
+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 ""
+"Démarre, stop ou vérifie l'état du serveur API. Pour spécifier sur quel port "
+"il doit tourner, veuillez utiliser la variable de config api.port. Les "
+"commandes sont (%s)."
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr "Le serveur tourne déjà sur le port %d"
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr "Le serveur tourne sur le port %d"
+
+msgid "Server is not running."
+msgstr "Le serveur est arrêté."
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -530,12 +538,6 @@ msgstr "Tapez `Joplin help` pour afficher l'aide."
 msgid "Fatal error:"
 msgstr "Erreur fatale :"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-"Tous les ports sont en cours d'utilisation. Veuillez signaler ce problème "
-"sur %s"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Le logiciel a été autorisé. Vous pouvez maintenant fermer cet onglet."
@@ -590,72 +592,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exporter vers \"%s\" au format \"%s\". Veuillez patienter..."
 
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-msgid "Note list"
-msgstr "Liste de notes"
-
-msgid "Note title"
-msgstr "Titre de la note"
-
-msgid "Note body"
-msgstr "Corps de la note"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
-
-msgid "PDF File"
-msgstr "Fichier PDF"
-
-msgid "Synchronisation status"
-msgstr "État de la synchronisation"
-
-msgid "New note"
-msgstr "Nouvelle note"
-
-msgid "New to-do"
-msgstr "Nouvelle tâche"
-
-msgid "New notebook"
-msgstr "Nouveau carnet"
-
-msgid "Print"
-msgstr "Imprimer"
-
-msgid "General Options"
-msgstr "Options générales"
-
-msgid "Encryption options"
-msgstr "Options de chiffrement"
-
-msgid "Web clipper options"
-msgstr "Options du Web Clipper"
-
-msgid "Create note from template"
-msgstr "Créer une note à partir d'un modèle"
-
-msgid "Create to-do from template"
-msgstr "Créer une tâche à partir d'un modèle"
-
-msgid "Insert template"
-msgstr "Insérer un modèle"
-
-msgid "Open template directory"
-msgstr "Ouvrir le dossier des modèles"
-
-msgid "Refresh templates"
-msgstr "Rafraichir modèles"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "Révision : %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Fichier"
 
@@ -753,6 +689,9 @@ msgstr "&Aide"
 msgid "Website and documentation"
 msgstr "Documentation en ligne"
 
+msgid "Joplin Forum"
+msgstr "Forum Joplin"
+
 msgid "Make a donation"
 msgstr "Faire un don"
 
@@ -866,6 +805,9 @@ msgstr ""
 "Ce code d'authentification est nécessaire uniquement pour permettre aux "
 "logiciels tiers d'accéder aux données de Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr "Sauvegarder vos changements avant de continuer ?"
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes et paramètres se trouve dans : %s"
@@ -876,6 +818,9 @@ msgstr "Vérifier config synchronisation"
 msgid "Browse..."
 msgstr "Parcourir…"
 
+msgid "Back"
+msgstr "Retour"
+
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -959,8 +904,8 @@ msgstr ""
 "probable qu'elle vont être prochainement disponible via la synchronisation."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Pour plus d'informations sur le chiffrement de bout en bout, ainsi que des "
 "conseils pour l'activer, veuillez consulter la documentation :"
@@ -971,12 +916,18 @@ msgstr "État"
 msgid "Encryption is:"
 msgstr "Le chiffrement est :"
 
+msgid "Firefox Extension"
+msgstr "Module Firefox"
+
+msgid "Chrome Web Store"
+msgstr "Chrome Web Store"
+
+msgid "Get it now:"
+msgstr "L'obtenir maintenant :"
+
 msgid "Usage"
 msgstr "Utilisation"
 
-msgid "Back"
-msgstr "Retour"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1005,9 +956,17 @@ msgstr "Renommer étiquette :"
 msgid "Set alarm:"
 msgstr "Régler alarme :"
 
-#, fuzzy
 msgid "Template file:"
-msgstr "Modèles"
+msgstr "Fichier de modèle :"
+
+msgid "New note"
+msgstr "Nouvelle note"
+
+msgid "New to-do"
+msgstr "Nouvelle tâche"
+
+msgid "New notebook"
+msgstr "Nouveau carnet"
 
 msgid "Layout"
 msgstr "Disposition"
@@ -1047,7 +1006,7 @@ msgid "Note History"
 msgstr "Historique des notes"
 
 msgid "Markup"
-msgstr ""
+msgstr "Langage de balisage"
 
 msgid "Previous versions of this note"
 msgstr "Versions précédentes de cette note"
@@ -1110,6 +1069,13 @@ msgstr ""
 "Les notes ne peuvent être imprimées ou exportées en PDF qu'une seule à la "
 "fois."
 
+msgid "PDF File"
+msgstr "Fichier PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Erreur lors de l'ouverture de la note dans l'éditeur de texte : %s"
+
 msgid "strong text"
 msgstr "texte en gras"
 
@@ -1184,12 +1150,6 @@ msgstr "Options"
 msgid "Synchronisation Status"
 msgstr "État de la synchronisation"
 
-msgid "Encryption Options"
-msgstr "Options de chiffrement"
-
-msgid "Clipper Options"
-msgstr "Options du Web Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1213,6 +1173,17 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
+msgid "Notebooks"
+msgstr "Carnets"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Déchiffrement des objets : %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Tél. ressources : %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Veuillez sélectionner un répertoire ou exporter l'état de la synchronisation"
@@ -1372,10 +1343,6 @@ msgstr "En cours"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La synchronisation est déjà en cours. État : %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr "Objet inconnu téléchargé - veuillez mettre Joplin à jour"
-
 msgid "Encrypted"
 msgstr "Chiffré"
 
@@ -1497,11 +1464,11 @@ msgstr "Clair"
 msgid "Dark"
 msgstr "Sombre"
 
-msgid "Solarized Light"
-msgstr ""
+msgid "Solarised Light"
+msgstr "Solarisé clair"
 
-msgid "Solarized Dark"
-msgstr ""
+msgid "Solarised Dark"
+msgstr "Solarisé sombre"
 
 msgid "Uncompleted to-dos on top"
 msgstr "Tâches non-terminées en haut"
@@ -1569,6 +1536,9 @@ msgstr "Activer la syntaxe ++insertion++"
 msgid "Enable multimarkdown table extension"
 msgstr "Activer les tables multi-markdown"
 
+msgid "Enable Fountain syntax support"
+msgstr "Activer la syntaxe \"Fountain\""
+
 msgid "Show tray icon"
 msgstr "Afficher l'icône dans la zone de notifications"
 
@@ -1593,6 +1563,9 @@ msgstr "Niveau de zoom"
 msgid "Editor font size"
 msgstr "Taille police éditeur"
 
+msgid "Editor font"
+msgstr "Police de l'éditeur"
+
 msgid "Editor font family"
 msgstr "Police de l'éditeur"
 
@@ -1657,6 +1630,21 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorer les erreurs de certificats TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+"Sécurité : Ne pas supprimer toutes les données lorsque la cible de "
+"synchronisation est vide (souvent à cause d'un bug ou d'un problème de "
+"config)"
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+"Détermine quel port sera utilisé par le serveur API. Si aucun n'est "
+"spécifié, un port par défaut sera utilisé."
+
 msgid "Enable note history"
 msgstr "Activer l'historique des notes"
 
@@ -1692,6 +1680,12 @@ msgstr "Modules"
 msgid "Application"
 msgstr "Application"
 
+msgid "Encryption"
+msgstr "Chiffrement"
+
+msgid "Web Clipper"
+msgstr "Web Clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "L'étiquette \"%s\" existe déjà. Veuillez choisir un autre nom."
@@ -1705,8 +1699,11 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Dossier d'export Joplin"
 
-msgid "Evernote Export File"
-msgstr "Fichiers d'export Evernote"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Fichiers d'export Evernote (vers Markdown)"
+
+msgid "Evernote Export File (as HTML)"
+msgstr "Fichiers d'export Evernote (vers HTML)"
 
 msgid "Json Export Directory"
 msgstr "Dossier d'export JSON"
@@ -1813,6 +1810,12 @@ msgstr "Permission d'utiliser l'appareil photo"
 msgid "Your permission to use your camera is required."
 msgstr "Votre permission est requise pour utiliser l'appareil photo."
 
+msgid "You currently have no notebooks."
+msgstr "Vous n'avez pour l'instant pas de carnets."
+
+msgid "Create a notebook"
+msgstr "Créer un carnet"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Ce carnet ne contient aucune note. Créez-en une en appuyant sur le bouton "
@@ -1856,20 +1859,9 @@ msgstr "Nouveau carnet"
 msgid "Configuration"
 msgstr "Configuration"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Déchiffrement des objets : %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Tél. ressources : %d/%d"
-
 msgid "All notes"
 msgstr "Toutes les notes"
 
-msgid "Notebooks"
-msgstr "Carnets"
-
 msgid "Checking... Please wait."
 msgstr "Vérification... Veuillez attendre."
 
@@ -1913,7 +1905,6 @@ msgstr "Entrez de nouvelles étiquettes ou sélectionnez de la liste"
 msgid "Warning"
 msgstr "Avertissement"
 
-#, fuzzy
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
@@ -1921,9 +1912,6 @@ msgstr ""
 "Pour utiliser la synchronisation par système de fichiers, votre autorisation "
 "pour écrire sur le stockage externe est requise."
 
-msgid "Information"
-msgstr "Information"
-
 msgid "Encryption Config"
 msgstr "Config chiffrement"
 
@@ -1948,13 +1936,12 @@ msgstr "Correction de l'index..."
 msgid "Fix search index"
 msgstr "Corriger index de recherche"
 
-#, fuzzy
 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 ""
 "Utilisez ceci pour corriger l'index du moteur de recherche en cas de "
-"problème. Cela peut prendre assez longtemps selon le nombre de notes."
+"problème. Cela peut prendre longtemps selon le nombre de notes."
 
 msgid "More information"
 msgstr "Plus d'information"
@@ -2109,6 +2096,80 @@ msgstr "Se connecter à OneDrive"
 msgid "Search"
 msgstr "Chercher"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Édition de la note en cours. Fermez l'éditeur de texte pour retourner à "
+#~ "l'invite de commande."
+
+#~ msgid "Note has been saved."
+#~ msgstr "La note a été enregistrée."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "Tous les ports sont en cours d'utilisation. Veuillez signaler ce problème "
+#~ "sur %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Barre latérale"
+
+#~ msgid "Note list"
+#~ msgstr "Liste de notes"
+
+#~ msgid "Note title"
+#~ msgstr "Titre de la note"
+
+#~ msgid "Note body"
+#~ msgstr "Corps de la note"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "État de la synchronisation"
+
+#~ msgid "Print"
+#~ msgstr "Imprimer"
+
+#~ msgid "General Options"
+#~ msgstr "Options générales"
+
+#~ msgid "Encryption options"
+#~ msgstr "Options de chiffrement"
+
+#~ msgid "Create note from template"
+#~ msgstr "Créer une note à partir d'un modèle"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "Créer une tâche à partir d'un modèle"
+
+#~ msgid "Insert template"
+#~ msgstr "Insérer un modèle"
+
+#~ msgid "Open template directory"
+#~ msgstr "Ouvrir le dossier des modèles"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Rafraichir modèles"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Révision : %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Options de chiffrement"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Options du Web Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr "Objet inconnu téléchargé - veuillez mettre Joplin à jour"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
 #~ msgid ""
 #~ "Joplin does not have permission to access \"%s\". Either choose a "
 #~ "different sync target, or give Joplin the \"Storage\" permission."
@@ -2166,9 +2227,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 "Joplin v%s"
-#~ msgstr "Joplin v%s"
-
 #~ msgid "Remove?"
 #~ msgstr "Supprimer ?"
 
@@ -2234,9 +2292,6 @@ msgstr "Chercher"
 #~ msgid "Exit the application."
 #~ msgstr "Quitter le logiciel."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Supprimer la note ou carnet sélectionné."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Marquer une tâches comme complétée / non-complétée"
 

CliClient/locales/gl_ES.po

@@ -172,16 +172,6 @@ msgstr "Ningún caderno activo."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "A nota non existe: «%s». Desexa creala?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Comezando a editar a nota. Peche o editor para volver ao diálogo."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Produciuse un erro abrindo a nota no editor: %s"
-
-msgid "Note has been saved."
-msgstr "A nota foi gardada."
-
 msgid "Exits the application."
 msgstr "Sae do aplicativo."
 
@@ -388,6 +378,23 @@ msgstr "Eliminar nota?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Busca o patrón <pattern> en todas as notas."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -524,10 +531,6 @@ msgstr "Escriba «joplin help» para obter información do uso."
 msgid "Fatal error:"
 msgstr "Erro fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "O aplicativo foi autorizado. Xa pode pechar esta lapela do navegador."
@@ -581,75 +584,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando a «%s» como formato «%s». Agarde..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Título do caderno:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Cadernos"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importando de «%s» como formato «%s». Agarde..."
-
-msgid "PDF File"
-msgstr "Ficheiro PDF"
-
-msgid "Synchronisation status"
-msgstr "Estado da sincronización"
-
-msgid "New note"
-msgstr "Nova nota"
-
-msgid "New to-do"
-msgstr "Nova tarefa"
-
-msgid "New notebook"
-msgstr "Novo caderno"
-
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opcións xerais"
-
-msgid "Encryption options"
-msgstr "Opcións de cifrado"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Cartafol de exportación do Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Ficheiro"
@@ -755,6 +689,10 @@ msgstr "Axuda"
 msgid "Website and documentation"
 msgstr "Sitio web e documentación"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Sitio web de Joplin"
+
 msgid "Make a donation"
 msgstr "Doar"
 
@@ -859,6 +797,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "As notas e axustes gardáronse en: %s"
@@ -869,6 +810,9 @@ msgstr "Comprobar a configuración da sincronización"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Anterior"
+
 msgid "Apply"
 msgstr ""
 
@@ -950,8 +894,8 @@ msgstr ""
 "descargados pola sincronización."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -960,13 +904,19 @@ msgstr "Estado"
 msgid "Encryption is:"
 msgstr "O cifrado é:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Uso: %s"
 
-msgid "Back"
-msgstr "Anterior"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -997,6 +947,15 @@ msgstr "Estabelecer alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova nota"
+
+msgid "New to-do"
+msgstr "Nova tarefa"
+
+msgid "New notebook"
+msgstr "Novo caderno"
+
 msgid "Layout"
 msgstr "Disposición"
 
@@ -1093,6 +1052,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "Ficheiro PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Produciuse un erro abrindo a nota no editor: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1168,13 +1134,6 @@ msgstr "Opcións"
 msgid "Synchronisation Status"
 msgstr "Estado da sincronización"
 
-msgid "Encryption Options"
-msgstr "Opcións de cifrado"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Opcións xerais"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1196,6 +1155,17 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
+msgid "Notebooks"
+msgstr "Cadernos"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementos obtidos: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Recursos: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Seleccione onde exportar o estado da sincronización"
 
@@ -1356,10 +1326,6 @@ msgstr "En proceso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "A sincronización xa está en proceso. Estado: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1477,10 +1443,10 @@ msgstr "Claro"
 msgid "Dark"
 msgstr "Escuro"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1552,6 +1518,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostrar a icona na bandexa"
 
@@ -1574,6 +1543,10 @@ msgstr "Porcentaxe de ampliación"
 msgid "Editor font size"
 msgstr "Familia de tipos de letra do editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Familia de tipos de letra do editor"
+
 msgid "Editor font family"
 msgstr "Familia de tipos de letra do editor"
 
@@ -1635,6 +1608,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Activar cifrado"
@@ -1675,6 +1658,13 @@ msgstr ""
 msgid "Application"
 msgstr "Sae do aplicativo."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "O cifrado é:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1688,7 +1678,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Cartafol de exportación do Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Ficheiro de exportación de Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Ficheiro de exportación de Evernote"
 
 #, fuzzy
@@ -1795,6 +1790,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ningún caderno activo."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Crea un caderno novo."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Non ten notas actualmente. Cree unha premendo no botón (+)."
 
@@ -1840,21 +1843,10 @@ msgstr "Novo caderno"
 msgid "Configuration"
 msgstr "Configuración"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Elementos obtidos: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Recursos: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "nota"
 
-msgid "Notebooks"
-msgstr "Cadernos"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Cancelando... Agarde."
@@ -1899,10 +1891,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuración"
-
 msgid "Encryption Config"
 msgstr "Configuración de cifrado"
 
@@ -2088,6 +2076,57 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "Comezando a editar a nota. Peche o editor para volver ao diálogo."
+
+#~ msgid "Note has been saved."
+#~ msgstr "A nota foi gardada."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Título do caderno:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Cadernos"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importando de «%s» como formato «%s». Agarde..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Estado da sincronización"
+
+#~ msgid "Print"
+#~ msgstr "Imprimir"
+
+#~ msgid "General Options"
+#~ msgstr "Opcións xerais"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opcións de cifrado"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Cartafol de exportación do Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opcións de cifrado"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Opcións xerais"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuración"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Cancelar sincronización"
 
@@ -2130,10 +2169,6 @@ msgstr "Buscar"
 #~ "Ruta para sincronizar cando estea activada a sincronización do sistema de "
 #~ "ficheiros. Vexa «sync.target»."
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Sitio web de Joplin"
-
 #~ msgid "State: %s."
 #~ msgstr "Estado: %s."
 

CliClient/locales/hr_HR.po

@@ -173,18 +173,6 @@ msgstr "Nema aktivne bilježnice."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Bilješka ne postoji: \"%s\". Napravi je?"
 
-#, fuzzy
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Počinjem uređivati bilješku. Za povratak u naredbeni redak, zatvori uređivač."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
-msgid "Note has been saved."
-msgstr "Bilješka je spremljena."
-
 msgid "Exits the application."
 msgstr "Izlaz iz aplikacije."
 
@@ -393,6 +381,23 @@ msgstr "Obrisati bilješku?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Pretražuje dati <pattern> u svim bilješkama."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, fuzzy, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -530,10 +535,6 @@ msgstr "Prikazuje informacije o korištenju."
 msgid "Fatal error:"
 msgstr "Fatalna greška:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikacija je autorizirana - smiješ zatvoriti karticu preglednika."
@@ -583,76 +584,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Naslov bilježnice:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Bilježnice"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-#, fuzzy
-msgid "PDF File"
-msgstr "Datoteka"
-
-msgid "Synchronisation status"
-msgstr "Status sinkronizacije"
-
-msgid "New note"
-msgstr "Nova bilješka"
-
-msgid "New to-do"
-msgstr "Novi zadatak"
-
-msgid "New notebook"
-msgstr "Nova bilježnica"
-
-msgid "Print"
-msgstr ""
-
-#, fuzzy
-msgid "General Options"
-msgstr "Opcije"
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Datoteka"
@@ -758,6 +689,10 @@ msgstr "Pomoć"
 msgid "Website and documentation"
 msgstr "Website i dokumentacija"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Evernote izvozne datoteke"
+
 #, fuzzy
 msgid "Make a donation"
 msgstr "Website i dokumentacija"
@@ -864,6 +799,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Bilješke i postavke su pohranjene u: %s"
@@ -875,6 +813,9 @@ msgstr "Prekini sinkronizaciju"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Natrag"
+
 msgid "Apply"
 msgstr ""
 
@@ -943,8 +884,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -953,13 +894,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr ""
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Korištenje: %s"
 
-msgid "Back"
-msgstr "Natrag"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -992,6 +939,15 @@ msgstr "Postavi upozorenje:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova bilješka"
+
+msgid "New to-do"
+msgstr "Novi zadatak"
+
+msgid "New notebook"
+msgstr "Nova bilježnica"
+
 msgid "Layout"
 msgstr "Izgled"
 
@@ -1087,6 +1043,14 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+#, fuzzy
+msgid "PDF File"
+msgstr "Datoteka"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1164,13 +1128,6 @@ msgstr "Opcije"
 msgid "Synchronisation Status"
 msgstr "Status Sinkronizacije"
 
-msgid "Encryption Options"
-msgstr ""
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Opcije"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1192,6 +1149,17 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
+msgid "Notebooks"
+msgstr "Bilježnice"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Stvorene lokalne stavke: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Resursi: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
 
@@ -1349,10 +1317,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizacija je već u toku. Stanje: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1469,10 +1433,10 @@ msgstr "Svijetla"
 msgid "Dark"
 msgstr "Tamna"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 #, fuzzy
@@ -1548,6 +1512,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1570,6 +1537,10 @@ msgstr ""
 msgid "Editor font size"
 msgstr "Uredi bilješku."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Uredi bilješku."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1628,6 +1599,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Bilješka je promijenjena:"
@@ -1668,6 +1649,12 @@ msgstr ""
 msgid "Application"
 msgstr "Izađi iz aplikacije."
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1683,7 +1670,11 @@ msgid "Joplin Export Directory"
 msgstr ""
 
 #, fuzzy
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote izvozne datoteke"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote izvozne datoteke"
 
 #, fuzzy
@@ -1786,6 +1777,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Obriši odabranu bilješku ili bilježnicu."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Stvara novu bilježnicu."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Trenutno nema bilješki. Stvori novu klikom na (+) gumb."
 
@@ -1831,21 +1830,10 @@ msgstr "Nova bilježnica"
 msgid "Configuration"
 msgstr "Konfiguracija"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Stvorene lokalne stavke: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Resursi: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "Nova bilješka"
 
-msgid "Notebooks"
-msgstr "Bilježnice"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Prekidam... Pričekaj."
@@ -1890,10 +1878,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfiguracija"
-
 msgid "Encryption Config"
 msgstr ""
 
@@ -2081,6 +2065,45 @@ msgstr "Prijavi se u OneDrive"
 msgid "Search"
 msgstr "Traži"
 
+#, fuzzy
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Počinjem uređivati bilješku. Za povratak u naredbeni redak, zatvori "
+#~ "uređivač."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Bilješka je spremljena."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Naslov bilježnice:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Bilježnice"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status sinkronizacije"
+
+#, fuzzy
+#~ msgid "General Options"
+#~ msgstr "Opcije"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Opcije"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfiguracija"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Prekini sinkronizaciju"
 
@@ -2175,9 +2198,6 @@ msgstr "Traži"
 #~ msgid "Cancel the current command."
 #~ msgstr "Prekini trenutnu naredbu."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Obriši odabranu bilješku ili bilježnicu."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Postavi zadatak kao završen/nezavršen"
 

CliClient/locales/it_IT.po

@@ -17,7 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
-msgstr "Per eliminare un'etichetta, togli l'etichetta dalle note a cui è associata."
+msgstr ""
+"Per eliminare un'etichetta, togli l'etichetta dalle note a cui è associata."
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr "Per favore seleziona la nota o il taccuino da eliminare."
@@ -174,16 +175,6 @@ msgstr "Nessun Taccuino attivo."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Non esiste la nota: \"%s\". Desideri crearla?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Comincia a modificare la nota. Chiudi l'editor per tornare al prompt."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Errore durante l'apertura della nota nell'editor: %s"
-
-msgid "Note has been saved."
-msgstr "La nota è stata salvata."
-
 msgid "Exits the application."
 msgstr "Esci dall'applicazione."
 
@@ -393,6 +384,25 @@ msgstr "Eliminare la nota?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Cerca <pattern> in tutte le note."
 
+#, javascript-format
+msgid ""
+"Start, stop or check the API server. To specify on which port it should run, "
+"set the api.port config variable. Commands are (%s)."
+msgstr ""
+"Avvia, ferma o controlla il server API. Per specificare su quale porta deve "
+"essere eseguito, setta la variabile api.config. I comandi sono (%s)."
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr "Il server è già in esecuzione sulla porta %d"
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr "Il server è in esecuzione sulla porta %d"
+
+msgid "Server is not running."
+msgstr "Il server non è in esecuzione."
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -534,10 +544,6 @@ msgstr "Scrivi `joplin help` per informazioni sull'uso."
 msgid "Fatal error:"
 msgstr "Errore fatale:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -594,74 +600,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Esportazione da \"%s\" come formato \"%s\". Si prega di attendere..."
 
-msgid "Sidebar"
-msgstr "Barra laterale"
-
-msgid "Note list"
-msgstr "Lista delle note"
-
-msgid "Note title"
-msgstr "Titolo della nota"
-
-msgid "Note body"
-msgstr "Corpo della nota"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importazione da \"%s\" come formato \"%s\". Si prega di attendere..."
-
-msgid "PDF File"
-msgstr "PDF File"
-
-msgid "Synchronisation status"
-msgstr "Stato di sincronizzazione"
-
-msgid "New note"
-msgstr "Nuova nota"
-
-msgid "New to-do"
-msgstr "Nuovo \"Cose-da-fare\""
-
-msgid "New notebook"
-msgstr "Nuovo taccuino"
-
-msgid "Print"
-msgstr "Stampa"
-
-msgid "General Options"
-msgstr "Opzioni Generali"
-
-msgid "Encryption options"
-msgstr "Opzioni Crittografia"
-
-msgid "Web clipper options"
-msgstr "Opzioni Web Clipper"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Inserisci data e ora"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Cartella di esportazione di Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&File"
 
@@ -675,7 +613,7 @@ msgid "Check for updates..."
 msgstr "Controlla aggiornamenti..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Modelli"
 
 msgid "Import"
 msgstr "Importa"
@@ -759,6 +697,9 @@ msgstr "&Aiuto"
 msgid "Website and documentation"
 msgstr "Sito web e documentazione"
 
+msgid "Joplin Forum"
+msgstr "Joplin Forum"
+
 msgid "Make a donation"
 msgstr "Fai una donazione"
 
@@ -870,6 +811,9 @@ msgstr ""
 "Il token autorizzativo è necessario solo per permettere ad applicazioni di "
 "terze parti di accedere a Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Le note e le impostazioni sono memorizzate in: %s"
@@ -880,6 +824,9 @@ msgstr "Controlla la configurazione della sincronizzazione"
 msgid "Browse..."
 msgstr "Naviga..."
 
+msgid "Back"
+msgstr "Indietro"
+
 msgid "Apply"
 msgstr "Applica"
 
@@ -963,8 +910,8 @@ msgstr ""
 "ad essi. È probabile che verranno scaricati tramite la sincronizzazione."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Per ulteriori informazioni sulla crittografia end-to-end (E2EE) e consigli "
 "su come abilitarlo, consultare la documentazione:"
@@ -975,12 +922,18 @@ msgstr "Stato"
 msgid "Encryption is:"
 msgstr "La crittografia è:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Uso"
 
-msgid "Back"
-msgstr "Indietro"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -996,7 +949,7 @@ msgid "Notebook title:"
 msgstr "Titolo del Taccuino:"
 
 msgid "Add or remove tags:"
-msgstr "Aggiungi or rimuovi etichetta:"
+msgstr "Aggiungi o rimuovi etichetta:"
 
 msgid "Rename notebook:"
 msgstr "Rinomina il Taccuino:"
@@ -1008,7 +961,16 @@ msgid "Set alarm:"
 msgstr "Imposta allarme:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "File del modello:"
+
+msgid "New note"
+msgstr "Nuova nota"
+
+msgid "New to-do"
+msgstr "Nuovo \"Cose-da-fare\""
+
+msgid "New notebook"
+msgstr "Nuovo taccuino"
 
 msgid "Layout"
 msgstr "Disposizione"
@@ -1108,6 +1070,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Solo una nota alla volta può essere stampata o esportata come PDF."
 
+msgid "PDF File"
+msgstr "PDF File"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Errore durante l'apertura della nota nell'editor: %s"
+
 msgid "strong text"
 msgstr "Testo grasseto"
 
@@ -1182,12 +1151,6 @@ msgstr "Opzioni"
 msgid "Synchronisation Status"
 msgstr "Stato della Sincronizzazione"
 
-msgid "Encryption Options"
-msgstr "Opzioni di crittografia"
-
-msgid "Clipper Options"
-msgstr "Opzioni Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1211,6 +1174,17 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
+msgid "Notebooks"
+msgstr "Taccuini"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Decrittografia Elementi: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Recupero risorse: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Prego selezionare dove lo stato della sincronizzazione deve essere esportato"
@@ -1370,12 +1344,6 @@ msgstr "In corso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronizzazione è già in corso. Stato: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Tipo elemento scaricato sconosciuto - prego aggiornare Joplin all’ultima "
-"versione"
-
 msgid "Encrypted"
 msgstr "Crittografato"
 
@@ -1495,17 +1463,17 @@ msgstr "Chiaro"
 msgid "Dark"
 msgstr "Scuro"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
-msgstr "Cose da fare incomplete in cima alla lista"
+msgstr "\"Cose-da-fare\" incomplete in cima alla lista"
 
 msgid "Show completed to-dos"
-msgstr "Mostra le cose da fare completate"
+msgstr "Mostra le \"Cose-da-fare\" completate"
 
 msgid "Sort notes by"
 msgstr "Ordina le note per"
@@ -1567,6 +1535,9 @@ msgstr "Attiva sintassi ++insert++"
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr "Attiva supporto sintassi Fountain"
+
 msgid "Show tray icon"
 msgstr "Visualizza tray icon"
 
@@ -1591,6 +1562,10 @@ msgstr "Percentuale di zoom globale"
 msgid "Editor font size"
 msgstr "Editor dimensione caratteri"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editor dimensione caratteri"
+
 msgid "Editor font family"
 msgstr "Editor famiglia caratteri"
 
@@ -1656,6 +1631,18 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignora gli errori del certificato TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+"Specifica la porta che deve essere usata dal server API. Se non viene "
+"settato, viene usato un valore di default."
+
 msgid "Enable note history"
 msgstr "Attiva cronologia della nota"
 
@@ -1691,6 +1678,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Applicazione"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "La crittografia è:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opzioni Web Clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Il tag \"%s\" esiste già. Scegliere un nome differente."
@@ -1704,7 +1699,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Cartella di esportazione di Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Esporta files di Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Esporta files di Evernote"
 
 msgid "Json Export Directory"
@@ -1812,6 +1812,12 @@ msgstr "Permesso di usare la fotocamera"
 msgid "Your permission to use your camera is required."
 msgstr "E’ richiesto il permesso di usare la fotocamera."
 
+msgid "You currently have no notebooks."
+msgstr "Al momento non hai taccuini."
+
+msgid "Create a notebook"
+msgstr "Crea un Taccuino"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
 
@@ -1840,35 +1846,21 @@ msgstr "Seleziona la data"
 msgid "Confirm"
 msgstr "Conferma"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Taccuini"
+msgstr "Taccuini: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Gli elementi crittografati non possono essere modificati"
+msgstr "I Taccuini crittografati non possono essere rinominati"
 
-#, fuzzy
 msgid "New Notebook"
-msgstr "Nuovo taccuino"
+msgstr "Nuovo Taccuino"
 
 msgid "Configuration"
 msgstr "Configurazione"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Decrittografia Elementi: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Recupero risorse: %d/%d"
-
-#, fuzzy
 msgid "All notes"
-msgstr "Eliminare le note?"
-
-msgid "Notebooks"
-msgstr "Taccuini"
+msgstr "Tutte le note"
 
 msgid "Checking... Please wait."
 msgstr "Controllo... Attendere per favore."
@@ -1913,48 +1905,43 @@ msgid "Type new tags or select from list"
 msgstr "Digita nuovi tag o seleziona dalla lista"
 
 msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Maggiori informazioni"
-
 msgid "Encryption Config"
 msgstr "Configurazione Crittografia"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Strumenti"
+msgstr "Strumenti"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Stato"
+msgstr "Stato sincronizzazione"
 
 msgid "Log"
 msgstr "Log"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Creare nuovo %s..."
+msgstr "Creazione report..."
 
 msgid "Export Debug Report"
 msgstr "Esporta il Report di Debug"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Correzione indice di ricerca..."
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Correggi indice di ricerca"
 
 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 ""
+"Usa questo per ricostruire l’indice di ricerca se c’è un problema con la "
+"ricerca. Potrebbe richiedere molto tempo, dipende dal numero di note."
 
 msgid "More information"
 msgstr "Maggiori informazioni"
@@ -2024,9 +2011,8 @@ msgstr "Il Taccuino non può essere salvato: %s"
 msgid "Edit notebook"
 msgstr "Modifica Taccuino"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Titolo del Taccuino:"
+msgstr "Inserisci titolo del Taccuino"
 
 msgid "Show all"
 msgstr "Mostra tutto"
@@ -2060,9 +2046,9 @@ msgstr "Collegamenti con protocollo \"%s\" non sono supportati"
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Aggiornato: %d."
+msgstr "Aggiornato: %s"
 
 msgid "View on map"
 msgstr "Guarda sulla mappa"
@@ -2070,13 +2056,11 @@ msgstr "Guarda sulla mappa"
 msgid "Go to source URL"
 msgstr ""
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Cerca..."
+msgstr "Allega..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Mostra opzioni avanzate"
+msgstr "Scegli un’opzione"
 
 msgid "Take photo"
 msgstr "Scatta foto"
@@ -2096,19 +2080,17 @@ msgstr "Converti in nota"
 msgid "Convert to todo"
 msgstr "Converti in Todo"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Proprietà della nota"
+msgstr "Proprietà"
 
 msgid "Add body"
-msgstr ""
+msgstr "Aggiungi corpo"
 
 msgid "Edit"
 msgstr "Modifica"
 
-#, fuzzy
 msgid "Add title"
-msgstr "titolo"
+msgstr "Aggiungi titolo"
 
 msgid "Login with OneDrive"
 msgstr "Accedi a OneDrive"
@@ -2116,6 +2098,81 @@ msgstr "Accedi a OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Comincia a modificare la nota. Chiudi l'editor per tornare al prompt."
+
+#~ msgid "Note has been saved."
+#~ msgstr "La nota è stata salvata."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "Tutte le potenziali porte sono in uso - prego riportare il problema a %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Barra laterale"
+
+#~ msgid "Note list"
+#~ msgstr "Lista delle note"
+
+#~ msgid "Note title"
+#~ msgstr "Titolo della nota"
+
+#~ msgid "Note body"
+#~ msgstr "Corpo della nota"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr ""
+#~ "Importazione da \"%s\" come formato \"%s\". Si prega di attendere..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Stato di sincronizzazione"
+
+#~ msgid "Print"
+#~ msgstr "Stampa"
+
+#~ msgid "General Options"
+#~ msgstr "Opzioni Generali"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opzioni Crittografia"
+
+#~ msgid "Create note from template"
+#~ msgstr "Crea nota da modello"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "Nuovo \"Cose-da-fare\" da modello"
+
+#~ msgid "Insert template"
+#~ msgstr "Inserisci modello"
+
+#~ msgid "Open template directory"
+#~ msgstr "Apri cartella modelli"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Aggiorna modelli"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Revisione: %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opzioni di crittografia"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opzioni Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Tipo elemento scaricato sconosciuto - prego aggiornare Joplin all’ultima "
+#~ "versione"
+
+#~ msgid "Information"
+#~ msgstr "Informazioni"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Permesso di usare la fotocamera"
@@ -2164,9 +2221,6 @@ msgstr "Cerca"
 #~ "Il percorso di sincronizzazione quando la sincronizzazione è abilitata. "
 #~ "Vedi `sync.target`."
 
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"
-
 #~ msgid "State: %s."
 #~ msgstr "Stato: %s."
 
@@ -2233,9 +2287,6 @@ msgstr "Cerca"
 #~ msgid "Cancel the current command."
 #~ msgstr "Annulla il comando corrente."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Elimina la nota o il taccuino selezionato."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Imposta un \"Cose-da-fare\" come completato / non completato"
 

CliClient/locales/joplin.pot

@@ -160,16 +160,6 @@ msgstr ""
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr ""
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
-msgid "Note has been saved."
-msgstr ""
-
 msgid "Exits the application."
 msgstr ""
 
@@ -353,6 +343,23 @@ msgstr ""
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -470,10 +477,6 @@ msgstr ""
 msgid "Fatal error:"
 msgstr ""
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -512,72 +515,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-msgid "Note title"
-msgstr ""
-
-msgid "Note body"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr ""
-
-msgid "Synchronisation status"
-msgstr ""
-
-msgid "New note"
-msgstr ""
-
-msgid "New to-do"
-msgstr ""
-
-msgid "New notebook"
-msgstr ""
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr ""
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr ""
 
@@ -675,6 +612,9 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
+msgid "Joplin Forum"
+msgstr ""
+
 msgid "Make a donation"
 msgstr ""
 
@@ -778,6 +718,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -788,6 +731,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -856,8 +802,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -866,10 +812,16 @@ msgstr ""
 msgid "Encryption is:"
 msgstr ""
 
-msgid "Usage"
+msgid "Firefox Extension"
 msgstr ""
 
-msgid "Back"
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
+msgid "Usage"
 msgstr ""
 
 #, javascript-format
@@ -901,6 +853,15 @@ msgstr ""
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr ""
+
+msgid "New to-do"
+msgstr ""
+
+msgid "New notebook"
+msgstr ""
+
 msgid "Layout"
 msgstr ""
 
@@ -992,6 +953,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr ""
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1066,12 +1034,6 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
-msgid "Encryption Options"
-msgstr ""
-
-msgid "Clipper Options"
-msgstr ""
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1092,6 +1054,17 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+msgid "Notebooks"
+msgstr ""
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr ""
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1240,10 +1213,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr ""
 
@@ -1355,10 +1324,10 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1427,6 +1396,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1448,6 +1420,9 @@ msgstr ""
 msgid "Editor font size"
 msgstr ""
 
+msgid "Editor font"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1502,6 +1477,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr ""
 
@@ -1537,6 +1522,12 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
+msgid "Encryption"
+msgstr ""
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1550,7 +1541,10 @@ msgstr ""
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1650,6 +1644,12 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+msgid "You currently have no notebooks."
+msgstr ""
+
+msgid "Create a notebook"
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 
@@ -1691,20 +1691,9 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr ""
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr ""
-
 msgid "All notes"
 msgstr ""
 
-msgid "Notebooks"
-msgstr ""
-
 msgid "Checking... Please wait."
 msgstr ""
 
@@ -1746,9 +1735,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-msgid "Information"
-msgstr ""
-
 msgid "Encryption Config"
 msgstr ""
 

CliClient/locales/ko.po

@@ -15,8 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "태그를 삭제하려면 먼저 연결된 노트의 태그를 해제해주세요."
@@ -175,16 +173,6 @@ msgstr "활성화된 노트북이 없습니다."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "\"%s\" 노트가 존재하지 않습니다. 새로 만들까요?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "노트 편집을 시작합니다. 프롬프트로 가시려면 편집기를 종료해주세요."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "편집기에서 노트를 열 수 없는 오류가 발생하였습니다: %s"
-
-msgid "Note has been saved."
-msgstr "노트가 저장되었습니다."
-
 msgid "Exits the application."
 msgstr "애플리케이션을 종료합니다."
 
@@ -192,7 +180,7 @@ msgid ""
 "Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
-"조플린의 데이터를 주어진 경로로 내보냅니다. 기본적으로 노트북, 노트, 태그, 기"
+"Joplin의 데이터를 주어진 경로로 내보냅니다. 기본적으로 노트북, 노트, 태그, 기"
 "타 자원을 포함한 완전한 데이터베이스를 내보내게 됩니다."
 
 #, javascript-format
@@ -261,7 +249,7 @@ msgid ""
 msgstr "키보드 단축키 및 설정 옵션을 변경하려면 `help keymap`을 입력해주세요"
 
 msgid "Imports data into Joplin."
-msgstr "데이터를 조플린으로 가져옵니다."
+msgstr "데이터를 Joplin으로 가져옵니다."
 
 #, javascript-format
 msgid "Source format: %s"
@@ -386,6 +374,25 @@ msgstr "이 노트를 삭제할까요?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "주어진 <pattern>을 모든 노트에서 검색합니다."
 
+#, javascript-format
+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 "서버가 이미 포트 %d에서 동작하고 있습니다"
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr "서버가 포트 %d에서 동작하고 있습니다"
+
+msgid "Server is not running."
+msgstr "서버가 동작하지 않습니다."
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -413,7 +420,7 @@ msgstr "인증이 완료되지 않았습니다 (인증 토큰을 받을 수 없
 
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
-msgstr "조플린을 Dropbox와 동기화하려면 다음 절차를 따라주세요:"
+msgstr "Joplin을 Dropbox와 동기화하려면 다음 절차를 따라주세요:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr "1단계: 브라우저에서 이 URL에 접근하여 애플리케이션을 허가합니다:"
@@ -518,10 +525,6 @@ msgstr "사용법에 대한 정보를 알고 싶으시다면 `joplin help`를
 msgid "Fatal error:"
 msgstr "치명적인 오류:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr "모든 가능한 포트들이 사용중에 있습니다 - %s 에 대한 문제를 알려주세요"
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "애플리케이션이 허가되었습니다 - 브라우저 탭을 닫으셔도 됩니다."
@@ -552,7 +555,7 @@ msgid ""
 "\n"
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
-"조플린에 오신 것을 환영합니다!\n"
+"Joplin에 오신 것을 환영합니다!\n"
 "\n"
 "`:help shortcuts`를 입력하면 키보드 단축키 목록을 확인할 수 있습니다. `:help`"
 "를 입력하시면 사용 방법을 확인하실 수 있습니다.\n"
@@ -574,78 +577,11 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "\"%s\"에 \"%s\" 포맷으로 내보내는 중입니다. 잠시만 기다려주세요..."
 
-msgid "Sidebar"
-msgstr "사이드바"
-
-msgid "Note list"
-msgstr "노트 목록"
-
-msgid "Note title"
-msgstr "노트 제목"
-
-msgid "Note body"
-msgstr "노트 본문"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "\"%s\"에서 \"%s\" 포맷으로 가져오는 중입니다. 잠시만 기다려주세요..."
-
-msgid "PDF File"
-msgstr "PDF 파일"
-
-msgid "Synchronisation status"
-msgstr "동기화 상태"
-
-msgid "New note"
-msgstr "새 노트"
-
-msgid "New to-do"
-msgstr "새 '할 일'"
-
-msgid "New notebook"
-msgstr "새 노트북"
-
-msgid "Print"
-msgstr "인쇄"
-
-msgid "General Options"
-msgstr "일반 옵션"
-
-msgid "Encryption options"
-msgstr "암호화 옵션"
-
-msgid "Web clipper options"
-msgstr "웹 수집기 옵션"
-
-msgid "Create note from template"
-msgstr "템플릿에서 노트 생성"
-
-msgid "Create to-do from template"
-msgstr "템플릿에서 할일 생성"
-
-msgid "Insert template"
-msgstr "템플릿 삽입"
-
-msgid "Open template directory"
-msgstr "템플릿 디렉터리 열기"
-
-msgid "Refresh templates"
-msgstr "템플릿 새로고침"
-
-#, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "개정판: %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
-#, fuzzy
 msgid "&File"
 msgstr "파일"
 
 msgid "About Joplin"
-msgstr "조플린에 대해서"
+msgstr "Joplin에 대해서"
 
 msgid "Preferences..."
 msgstr "설정…"
@@ -675,7 +611,6 @@ msgstr "종료"
 msgid "Close Window"
 msgstr "창 닫기"
 
-#, fuzzy
 msgid "&Edit"
 msgstr "편집"
 
@@ -718,7 +653,6 @@ msgstr "모든 노트에서 검색"
 msgid "Search in current note"
 msgstr "현재 노트에서 검색"
 
-#, fuzzy
 msgid "&View"
 msgstr "보기"
 
@@ -731,17 +665,18 @@ msgstr "편집기 배치 형태 전환"
 msgid "Focus"
 msgstr "강조"
 
-#, fuzzy
 msgid "&Tools"
 msgstr "도구"
 
-#, fuzzy
 msgid "&Help"
 msgstr "도움말"
 
 msgid "Website and documentation"
 msgstr "웹사이트 및 각종 문서"
 
+msgid "Joplin Forum"
+msgstr "Joplin 포럼"
+
 msgid "Make a donation"
 msgstr "기부하기"
 
@@ -762,7 +697,7 @@ msgid "Cancel"
 msgstr "취소"
 
 msgid "Current version is up-to-date."
-msgstr "현재 최신 버전을 사용하고 있으십니다."
+msgstr "현재 최신 버전을 사용중입니다."
 
 #, javascript-format
 msgid "%s (pre-release)"
@@ -812,7 +747,7 @@ msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
 "to Joplin."
 msgstr ""
-"조플린 웹 수집기는 브라우저에서 웹 페이지 및 스크린샷을 조플린에 저장할 수 있"
+"Joplin 웹 수집기는 브라우저에서 웹 페이지 및 스크린샷을 Joplin에 저장할 수 있"
 "게 해줍니다."
 
 msgid "In order to use the web clipper, you need to do the following:"
@@ -826,8 +761,8 @@ msgid ""
 "enabling it your firewall may ask you to give permission to Joplin to listen "
 "to a particular port."
 msgstr ""
-"이 서비스는 브라우저 확장 기능이 조플린과 연결하게 해줍니다. 활성화시 방화벽"
-"에서 조플린에게 특정 포트 접근을 허가할 것인지 물어볼 수 있습니다."
+"이 서비스는 브라우저 확장 기능이 Joplin과 연결하도록 해줍니다. 서비스를 활성"
+"화시 방화벽에서 Joplin에게 특정 포트 접근을 허가할 것인지 물어볼 수 있습니다."
 
 msgid "Step 2: Install the extension"
 msgstr "2단계: 확장 기능 설치"
@@ -848,9 +783,12 @@ msgid ""
 "This authorisation token is only needed to allow third-party applications to "
 "access Joplin."
 msgstr ""
-"이 인증 토큰은 오직 서드파티 애플리케이션에서 조플린에 접근할 때만 필요합니"
+"이 인증 토큰은 오직 서드파티 애플리케이션에서 Joplin에 접근할 때만 필요합니"
 "다."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "노트와 설정값이 다음에 저장되었습니다: %s"
@@ -861,6 +799,9 @@ msgstr "동기화 설정 확인"
 msgid "Browse..."
 msgstr "훑어보기…"
 
+msgid "Back"
+msgstr "뒤로 가기"
+
 msgid "Apply"
 msgstr "적용"
 
@@ -941,10 +882,10 @@ msgstr ""
 "될 가능성이 있습니다."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"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 "상태"
@@ -952,12 +893,18 @@ msgstr "상태"
 msgid "Encryption is:"
 msgstr "암호화는 다음과 같습니다:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "사용 방법"
 
-msgid "Back"
-msgstr "뒤로 가기"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -987,6 +934,15 @@ msgstr "알람 설정:"
 msgid "Template file:"
 msgstr "템플릿 파일:"
 
+msgid "New note"
+msgstr "새 노트"
+
+msgid "New to-do"
+msgstr "새 '할 일'"
+
+msgid "New notebook"
+msgstr "새 노트북"
+
 msgid "Layout"
 msgstr "배치"
 
@@ -1082,6 +1038,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "한 번에 오직 하나의 노트만 출력하거나 내보내기 할 수 있습니다."
 
+msgid "PDF File"
+msgstr "PDF 파일"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "편집기에서 노트를 열 수 없는 오류가 발생하였습니다: %s"
+
 msgid "strong text"
 msgstr "굵게"
 
@@ -1156,12 +1119,6 @@ msgstr "옵션"
 msgid "Synchronisation Status"
 msgstr "동기화 상태"
 
-msgid "Encryption Options"
-msgstr "암호화 옵션"
-
-msgid "Clipper Options"
-msgstr "수집기 옵션"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1185,6 +1142,17 @@ msgstr "삭제"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
+msgid "Notebooks"
+msgstr "노트북"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "복호화 항목: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "리소스 가져오는 중: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "동기화 상태를 내보낼 대상을 선택하세요"
 
@@ -1228,9 +1196,8 @@ msgstr ""
 "노트 제목을 적으시거나 혹은 건너 뛰세요. 혹은 # 를 적고 태그 이름을 붙이거"
 "나, @뒤에 노트북 이름을 적으세요."
 
-#, fuzzy
 msgid "Goto Anything..."
-msgstr "가고 싶은 곳으로 이동…"
+msgstr "가고자 하는 곳으로 이동…"
 
 #, javascript-format
 msgid "Usage: %s"
@@ -1344,12 +1311,6 @@ msgstr "진행 중"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "동기화가 이미 진행되고 있습니다. 상태: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"알려지지 않은 타입을 다운로드 했습니다 - 조플린을 최신 버전으로 업데이트 해주"
-"세요"
-
 msgid "Encrypted"
 msgstr "암호화됨"
 
@@ -1468,10 +1429,10 @@ msgstr "밝음"
 msgid "Dark"
 msgstr "어두움"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr "Solarized Light"
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr "Solarized Dark"
 
 msgid "Uncompleted to-dos on top"
@@ -1486,7 +1447,6 @@ msgstr "노트를 다음 기준으로 정렬"
 msgid "Reverse sort order"
 msgstr "정렬 순서 반전"
 
-#, fuzzy
 msgid "Sort notebooks by"
 msgstr "노트를 다음 기준으로 정렬"
 
@@ -1539,7 +1499,10 @@ msgid "Enable ++insert++ syntax"
 msgstr "++insert++ 확장 허용"
 
 msgid "Enable multimarkdown table extension"
-msgstr "멀티마크다운 테이블 확장 허용"
+msgstr "멀티 마크다운 테이블 확장 허용"
+
+msgid "Enable Fountain syntax support"
+msgstr "Fountain 구문 지원 허용"
 
 msgid "Show tray icon"
 msgstr "트레이 아이콘 표시"
@@ -1552,11 +1515,11 @@ msgid ""
 "this setting so that your notes are constantly being synchronised, thus "
 "reducing the number of conflicts."
 msgstr ""
-"조플린을 백그라운드에서 구동합니다. 노트가 정기적으로 동기화 되므로, 충돌 횟"
+"Joplin을 백그라운드에서 구동합니다. 노트가 정기적으로 동기화 되므로, 충돌 횟"
 "수가 줄어들게 되므로 이 옵션을 활성화 하시는 것을 추천드립니다."
 
 msgid "Start application minimised in the tray icon"
-msgstr "트레이에 최소화 된 채로 조플린 실행"
+msgstr "트레이에 최소화 된 채로 Joplin 실행"
 
 msgid "Global zoom percentage"
 msgstr "전체 확대 비율"
@@ -1564,6 +1527,10 @@ msgstr "전체 확대 비율"
 msgid "Editor font size"
 msgstr "편집기 글꼴 크기"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "편집기 글꼴 크기"
+
 msgid "Editor font family"
 msgstr "편집기 글꼴 모음"
 
@@ -1627,6 +1594,18 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS 인증서 오류 무시"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+"API 서버에 사용할 포트를 선택해주세요. 선택되지 않으면, 기본 포트를 선택합니"
+"다."
+
 msgid "Enable note history"
 msgstr "노트 역사 허용"
 
@@ -1662,20 +1641,33 @@ msgstr "플러그인"
 msgid "Application"
 msgstr "애플리케이션"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "암호화는 다음과 같습니다:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "웹 수집기 옵션"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "태그 \"%s\"(이)가 이미 존재합니다. 다른 이름을 선택해 주세요."
 
 msgid "Joplin Export File"
-msgstr "조플린 내보내기 파일"
+msgstr "Joplin 내보내기 파일"
 
 msgid "Markdown"
 msgstr "마크다운"
 
 msgid "Joplin Export Directory"
-msgstr "조플린 내보내기 폴더"
+msgstr "Joplin 내보내기 폴더"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "에버노트 내보내기 파일"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "에버노트 내보내기 파일"
 
 msgid "Json Export Directory"
@@ -1740,8 +1732,8 @@ msgid ""
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
-"조플린이 여러 항목에 대해서 복호화를 실패했습니다. 아마도 너무 크거나 혹은 손"
-"상되었기 때문일 것입니다. 이 파일들은 기기에 남지만, 조플린은 더이상 이 항목"
+"Joplin이 여러 항목에 대해서 복호화를 실패했습니다. 아마도 너무 크거나 혹은 손"
+"상되었기 때문일 것입니다. 이 파일들은 기기에 남지만, Joplin은 더이상 이 항목"
 "들을 복호화 할 수 없습니다."
 
 msgid "Sync status (synced items / total items)"
@@ -1783,6 +1775,12 @@ msgstr "카메라 사용 허가"
 msgid "Your permission to use your camera is required."
 msgstr "카메라 사용 허가가 필요합니다."
 
+msgid "You currently have no notebooks."
+msgstr "현재 노트북이 없습니다."
+
+msgid "Create a notebook"
+msgstr "새 노트북을 만듭니다"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "노트가 없습니다. (+) 버튼을 클릭하여 새로 만드세요."
 
@@ -1824,20 +1822,9 @@ msgstr "새 노트북"
 msgid "Configuration"
 msgstr "설정"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "복호화 항목: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "리소스 가져오는 중: %d/%d"
-
 msgid "All notes"
 msgstr "모든 노트"
 
-msgid "Notebooks"
-msgstr "노트북"
-
 msgid "Checking... Please wait."
 msgstr "확인 중입니다... 잠시만 기다리세요."
 
@@ -1888,9 +1875,6 @@ msgid ""
 msgstr ""
 "파일 시스템 동기화를 사용하실려면 외부 저장소 쓰기 권한을 필요로 합니다."
 
-msgid "Information"
-msgstr "정보"
-
 msgid "Encryption Config"
 msgstr "암호화 설정"
 
@@ -1946,7 +1930,7 @@ msgid "- Location: to allow attaching geo-location information to a note."
 msgstr "- 위치: 지리적 위치 정보를 노트에 첨부하기 위해 필요합니다."
 
 msgid "Joplin website"
-msgstr "조플린 웹사이트"
+msgstr "Joplin 웹사이트"
 
 #, javascript-format
 msgid "Database v%s"
@@ -2010,7 +1994,7 @@ msgstr "ID %s에 해당하는 항목이 없습니다"
 
 #, javascript-format
 msgid "The Joplin mobile app does not currently support this type of link: %s"
-msgstr "조플린 모바일 앱은 현재 해당 형식의 링크를 지원하지 않습니다: %s"
+msgstr "Joplin 모바일 앱에서는 현재 해당 형식의 링크를 지원하지 않습니다: %s"
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
@@ -2072,6 +2056,80 @@ msgstr "OneDrive 로그인"
 msgid "Search"
 msgstr "검색"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "노트 편집을 시작합니다. 프롬프트로 가시려면 편집기를 종료해주세요."
+
+#~ msgid "Note has been saved."
+#~ msgstr "노트가 저장되었습니다."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr ""
+#~ "모든 가능한 포트들이 사용중에 있습니다 - %s 에 대한 문제를 알려주세요"
+
+#~ msgid "Sidebar"
+#~ msgstr "사이드바"
+
+#~ msgid "Note list"
+#~ msgstr "노트 목록"
+
+#~ msgid "Note title"
+#~ msgstr "노트 제목"
+
+#~ msgid "Note body"
+#~ msgstr "노트 본문"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr ""
+#~ "\"%s\"에서 \"%s\" 포맷으로 가져오는 중입니다. 잠시만 기다려주세요..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "동기화 상태"
+
+#~ msgid "Print"
+#~ msgstr "인쇄"
+
+#~ msgid "General Options"
+#~ msgstr "일반 옵션"
+
+#~ msgid "Encryption options"
+#~ msgstr "암호화 옵션"
+
+#~ msgid "Create note from template"
+#~ msgstr "템플릿에서 노트 생성"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "템플릿에서 할일 생성"
+
+#~ msgid "Insert template"
+#~ msgstr "템플릿 삽입"
+
+#~ msgid "Open template directory"
+#~ msgstr "템플릿 디렉터리 열기"
+
+#~ msgid "Refresh templates"
+#~ msgstr "템플릿 새로고침"
+
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "개정판: %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "암호화 옵션"
+
+#~ msgid "Clipper Options"
+#~ msgstr "수집기 옵션"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "알려지지 않은 타입을 다운로드 했습니다 - Joplin을 최신 버전으로 업데이트 "
+#~ "해주세요"
+
+#~ msgid "Information"
+#~ msgstr "정보"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "카메라 사용 허가"
@@ -2118,9 +2176,6 @@ msgstr "검색"
 #~ "파일 시스템 동기화가 활성화된 경우에 동기화를 할 경로입니다. `sync.target`"
 #~ "를 참조하세요."
 
-#~ msgid "Joplin v%s"
-#~ msgstr "조플린 v%s"
-
 #~ msgid "State: %s."
 #~ msgstr "상태: %s."
 

CliClient/locales/nb_NO.po

@@ -172,18 +172,6 @@ msgstr "Ingen aktiv notatbok."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notat eksisterer ikke: \"%s\". Vil du opprette det?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Notatredigering startet. Lukk editoren for å komme tilbake til "
-"kommandolinjen."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Feil ved åpning av notat i editor: %s"
-
-msgid "Note has been saved."
-msgstr "Notat har blitt lagret."
-
 msgid "Exits the application."
 msgstr "Avslutter programmet."
 
@@ -388,6 +376,23 @@ msgstr "Slett notat?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Søker etter angitt <pattern> i alle notatene."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -522,10 +527,6 @@ msgstr "Skriv `joplin help` for brukerinformasjon."
 msgid "Fatal error:"
 msgstr "Kritisk feil:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Applikasjonen er autorisert - du kan nå lukke denne nettleserenfanen."
@@ -579,74 +580,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksporterer til \"%s\" i \"%s\" format. Vennligst vent..."
 
-msgid "Sidebar"
-msgstr "Sidepanel"
-
-msgid "Note list"
-msgstr "Notatliste"
-
-msgid "Note title"
-msgstr "Tittel på notat:"
-
-msgid "Note body"
-msgstr "Notatbrødtekst"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importerer fra \"%s\" i \"%s\"-format. Vennligst vent..."
-
-msgid "PDF File"
-msgstr "PDF-fil"
-
-msgid "Synchronisation status"
-msgstr "Synkroniseringsstatus"
-
-msgid "New note"
-msgstr "Nytt notat"
-
-msgid "New to-do"
-msgstr "Nytt gjøremål"
-
-msgid "New notebook"
-msgstr "Ny notatbok"
-
-msgid "Print"
-msgstr "Skriv ut"
-
-msgid "General Options"
-msgstr "Generelle innstillinger"
-
-msgid "Encryption options"
-msgstr "Krypteringsvalg"
-
-msgid "Web clipper options"
-msgstr "Web Clipper-innstillinger"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Sett inn dato/tid"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin-eksportert katalog"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Fil"
 
@@ -744,6 +677,10 @@ msgstr "&Hjelp"
 msgid "Website and documentation"
 msgstr "Nettsted og dokumentasjon"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin v%s"
+
 msgid "Make a donation"
 msgstr "Gi et bidrag"
 
@@ -854,6 +791,9 @@ msgstr ""
 "Denne autoriseringsbeviset er det eneste nødvendige for å gi "
 "tredjepartsapplikasjoner tilgang til Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notater og innstillinger er lagret i: %s"
@@ -864,6 +804,9 @@ msgstr "Sjekk synkroniseringskonfigurasjon"
 msgid "Browse..."
 msgstr "Utforsk..."
 
+msgid "Back"
+msgstr "Tilbake"
+
 msgid "Apply"
 msgstr "Bruk"
 
@@ -946,8 +889,8 @@ msgstr ""
 "vil siden bli lastet ned via synkronisering."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "For mer informasjon om ende-til-ende-kryptering (E2EE) og råd om hvordan du "
 "aktiverer det kan du sjekke dokumentasjonen:"
@@ -958,12 +901,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Kryptering er:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Bruk"
 
-msgid "Back"
-msgstr "Tilbake"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -995,6 +944,15 @@ msgstr "Angi alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nytt notat"
+
+msgid "New to-do"
+msgstr "Nytt gjøremål"
+
+msgid "New notebook"
+msgstr "Ny notatbok"
+
 msgid "Layout"
 msgstr "Visning"
 
@@ -1091,6 +1049,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Kun ett notat kan bli printet eller eksportert som PDF om gangen."
 
+msgid "PDF File"
+msgstr "PDF-fil"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Feil ved åpning av notat i editor: %s"
+
 msgid "strong text"
 msgstr "fet tekst"
 
@@ -1165,12 +1130,6 @@ msgstr "Generelle innstillinger"
 msgid "Synchronisation Status"
 msgstr "Synkroniseringsstatus"
 
-msgid "Encryption Options"
-msgstr "Krypteringsinnstillinger"
-
-msgid "Clipper Options"
-msgstr "Clipper-innstillinger"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1195,6 +1154,17 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Gi nytt navn"
 
+msgid "Notebooks"
+msgstr "Notatbøker"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Dekrypterer elementer: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Henter ressurser: %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Velg hvor synkroniseringsstatusen skal eksporteres til"
 
@@ -1351,10 +1321,6 @@ msgstr "Pågår"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering pågår allerede. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Kryptert"
 
@@ -1471,10 +1437,10 @@ msgstr "Lys"
 msgid "Dark"
 msgstr "Mørk"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1547,6 +1513,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Vis systemmenyikon"
 
@@ -1571,6 +1540,10 @@ msgstr "Global forstørrelse"
 msgid "Editor font size"
 msgstr "Editorskriftstørrelse"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editorskriftstørrelse"
+
 msgid "Editor font family"
 msgstr "Editorskrifttype"
 
@@ -1634,6 +1607,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorer TLS-sertifikatfeil"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Liste over innhold"
@@ -1670,6 +1653,14 @@ msgstr ""
 msgid "Application"
 msgstr "Applikasjon"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Kryptering er:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web Clipper-innstillinger"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Merkelappen \"%s\" eksiterer allerede. Vennligst velg et annet navn."
@@ -1683,7 +1674,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-eksportert katalog"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote-eksportert fil"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote-eksportert fil"
 
 msgid "Json Export Directory"
@@ -1789,6 +1785,14 @@ 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."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Oppretter en ny 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."
 
@@ -1832,21 +1836,10 @@ msgstr "Ny notatbok"
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Dekrypterer elementer: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Henter ressurser: %d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notat"
 
-msgid "Notebooks"
-msgstr "Notatbøker"
-
 msgid "Checking... Please wait."
 msgstr "Sjekker… Vennligst vent."
 
@@ -1895,10 +1888,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfigurasjon"
-
 msgid "Encryption Config"
 msgstr "Krypteringsinnstillinger"
 
@@ -2087,6 +2076,66 @@ msgstr "Innlogging med OneDrive"
 msgid "Search"
 msgstr "Søk"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Notatredigering startet. Lukk editoren for å komme tilbake til "
+#~ "kommandolinjen."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notat har blitt lagret."
+
+#~ msgid "Sidebar"
+#~ msgstr "Sidepanel"
+
+#~ msgid "Note list"
+#~ msgstr "Notatliste"
+
+#~ msgid "Note title"
+#~ msgstr "Tittel på notat:"
+
+#~ msgid "Note body"
+#~ msgstr "Notatbrødtekst"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importerer fra \"%s\" i \"%s\"-format. Vennligst vent..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synkroniseringsstatus"
+
+#~ msgid "Print"
+#~ msgstr "Skriv ut"
+
+#~ msgid "General Options"
+#~ msgstr "Generelle innstillinger"
+
+#~ msgid "Encryption options"
+#~ msgstr "Krypteringsvalg"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Sett inn dato/tid"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin-eksportert katalog"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Krypteringsinnstillinger"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper-innstillinger"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfigurasjon"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Tillatelse til å bruke kamera"
@@ -2135,7 +2184,3 @@ msgstr "Søk"
 #~ msgstr ""
 #~ "Stien som skal synkroniseres når filsystemsynkronisering er aktivert. Se "
 #~ "`sync.target`."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"

CliClient/locales/nl_BE.po

@@ -174,17 +174,6 @@ msgstr "Geen actief notitieboek."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notitie bestaat niet: \"%s\". Aanmaken?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Bewerken notitie gestart. Sluit de editor om terug naar de prompt te gaan."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
-msgid "Note has been saved."
-msgstr "Notitie is opgeslaan."
-
 msgid "Exits the application."
 msgstr "Sluit de applicatie."
 
@@ -394,6 +383,23 @@ msgstr "Notitie verwijderen?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Zoektermen voor het opgegeven <pattern> in alle notities."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -531,10 +537,6 @@ msgstr "Toont gebruiksinformatie."
 msgid "Fatal error:"
 msgstr "Fatale fout:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "De applicatie is geauthenticeerd - U kan deze tab sluiten."
@@ -589,75 +591,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr ""
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Notitieboek titel:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Notitieboeken"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-#, fuzzy
-msgid "PDF File"
-msgstr "Bestand"
-
-msgid "Synchronisation status"
-msgstr "Synchronisatie status"
-
-msgid "New note"
-msgstr "Nieuwe notitie"
-
-msgid "New to-do"
-msgstr "Nieuwe to-do"
-
-msgid "New notebook"
-msgstr "Nieuw notitieboek"
-
-msgid "Print"
-msgstr ""
-
-msgid "General Options"
-msgstr "Algemene opties"
-
-msgid "Encryption options"
-msgstr "Versleutelopties"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Bestand"
@@ -762,6 +695,10 @@ msgstr "Help"
 msgid "Website and documentation"
 msgstr "Website en documentatie"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Exporteer Evernote bestanden"
+
 #, fuzzy
 msgid "Make a donation"
 msgstr "Website en documentatie"
@@ -868,6 +805,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen zijn opgeslaan in %s"
@@ -879,6 +819,9 @@ msgstr "Annuleer synchronisatie"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Terug"
+
 msgid "Apply"
 msgstr ""
 
@@ -959,8 +902,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -969,13 +912,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Versleuteling is:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Gebruik: %s"
 
-msgid "Back"
-msgstr "Terug"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1008,6 +957,15 @@ msgstr "Stel melding in:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nieuwe notitie"
+
+msgid "New to-do"
+msgstr "Nieuwe to-do"
+
+msgid "New notebook"
+msgstr "Nieuw notitieboek"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1106,6 +1064,14 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+#, fuzzy
+msgid "PDF File"
+msgstr "Bestand"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1183,13 +1149,6 @@ msgstr "Opties"
 msgid "Synchronisation Status"
 msgstr "Synchronisatie status"
 
-msgid "Encryption Options"
-msgstr "Versleutelopties"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Algemene opties"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1212,6 +1171,17 @@ msgstr "Verwijderen"
 msgid "Rename"
 msgstr "Hernoem"
 
+msgid "Notebooks"
+msgstr "Notitieboeken"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Opgehaalde items: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Middelen: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
 
@@ -1372,10 +1342,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronisatie is reeds bezig. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1495,10 +1461,10 @@ msgstr "Licht"
 msgid "Dark"
 msgstr "Donker"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 #, fuzzy
@@ -1574,6 +1540,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1596,6 +1565,10 @@ msgstr ""
 msgid "Editor font size"
 msgstr "Bewerk notitie."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Bewerk notitie."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1655,6 +1628,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Schakel encryptie in"
@@ -1695,6 +1678,13 @@ msgstr ""
 msgid "Application"
 msgstr "Sluit de applicatie."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Versleuteling is:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1710,7 +1700,11 @@ msgid "Joplin Export Directory"
 msgstr ""
 
 #, fuzzy
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr "Exporteer Evernote bestanden"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Exporteer Evernote bestanden"
 
 #, fuzzy
@@ -1816,6 +1810,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Verwijder de geselecteerde notitie of het geselecteerde notitieboek."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Maakt een nieuw notitieboek aan."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Er zijn momenteel geen notities. Maak een notitie door op (+) te klikken."
@@ -1862,21 +1864,10 @@ msgstr "Nieuw notitieboek"
 msgid "Configuration"
 msgstr "Configuratie"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Opgehaalde items: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Middelen: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "Nieuwe notitie"
 
-msgid "Notebooks"
-msgstr "Notitieboeken"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Annuleren.. Even geduld."
@@ -1921,10 +1912,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuratie"
-
 msgid "Encryption Config"
 msgstr "Encryptie configuratie"
 
@@ -2111,6 +2098,48 @@ msgstr "Log in met OneDrive"
 msgid "Search"
 msgstr "Zoeken"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Bewerken notitie gestart. Sluit de editor om terug naar de prompt te gaan."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notitie is opgeslaan."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Notitieboek titel:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Notitieboeken"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synchronisatie status"
+
+#~ msgid "General Options"
+#~ msgstr "Algemene opties"
+
+#~ msgid "Encryption options"
+#~ msgstr "Versleutelopties"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Versleutelopties"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Algemene opties"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configuratie"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Annuleer synchronisatie"
 
@@ -2206,10 +2235,6 @@ msgstr "Zoeken"
 #~ msgid "Cancel the current command."
 #~ msgstr "Annuleer het huidige commando."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr ""
-#~ "Verwijder de geselecteerde notitie of het geselecteerde notitieboek."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Zet een to-do als voltooid / niet voltooid"
 

CliClient/locales/nl_NL.po

@@ -176,17 +176,6 @@ msgstr "Geen actief notitieboek."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notitie bestaat niet: \"%s\". Wil je deze creëren?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Bezig met starten van notitiebewerking. Sluit de bewerker om terug te keren."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fout bij openen van notitie in bewerker: %s"
-
-msgid "Note has been saved."
-msgstr "Notitie is opgeslagen."
-
 msgid "Exits the application."
 msgstr "Sluit de applicatie af."
 
@@ -395,6 +384,23 @@ msgstr "Notitie verwijderen?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Doorzoekt alle notities op het opgegeven <pattern>."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -529,10 +535,6 @@ msgstr "Typ `joplin help` voor meer informatie over het gebruik."
 msgid "Fatal error:"
 msgstr "Fatale fout:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -588,74 +590,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Bezig met exporteren van \"%s\" in het formaat \"%s\". Even geduld..."
 
-msgid "Sidebar"
-msgstr "Zijbalk"
-
-msgid "Note list"
-msgstr "Notitielijst"
-
-msgid "Note title"
-msgstr "Titel van notitie"
-
-msgid "Note body"
-msgstr "Inhoud van notitie"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Bezig met importeren van \"%s\" in het formaat \"%s\". Even geduld..."
-
-msgid "PDF File"
-msgstr "PDF-bestand"
-
-msgid "Synchronisation status"
-msgstr "Synchronisatiestatus"
-
-msgid "New note"
-msgstr "Nieuwe notitie"
-
-msgid "New to-do"
-msgstr "Nieuwe taak"
-
-msgid "New notebook"
-msgstr "Nieuw notitieboek"
-
-msgid "Print"
-msgstr "Afdrukken"
-
-msgid "General Options"
-msgstr "Algemene opties"
-
-msgid "Encryption options"
-msgstr "Versleutelingsopties"
-
-msgid "Web clipper options"
-msgstr "Webclipper-opties"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Datum en tijd invoegen"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin-exportmap"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Bestand"
 
@@ -669,7 +603,7 @@ msgid "Check for updates..."
 msgstr "Controleren op updates..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Sjablonen"
 
 msgid "Import"
 msgstr "Importeren"
@@ -753,6 +687,10 @@ msgstr "&Help"
 msgid "Website and documentation"
 msgstr "Website en documentatie"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin-website"
+
 msgid "Make a donation"
 msgstr "Doneren"
 
@@ -864,6 +802,9 @@ msgstr ""
 "Dit autorisatie-token is alleen nodig om applicaties van derden toegang te "
 "geven tot Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen worden opgeslagen in: %s"
@@ -874,6 +815,9 @@ msgstr "Synchronisatieconfiguratie controleren"
 msgid "Browse..."
 msgstr "Bladeren…"
 
+msgid "Back"
+msgstr "Terug"
+
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -956,8 +900,8 @@ msgstr ""
 "items. Waarschijnlijk worden ze uiteindelijk gedownload via synchronisatie."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Bekijk, voor meer informatie over End-To-End-versleuteling (E2EE) en hulp "
 "bij het inschakelen hiervan, onze documentatie:"
@@ -968,12 +912,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Gebruikte versleuteling:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Gebruik"
 
-msgid "Back"
-msgstr "Terug"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1003,7 +953,16 @@ msgid "Set alarm:"
 msgstr "Alarm instellen:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "Sjabloonbestand:"
+
+msgid "New note"
+msgstr "Nieuwe notitie"
+
+msgid "New to-do"
+msgstr "Nieuwe taak"
+
+msgid "New notebook"
+msgstr "Nieuw notitieboek"
 
 msgid "Layout"
 msgstr "Indeling"
@@ -1044,7 +1003,7 @@ msgid "Note History"
 msgstr "Notitiegeschiedenis"
 
 msgid "Markup"
-msgstr ""
+msgstr "Opmaak"
 
 msgid "Previous versions of this note"
 msgstr "Vorige versies van deze notitie"
@@ -1107,6 +1066,13 @@ msgstr ""
 "Slechts één notitie kan gelijktijdig worden afgedrukt of geëxporteerd naar "
 "PDF."
 
+msgid "PDF File"
+msgstr "PDF-bestand"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fout bij openen van notitie in bewerker: %s"
+
 msgid "strong text"
 msgstr "vetgedrukte tekst"
 
@@ -1181,12 +1147,6 @@ msgstr "Opties"
 msgid "Synchronisation Status"
 msgstr "Synchronisatiestatus"
 
-msgid "Encryption Options"
-msgstr "Versleutelopties"
-
-msgid "Clipper Options"
-msgstr "Webclipperopties"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1211,6 +1171,17 @@ msgstr "Verwijderen"
 msgid "Rename"
 msgstr "Naam wijzigen"
 
+msgid "Notebooks"
+msgstr "Notitieboeken"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Bezig met ontsleutelen van items: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Bronnen ophalen: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Kies waar de synchronisatiestatus naar moet worden geëxporteerd"
 
@@ -1369,11 +1340,6 @@ msgstr "Bezig"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "De synchronisatie loopt al. Status: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Onbekend type item gedownload - graag Joplin upgraden naar de laatste versie"
-
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1495,11 +1461,11 @@ msgstr "Licht"
 msgid "Dark"
 msgstr "Donker"
 
-msgid "Solarized Light"
-msgstr ""
+msgid "Solarised Light"
+msgstr "Solarised Light"
 
-msgid "Solarized Dark"
-msgstr ""
+msgid "Solarised Dark"
+msgstr "Solarised Dark"
 
 msgid "Uncompleted to-dos on top"
 msgstr "Niet-afgeronde taken bovenaan"
@@ -1567,6 +1533,10 @@ msgstr "Inschakelen ++insert++ syntaxis"
 msgid "Enable multimarkdown table extension"
 msgstr "Inschakelen multimarkdown tabel extensie"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Inschakelen ~sub~ syntaxis"
+
 msgid "Show tray icon"
 msgstr "Systeemvakpictogram tonen"
 
@@ -1591,6 +1561,10 @@ msgstr "Globaal zoompercentage"
 msgid "Editor font size"
 msgstr "Lettergrootte van bewerker"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Lettergrootte van bewerker"
+
 msgid "Editor font family"
 msgstr "Lettertype van bewerker"
 
@@ -1656,6 +1630,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS-certificaatfouten negeren"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "Inschakelen geschiedenis van notities"
 
@@ -1691,6 +1675,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Applicatie"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Gebruikte versleuteling:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Webclipper-opties"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Het label “%s” bestaat al. Kies een andere naam."
@@ -1704,7 +1696,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-exportmap"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote-exportbestand"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote-exportbestand"
 
 msgid "Json Export Directory"
@@ -1814,6 +1811,14 @@ 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."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Creëert een nieuw notitieboek."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Er zijn momenteel geen notities. Creëer een notitie door te drukken op de "
@@ -1859,21 +1864,10 @@ msgstr "Nieuw notitieboek"
 msgid "Configuration"
 msgstr "Configuratie"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Bezig met ontsleutelen van items: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Bronnen ophalen: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notitie"
 
-msgid "Notebooks"
-msgstr "Notitieboeken"
-
 msgid "Checking... Please wait."
 msgstr "Controleren… Even geduld."
 
@@ -1915,16 +1909,14 @@ msgid "Type new tags or select from list"
 msgstr "Typ nieuwe labels of kies ze uit de lijst"
 
 msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
-
-#, fuzzy
-msgid "Information"
-msgstr "Meer informatie"
+"Om synchronisatie via het bestandssysteem te gebruiken is je toestemming "
+"nodig om naar externe opslag te schrijven."
 
 msgid "Encryption Config"
 msgstr "Versleutelconfiguratie"
@@ -1948,15 +1940,17 @@ msgid "Export Debug Report"
 msgstr "Foutopsporingsrapportage exporteren"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Zoekindex repareren…"
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Zoekindex repareren"
 
 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 ""
+"Gebruik dit om de zoekindex opnieuw op te bouwen als er een probleem is met "
+"zoeken: Het kan lang duren afhankelijk van het aantal notities."
 
 msgid "More information"
 msgstr "Meer informatie"
@@ -2099,7 +2093,7 @@ msgid "Properties"
 msgstr "Eigenschappen van notitie"
 
 msgid "Add body"
-msgstr ""
+msgstr "Inhoud toevoegen"
 
 msgid "Edit"
 msgstr "Bewerken"
@@ -2114,6 +2108,85 @@ msgstr "Inloggen met OneDrive"
 msgid "Search"
 msgstr "Zoeken"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Bezig met starten van notitiebewerking. Sluit de bewerker om terug te "
+#~ "keren."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notitie is opgeslagen."
+
+#~ msgid "All potential ports are in use - please report the issue at %s"
+#~ msgstr "Alle potentiële poorten zijn in gebruik - Meld het probleem op %s"
+
+#~ msgid "Sidebar"
+#~ msgstr "Zijbalk"
+
+#~ msgid "Note list"
+#~ msgstr "Notitielijst"
+
+#~ msgid "Note title"
+#~ msgstr "Titel van notitie"
+
+#~ msgid "Note body"
+#~ msgstr "Inhoud van notitie"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr ""
+#~ "Bezig met importeren van \"%s\" in het formaat \"%s\". Even geduld..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synchronisatiestatus"
+
+#~ msgid "Print"
+#~ msgstr "Afdrukken"
+
+#~ msgid "General Options"
+#~ msgstr "Algemene opties"
+
+#~ msgid "Encryption options"
+#~ msgstr "Versleutelingsopties"
+
+#~ msgid "Create note from template"
+#~ msgstr "Notitie maken van sjabloon"
+
+#~ msgid "Create to-do from template"
+#~ msgstr "To-do maken van sjabloon"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Datum en tijd invoegen"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin-exportmap"
+
+#~ msgid "Refresh templates"
+#~ msgstr "Sjablonen vernieuwen"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Versleutelopties"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Webclipperopties"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Onbekend type item gedownload - graag Joplin upgraden naar de laatste "
+#~ "versie"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Meer informatie"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Toestemming om de camera te gebruiken"
@@ -2162,10 +2235,6 @@ msgstr "Zoeken"
 #~ "Het pad waarnaar gesynchroniseerd moet worden als bestandssysteem-"
 #~ "synchronisatie is ingeschakeld. Zie `sync.target`."
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin-website"
-
 #~ msgid "State: %s."
 #~ msgstr "Status: %s."
 

CliClient/locales/pl_PL.po

@@ -178,18 +178,6 @@ msgstr "Brak aktywnego notatnika."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notatka nie istnieje: \"%s\". Utworzyć?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Rozpoczynanie edycji notatki. Zamknij edytor, aby powrócić do wiersza "
-"poleceń."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Błąd przy otwieraniu notatki w edytorze: %s"
-
-msgid "Note has been saved."
-msgstr "Notatka została zapisana."
-
 msgid "Exits the application."
 msgstr "Wychodzi z aplikacji."
 
@@ -398,6 +386,23 @@ msgstr "Usunąć notatkę?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Wyszukuje wskazany <pattern> we wszystkich notatkach."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -539,10 +544,6 @@ msgstr "Wpisz `joplin help` dla informacji o użytkowaniu."
 msgid "Fatal error:"
 msgstr "Błąd krytyczny:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikacja została uwierzytelniona - możesz zamknąć kartę przeglądarki."
@@ -598,74 +599,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Eksportowanie do \"%s\" jako \"%s\". Proszę czekać..."
 
-msgid "Sidebar"
-msgstr "Nawigator"
-
-msgid "Note list"
-msgstr "Lista notatek"
-
-msgid "Note title"
-msgstr "Tytuł notatki"
-
-msgid "Note body"
-msgstr "Zawartość notatki"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importowanie z \"%s\"  jako \"%s\". Proszę czekać..."
-
-msgid "PDF File"
-msgstr "Plik PDF"
-
-msgid "Synchronisation status"
-msgstr "Status synchronizacji"
-
-msgid "New note"
-msgstr "Nowa notatka"
-
-msgid "New to-do"
-msgstr "Nowe zadanie"
-
-msgid "New notebook"
-msgstr "Nowy notatnik"
-
-msgid "Print"
-msgstr "Drukuj"
-
-msgid "General Options"
-msgstr "Opcje główne"
-
-msgid "Encryption options"
-msgstr "Opcje szyfrowania"
-
-msgid "Web clipper options"
-msgstr "Opcje Web clipper"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Wstaw stempel czasowy"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Katalog Joplin Export"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Plik"
 
@@ -763,6 +696,10 @@ msgstr "&Pomoc"
 msgid "Website and documentation"
 msgstr "Strona internetowa i dokumentacja"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Plik Joplin Export"
+
 msgid "Make a donation"
 msgstr "Przekaż datek"
 
@@ -873,6 +810,9 @@ msgstr ""
 "Token uwierzytelniający jest potrzebny jedynie w celu pozwolenia aplikacjom "
 "firm trzecich na dostęp do Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notatki i ustawienia są przechowywane w: %s"
@@ -883,6 +823,9 @@ msgstr "Sprawdź konfigurację synchronizacji"
 msgid "Browse..."
 msgstr "Przeglądaj..."
 
+msgid "Back"
+msgstr "Cofnij"
+
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -965,8 +908,8 @@ msgstr ""
 "pobrane przy synchonizacji."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Aby uzyskać informacje o szyfrowaniu po stronie klienta (E2EE) i przykłady "
 "ułatwiające jego uruchomienie, proszę sprawdź dokumentację:"
@@ -977,12 +920,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Szyfrowanie jest:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Przykłady"
 
-msgid "Back"
-msgstr "Cofnij"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1014,6 +963,15 @@ msgstr "Ustaw powiadomienie:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nowa notatka"
+
+msgid "New to-do"
+msgstr "Nowe zadanie"
+
+msgid "New notebook"
+msgstr "Nowy notatnik"
+
 msgid "Layout"
 msgstr "Układ"
 
@@ -1113,6 +1071,13 @@ msgstr ""
 "Jedna notatka może zostać wydrukowana lub wyeksportowana do pliku PDF w tym "
 "samym czasie."
 
+msgid "PDF File"
+msgstr "Plik PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Błąd przy otwieraniu notatki w edytorze: %s"
+
 msgid "strong text"
 msgstr "pogrubienie"
 
@@ -1187,12 +1152,6 @@ msgstr "Opcje"
 msgid "Synchronisation Status"
 msgstr "Status synchronizacji"
 
-msgid "Encryption Options"
-msgstr "Opcje szyfrowania"
-
-msgid "Clipper Options"
-msgstr "Opcje funkcji Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1217,6 +1176,17 @@ msgstr "Usuń"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
+msgid "Notebooks"
+msgstr "Notatniki"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Deszyfrowanie obiektów %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Pobieranie zasobów: %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Proszę wybrać gdzie powinen zostać eksportowany status synchronizacji"
 
@@ -1375,12 +1345,6 @@ msgstr "W trakcie"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronizacja w toku. Stan: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Pobrano nieznany typ pliku - proszę zaaktualizować Joplin do najnowszej "
-"wersji"
-
 msgid "Encrypted"
 msgstr "Zaszyfrowane"
 
@@ -1503,10 +1467,10 @@ msgstr "Jasny"
 msgid "Dark"
 msgstr "Ciemny"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1575,6 +1539,10 @@ msgstr "Aktywuj składnię ++instert++"
 msgid "Enable multimarkdown table extension"
 msgstr "Aktywuj rozszerzenie dla tabeli multimarkdown"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Aktywuj składnię ~sub~"
+
 msgid "Show tray icon"
 msgstr "Pokaż ikonę w zasobniku systemowym"
 
@@ -1599,6 +1567,10 @@ msgstr "Powiększenie globalne w procentach"
 msgid "Editor font size"
 msgstr "Wielkość czcionki edytora"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Wielkość czcionki edytora"
+
 msgid "Editor font family"
 msgstr "Rodzina czcionek edytora"
 
@@ -1666,6 +1638,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoruj błędy certyfikatu TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "Aktywuj historię notatek"
 
@@ -1701,6 +1683,14 @@ msgstr "Wtyczki"
 msgid "Application"
 msgstr "Aplikacja"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Szyfrowanie jest:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opcje Web clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Znacznik \"%s\" istnieje. Proszę wybrać inną nazwę."
@@ -1714,7 +1704,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Katalog Joplin Export"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Plik Evernote Export"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Plik Evernote Export"
 
 msgid "Json Export Directory"
@@ -1820,6 +1815,14 @@ msgstr "Uprawenie do użytkowania kamery"
 msgid "Your permission to use your camera is required."
 msgstr "Wymagane uprawenienie do użytkowania kamery."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Brak aktywnego notatnika."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Tworzy nowy notatnik."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Brak notatek. Aby utworzyć, naciśnij przycisk (+)."
 
@@ -1863,21 +1866,10 @@ msgstr "Nowy notatnik"
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Deszyfrowanie obiektów %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Pobieranie zasobów: %d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notatka"
 
-msgid "Notebooks"
-msgstr "Notatniki"
-
 msgid "Checking... Please wait."
 msgstr "Sprawdzanie... Proszę czekać."
 
@@ -1926,10 +1918,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfiguracja"
-
 msgid "Encryption Config"
 msgstr "Konfiguracja szyfrowania"
 
@@ -2123,6 +2111,72 @@ msgstr "Zaloguj z OneDrive"
 msgid "Search"
 msgstr "Wyszukaj"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Rozpoczynanie edycji notatki. Zamknij edytor, aby powrócić do wiersza "
+#~ "poleceń."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Notatka została zapisana."
+
+#~ msgid "Sidebar"
+#~ msgstr "Nawigator"
+
+#~ msgid "Note list"
+#~ msgstr "Lista notatek"
+
+#~ msgid "Note title"
+#~ msgstr "Tytuł notatki"
+
+#~ msgid "Note body"
+#~ msgstr "Zawartość notatki"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importowanie z \"%s\"  jako \"%s\". Proszę czekać..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status synchronizacji"
+
+#~ msgid "Print"
+#~ msgstr "Drukuj"
+
+#~ msgid "General Options"
+#~ msgstr "Opcje główne"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opcje szyfrowania"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Wstaw stempel czasowy"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Katalog Joplin Export"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opcje szyfrowania"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opcje funkcji Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Pobrano nieznany typ pliku - proszę zaaktualizować Joplin do najnowszej "
+#~ "wersji"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfiguracja"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Uprawenie do użytkowania kamery"

CliClient/locales/pt_BR.po

@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Renato Nunes Bastos <rnbastos@gmail.com>\n"
+"Last-Translator: Rafael Teixeira <rto.tinfo@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.0.7\n"
+"X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -60,7 +60,7 @@ msgid "The command \"%s\" is only available in GUI mode"
 msgstr "O comando \"%s\" está disponível somente em modo gráfico"
 
 msgid "Cannot change encrypted item"
-msgstr "Não pode mudar um item encriptado"
+msgstr "Não é possível mudar um item encriptado"
 
 #, javascript-format
 msgid "Missing required argument: %s"
@@ -173,16 +173,6 @@ msgstr "Nenhum caderno ativo."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "A nota não existe: \"%s\". Criar?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Começando a editar a nota. Feche o editor para voltar ao prompt."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Erro ao abir a nota no editor: %s"
-
-msgid "Note has been saved."
-msgstr "Nota gravada."
-
 msgid "Exits the application."
 msgstr "Sai da aplicação."
 
@@ -386,6 +376,23 @@ msgstr "Apagar nota?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Procura o padrão <pattern>em todas as notas."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -527,10 +534,6 @@ msgstr "Digite 'joplin help' para informações de uso."
 msgid "Fatal error:"
 msgstr "Erro fatal:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -586,74 +589,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportando para \"%s\" com o formato \"%s\". Por favor, aguarde..."
 
-msgid "Sidebar"
-msgstr "Barra Lateral"
-
-msgid "Note list"
-msgstr "Lista de notas"
-
-msgid "Note title"
-msgstr "Título da Nota:"
-
-msgid "Note body"
-msgstr "Corpo da Nota"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importando de \"%s\" com o formato \"%s\". Por favor, aguarde..."
-
-msgid "PDF File"
-msgstr "Arquivo PDF"
-
-msgid "Synchronisation status"
-msgstr "Status de sincronização"
-
-msgid "New note"
-msgstr "Nova nota"
-
-msgid "New to-do"
-msgstr "Nova tarefa"
-
-msgid "New notebook"
-msgstr "Novo caderno"
-
-msgid "Print"
-msgstr "Imprimir"
-
-msgid "General Options"
-msgstr "Opções Gerais"
-
-msgid "Encryption options"
-msgstr "Opções de Encriptação"
-
-msgid "Web clipper options"
-msgstr "Opções do Web clipper"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Inserir Data e Hora"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Diretório de Exportação do Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Arquivo"
 
@@ -751,11 +686,15 @@ msgstr "&Ajuda"
 msgid "Website and documentation"
 msgstr "Website e documentação"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Site do Joplin"
+
 msgid "Make a donation"
 msgstr "Fazer uma doação"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Habilitar/Desabilitar ferramentas de desenvolvimento"
 
 #, javascript-format
 msgid "Open %s"
@@ -862,6 +801,9 @@ msgstr ""
 "Esse token de autorização só é necessário para permitir que aplicativos de "
 "terceiros acessem o Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notas e configurações estão armazenadas em: %s"
@@ -872,6 +814,9 @@ msgstr "Verificar a configuração da sincronização"
 msgid "Browse..."
 msgstr "Navegar..."
 
+msgid "Back"
+msgstr "Voltar"
+
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -953,8 +898,8 @@ msgstr ""
 "elas serão baixadas via sincronização."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Para mais informações sobre Encriptação ponto-a-ponto (E2EE) e recomendações "
 "sobre como habilitar, favor verificar a documentação:"
@@ -965,12 +910,18 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Encriptação está:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Uso"
 
-msgid "Back"
-msgstr "Voltar"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1001,6 +952,15 @@ msgstr "Definir alarme:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova nota"
+
+msgid "New to-do"
+msgstr "Nova tarefa"
+
+msgid "New notebook"
+msgstr "Novo caderno"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1097,6 +1057,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr "Só uma nota pode ser impressa ou exportada para PDF de cada vez."
 
+msgid "PDF File"
+msgstr "Arquivo PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Erro ao abir a nota no editor: %s"
+
 msgid "strong text"
 msgstr "texto forte"
 
@@ -1171,12 +1138,6 @@ msgstr "Opções"
 msgid "Synchronisation Status"
 msgstr "Status de sincronização"
 
-msgid "Encryption Options"
-msgstr "Opções de Encriptação"
-
-msgid "Clipper Options"
-msgstr "Opções do clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1200,13 +1161,24 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
+msgid "Notebooks"
+msgstr "Cadernos"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Decriptando itens: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Buscando recursos: %d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Favor selecionar o local para onde o status de sincronia deveria ser "
 "exportado"
 
 msgid "Retry"
-msgstr ""
+msgstr "Tentar novamente"
 
 msgid "Add or remove tags"
 msgstr "Adicionar ou remover tags"
@@ -1360,12 +1332,6 @@ msgstr "Em andamento"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sincronização já em andamento. Estado: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Tipo de item desconhecido baixado - por favor, atualize o Joplin para a "
-"última versão"
-
 msgid "Encrypted"
 msgstr "Encriptado"
 
@@ -1452,15 +1418,18 @@ msgid ""
 "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 ""
+"No modo \"Manual\", os anexos são baixados apenas quando você clica neles. "
+"Em \"Automático\", eles são baixados quando você abre a nota. Em \"Sempre\", "
+"todos os anexos são baixados independentemente de você abrir a nota ou não."
 
 msgid "Always"
-msgstr ""
+msgstr "Sempre"
 
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 msgid "Auto"
-msgstr ""
+msgstr "Automático"
 
 msgid "Max concurrent connections"
 msgstr ""
@@ -1483,10 +1452,10 @@ msgstr "Light"
 msgid "Dark"
 msgstr "Dark"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1526,7 +1495,7 @@ msgid "Enable math expressions"
 msgstr "Habilitar expressões matemáticas"
 
 msgid "Enable ==mark== syntax"
-msgstr "Habilitar sintaxe ==marcador== "
+msgstr "Habilitar sintaxe ==marcador=="
 
 msgid "Enable footnotes"
 msgstr "Habilitar notas de rodapé"
@@ -1538,22 +1507,26 @@ msgid "Enable ~sub~ syntax"
 msgstr "Habilitar sintaxe ~sub~"
 
 msgid "Enable ^sup^ syntax"
-msgstr "Habilitar sintaxe ^sup^ "
+msgstr "Habilitar sintaxe ^sup^"
 
 msgid "Enable deflist syntax"
-msgstr "Habilitar sintaxe de deflist "
+msgstr "Habilitar sintaxe de deflist"
 
 msgid "Enable abbreviation syntax"
 msgstr "Habilitar sintaxe de abreviações"
 
 msgid "Enable markdown emoji"
-msgstr "Habilitar emojis em markdown "
+msgstr "Habilitar emojis em markdown"
 
 msgid "Enable ++insert++ syntax"
-msgstr "Habilitar sintaxe ++inserir++ "
+msgstr "Habilitar sintaxe ++inserir++"
 
 msgid "Enable multimarkdown table extension"
-msgstr "Habilitar extensão de tabela de multimarkdown "
+msgstr "Habilitar extensão de tabela de multimarkdown"
+
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Habilitar sintaxe ~sub~"
 
 msgid "Show tray icon"
 msgstr "Exibir tray icon"
@@ -1579,6 +1552,10 @@ msgstr "Porcentagem global do zoom"
 msgid "Editor font size"
 msgstr "Tamanho da fonte no Editor"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Tamanho da fonte no Editor"
+
 msgid "Editor font family"
 msgstr "Família de fontes do editor"
 
@@ -1643,6 +1620,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorar erros de certificados TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "Habilitar histórico de notas"
 
@@ -1678,6 +1665,14 @@ msgstr "Plugins"
 msgid "Application"
 msgstr "Aplicação"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Encriptação está:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Opções do Web clipper"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "A tag \"%s\" já existe. Escolha um nome diferente."
@@ -1691,7 +1686,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Diretório de Exportação do Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Arquivo de Exportação do Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Arquivo de Exportação do Evernote"
 
 msgid "Json Export Directory"
@@ -1747,17 +1747,19 @@ msgstr "%s (%s) não pôde ser enviado: %s"
 
 #, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "Item \"%s\" não pôde ser baixado: %s"
+msgstr "O item \"%s\" não pôde ser baixado: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Os itens não podem ser sincronizados"
+msgstr "Os itens não podem ser decriptados"
 
 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 ""
+"O Joplin falhou ao tentar decriptar esses múltiplos items, possivelmente "
+"porque eles estão corruptos ou são grandes demais. Esses itens permanecerão "
+"no dispositivo, porém o Joplin não vai mais tentar decriptá-los."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Status de sincronização (sincronizados / totais)"
@@ -1798,6 +1800,14 @@ 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."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Cria um novo 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 (+)."
 
@@ -1826,35 +1836,21 @@ msgstr "Selecionar data"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Cadernos"
+msgstr "Caderno: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Itens encriptados não podem ser modificados"
+msgstr "Cadernos encriptados não podem ser renomeados"
 
-#, fuzzy
 msgid "New Notebook"
 msgstr "Novo caderno"
 
 msgid "Configuration"
 msgstr "Configuração"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Decriptando itens: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Buscando recursos: %d"
-
-#, fuzzy
 msgid "All notes"
-msgstr "Excluir notas?"
-
-msgid "Notebooks"
-msgstr "Cadernos"
+msgstr "Todas as notas"
 
 msgid "Checking... Please wait."
 msgstr "Verificando... Por favor aguarde."
@@ -1898,27 +1894,21 @@ msgid "Type new tags or select from list"
 msgstr "Digite novsa tags, ou selecione da lista"
 
 msgid "Warning"
-msgstr ""
+msgstr "Atenção"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configuração"
-
 msgid "Encryption Config"
 msgstr "Configuração de Encriptação"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Ferramentas"
+msgstr "Ferramentas"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Status"
+msgstr "Status de sincronização"
 
 msgid "Log"
 msgstr "Log"
@@ -1941,9 +1931,8 @@ msgid ""
 "may take a long time depending on the number of notes."
 msgstr ""
 
-#, fuzzy
 msgid "More information"
-msgstr "Configuração"
+msgstr "Mais informações"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -2009,9 +1998,8 @@ msgstr "O caderno não pôde ser salvo: %s"
 msgid "Edit notebook"
 msgstr "Editar caderno"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Título do caderno:"
+msgstr "Entre o título do caderno"
 
 msgid "Show all"
 msgstr "Exibir tudo"
@@ -2038,15 +2026,15 @@ msgstr "O app mobile do Joplin não suporta, atualmente, esse tipo de link: %s"
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "Links com o protocolo \"%s\" não são suportados"
 
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagem não suportada: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Atualizado: %d."
+msgstr "Atualizado: %s"
 
 msgid "View on map"
 msgstr "Ver no mapa"
@@ -2058,9 +2046,8 @@ msgstr "Ir para a URL de origem"
 msgid "Attach..."
 msgstr "Pesquisar..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Mostrar opções avançadas"
+msgstr "Escolha uma opção"
 
 msgid "Take photo"
 msgstr "Tirar foto"
@@ -2090,9 +2077,8 @@ msgstr ""
 msgid "Edit"
 msgstr "Editar"
 
-#, fuzzy
 msgid "Add title"
-msgstr "título"
+msgstr "Adicionar título"
 
 msgid "Login with OneDrive"
 msgstr "Login com OneDrive"
@@ -2100,6 +2086,69 @@ msgstr "Login com OneDrive"
 msgid "Search"
 msgstr "Procurar"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "Começando a editar a nota. Feche o editor para voltar ao prompt."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Nota gravada."
+
+#~ msgid "Sidebar"
+#~ msgstr "Barra Lateral"
+
+#~ msgid "Note list"
+#~ msgstr "Lista de notas"
+
+#~ msgid "Note title"
+#~ msgstr "Título da Nota"
+
+#~ msgid "Note body"
+#~ msgstr "Corpo da Nota"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importando de \"%s\" com o formato \"%s\". Por favor, aguarde..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status de sincronização"
+
+#~ msgid "Print"
+#~ msgstr "Imprimir"
+
+#~ msgid "General Options"
+#~ msgstr "Opções Gerais"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opções de Encriptação"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Inserir Data e Hora"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Diretório de Exportação do Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opções de Encriptação"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opções do Clipper"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Tipo de item desconhecido baixado - por favor, atualize o Joplin para a "
+#~ "última versão"
+
+#~ msgid "Information"
+#~ msgstr "Informação"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Permissão para utilizar sua câmera"
@@ -2146,10 +2195,6 @@ msgstr "Procurar"
 #~ "O caminho para sincronizar, quando a sincronização do sistema de arquivos "
 #~ "está habilitada. Veja `sync.target`."
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Site do Joplin"
-
 #~ msgid "State: %s."
 #~ msgstr "Estado: \"%s\"."
 
@@ -2205,9 +2250,6 @@ msgstr "Procurar"
 #~ msgid "Exit the application."
 #~ msgstr "Sair da aplicação."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Excluir nota selecionada ou notebook."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Marcar uma tarefa como completada / não completada"
 

CliClient/locales/ro.po

@@ -164,16 +164,6 @@ msgstr "Niciun caiet de notițe activ."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Notița nu există: \"%s\". Doriți să o creați?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Eroare deschidere notiță în editor: %s"
-
-msgid "Note has been saved."
-msgstr "Notița a fost salvată."
-
 msgid "Exits the application."
 msgstr ""
 
@@ -357,6 +347,23 @@ msgstr "Ștergeți notița?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -476,10 +483,6 @@ msgstr "Tastați `joplin help` pentru informații de utilizare."
 msgid "Fatal error:"
 msgstr "Eroare fatală:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -525,74 +528,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Se exportă către \"%s\" în format \"%s\". Vă rugăm să așteotați..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Titlul caietului de notițe:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Caiete de notițe"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
-msgid "PDF File"
-msgstr "Fișier PDF"
-
-msgid "Synchronisation status"
-msgstr "Statusul sincronizării"
-
-msgid "New note"
-msgstr "Adăugați o nouă notiță"
-
-msgid "New to-do"
-msgstr "Adăugați o nouă sarcină"
-
-msgid "New notebook"
-msgstr "Adăugați un nou caiet de notițe"
-
-msgid "Print"
-msgstr "Printați"
-
-msgid "General Options"
-msgstr "Opțiuni Generale"
-
-msgid "Encryption options"
-msgstr "Opțiuni de criptare"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-msgid "Open template directory"
-msgstr ""
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fișier"
@@ -697,6 +632,10 @@ msgstr "Ajutor"
 msgid "Website and documentation"
 msgstr "Website și documentație"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Website Joplin"
+
 msgid "Make a donation"
 msgstr "Faceți o donație"
 
@@ -801,6 +740,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr ""
@@ -811,6 +753,9 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Înapoi"
+
 msgid "Apply"
 msgstr "Aplicați"
 
@@ -879,8 +824,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -889,13 +834,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Criptarea este:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Utilizare: %s"
 
-msgid "Back"
-msgstr "Înapoi"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -925,6 +876,15 @@ msgstr "Setați alarma:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Adăugați o nouă notiță"
+
+msgid "New to-do"
+msgstr "Adăugați o nouă sarcină"
+
+msgid "New notebook"
+msgstr "Adăugați un nou caiet de notițe"
+
 msgid "Layout"
 msgstr ""
 
@@ -1018,6 +978,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "Fișier PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Eroare deschidere notiță în editor: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1092,12 +1059,6 @@ msgstr "Opțiuni"
 msgid "Synchronisation Status"
 msgstr "Statutul sincronizării"
 
-msgid "Encryption Options"
-msgstr "Opțiuni de criptare"
-
-msgid "Clipper Options"
-msgstr "Opțiuni Clipper"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1118,6 +1079,17 @@ msgstr "Ștergeți"
 msgid "Rename"
 msgstr "Redenumiți"
 
+msgid "Notebooks"
+msgstr "Caiete de notițe"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Se decriptează itemi: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Resurse: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 
@@ -1269,10 +1241,6 @@ msgstr "În progres"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Criptat"
 
@@ -1384,10 +1352,10 @@ msgstr "Deschisă"
 msgid "Dark"
 msgstr "Închisă"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1458,6 +1426,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Afișați iconița coșul de gunoi"
 
@@ -1480,6 +1451,10 @@ msgstr ""
 msgid "Editor font size"
 msgstr "Editează notiță."
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editează notiță."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1534,6 +1509,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoră erorile de certificat TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Activați criptarea"
@@ -1574,6 +1559,13 @@ msgstr ""
 msgid "Application"
 msgstr "Duplicați"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Criptarea este:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1587,7 +1579,10 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr ""
 
-msgid "Evernote Export File"
+msgid "Evernote Export File (as Markdown)"
+msgstr ""
+
+msgid "Evernote Export File (as HTML)"
 msgstr ""
 
 msgid "Json Export Directory"
@@ -1688,6 +1683,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Niciun caiet de notițe activ."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Creați caiet de notițe."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 
@@ -1732,21 +1735,10 @@ msgstr "Adăugați un nou caiet de notițe"
 msgid "Configuration"
 msgstr "Configurare"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Se decriptează itemi: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Resurse: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "notiță"
 
-msgid "Notebooks"
-msgstr "Caiete de notițe"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "Se anulează... Vă rugăm să așteptați."
@@ -1789,10 +1781,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Configurare"
-
 msgid "Encryption Config"
 msgstr ""
 
@@ -1978,6 +1966,46 @@ msgstr "Autentificare prin OneDrive"
 msgid "Search"
 msgstr "Caută"
 
+#~ msgid "Note has been saved."
+#~ msgstr "Notița a fost salvată."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Titlul caietului de notițe:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Caiete de notițe"
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Statusul sincronizării"
+
+#~ msgid "Print"
+#~ msgstr "Printați"
+
+#~ msgid "General Options"
+#~ msgstr "Opțiuni Generale"
+
+#~ msgid "Encryption options"
+#~ msgstr "Opțiuni de criptare"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Opțiuni de criptare"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Opțiuni Clipper"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Configurare"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Amânați sincronizarea"
 
@@ -2008,10 +2036,6 @@ msgstr "Caută"
 #~ msgid "%s (%s): %s"
 #~ msgstr "%s (%s): %s"
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Website Joplin"
-
 #~ msgid "State: %s."
 #~ msgstr "Statut: %s."
 

CliClient/locales/ru_RU.po

@@ -177,18 +177,6 @@ msgstr "Нет активного блокнота."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Заметка не существует: \"%s\". Создать?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Запуск редактирования заметки. Закройте редактор, чтобы вернуться к "
-"приглашению."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Ошибка при открытии заметки в редакторе: %s"
-
-msgid "Note has been saved."
-msgstr "Заметка сохранена."
-
 msgid "Exits the application."
 msgstr "Выйти из приложения."
 
@@ -394,6 +382,23 @@ msgstr "Удалить заметку?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Запросы для заданного <pattern> во всех заметках."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -534,10 +539,6 @@ msgstr "Введите `joplin help` для получения информац
 msgid "Fatal error:"
 msgstr "Фатальная ошибка:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Приложение авторизовано — можно закрыть вкладку браузера."
@@ -592,74 +593,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Экспорт в \"%s\" в формате \"%s\". Пожалуйста, подождите..."
 
-msgid "Sidebar"
-msgstr "Боковая панель"
-
-msgid "Note list"
-msgstr "Список заметок"
-
-msgid "Note title"
-msgstr "Название заметки"
-
-msgid "Note body"
-msgstr "Тело заметки"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Импорт из \"%s\" в формате \"%s\". Пожалуйста, подождите..."
-
-msgid "PDF File"
-msgstr "Файл PDF"
-
-msgid "Synchronisation status"
-msgstr "Статус синхронизации"
-
-msgid "New note"
-msgstr "Новая заметка"
-
-msgid "New to-do"
-msgstr "Новая задача"
-
-msgid "New notebook"
-msgstr "Новый блокнот"
-
-msgid "Print"
-msgstr "Печать"
-
-msgid "General Options"
-msgstr "Основные настройки"
-
-msgid "Encryption options"
-msgstr "Настройки шифрования"
-
-msgid "Web clipper options"
-msgstr "Настройки веб-клиппера"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Вставить дату и время"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Каталог экспорта Joplin"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 msgid "&File"
 msgstr "&Файл"
 
@@ -757,6 +690,10 @@ msgstr "&Помощь"
 msgid "Website and documentation"
 msgstr "Сайт и документация"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin v%s"
+
 msgid "Make a donation"
 msgstr "Сделать пожертвование"
 
@@ -867,6 +804,9 @@ msgstr ""
 "Этот токен авторизации необходим только для разрешения сторонним приложениям "
 "получать доступ к Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Заметки и настройки сохранены в: %s"
@@ -877,6 +817,9 @@ msgstr "Проверить настройки синхронизации"
 msgid "Browse..."
 msgstr "Обзор..."
 
+msgid "Back"
+msgstr "Назад"
+
 msgid "Apply"
 msgstr "Применить"
 
@@ -960,8 +903,8 @@ msgstr ""
 "загрузятся при синхронизации."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Для получения дополнительной информации о сквозном шифровании (E2EE) и "
 "советах о том, как его включить, пожалуйста, обратитесь к документации:"
@@ -972,12 +915,18 @@ msgstr "Статус"
 msgid "Encryption is:"
 msgstr "Шифрование:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Использование: %s"
 
-msgid "Back"
-msgstr "Назад"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1008,6 +957,15 @@ msgstr "Установить напоминание:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Новая заметка"
+
+msgid "New to-do"
+msgstr "Новая задача"
+
+msgid "New notebook"
+msgstr "Новый блокнот"
+
 msgid "Layout"
 msgstr "Разметка"
 
@@ -1105,6 +1063,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Только одна заметка может быть напечатана или экспортирована в PDF за раз."
 
+msgid "PDF File"
+msgstr "Файл PDF"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Ошибка при открытии заметки в редакторе: %s"
+
 msgid "strong text"
 msgstr "выделенный текст"
 
@@ -1179,12 +1144,6 @@ msgstr "Настройки"
 msgid "Synchronisation Status"
 msgstr "Статус синхронизации"
 
-msgid "Encryption Options"
-msgstr "Настройки шифрования"
-
-msgid "Clipper Options"
-msgstr "Настройки клиппера"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1207,6 +1166,17 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
+msgid "Notebooks"
+msgstr "Блокноты"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Расшифровано элементов: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Получение ресурсов: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr ""
 "Пожалуйста, выберите, куда должен быть экспортирован статус синхронизации"
@@ -1364,10 +1334,6 @@ msgstr "Выполнение"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизация уже выполняется. Состояние: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Зашифровано"
 
@@ -1485,10 +1451,10 @@ msgstr "Светлая"
 msgid "Dark"
 msgstr "Темная"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1558,6 +1524,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Показывать иконку в трее"
 
@@ -1582,6 +1551,10 @@ msgstr "Глобальный масштаб в процентах"
 msgid "Editor font size"
 msgstr "Размер шрифта редактора"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Размер шрифта редактора"
+
 msgid "Editor font family"
 msgstr "Семейство шрифтов редактора"
 
@@ -1648,6 +1621,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Игнорировать ошибки сертификата TLS"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Включить шифрование"
@@ -1684,6 +1667,14 @@ msgstr ""
 msgid "Application"
 msgstr "Приложение"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Шифрование:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Настройки веб-клиппера"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Метка \"%s\" уже существует. Пожалуйста, выберите другое имя."
@@ -1697,7 +1688,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Каталог экспорта Joplin"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Файл экспорта Evernote"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Файл экспорта Evernote"
 
 msgid "Json Export Directory"
@@ -1804,6 +1800,14 @@ msgstr "Разрешение на использование камеры"
 msgid "Your permission to use your camera is required."
 msgstr "Необходимо ваше разрешение на использование камеры."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Нет активного блокнота."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Создает новый блокнот."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Сейчас здесь нет заметок. Создайте новую, нажав кнопку (+)."
 
@@ -1847,21 +1851,10 @@ msgstr "Новый блокнот"
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Расшифровано элементов: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Получение ресурсов: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "заметка"
 
-msgid "Notebooks"
-msgstr "Блокноты"
-
 msgid "Checking... Please wait."
 msgstr "Проверка... Пожалуйста, подождите."
 
@@ -1910,10 +1903,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Конфигурация"
-
 msgid "Encryption Config"
 msgstr "Конфигурация шифрования"
 
@@ -2106,6 +2095,66 @@ msgstr "Войти с OneDrive"
 msgid "Search"
 msgstr "Поиск"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Запуск редактирования заметки. Закройте редактор, чтобы вернуться к "
+#~ "приглашению."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Заметка сохранена."
+
+#~ msgid "Sidebar"
+#~ msgstr "Боковая панель"
+
+#~ msgid "Note list"
+#~ msgstr "Список заметок"
+
+#~ msgid "Note title"
+#~ msgstr "Название заметки"
+
+#~ msgid "Note body"
+#~ msgstr "Тело заметки"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Импорт из \"%s\" в формате \"%s\". Пожалуйста, подождите..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Статус синхронизации"
+
+#~ msgid "Print"
+#~ msgstr "Печать"
+
+#~ msgid "General Options"
+#~ msgstr "Основные настройки"
+
+#~ msgid "Encryption options"
+#~ msgstr "Настройки шифрования"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Вставить дату и время"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Каталог экспорта Joplin"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Настройки шифрования"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Настройки клиппера"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Конфигурация"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Разрешение на использование камеры"
@@ -2151,6 +2200,3 @@ msgstr "Поиск"
 #~ msgstr ""
 #~ "Путь для синхронизации, когда включена синхронизация файловой системы. "
 #~ "См. `sync.target`."
-
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"

CliClient/locales/sl_SI.po

@@ -173,18 +173,6 @@ msgstr "Ni aktivnih beležnic."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Zabeležka ne obstaja: \"%s\". Bi jo radi ustvarili?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Urejanje zabeležke se začenja. Zaprite urejevalnik, da se vrnete na ukazni "
-"poziv."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Napaka v odpiranju zabeležke v urejevalniku: %s"
-
-msgid "Note has been saved."
-msgstr "Zabeležka je bila shranjena."
-
 msgid "Exits the application."
 msgstr "Izhod iz aplikacije."
 
@@ -395,6 +383,23 @@ msgstr "Želite izbrisati zabeležko?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Išči dani <pattern> v vseh zabeležkah."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -529,10 +534,6 @@ msgstr "Vtipkajte `joplin help` za informacije o uporabi."
 msgid "Fatal error:"
 msgstr "Usodna napaka:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Aplikacija je bila avtorizirana - lahko zaprete zavihek v brskalniku."
@@ -587,75 +588,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Izvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "Naslov beležnice:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "Beležnice"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Uvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
-
-msgid "PDF File"
-msgstr "PDF datoteka"
-
-msgid "Synchronisation status"
-msgstr "Status sinhronizacije"
-
-msgid "New note"
-msgstr "Nova zabeležka"
-
-msgid "New to-do"
-msgstr "Novi seznam opravil"
-
-msgid "New notebook"
-msgstr "Nova beležnica"
-
-msgid "Print"
-msgstr "Natisni"
-
-msgid "General Options"
-msgstr "Splošne možnosti"
-
-msgid "Encryption options"
-msgstr "Možnosti enkripcije"
-
-msgid "Web clipper options"
-msgstr ""
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-msgid "Insert template"
-msgstr ""
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin izvozno mesto"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Datoteka"
@@ -761,6 +693,10 @@ msgstr "Pomoč"
 msgid "Website and documentation"
 msgstr "Spletna stran in dokumentacija"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin spletna stran"
+
 msgid "Make a donation"
 msgstr "Doniraj"
 
@@ -865,6 +801,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Zabeležke in nastavitve so shranjene v: %s"
@@ -875,6 +814,9 @@ msgstr "Preveri nastavitve sinhronizacije"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "Nazaj"
+
 msgid "Apply"
 msgstr ""
 
@@ -958,8 +900,8 @@ msgstr ""
 "da bodo sčasoma preneseni s sinhronizacijo."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -968,13 +910,19 @@ msgstr "Status"
 msgid "Encryption is:"
 msgstr "Enkripcija je:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "Uporaba: %s"
 
-msgid "Back"
-msgstr "Nazaj"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1006,6 +954,15 @@ msgstr "Nastavi alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Nova zabeležka"
+
+msgid "New to-do"
+msgstr "Novi seznam opravil"
+
+msgid "New notebook"
+msgstr "Nova beležnica"
+
 msgid "Layout"
 msgstr "Izgled"
 
@@ -1107,6 +1064,13 @@ msgstr ""
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "PDF datoteka"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Napaka v odpiranju zabeležke v urejevalniku: %s"
+
 msgid "strong text"
 msgstr ""
 
@@ -1182,13 +1146,6 @@ msgstr "Možnosti"
 msgid "Synchronisation Status"
 msgstr "Sinhronizacijski status"
 
-msgid "Encryption Options"
-msgstr "Možnosti enkripcije"
-
-#, fuzzy
-msgid "Clipper Options"
-msgstr "Splošne možnosti"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1211,6 +1168,17 @@ msgstr "Izbriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
+msgid "Notebooks"
+msgstr "Beležnice"
+
+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Preneseni predmeti: %d/%d"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Viri: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Prosim izberite, kam želite izvoziti sinhronizacijski status"
 
@@ -1371,10 +1339,6 @@ msgstr "V postopku"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinhronizacija je že v postopku. Stanje: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Enkriptirano"
 
@@ -1492,10 +1456,10 @@ msgstr "Svetlo"
 msgid "Dark"
 msgstr "Temno"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1567,6 +1531,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Pokaži ikono v območju za obvestila(opravilna vrstica)"
 
@@ -1589,6 +1556,10 @@ msgstr "Celokupen procent povečave"
 msgid "Editor font size"
 msgstr "Družina urejevalnika besedilnega stila"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Družina urejevalnika besedilnega stila"
+
 msgid "Editor font family"
 msgstr "Družina urejevalnika besedilnega stila"
 
@@ -1650,6 +1621,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Omogoči enkripcijo"
@@ -1690,6 +1671,13 @@ msgstr ""
 msgid "Application"
 msgstr "Izhod iz aplikacije."
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Enkripcija je:"
+
+msgid "Web Clipper"
+msgstr ""
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1703,7 +1691,12 @@ msgstr "Sistem označevanja"
 msgid "Joplin Export Directory"
 msgstr "Joplin izvozno mesto"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote izvozna datoteka"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote izvozna datoteka"
 
 #, fuzzy
@@ -1810,6 +1803,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ni aktivnih beležnic."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Ustvari novo beležnico."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Trenutno ni zabeležk. Ustvarite jo s klikom na (+) gumb."
 
@@ -1855,21 +1856,10 @@ msgstr "Nova beležnica"
 msgid "Configuration"
 msgstr "Nastavitve"
 
-#, fuzzy, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Preneseni predmeti: %d/%d"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Viri: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "zabeležka"
 
-msgid "Notebooks"
-msgstr "Beležnice"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "V preklicu...Prosim počakajte."
@@ -1914,10 +1904,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Nastavitve"
-
 msgid "Encryption Config"
 msgstr "Nastavite enkripcije"
 
@@ -2103,6 +2089,59 @@ msgstr "Prijavi se z OneDrive"
 msgid "Search"
 msgstr "Išči"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Urejanje zabeležke se začenja. Zaprite urejevalnik, da se vrnete na "
+#~ "ukazni poziv."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Zabeležka je bila shranjena."
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "Naslov beležnice:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "Beležnice"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Uvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Status sinhronizacije"
+
+#~ msgid "Print"
+#~ msgstr "Natisni"
+
+#~ msgid "General Options"
+#~ msgstr "Splošne možnosti"
+
+#~ msgid "Encryption options"
+#~ msgstr "Možnosti enkripcije"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin izvozno mesto"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Možnosti enkripcije"
+
+#, fuzzy
+#~ msgid "Clipper Options"
+#~ msgstr "Splošne možnosti"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Nastavitve"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Prekliči sinhronizacijo"
 
@@ -2146,10 +2185,6 @@ msgstr "Išči"
 #~ "Pot za sinhronizacijo, ki bo uporabljena ob omogočeni sinhronizaciji. "
 #~ "Poglej `sync.target`."
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin spletna stran"
-
 #~ msgid "State: %s."
 #~ msgstr "Stanje: %s."
 

CliClient/locales/sr_RS.po

@@ -176,16 +176,6 @@ msgstr "Нема активне бележнице."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Белешка не постоји: \"%s. Направити је?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "Започињете са изменом белешке. Затворите уредника да се вратите назад."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Грешка при отварању бележнице у уреднику: %s"
-
-msgid "Note has been saved."
-msgstr "Белешка је сачувана."
-
 msgid "Exits the application."
 msgstr "Излаз из апликације."
 
@@ -391,6 +381,23 @@ msgstr "Обрисати белешку?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Претражује задати <pattern> у свим белешкама."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -532,10 +539,6 @@ msgstr "Укуцајте 'joplin help' за информацију о кориш
 msgid "Fatal error:"
 msgstr "Фатална грешка:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -591,74 +594,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Извозим у \"%s као \"%s\" формат. Молимо вас да сачекате..."
 
-msgid "Sidebar"
-msgstr "Бочна трака"
-
-msgid "Note list"
-msgstr "Листа белешки"
-
-msgid "Note title"
-msgstr "Наслов белешке"
-
-msgid "Note body"
-msgstr "Тело белешке"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Увозим из \"%s\" као \"%s\" формат. Молимо вас да сачекате..."
-
-msgid "PDF File"
-msgstr "ПДФ Фајл"
-
-msgid "Synchronisation status"
-msgstr "Статус синхронизације"
-
-msgid "New note"
-msgstr "Нова белешка"
-
-msgid "New to-do"
-msgstr "Нова ставка задужења"
-
-msgid "New notebook"
-msgstr "Нова бележница"
-
-msgid "Print"
-msgstr "Штампај"
-
-msgid "General Options"
-msgstr "Опште поставке"
-
-msgid "Encryption options"
-msgstr "Опције шифровања"
-
-msgid "Web clipper options"
-msgstr "Опције веб клипера"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Уметни време и датум"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Џоплин директоријум за извоз"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "Нова верзија: %s"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr ""
-
 msgid "&File"
 msgstr "&Фајл"
 
@@ -757,6 +692,10 @@ msgstr "&Помоћ"
 msgid "Website and documentation"
 msgstr "Вебсајт и документација"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Џоплин фајл за извоз"
+
 msgid "Make a donation"
 msgstr "Донација"
 
@@ -867,6 +806,9 @@ msgstr ""
 "Овај токен за ауторизацију је само потребан када се дозвољава апликацијама "
 "трећих страна да приступе Џоплину."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Белешке и подешавања су складиштени у: %s"
@@ -877,6 +819,9 @@ msgstr "Проверите поставке синхронизације"
 msgid "Browse..."
 msgstr "Пронађи."
 
+msgid "Back"
+msgstr "Назад"
+
 msgid "Apply"
 msgstr "Примени"
 
@@ -959,8 +904,8 @@ msgstr ""
 "преузети путем синхронизације."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "За више информација о End-To-End Шифровању (Е2ЕЕ) и саветима о томе како да "
 "га омогућите, молимо вас да проверите документацију:"
@@ -971,12 +916,18 @@ msgstr "Статус"
 msgid "Encryption is:"
 msgstr "Шифровање је:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Употреба"
 
-msgid "Back"
-msgstr "Назад"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1007,6 +958,15 @@ msgstr "Подеси аларм:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Нова белешка"
+
+msgid "New to-do"
+msgstr "Нова ставка задужења"
+
+msgid "New notebook"
+msgstr "Нова бележница"
+
 msgid "Layout"
 msgstr "Распоред"
 
@@ -1104,6 +1064,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Jедино једна белешка може бити одштампана или извезена у ПДВ истовремено."
 
+msgid "PDF File"
+msgstr "ПДФ Фајл"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Грешка при отварању бележнице у уреднику: %s"
+
 msgid "strong text"
 msgstr "подебљан текст"
 
@@ -1178,12 +1145,6 @@ msgstr "Опције"
 msgid "Synchronisation Status"
 msgstr "Статус синхронизације"
 
-msgid "Encryption Options"
-msgstr "Опције шифровања"
-
-msgid "Clipper Options"
-msgstr "Опције клипера"
-
 #, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1207,6 +1168,17 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr "Преименуј"
 
+msgid "Notebooks"
+msgstr "Бележнице"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Дешифрујем ставке: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Дохватам ресурсе: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Молимо вас да одаберете где ће се извести статус синхронизације"
 
@@ -1365,12 +1337,6 @@ msgstr "У току"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизација је већ у току. Стање: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-"Непознати тип ставке је преузет - молимо вас да надоградите Џоплин у "
-"последњу верзију"
-
 msgid "Encrypted"
 msgstr "Шифровано"
 
@@ -1492,10 +1458,10 @@ msgstr "Светла"
 msgid "Dark"
 msgstr "Тамна"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1564,6 +1530,10 @@ msgstr "Омогући ++insert++ синтаксу"
 msgid "Enable multimarkdown table extension"
 msgstr "Омогући проширење мултимаркдаун табеле"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Омогућу ~sub~ синтаксу"
+
 msgid "Show tray icon"
 msgstr "Прикажи иконицу апликације на траци"
 
@@ -1588,6 +1558,10 @@ msgstr "Глобални проценат увећања"
 msgid "Editor font size"
 msgstr "Величина слова у уреднику"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Величина слова у уреднику"
+
 msgid "Editor font family"
 msgstr "Породица фонтова у уреднику"
 
@@ -1652,6 +1626,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Занемари грешке са ТЛС сертификатима"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 msgid "Enable note history"
 msgstr "Омогући историју бележнице"
 
@@ -1687,6 +1671,14 @@ msgstr "Проширења/прикључци"
 msgid "Application"
 msgstr "Апликација"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Шифровање је:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Опције веб клипера"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Ознака \"%s\" већ постоји. Молимо вас да одаберете други назив."
@@ -1700,7 +1692,12 @@ msgstr "Маркдаун"
 msgid "Joplin Export Directory"
 msgstr "Џоплин директоријум за извоз"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Еверноут фајл за извоз"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Еверноут фајл за извоз"
 
 msgid "Json Export Directory"
@@ -1808,6 +1805,14 @@ msgstr "Дозвола за употребу камере"
 msgid "Your permission to use your camera is required."
 msgstr "Ваша дозвола за употребу камере је неопходна."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Нема активне бележнице."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Креира нову бележницу."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Тренутно нема белешки. Направите једну тако што ће те кликнути на (+) дугме."
@@ -1852,21 +1857,10 @@ msgstr "Нова бележница"
 msgid "Configuration"
 msgstr "Поставке"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Дешифрујем ставке: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Дохватам ресурсе: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "белешка"
 
-msgid "Notebooks"
-msgstr "Бележнице"
-
 msgid "Checking... Please wait."
 msgstr "Проверавам... Молимо вас да сачекате."
 
@@ -1916,10 +1910,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Више информација"
-
 msgid "Encryption Config"
 msgstr "Поставке шифровања"
 
@@ -2107,6 +2097,68 @@ msgstr "Пријави се са УванДрајвом"
 msgid "Search"
 msgstr "Претрага"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Започињете са изменом белешке. Затворите уредника да се вратите назад."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Белешка је сачувана."
+
+#~ msgid "Sidebar"
+#~ msgstr "Бочна трака"
+
+#~ msgid "Note list"
+#~ msgstr "Листа белешки"
+
+#~ msgid "Note title"
+#~ msgstr "Наслов белешке"
+
+#~ msgid "Note body"
+#~ msgstr "Тело белешке"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Увозим из \"%s\" као \"%s\" формат. Молимо вас да сачекате..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Статус синхронизације"
+
+#~ msgid "Print"
+#~ msgstr "Штампај"
+
+#~ msgid "General Options"
+#~ msgstr "Опште поставке"
+
+#~ msgid "Encryption options"
+#~ msgstr "Опције шифровања"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Уметни време и датум"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Џоплин директоријум за извоз"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "Нова верзија: %s"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Опције шифровања"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Опције клипера"
+
+#~ msgid ""
+#~ "Unknown item type downloaded - please upgrade Joplin to the latest version"
+#~ msgstr ""
+#~ "Непознати тип ставке је преузет - молимо вас да надоградите Џоплин у "
+#~ "последњу верзију"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Више информација"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Дозвола за употребу камере"

CliClient/locales/sv.po

@@ -174,18 +174,6 @@ msgstr "Ingen aktiv anteckningsbok."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Anteckning finns inte: \"%s\". Skapa den?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-"Börjar redigera anteckning. Stäng redigeraren för att komma tillbaka till "
-"prompten."
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Fel vid öppning av anteckning i redigeraren: %s"
-
-msgid "Note has been saved."
-msgstr "Anteckning har sparats."
-
 msgid "Exits the application."
 msgstr "Avslutar programmet."
 
@@ -396,6 +384,23 @@ msgstr "Ta bort anteckning?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Söker efter det givna <pattern> i alla anteckningarna."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -535,10 +540,6 @@ msgstr "Skriv `joplin help` för användningsinformation."
 msgid "Fatal error:"
 msgstr "Allvarligt fel:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "Programmet har godkänts - du kan nu stänga den här webbläsarfliken."
@@ -593,74 +594,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "Exportera till \"%s\" som \"%s\" format. Vänta..."
 
-msgid "Sidebar"
-msgstr "Sidofältet"
-
-msgid "Note list"
-msgstr "Anteckningsboken"
-
-msgid "Note title"
-msgstr "Rubriken"
-
-msgid "Note body"
-msgstr "Texten"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importerar från \"%s\" som \"%s\" format. Vänta..."
-
-msgid "PDF File"
-msgstr "PDF-fil"
-
-msgid "Synchronisation status"
-msgstr "Synkroniseringstillstånd"
-
-msgid "New note"
-msgstr "Ny anteckning"
-
-msgid "New to-do"
-msgstr "Ny att-göra"
-
-msgid "New notebook"
-msgstr "Ny anteckningsbok"
-
-msgid "Print"
-msgstr "Skriv ut"
-
-msgid "General Options"
-msgstr "Allmänna inställningar"
-
-msgid "Encryption options"
-msgstr "Krypteringsinställningar"
-
-msgid "Web clipper options"
-msgstr "Web clipper-inställningar"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Infoga datumtid"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin-exporteringskatalog"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
@@ -763,6 +696,10 @@ msgstr "Hjälp"
 msgid "Website and documentation"
 msgstr "Webbplats och dokumentation"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin v%s"
+
 msgid "Make a donation"
 msgstr "Gör en donation"
 
@@ -873,6 +810,9 @@ msgstr ""
 "Denna auktorisering behövs endast för att tillåta tredjepartsprogram att "
 "integrera med Joplin."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Anteckningar och inställningar lagras i: %s"
@@ -883,6 +823,9 @@ msgstr "Kontrollera synkroniseringskonfigurationen"
 msgid "Browse..."
 msgstr "Bläddra..."
 
+msgid "Back"
+msgstr "Tillbaka"
+
 msgid "Apply"
 msgstr "Tillämpa"
 
@@ -965,8 +908,8 @@ msgstr ""
 "småningom kommer att hämtas via synkronisering."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "För mer information om End-to-End Encryption (E2EE) och råd om hur du "
 "aktiverar det finns i dokumentationen:"
@@ -977,12 +920,18 @@ msgstr "Tillstånd"
 msgid "Encryption is:"
 msgstr "Kryptering är:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Användning"
 
-msgid "Back"
-msgstr "Tillbaka"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -1014,6 +963,15 @@ msgstr "Ställ in alarm:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Ny anteckning"
+
+msgid "New to-do"
+msgstr "Ny att-göra"
+
+msgid "New notebook"
+msgstr "Ny anteckningsbok"
+
 msgid "Layout"
 msgstr "Layout"
 
@@ -1113,6 +1071,13 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 "Endast en anteckning i taget kan bli utskriven eller exporterad till PDF."
 
+msgid "PDF File"
+msgstr "PDF-fil"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Fel vid öppning av anteckning i redigeraren: %s"
+
 msgid "strong text"
 msgstr "stark text"
 
@@ -1187,12 +1152,6 @@ msgstr "Inställningar"
 msgid "Synchronisation Status"
 msgstr "Synkroniseringstillstånd"
 
-msgid "Encryption Options"
-msgstr "Krypteringsinställningar"
-
-msgid "Clipper Options"
-msgstr "Clipper-inställningar"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1215,6 +1174,17 @@ msgstr "Ta bort"
 msgid "Rename"
 msgstr "Byt namn"
 
+msgid "Notebooks"
+msgstr "Anteckningsböcker"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Dekrypterar objekt: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Hämtar resurser: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Välj vart synkroniseringstillståndet ska exporteras till"
 
@@ -1373,10 +1343,6 @@ msgstr "Pågår"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering pågår redan. Tillstånd: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Krypterad"
 
@@ -1494,10 +1460,10 @@ msgstr "Ljus"
 msgid "Dark"
 msgstr "Mörk"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1568,6 +1534,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Visa fältikon"
 
@@ -1592,6 +1561,10 @@ msgstr "Global zoomprocent"
 msgid "Editor font size"
 msgstr "Redigerarens teckenstorlek"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Redigerarens teckenstorlek"
+
 msgid "Editor font family"
 msgstr "Redigerarens typsnittsfamilj"
 
@@ -1657,6 +1630,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorera TLS-certifikatfel"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Aktivera kryptering"
@@ -1694,6 +1677,14 @@ msgstr ""
 msgid "Application"
 msgstr "Avslutar programmet"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Kryptering är:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web clipper-inställningar"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "Taggen \"%s\" finns redan. Välj ett annat namn."
@@ -1707,7 +1698,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin-exporteringskatalog"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote-exporteringsfil"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote-exporteringsfil"
 
 msgid "Json Export Directory"
@@ -1813,6 +1809,14 @@ msgstr "Tillåtelse att använda kameran"
 msgid "Your permission to use your camera is required."
 msgstr "Du måste ge tillåtelse att använda kameran."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ingen aktiv anteckningsbok."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Skapar en ny anteckningsbok."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Det finns för närvarande inga anteckningar. Skapa en genom att klicka på (+)-"
@@ -1858,21 +1862,10 @@ msgstr "Ny anteckningsbok"
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Dekrypterar objekt: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Hämtar resurser: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "anteckning"
 
-msgid "Notebooks"
-msgstr "Anteckningsböcker"
-
 msgid "Checking... Please wait."
 msgstr "Kontrollerar... vänta."
 
@@ -1921,10 +1914,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Konfiguration"
-
 msgid "Encryption Config"
 msgstr "Kryptering-konfiguration"
 
@@ -2118,6 +2107,66 @@ msgstr "Logga in med OneDrive"
 msgid "Search"
 msgstr "Sök"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr ""
+#~ "Börjar redigera anteckning. Stäng redigeraren för att komma tillbaka till "
+#~ "prompten."
+
+#~ msgid "Note has been saved."
+#~ msgstr "Anteckning har sparats."
+
+#~ msgid "Sidebar"
+#~ msgstr "Sidofältet"
+
+#~ msgid "Note list"
+#~ msgstr "Anteckningsboken"
+
+#~ msgid "Note title"
+#~ msgstr "Rubriken"
+
+#~ msgid "Note body"
+#~ msgstr "Texten"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "Importerar från \"%s\" som \"%s\" format. Vänta..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Synkroniseringstillstånd"
+
+#~ msgid "Print"
+#~ msgstr "Skriv ut"
+
+#~ msgid "General Options"
+#~ msgstr "Allmänna inställningar"
+
+#~ msgid "Encryption options"
+#~ msgstr "Krypteringsinställningar"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Infoga datumtid"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin-exporteringskatalog"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Krypteringsinställningar"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper-inställningar"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Konfiguration"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Tillåtelse att använda kameran"
@@ -2167,9 +2216,6 @@ msgstr "Sök"
 #~ "Sökvägen att synkronisera med när synkronisering av filsystem är "
 #~ "aktiverat. Se `sync.target`."
 
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"
-
 #~ msgid "State: %s."
 #~ msgstr "Tillstånd: %s."
 

CliClient/locales/tr_TR.po

@@ -171,16 +171,6 @@ msgstr "Aktif not defteri yok."
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "\"%s\" notu mevcut değil. Oluşturulsun mu?"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr ""
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "Editörde not açılırken hata oluştu: %s"
-
-msgid "Note has been saved."
-msgstr "Not kaydedildi."
-
 msgid "Exits the application."
 msgstr "Uygulamadan çıkar."
 
@@ -376,6 +366,23 @@ msgstr "Notu sil?"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Tüm notlarda girilen <pattern> i arar."
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -501,10 +508,6 @@ msgstr "Kullanım bilgisi için `joplin help` yazın."
 msgid "Fatal error:"
 msgstr "Büyük hata:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
@@ -560,74 +563,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "\"%s\" den \"%s\" biçiminde dışa aktarılıyor. Lütfen bekleyin..."
 
-msgid "Sidebar"
-msgstr "Kenar çubuğu"
-
-msgid "Note list"
-msgstr "Not listesi"
-
-msgid "Note title"
-msgstr "Not başlığı"
-
-msgid "Note body"
-msgstr "Not gövdesi"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "\"%s\" den \"%s\" biçiminde içe aktarılıyor. Lütfen bekleyin..."
-
-msgid "PDF File"
-msgstr "PDF Dosyası"
-
-msgid "Synchronisation status"
-msgstr "Senkronizasyon durumu"
-
-msgid "New note"
-msgstr "Yeni not"
-
-msgid "New to-do"
-msgstr "Yeni yapılacak"
-
-msgid "New notebook"
-msgstr "Yeni not defteri"
-
-msgid "Print"
-msgstr "Yazdır"
-
-msgid "General Options"
-msgstr "Genel seçenekler"
-
-msgid "Encryption options"
-msgstr "Şifreleme seçenekleri"
-
-msgid "Web clipper options"
-msgstr "Web alıntılama ayarları"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "Tarih Ekle"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin Dizin Dışa Aktarım"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "Dosya"
@@ -730,6 +665,10 @@ msgstr "Yardım"
 msgid "Website and documentation"
 msgstr "Web sitesi ve dökümanlar"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin v%s"
+
 msgid "Make a donation"
 msgstr "Bağış yapın"
 
@@ -841,6 +780,9 @@ msgstr ""
 "Bu yetkilendirme yalnızca üçüncü taraf uygulamaların Joplin'e erişmesine "
 "izin vermek için gereklidir."
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notlar ve ayarlar şu konumda saklanır: %s"
@@ -851,6 +793,9 @@ msgstr "Senkronizasyon yapılandırmasını kontrol et"
 msgid "Browse..."
 msgstr "Bul..."
 
+msgid "Back"
+msgstr "Geri"
+
 msgid "Apply"
 msgstr "Uygula"
 
@@ -934,8 +879,8 @@ msgstr ""
 "senkronizasyon yoluyla indirilmeleri sağlanacaktır."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Uçtan Uca Şifreleme (E2EE) hakkında bilgi ve nasıl aktif edilebileceğine "
 "dair ipuçları için lütfen belgeleri inceleyin:"
@@ -946,12 +891,18 @@ msgstr "Durum"
 msgid "Encryption is:"
 msgstr "Şifreleme:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 msgid "Usage"
 msgstr "Kullanım"
 
-msgid "Back"
-msgstr "Geri"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -983,6 +934,15 @@ msgstr "Alarm kur:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "Yeni not"
+
+msgid "New to-do"
+msgstr "Yeni yapılacak"
+
+msgid "New notebook"
+msgstr "Yeni not defteri"
+
 msgid "Layout"
 msgstr "Düzen"
 
@@ -1083,6 +1043,13 @@ msgstr ""
 "Bir seferde yalnızca bir not yazdırılabilir veya PDF olarak dışa "
 "aktarılabilir."
 
+msgid "PDF File"
+msgstr "PDF Dosyası"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "Editörde not açılırken hata oluştu: %s"
+
 msgid "strong text"
 msgstr "kuvvetli metin"
 
@@ -1157,12 +1124,6 @@ msgstr "Seçenekler"
 msgid "Synchronisation Status"
 msgstr "Senkronizasyon Durumu"
 
-msgid "Encryption Options"
-msgstr "Şifreleme Seçenekleri"
-
-msgid "Clipper Options"
-msgstr "Alıntılama Seçenekleri"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1184,6 +1145,17 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
+msgid "Notebooks"
+msgstr "Not defterleri"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Şifresi çözülenler: %d/%d"
+
+#, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "Kaynaklar alınıyor: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "Lütfen senkronizasyon durumunun nereye aktarılacağını seçin"
 
@@ -1342,10 +1314,6 @@ msgstr "Devam etmekte"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Senkronizasyon zaten devam ediyor. Durum: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "Şifrelenmiş"
 
@@ -1462,10 +1430,10 @@ msgstr "Aydınlık"
 msgid "Dark"
 msgstr "Karanlık"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1536,6 +1504,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Tepsi simgesini göster"
 
@@ -1560,6 +1531,10 @@ msgstr "Global yakınlaştırma yüzdesi"
 msgid "Editor font size"
 msgstr "Editör yazı boyutu"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "Editör yazı boyutu"
+
 msgid "Editor font family"
 msgstr "Editör yazı tipi"
 
@@ -1624,6 +1599,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS sertifikası hatalarını yoksay"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "Şifrelemeyi etkinleştir"
@@ -1660,6 +1645,14 @@ msgstr ""
 msgid "Application"
 msgstr "Uygulama"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "Şifreleme:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web alıntılama ayarları"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr " \"%s\" etiketi mevcut. Lütfen başka isim seçin."
@@ -1673,7 +1666,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin Dizin Dışa Aktarım"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote Dosya Dışa Aktarım"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote Dosya Dışa Aktarım"
 
 msgid "Json Export Directory"
@@ -1779,6 +1777,14 @@ msgstr "Kamera kullanımı için izin"
 msgid "Your permission to use your camera is required."
 msgstr "Kamera kullanımı için izniniz gerekmektedir."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Aktif not defteri yok."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Yeni bir not defteri oluşturur."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Şu anda not yok. (+) butonuna tıklayarak bir tane oluşturun."
 
@@ -1822,21 +1828,10 @@ msgstr "Yeni not defteri"
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "Şifresi çözülenler: %d/%d"
-
-#, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "Kaynaklar alınıyor: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "not"
 
-msgid "Notebooks"
-msgstr "Not defterleri"
-
 msgid "Checking... Please wait."
 msgstr "Kontrol ediliyor... Lütfen bekleyin."
 
@@ -1885,10 +1880,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "Yapılandırma"
-
 msgid "Encryption Config"
 msgstr "Yapılandırmayı şifrele"
 
@@ -2079,6 +2070,61 @@ msgstr "OneDrive ile giriş yapın"
 msgid "Search"
 msgstr "Arama"
 
+#~ msgid "Note has been saved."
+#~ msgstr "Not kaydedildi."
+
+#~ msgid "Sidebar"
+#~ msgstr "Kenar çubuğu"
+
+#~ msgid "Note list"
+#~ msgstr "Not listesi"
+
+#~ msgid "Note title"
+#~ msgstr "Not başlığı"
+
+#~ msgid "Note body"
+#~ msgstr "Not gövdesi"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "\"%s\" den \"%s\" biçiminde içe aktarılıyor. Lütfen bekleyin..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "Senkronizasyon durumu"
+
+#~ msgid "Print"
+#~ msgstr "Yazdır"
+
+#~ msgid "General Options"
+#~ msgstr "Genel seçenekler"
+
+#~ msgid "Encryption options"
+#~ msgstr "Şifreleme seçenekleri"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "Tarih Ekle"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin Dizin Dışa Aktarım"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "Şifreleme Seçenekleri"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Alıntılama Seçenekleri"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Yapılandırma"
+
 #, fuzzy
 #~ msgid "Permission to write to external storage"
 #~ msgstr "Kamera kullanımı için izin"
@@ -2125,6 +2171,3 @@ msgstr "Arama"
 #~ msgstr ""
 #~ "Dosya sistemi senkronizasyonu etkinleştirildiğinde senkronize edilecek "
 #~ "yol. Bakınız `sync.target`."
-
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin v%s"

CliClient/locales/zh_CN.po

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

CliClient/locales/zh_TW.po

@@ -168,16 +168,6 @@ msgstr "無使用中的記事本。"
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "記事不存在: \"%s\"。要建立嗎？"
 
-msgid "Starting to edit note. Close the editor to get back to the prompt."
-msgstr "開始編輯記事。如需返回命令行，請關閉編輯器。"
-
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr "在編輯器中開啟記事時出錯: %s"
-
-msgid "Note has been saved."
-msgstr "記事已被儲存。"
-
 msgid "Exits the application."
 msgstr "離開本程式。"
 
@@ -372,6 +362,23 @@ msgstr "刪除記事？"
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "在所有記事中搜索特定的 <pattern>。"
 
+#, javascript-format
+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 ""
+
+#, javascript-format
+msgid "Server is already running on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Server is running on port %d"
+msgstr ""
+
+msgid "Server is not running."
+msgstr ""
+
 #, javascript-format
 msgid ""
 "Sets the property <name> of the given <note> to the given [value]. Possible "
@@ -501,10 +508,6 @@ msgstr "鍵入 `joplin help` 檢視使用說明。"
 msgid "Fatal error:"
 msgstr "嚴重錯誤:"
 
-#, javascript-format
-msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
-
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr "應用程式已取得權限 - 您現在可以關閉此瀏覽器分頁。"
@@ -553,76 +556,6 @@ msgstr ""
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
 msgstr "匯出到 \"%s\" 為 \"%s\" 格式。請稍候..."
 
-msgid "Sidebar"
-msgstr ""
-
-msgid "Note list"
-msgstr ""
-
-#, fuzzy
-msgid "Note title"
-msgstr "記事本標題:"
-
-#, fuzzy
-msgid "Note body"
-msgstr "記事本"
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "從 \"%s\" 匯入為 \"%s\" 格式。請稍候..."
-
-msgid "PDF File"
-msgstr "PDF 檔案"
-
-msgid "Synchronisation status"
-msgstr "顯示同步狀態"
-
-msgid "New note"
-msgstr "新增記事"
-
-msgid "New to-do"
-msgstr "新增待辦事項"
-
-msgid "New notebook"
-msgstr "新增記事本"
-
-msgid "Print"
-msgstr "列印"
-
-msgid "General Options"
-msgstr "一般選項"
-
-msgid "Encryption options"
-msgstr "加密選項"
-
-msgid "Web clipper options"
-msgstr "Web clipper 選項"
-
-msgid "Create note from template"
-msgstr ""
-
-msgid "Create to-do from template"
-msgstr ""
-
-#, fuzzy
-msgid "Insert template"
-msgstr "插入日期時間"
-
-#, fuzzy
-msgid "Open template directory"
-msgstr "Joplin 匯出目錄"
-
-msgid "Refresh templates"
-msgstr ""
-
-#, fuzzy, javascript-format
-msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
-
-#, javascript-format
-msgid "%s %s (%s, %s)"
-msgstr "%s %s (%s, %s)"
-
 #, fuzzy
 msgid "&File"
 msgstr "檔案"
@@ -728,6 +661,10 @@ msgstr "說明"
 msgid "Website and documentation"
 msgstr "官方網站及線上說明"
 
+#, fuzzy
+msgid "Joplin Forum"
+msgstr "Joplin 官方網站"
+
 msgid "Make a donation"
 msgstr "捐助"
 
@@ -834,6 +771,9 @@ msgid ""
 "access Joplin."
 msgstr ""
 
+msgid "This will open a new screen. Save your current changes?"
+msgstr ""
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "所有記事和設置均儲存於: %s"
@@ -844,6 +784,9 @@ msgstr "檢測同步設置"
 msgid "Browse..."
 msgstr ""
 
+msgid "Back"
+msgstr "返回"
+
 msgid "Apply"
 msgstr "套用"
 
@@ -921,8 +864,8 @@ msgstr ""
 "可能最終會通過同步下載。"
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr "有關端到端加密 (E2EE) 的詳細資訊以及該如何啟用它，請參考線上文檔:"
 
 msgid "Status"
@@ -931,13 +874,19 @@ msgstr "狀態"
 msgid "Encryption is:"
 msgstr "加密:"
 
+msgid "Firefox Extension"
+msgstr ""
+
+msgid "Chrome Web Store"
+msgstr ""
+
+msgid "Get it now:"
+msgstr ""
+
 #, fuzzy
 msgid "Usage"
 msgstr "使用資訊: %s"
 
-msgid "Back"
-msgstr "返回"
-
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
@@ -967,6 +916,15 @@ msgstr "設置提醒:"
 msgid "Template file:"
 msgstr ""
 
+msgid "New note"
+msgstr "新增記事"
+
+msgid "New to-do"
+msgstr "新增待辦事項"
+
+msgid "New notebook"
+msgstr "新增記事本"
+
 msgid "Layout"
 msgstr "頁面佈局"
 
@@ -1061,6 +1019,13 @@ msgstr "此筆記沒有內容。按一下 \"%s\" 切換到編輯模式並編輯
 msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
+msgid "PDF File"
+msgstr "PDF 檔案"
+
+#, javascript-format
+msgid "Error opening note in editor: %s"
+msgstr "在編輯器中開啟記事時出錯: %s"
+
 msgid "strong text"
 msgstr "重要文字 <strong>"
 
@@ -1135,12 +1100,6 @@ msgstr "選項"
 msgid "Synchronisation Status"
 msgstr "同步狀態"
 
-msgid "Encryption Options"
-msgstr "加密選項"
-
-msgid "Clipper Options"
-msgstr "Clipper 選項"
-
 #, fuzzy, javascript-format
 msgid ""
 "Delete notebook \"%s\"?\n"
@@ -1161,6 +1120,17 @@ msgstr "刪除"
 msgid "Rename"
 msgstr "重新命名"
 
+msgid "Notebooks"
+msgstr "記事本"
+
+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "正在解密項目: %d/%d 項"
+
+#, fuzzy, javascript-format
+msgid "Fetching resources: %d/%d"
+msgstr "資源: %d/%d"
+
 msgid "Please select where the sync status should be exported to"
 msgstr "請選擇將同步狀態導出到的位置"
 
@@ -1316,10 +1286,6 @@ msgstr "進行中"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "同步已在進行中。狀態: %s"
 
-msgid ""
-"Unknown item type downloaded - please upgrade Joplin to the latest version"
-msgstr ""
-
 msgid "Encrypted"
 msgstr "已加密"
 
@@ -1433,10 +1399,10 @@ msgstr "光亮"
 msgid "Dark"
 msgstr "暗黑"
 
-msgid "Solarized Light"
+msgid "Solarised Light"
 msgstr ""
 
-msgid "Solarized Dark"
+msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
@@ -1507,6 +1473,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "顯示系統匣圖示"
 
@@ -1529,6 +1498,10 @@ msgstr "整體縮放比例 (%)"
 msgid "Editor font size"
 msgstr "編輯器字型系列"
 
+#, fuzzy
+msgid "Editor font"
+msgstr "編輯器字型系列"
+
 msgid "Editor font family"
 msgstr "編輯器字型系列"
 
@@ -1590,6 +1563,16 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "忽略 TLS 證書錯誤"
 
+msgid ""
+"Fail-safe: Do not wipe out local data when sync target is empty (often the "
+"result of a misconfiguration or bug)"
+msgstr ""
+
+msgid ""
+"Specify the port that should be used by the API server. If not set, a "
+"default will be used."
+msgstr ""
+
 #, fuzzy
 msgid "Enable note history"
 msgstr "啟用加密"
@@ -1630,6 +1613,14 @@ msgstr ""
 msgid "Application"
 msgstr "離開本程式。"
 
+#, fuzzy
+msgid "Encryption"
+msgstr "加密:"
+
+#, fuzzy
+msgid "Web Clipper"
+msgstr "Web clipper 選項"
+
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr ""
@@ -1643,7 +1634,12 @@ msgstr "Markdown"
 msgid "Joplin Export Directory"
 msgstr "Joplin 匯出目錄"
 
-msgid "Evernote Export File"
+#, fuzzy
+msgid "Evernote Export File (as Markdown)"
+msgstr "Evernote 匯出檔"
+
+#, fuzzy
+msgid "Evernote Export File (as HTML)"
 msgstr "Evernote 匯出檔"
 
 #, fuzzy
@@ -1747,6 +1743,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "無使用中的記事本。"
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "新增記事本。"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "您當前沒有任何筆記。通過按一下 (+) 鍵去新增一則筆記。"
 
@@ -1791,21 +1795,10 @@ msgstr "新增記事本"
 msgid "Configuration"
 msgstr "設置"
 
-#, javascript-format
-msgid "Decrypting items: %d/%d"
-msgstr "正在解密項目: %d/%d 項"
-
-#, fuzzy, javascript-format
-msgid "Fetching resources: %d/%d"
-msgstr "資源: %d/%d"
-
 #, fuzzy
 msgid "All notes"
 msgstr "記事"
 
-msgid "Notebooks"
-msgstr "記事本"
-
 #, fuzzy
 msgid "Checking... Please wait."
 msgstr "正在取消中...請稍候。"
@@ -1850,10 +1843,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#, fuzzy
-msgid "Information"
-msgstr "設置"
-
 msgid "Encryption Config"
 msgstr "加密設置"
 
@@ -2040,6 +2029,60 @@ msgstr "以 OneDrive 登錄"
 msgid "Search"
 msgstr "搜尋"
 
+#~ msgid "Starting to edit note. Close the editor to get back to the prompt."
+#~ msgstr "開始編輯記事。如需返回命令行，請關閉編輯器。"
+
+#~ msgid "Note has been saved."
+#~ msgstr "記事已被儲存。"
+
+#, fuzzy
+#~ msgid "Note title"
+#~ msgstr "記事本標題:"
+
+#, fuzzy
+#~ msgid "Note body"
+#~ msgstr "記事本"
+
+#~ msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
+#~ msgstr "從 \"%s\" 匯入為 \"%s\" 格式。請稍候..."
+
+#~ msgid "Synchronisation status"
+#~ msgstr "顯示同步狀態"
+
+#~ msgid "Print"
+#~ msgstr "列印"
+
+#~ msgid "General Options"
+#~ msgstr "一般選項"
+
+#~ msgid "Encryption options"
+#~ msgstr "加密選項"
+
+#, fuzzy
+#~ msgid "Insert template"
+#~ msgstr "插入日期時間"
+
+#, fuzzy
+#~ msgid "Open template directory"
+#~ msgstr "Joplin 匯出目錄"
+
+#, fuzzy
+#~ msgid "Revision: %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid "%s %s (%s, %s)"
+#~ msgstr "%s %s (%s, %s)"
+
+#~ msgid "Encryption Options"
+#~ msgstr "加密選項"
+
+#~ msgid "Clipper Options"
+#~ msgstr "Clipper 選項"
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "設置"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "取消同步"
 
@@ -2078,10 +2121,6 @@ msgstr "搜尋"
 #~ "See `sync.target`."
 #~ msgstr "啟用檔案系統同步時要同步的路徑。請參閱 `sync.target`。"
 
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Joplin 官方網站"
-
 #~ msgid "State: %s."
 #~ msgstr "狀態: %s。"
 

CliClient/package-lock.json

@@ -1,9 +1,22 @@
 {
   "name": "joplin",
-  "version": "1.0.140",
+  "version": "1.0.146",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@cronvel/get-pixels": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.3.1.tgz",
+      "integrity": "sha512-jgDb8vGPkpjRDbiYyHTI2Bna4HJysjPNSiERzBnRJjCR/YqC3u0idTae0tmNECsaZLOpAWmlK9wiIwnLGIT9Bg==",
+      "requires": {
+        "jpeg-js": "^0.1.1",
+        "ndarray": "^1.0.13",
+        "ndarray-pack": "^1.1.1",
+        "node-bitmap": "0.0.1",
+        "omggif": "^1.0.5",
+        "pngjs": "^2.0.0"
+      }
+    },
     "abab": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
@@ -127,22 +140,6 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
-    "async-kit": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/async-kit/-/async-kit-2.2.3.tgz",
-      "integrity": "sha1-JkdRonndxfWbQZY4uAWuLEmFj7c=",
-      "requires": {
-        "nextgen-events": "^0.9.0",
-        "tree-kit": "^0.5.26"
-      },
-      "dependencies": {
-        "nextgen-events": {
-          "version": "0.9.9",
-          "resolved": "https://registry.npmjs.org/nextgen-events/-/nextgen-events-0.9.9.tgz",
-          "integrity": "sha1-OaivxKK4RTiMV+LGu5cWcRmGo6A="
-        }
-      }
-    },
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
@@ -169,9 +166,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -230,14 +227,6 @@
         }
       }
     },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "requires": {
-        "hoek": "4.x.x"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -310,6 +299,11 @@
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
       "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
     },
+    "chroma-js": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.0.6.tgz",
+      "integrity": "sha512-IiiClbBRkRwuXNl6impq5ssEhUGpmWvc5zzImZbDUWLWcFbj6ZbtsdZEx6sIXMKes7azgYaUpnmsY1T8BL6PqQ=="
+    },
     "clean-css": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
@@ -318,6 +312,22 @@
         "source-map": "0.5.x"
       }
     },
+    "clean-html": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/clean-html/-/clean-html-1.5.0.tgz",
+      "integrity": "sha512-eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q==",
+      "requires": {
+        "htmlparser2": "^3.8.2",
+        "minimist": "^1.1.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
     "cliss": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/cliss/-/cliss-0.0.2.tgz",
@@ -433,24 +443,6 @@
       "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
       "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
     },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.x.x"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-          "requires": {
-            "hoek": "4.x.x"
-          }
-        }
-      }
-    },
     "css": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
@@ -498,11 +490,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "data-uri-to-buffer": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz",
-      "integrity": "sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo="
-    },
     "data-urls": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
@@ -559,6 +546,11 @@
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -574,6 +566,32 @@
       "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz",
       "integrity": "sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="
     },
+    "dom-serializer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
+        },
+        "entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
+        }
+      }
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
     "domexception": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
@@ -582,6 +600,23 @@
         "webidl-conversions": "^4.0.2"
       }
     },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -716,9 +751,9 @@
       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
     },
     "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extsprintf": {
       "version": "1.3.0",
@@ -748,6 +783,14 @@
         "format": "^0.2.2"
       }
     },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
     "file-type": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
@@ -891,24 +934,6 @@
         }
       }
     },
-    "get-pixels": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/get-pixels/-/get-pixels-3.3.0.tgz",
-      "integrity": "sha1-jZeVvq4YhQuED3SVgbrcBdPjbkE=",
-      "requires": {
-        "data-uri-to-buffer": "0.0.3",
-        "jpeg-js": "^0.1.1",
-        "mime-types": "^2.0.1",
-        "ndarray": "^1.0.13",
-        "ndarray-pack": "^1.1.1",
-        "node-bitmap": "0.0.1",
-        "omggif": "^1.0.5",
-        "parse-data-uri": "^0.2.0",
-        "pngjs": "^2.0.0",
-        "request": "^2.44.0",
-        "through": "^2.3.4"
-      }
-    },
     "get-prototype-chain": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-prototype-chain/-/get-prototype-chain-1.0.1.tgz",
@@ -956,12 +981,35 @@
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "requires": {
-        "ajv": "^5.1.0",
+        "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
       }
     },
     "has-ansi": {
@@ -989,17 +1037,6 @@
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-      "requires": {
-        "boom": "4.x.x",
-        "cryptiles": "3.x.x",
-        "hoek": "4.x.x",
-        "sntp": "2.x.x"
-      }
-    },
     "he": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -1010,11 +1047,6 @@
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
       "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
     },
-    "hoek": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
-    },
     "html-encoding-sniffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
@@ -1042,6 +1074,44 @@
         "uglify-js": "3.3.x"
       }
     },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        }
+      }
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -1643,9 +1713,9 @@
       }
     },
     "joplin-turndown-plugin-gfm": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz",
-      "integrity": "sha512-uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.9.tgz",
+      "integrity": "sha512-SOa/Uiy3nyoBGtHqFe+TBg10UTIOzzcUUzNhx2MyR4Z0vbKL3enGggGypig1t7G5uHwv5j+NhooRuM619Zk0bw=="
     },
     "jpeg-js": {
       "version": "0.1.2",
@@ -1710,6 +1780,11 @@
         "graceful-fs": "^4.1.9"
       }
     },
+    "lazyness": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/lazyness/-/lazyness-1.1.1.tgz",
+      "integrity": "sha512-rYHC6l6LeRlJSt5jxpqN8z/49gZ0CqLi89HAGzJjHahCFlqEjFGFN9O15hmzSzUGFl7zN/vOWduv/+0af3r/kQ=="
+    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
@@ -1747,9 +1822,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+      "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.4",
@@ -1876,9 +1951,9 @@
       }
     },
     "minizlib": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+      "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
       "requires": {
         "minipass": "^2.2.1"
       }
@@ -1892,15 +1967,33 @@
       }
     },
     "moment": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
-      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
     },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "multiparty": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.1.tgz",
+      "integrity": "sha512-AvESCnNoQlZiOfP9R4mxN8M9csy2L16EIbWIkt3l4FuGti9kXBS8QVzlfyg4HEnarJhrzZilgNFlZtqmoiAIIA==",
+      "requires": {
+        "fd-slicer": "1.1.0",
+        "http-errors": "~1.7.0",
+        "safe-buffer": "5.1.2",
+        "uid-safe": "2.1.5"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
+      }
+    },
     "nan": {
       "version": "2.13.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
@@ -1955,9 +2048,9 @@
       }
     },
     "nextgen-events": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/nextgen-events/-/nextgen-events-0.11.3.tgz",
-      "integrity": "sha512-dC4v/dOF6m8/M05eU712KXjRJ0e/187rx5CMS/fTnulv2QGPps1U/c/J1D3wtegEhK+EE7LuJc3jly3pyfV46g=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.0.tgz",
+      "integrity": "sha512-eBz5mrO4Hw2eenPVm0AVPHuAzg/RZetAWMI547RH8O9+a0UYhCysiZ3KoNWslnWNlHetb9kzowEshsKsmFo2YQ=="
     },
     "no-case": {
       "version": "2.3.2",
@@ -2074,9 +2167,9 @@
       "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
     },
     "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -2120,9 +2213,9 @@
       }
     },
     "omggif": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz",
-      "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz",
+      "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="
     },
     "once": {
       "version": "1.4.0",
@@ -2200,14 +2293,6 @@
         "no-case": "^2.2.0"
       }
     },
-    "parse-data-uri": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz",
-      "integrity": "sha1-vwTYUd1ch7CrI45dAazklLYEtMk=",
-      "requires": {
-        "data-uri-to-buffer": "0.0.3"
-      }
-    },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -2218,6 +2303,11 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -2349,9 +2439,14 @@
       }
     },
     "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
+    "random-bytes": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
-      "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs="
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs="
     },
     "rc": {
       "version": "1.2.8",
@@ -2416,32 +2511,82 @@
       "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
     },
     "request": {
-      "version": "2.85.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
-      "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "requires": {
         "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
+        "aws4": "^1.8.0",
         "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
-        "hawk": "~6.0.2",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
         "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "stringstream": "~0.0.5",
-        "tough-cookie": "~2.3.3",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        },
+        "uuid": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+          "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+        }
       }
     },
     "request-promise-core": {
@@ -2522,6 +2667,24 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "seventh": {
+      "version": "0.7.28",
+      "resolved": "https://registry.npmjs.org/seventh/-/seventh-0.7.28.tgz",
+      "integrity": "sha512-WitJqSwsjLWbCP9cciaozByx4csddLQyNoaPBqOpYFMNE6iD6FK/pM8J2yqtpauSxJUUo7Wfv5KF5w1jbVov7A==",
+      "requires": {
+        "setimmediate": "^1.0.5"
+      }
+    },
     "sharp": {
       "version": "0.22.1",
       "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.22.1.tgz",
@@ -2623,14 +2786,6 @@
         "is-fullwidth-code-point": "^2.0.0"
       }
     },
-    "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-      "requires": {
-        "hoek": "4.x.x"
-      }
-    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -2812,6 +2967,11 @@
         "tweetnacl": "~0.14.0"
       }
     },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -2823,12 +2983,9 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
     "string-kit": {
-      "version": "0.6.14",
-      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.14.tgz",
-      "integrity": "sha512-Sz9Q98Q4JKLaOaXUYLSO8ScWhO9z/itJ53GJOLl+w/wR9XXFt82MzN4Q5pwXN9QZCN1/aCnZhOe67ANK8Vs6Vw==",
-      "requires": {
-        "xregexp": "^3.2.0"
-      }
+      "version": "0.9.10",
+      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.9.10.tgz",
+      "integrity": "sha512-hcJem/u3/ddt3lSY2Xlx953XCHe3C8BX2XEWbPrByjyJ0CSR36X7kzsGFsI5lLaG94dLCQYpt8ffVwRjKpRT6g=="
     },
     "string-padding": {
       "version": "1.0.2",
@@ -2883,11 +3040,6 @@
         }
       }
     },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
     "strip-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -2937,16 +3089,43 @@
       }
     },
     "tar": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz",
-      "integrity": "sha512-gJlTiiErwo96K904FnoYWl+5+FBgS+FimU6GMh66XLdLa55al8+d4jeDfPoGwSNHdtWI5FJP6xurmVqhBuGJpQ==",
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz",
+      "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==",
       "requires": {
-        "chownr": "^1.0.1",
-        "fs-minipass": "^1.2.3",
-        "minipass": "^2.2.1",
-        "minizlib": "^1.1.0",
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.3.5",
+        "minizlib": "^1.2.1",
         "mkdirp": "^0.5.0",
-        "yallist": "^3.0.2"
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
+          "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+        }
       }
     },
     "tar-fs": {
@@ -3008,23 +3187,20 @@
       }
     },
     "terminal-kit": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.15.1.tgz",
-      "integrity": "sha512-nk0+wDRfcvjnBXW6b2X2SFBzCMbT5ZJX56rRvmq/CFaimMYfWHU1eooy33RmzWByXWkkI71zx17q3vlp71OUNA==",
+      "version": "1.31.2",
+      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.31.2.tgz",
+      "integrity": "sha512-qbzHgHONdyJ5SQsjMWvoV5Jivw2VGbV8uw6U8WMgEgkbjX5AZ6Irhs183z459+b6u++36+6WIFeYddIDoXKNeQ==",
       "requires": {
-        "async-kit": "^2.2.3",
-        "get-pixels": "^3.3.0",
+        "@cronvel/get-pixels": "^3.3.1",
+        "chroma-js": "^2.0.4",
+        "lazyness": "^1.1.1",
         "ndarray": "^1.0.18",
-        "nextgen-events": "^0.11.2",
-        "string-kit": "^0.6.9",
-        "tree-kit": "^0.5.26"
+        "nextgen-events": "^1.1.1",
+        "seventh": "^0.7.28",
+        "string-kit": "^0.9.10",
+        "tree-kit": "^0.6.1"
       }
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
     "tkwidgets": {
       "version": "0.5.26",
       "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.26.tgz",
@@ -3032,7 +3208,7 @@
       "requires": {
         "chalk": "^2.1.0",
         "emphasize": "^1.5.0",
-        "node-emoji": "git+https://github.com/laurent22/node-emoji.git",
+        "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5",
         "slice-ansi": "^1.0.0",
         "string-width": "^2.1.1",
         "terminal-kit": "^1.13.11",
@@ -3053,6 +3229,11 @@
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
     "tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
@@ -3077,9 +3258,9 @@
       }
     },
     "tree-kit": {
-      "version": "0.5.26",
-      "resolved": "https://registry.npmjs.org/tree-kit/-/tree-kit-0.5.26.tgz",
-      "integrity": "sha1-hXHIb6JNHbdU5bDLOn4J9B50qN8="
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/tree-kit/-/tree-kit-0.6.1.tgz",
+      "integrity": "sha512-7mV4KbsLMuA6ths3J1wpVUj2PLmLdoNEGnP9fm3kxef4UXYC/A0rL5gKsqtkUaCMuRYUMORyioy8IpBWUBQ1Ig=="
     },
     "tunnel-agent": {
       "version": "0.6.0",
@@ -3129,6 +3310,14 @@
         }
       }
     },
+    "uid-safe": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+      "requires": {
+        "random-bytes": "~1.0.0"
+      }
+    },
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -3175,12 +3364,12 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
     },
     "url-parse": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
-      "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
       "requires": {
-        "querystringify": "~1.0.0",
-        "requires-port": "~1.0.0"
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
       }
     },
     "util-deprecate": {
@@ -3319,11 +3508,6 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
       "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
     },
-    "xregexp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz",
-      "integrity": "sha1-yzYBmHv+JpW1hAAMGPHEqMMih44="
-    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",

CliClient/package.json

@@ -20,7 +20,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.140",
+  "version": "1.0.146",
   "bin": {
     "joplin": "./main.js"
   },
@@ -31,6 +31,7 @@
     "app-module-path": "^2.2.0",
     "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
+    "clean-html": "^1.5.0",
     "compare-version": "^0.1.2",
     "diacritics": "^1.3.0",
     "diff-match-patch": "^1.0.4",
@@ -44,14 +45,14 @@
     "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.17",
-    "joplin-turndown-plugin-gfm": "^1.0.8",
+    "joplin-turndown-plugin-gfm": "^1.0.9",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
-    "lodash": "^4.17.4",
     "markdown-it": "^8.4.2",
     "md5": "^2.2.1",
     "mime": "^2.0.3",
-    "moment": "^2.18.1",
+    "moment": "^2.24.0",
+    "multiparty": "^4.2.1",
     "node-emoji": "^1.8.1",
     "node-fetch": "^1.7.1",
     "node-persist": "^2.1.0",
@@ -60,6 +61,7 @@
     "query-string": "4.3.4",
     "read-chunk": "^2.1.0",
     "redux": "^3.7.2",
+    "request": "^2.88.0",
     "sax": "^1.2.2",
     "server-destroy": "^1.0.1",
     "sharp": "^0.22.1",
@@ -69,10 +71,11 @@
     "string-to-stream": "^1.1.0",
     "strip-ansi": "^4.0.0",
     "syswide-cas": "^5.2.0",
-    "tar": "^4.4.0",
+    "tar": "^4.4.10",
     "tcp-port-used": "^0.1.2",
+    "terminal-kit": "^1.30.0",
     "tkwidgets": "^0.5.26",
-    "url-parse": "^1.2.0",
+    "url-parse": "^1.4.7",
     "uuid": "^3.0.1",
     "valid-url": "^1.0.9",
     "word-wrap": "^1.2.3",

CliClient/run_test.sh

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

CliClient/tests/ArrayUtils.js

@@ -1,7 +1,9 @@
+/* eslint-disable no-unused-vars */
+
 require('app-module-path').addPath(__dirname);
 
 const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const ArrayUtils = require('lib/ArrayUtils.js');
 
 process.on('unhandledRejection', (reason, p) => {
@@ -14,7 +16,7 @@ describe('ArrayUtils', function() {
 		done();
 	});
 
-	it('should remove array elements', async (done) => {
+	it('should remove array elements', asyncTest(async () => {
 		let a = ['un', 'deux', 'trois'];
 		a = ArrayUtils.removeElement(a, 'deux');
 
@@ -25,11 +27,9 @@ describe('ArrayUtils', function() {
 		a = ['un', 'deux', 'trois'];
 		a = ArrayUtils.removeElement(a, 'not in there');
 		expect(a.length).toBe(3);
+	}));
 
-		done();
-	});
-
-	it('should find items using binary search', async (done) => {
+	it('should find items using binary search', asyncTest(async () => {
 		let items = ['aaa', 'ccc', 'bbb'];
 		expect(ArrayUtils.binarySearch(items, 'bbb')).toBe(-1); // Array not sorted!
 		items.sort();
@@ -40,17 +40,13 @@ describe('ArrayUtils', function() {
 
 		items = [];
 		expect(ArrayUtils.binarySearch(items, 'aaa')).toBe(-1);
+	}));
 
-		done();
-	});
-
-	it('should compare arrays', async (done) => {
+	it('should compare arrays', asyncTest(async () => {
 		expect(ArrayUtils.contentEquals([], [])).toBe(true);
 		expect(ArrayUtils.contentEquals(['a'], ['a'])).toBe(true);
 		expect(ArrayUtils.contentEquals(['b', 'a'], ['a', 'b'])).toBe(true);
 		expect(ArrayUtils.contentEquals(['b'], ['a', 'b'])).toBe(false);
+	}));
 
-		done();
-	});
-
-});
+});

CliClient/tests/EnexToHtml.js

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