Android release v1.0.128

Electron release v1.0.102
All: Revert #554 to try to fix #624 : WebDAV error when syncing with SeaFile
2025-08-27 20:29:45 +02:00 · 2018-06-21 19:08:59 +01:00 · 2018-06-21 19:05:58 +01:00 · 2018-06-21 19:00:20 +01:00 · 2018-06-21 18:53:42 +01:00 · 2018-06-21 18:04:10 +01:00
281 changed files with 42827 additions and 5765 deletions
--- a/CliClient/app/app-gui.js
+++ b/CliClient/app/app-gui.js
@@ -1,5 +1,6 @@
 const { Logger } = require('lib/logger.js');
 const Folder = require('lib/models/Folder.js');
+const BaseItem = require('lib/models/BaseItem.js');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
@@ -9,6 +10,8 @@ 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 chalk = require('chalk');
 const tk = require('terminal-kit');
@@ -638,12 +641,27 @@ class AppGui {
 				return true;
 			}

-			if (link.type === 'resource') {
-				const resourceId = link.id;
-				let resource = await Resource.load(resourceId);
-				if (!resource) throw new Error('No resource with ID ' + resourceId); // Should be nearly impossible
-				if (resource.mime) response.setHeader('Content-Type', resource.mime);
-				response.write(await Resource.content(resource));
+			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.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 = [`
+						<!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('</body></html>');
+					response.write(html.join(''));
+				} else {
+					throw new Error('Unsupported item type: ' + item.type_);
+				}
+
 				return true;
 			}

@@ -659,7 +677,7 @@ class AppGui {

 				if (resourceIdRegex.test(url)) {
 					noteLinks[index] = {
-						type: 'resource',
+						type: 'item',
 						id: url.substr(2),
 					};					
 				} else if (hasProtocol(url, ['http', 'https', 'file', 'ftp'])) {
--- a/CliClient/app/autocompletion.js
+++ b/CliClient/app/autocompletion.js
@@ -36,7 +36,7 @@ async function handleAutocompletionPromise(line) {
 	if (next[0] === '-') {
 		for (let i = 0; i<metadata.options.length; i++) {
 			const options = metadata.options[i][0].split(' ');
-		//if there are multiple options then they will be seperated 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);
--- a/CliClient/app/command-help.js
+++ b/CliClient/app/command-help.js
@@ -72,7 +72,7 @@ class Command extends BaseCommand {
 			this.stdout('');
 			this.stdout(commandNames.join(', '));
 			this.stdout('');
-			this.stdout(_('In any command, a note or notebook can be refered to by title or ID, or using the shortcuts `$n` or `$b` for, respectively, the currently selected note or notebook. `$c` can be used to refer to the currently selected item.'));
+			this.stdout(_('In any command, a note or notebook can be referred to by title or ID, or using the shortcuts `$n` or `$b` for, respectively, the currently selected note or notebook. `$c` can be used to refer to the currently selected item.'));
 			this.stdout('');
 			this.stdout(_('To move from one pane to another, press Tab or Shift+Tab.'));
 			this.stdout(_('Use the arrows and page up/down to scroll the lists and text areas (including this console).'));
--- a/CliClient/app/command-rmbook.js
+++ b/CliClient/app/command-rmbook.js
@@ -29,7 +29,7 @@ class Command extends BaseCommand {

 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, pattern);
 		if (!folder) throw new Error(_('Cannot find "%s".', pattern));
-		const ok = force ? true : await this.prompt(_('Delete notebook? All notes within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
+		const ok = force ? true : await this.prompt(_('Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
 		if (!ok) return;

 		await Folder.delete(folder.id);
--- a/CliClient/app/gui/FolderListWidget.js
+++ b/CliClient/app/gui/FolderListWidget.js
@@ -18,19 +18,20 @@ class FolderListWidget extends ListWidget {
 		this.notesParentType_ = 'Folder';
 		this.updateIndexFromSelectedFolderId_ = false;
 		this.updateItems_ = false;
+		this.trimItemTitle = false;

 		this.itemRenderer = (item) => {
 			let output = [];
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
-				output.push(Folder.displayTitle(item));
+				output.push(' '.repeat(this.folderDepth(this.folders, item.id)) + Folder.displayTitle(item));
 			} else if (item.type_ === Tag.modelType()) {
 				output.push('[' + Folder.displayTitle(item) + ']');
 			} else if (item.type_ === BaseModel.TYPE_SEARCH) {
 				output.push(_('Search:'));
 				output.push(item.title);
-			}			
+			}

 			// if (item && item.id) output.push(item.id.substr(0, 5));
 			
@@ -38,6 +39,17 @@ class FolderListWidget extends ListWidget {
 		};
 	}

+	folderDepth(folders, folderId) {
+		let output = 0;
+		while (true) {
+			const folder = BaseModel.byId(folders, folderId);
+			if (!folder.parent_id) return output;
+			output++;
+			folderId = folder.parent_id;
+		}
+		throw new Error('unreachable');
+	}
+
 	get selectedFolderId() {
 		return this.selectedFolderId_;
 	}
--- a/CliClient/app/main.js
+++ b/CliClient/app/main.js
@@ -66,26 +66,6 @@ process.stdout.on('error', function( err ) {
 	}
 });

-
-
-
-
-// async function main() {
-// 	const InteropService = require('lib/services/InteropService');
-// 	const service = new InteropService();
-// 	console.info(service.moduleByFormat('importer', 'enex'));
-// 	//await service.modules();
-// }
-
-// main().catch((error) => { console.error(error); });
-
-
-
-
-
-
-
-
 application.start(process.argv).catch((error) => {
 	if (error.code == 'flagError') {
 		console.error(error.message);
--- a/CliClient/locales/ca.po
+++ b/CliClient/locales/ca.po
--- a/CliClient/locales/cs_CZ.po
+++ b/CliClient/locales/cs_CZ.po
@@ -229,7 +229,7 @@ msgid "The possible commands are:"
 msgstr "Dostupné příkazy:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -364,7 +364,10 @@ msgstr "Smaže vybraný zápisník."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Smaže zápisník bez potvrzení."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Smazat zápisník? Budou smazány i všechny poznámky v něm obsažené."

 msgid "Deletes the notes matching <note-pattern>."
@@ -611,6 +614,15 @@ msgstr "Vyjmout"
 msgid "Paste"
 msgstr "Vložit"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Hledat ve všech poznámkách"

@@ -629,6 +641,9 @@ msgstr "Nástroje"
 msgid "Synchronisation status"
 msgstr "Stav synchronizace"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Nastavení šifrování"

@@ -679,6 +694,49 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Stav: %s."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Zkontrolujte nastavení synchronizace"

@@ -798,6 +856,10 @@ msgstr "Tagy oddělujte čárkami."
 msgid "Rename notebook:"
 msgstr "Přejmenovat zápisník:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Přejmenovat"
+
 msgid "Set alarm:"
 msgstr "Nastavit alarm:"

@@ -826,6 +888,10 @@ msgstr "Přidat či odebrat tagy"
 msgid "Switch between note and to-do type"
 msgstr "Přepnout mezi poznámkou a to-do"

+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Smazat"

@@ -842,13 +908,38 @@ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na \"Nový zápi
 msgid "Open..."
 msgstr "Otevřít..."

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Nebylo možné uložit zápisník: %s"
+
 msgid "Save as..."
 msgstr "Uložit jako..."

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodporovaný link či zpráva: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr "Tato poznámka je prázdný. Klikněte na  \"%s\" pro otevření editoru."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Přiložit soubor"

@@ -858,11 +949,37 @@ msgstr "Tagy"
 msgid "Set alarm"
 msgstr "Nastavit alarm"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr "Tato poznámka je prázdný. Klikněte na  \"%s\" pro otevření editoru."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Zastavuji..."

 msgid "to-do"
 msgstr "to-do"
@@ -895,6 +1012,10 @@ msgstr "Stav synchronizace"
 msgid "Encryption Options"
 msgstr "Nastavení šifrování"

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Obecná nastavení"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Odebrat tento tag ze všech poznámek?"

@@ -1035,6 +1156,10 @@ msgstr "Nelze editovat zašifrovanou položku"
 msgid "Conflicts"
 msgstr "Konflikty"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Poznámku nelze přesunout do zápisníku \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Zápisník s tímto názvem již existuje: \"%s\""
@@ -1043,6 +1168,18 @@ msgstr "Zápisník s tímto názvem již existuje: \"%s\""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Zápisník se nemůže jmenovat \"%s\", tento název je rezervován."

+#, fuzzy
+msgid "title"
+msgstr "Bez názvu"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Upraveno: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Vytvořeno: %d."
+
 msgid "Untitled"
 msgstr "Bez názvu"

@@ -1088,6 +1225,10 @@ msgstr "Tmavý"
 msgid "Uncompleted to-dos on top"
 msgstr "Nedokončené to-do listy nahoře"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Nedokončené to-do listy nahoře"
+
 msgid "Sort notes by"
 msgstr "Řadit poznámky podle"

@@ -1121,9 +1262,10 @@ msgstr "Globální zoom"
 msgid "Editor font family"
 msgstr "Rodina písma v editoru"

+#, fuzzy
 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 "Jméno fontu není kontrolováno. Pokud je neplatné či chybí, bude použit "
 "defaultní monospace font."
@@ -1187,6 +1329,18 @@ msgstr "WebDAV uživatelské jméno"
 msgid "WebDAV password"
 msgstr "WebDAV heslo"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Neplatná hodnota: \"%s\". Přípustné hodnoty jsou: %s."
@@ -1305,6 +1459,10 @@ msgstr "Přesunout poznámky %d do zápisníku \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Stiskněte pro zadání hesla k dešifrování."

+#, fuzzy
+msgid "Save alarm"
+msgstr "Nastavit alarm"
+
 msgid "Select date"
 msgstr "Vybrat datum"

@@ -1314,12 +1472,32 @@ msgstr "Potvrdit"
 msgid "Cancel synchronisation"
 msgstr "Zrušit synchronizaci"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Získané položky: %d/%d."
+
 msgid "New tags:"
 msgstr "Nové tagy:"

 msgid "Type new tags or select from list"
 msgstr "Zadejte nové tagy, nebo vyberte existující ze seznamu"

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr "Web Joplinu"

@@ -1366,6 +1544,14 @@ msgstr "Uložit změny"
 msgid "Discard changes"
 msgstr "Zahodit změny"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodporovaný formát obrázku: %s"
@@ -1376,6 +1562,9 @@ msgstr "Přiložit obrázek"
 msgid "Attach any file"
 msgstr "Přiložit soubor"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Konvertovat na poznámku"

--- a/CliClient/locales/da_DK.po
+++ b/CliClient/locales/da_DK.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR Laurent Cozic
 # This file is distributed under the same license as the Joplin-CLI package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
@@ -229,7 +229,7 @@ msgid "The possible commands are:"
 msgstr "Mulige kommandoer er:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -367,7 +367,10 @@ msgstr "Sletter aktuelle notesbog."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Sletter notesbogen uden at bede om bekræftelse."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Slet notesbog? Alle noter i notesbogen bliver også slettet."

 msgid "Deletes the notes matching <note-pattern>."
@@ -616,6 +619,15 @@ msgstr "Klip"
 msgid "Paste"
 msgstr "Indsæt"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Søg i alle noter"

@@ -634,6 +646,9 @@ msgstr "Værktøjer"
 msgid "Synchronisation status"
 msgstr "Synkroniserings status"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Krypterings muligheder"

@@ -684,6 +699,49 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Tilstand: %s."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Check synkroniserings Indstillinger"

@@ -807,6 +865,10 @@ msgstr "Adskil hver mærke med komma."
 msgid "Rename notebook:"
 msgstr "Omdøb notesbog:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Omdøb"
+
 msgid "Set alarm:"
 msgstr "Indstil alarm:"

@@ -835,6 +897,10 @@ msgstr "Tilføj eller slet mærker"
 msgid "Switch between note and to-do type"
 msgstr "Skift mellem note-  og opgave type"

+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Slet"

@@ -851,13 +917,38 @@ msgstr "Der er ingen notesbog. Opret en ved at klikke på \"Ny Notesbog\"."
 msgid "Open..."
 msgstr "Åben..."

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Notesbogen kan ikke gemmes: %s"
+
 msgid "Save as..."
 msgstr "Gem som..."

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Ugyldigt- eller ulovligt link eller besked: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr "Denne note er tom. Klik på \"%s\" for at starte editor og rette noten."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Vedhæft fil"

@@ -867,11 +958,37 @@ msgstr "Mærker"
 msgid "Set alarm"
 msgstr "Indstil alarm"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr "Denne note er tom. Klik på \"%s\" for at starte editor og rette noten."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Annullerer..."

 msgid "to-do"
 msgstr "opgave"
@@ -904,6 +1021,10 @@ msgstr "Synkroniserings status"
 msgid "Encryption Options"
 msgstr "Krypterings indstillinger"

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Generelle indstillinger"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Slet denne markering fra alle noter?"

@@ -1044,6 +1165,10 @@ msgstr "Krypteret emner kan ikke rettes"
 msgid "Conflicts"
 msgstr "Konflikter"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Kan ikke flytte note til \"%s\" notesbog"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "En notesbog bruger allerede dette navn: \"%s\""
@@ -1052,6 +1177,18 @@ msgstr "En notesbog bruger allerede dette navn: \"%s\""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Notesbøger kan ikke få navnet \"%s\", da det er en beskyttet titel."

+#, fuzzy
+msgid "title"
+msgstr "Samlet"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Opdateret %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Oprettet: %d."
+
 msgid "Untitled"
 msgstr "Samlet"

@@ -1097,6 +1234,10 @@ msgstr "Mørkt"
 msgid "Uncompleted to-dos on top"
 msgstr "Ufærdige opgaver øverst"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Ufærdige opgaver øverst"
+
 msgid "Sort notes by"
 msgstr "Sorter noter efter"

@@ -1130,9 +1271,10 @@ msgstr "Global zoom procent"
 msgid "Editor font family"
 msgstr "Rediger skrifttype"

+#, fuzzy
 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 "Skrifttypenavn checkes ikke. Hvis tom eller ukorrekt, standard vil returnere "
 "til monospace font."
@@ -1196,6 +1338,18 @@ msgstr "WebDAV brugernavn"
 msgid "WebDAV password"
 msgstr "WebDAV kodeord"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ulovlig værdi: \"%s\".  Mulige valg er: %s."
@@ -1314,6 +1468,10 @@ msgstr "Flyt %d noter til notesbogen \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Klik for at gemme dekrypterings kodeord."

+#, fuzzy
+msgid "Save alarm"
+msgstr "Indstil alarm"
+
 msgid "Select date"
 msgstr "Vælg dato"

@@ -1323,12 +1481,32 @@ msgstr "Bekræft"
 msgid "Cancel synchronisation"
 msgstr "Afbryd synkronisering"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Hentede emner: %d/%d."
+
 msgid "New tags:"
 msgstr "Nye tags:"

 msgid "Type new tags or select from list"
 msgstr "Indtast nye tags eller vælg fra listen"

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr "Joplin hjemmeside"

@@ -1375,6 +1553,14 @@ msgstr "Gem ændringer"
 msgid "Discard changes"
 msgstr "Fortryd ændringer"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Ulovlig billedtype: %s"
@@ -1385,6 +1571,9 @@ msgstr "Vedhæft foto"
 msgid "Attach any file"
 msgstr "Vedhæft fil"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Konverter til note"

--- a/CliClient/locales/de_DE.po
+++ b/CliClient/locales/de_DE.po
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Tobias Grasse <mail@tobias-grasse.net>\n"
+"Last-Translator: Philipp Zumstein <zuphilip@gmail.com>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 msgid "To delete a tag, untag the associated notes."
@@ -238,7 +238,7 @@ msgid "The possible commands are:"
 msgstr "Mögliche Befehle lauten:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -259,9 +259,8 @@ msgstr ""
 "Benutze die Pfeiltasten und Bild hoch/runter um durch Listen und Texte zu "
 "scrollen (inklusive diesem Terminal)."

-#, fuzzy
 msgid "To maximise/minimise the console, press \"tc\"."
-msgstr "Um das Terminal zu maximieren/minimieren, drücke \"TC\"."
+msgstr "Um das Terminal zu maximieren/minimieren, drücke \"tc\"."

 msgid "To enter command line mode, press \":\""
 msgstr "Um den Kommandozeilen Modus aufzurufen, drücke \":\""
@@ -272,8 +271,8 @@ msgstr "Um den Kommandozeilen Modus zu beenden, drücke ESCAPE"
 msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
 msgstr ""
-"Um die komplette Liste aller verfügbaren Tastenkürzeln anzuzeigen, tippe "
-"`help keymap` ein"
+"Um die komplette Liste aller verfügbaren Tastenkürzeln und "
+"Konfigurationseinstellungen anzuzeigen, tippe `help keymap` ein"

 msgid "Imports data into Joplin."
 msgstr "Importiert Daten in Joplin."
@@ -380,9 +379,12 @@ msgstr "Löscht das ausgewählte Notizbuch."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Löscht das Notizbuch, ohne nach einer Bestätigung zu fragen."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
-"Notizbuch wirklich löschen? Alle Notizen darin werden ebenfalls gelöscht."
+"Notizbuch wirklich löschen? Alle Notizen und Unternotizen darin werden "
+"ebenfalls gelöscht."

 msgid "Deletes the notes matching <note-pattern>."
 msgstr "Löscht die Notizen, die mit <note-pattern> übereinstimmen."
@@ -433,12 +435,14 @@ msgstr ""
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"Um Joplin die Synchronisation mit Dropbox zu ermöglichen, folge bitte den "
+"folgenden Schritten:"

 msgid "Step 1: Open this URL in your browser to authorise the application:"
-msgstr ""
+msgstr "Schritt 1: URL im Browser öffnen um die Anwendung zu autorisieren:"

 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Schritt 2: Den von Dropbox bereitgestellten Code eingeben:"

 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -531,9 +535,8 @@ msgstr "Standard: %s"
 msgid "Possible keys/values:"
 msgstr "Mögliche Werte:"

-#, fuzzy
 msgid "Type `joplin help` for usage information."
-msgstr "Zeigt die Nutzungsstatistik an."
+msgstr "Gib `joplin help` ein um die Nutzungsstatistik anzuzeigen."

 msgid "Fatal error:"
 msgstr "Schwerwiegender Fehler:"
@@ -541,7 +544,7 @@ msgstr "Schwerwiegender Fehler:"
 msgid ""
 "The application has been authorised - you may now close this browser tab."
 msgstr ""
-"Das Programm wurde autorisiert - Du kannst diesen Browsertab nun schließen."
+"Das Programm wurde autorisiert - du kannst diesen Browsertab nun schließen."

 msgid "The application has been successfully authorised."
 msgstr "Das Programm wurde erfolgreich autorisiert."
@@ -640,6 +643,15 @@ msgstr "Ausschneiden"
 msgid "Paste"
 msgstr "Einfügen"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Alle Notizen durchsuchen"

@@ -647,7 +659,7 @@ msgid "View"
 msgstr "Ansicht"

 msgid "Toggle sidebar"
-msgstr ""
+msgstr "Seitenleiste ein/aus"

 msgid "Toggle editor layout"
 msgstr "Editor Layout umschalten"
@@ -658,8 +670,11 @@ msgstr "Werkzeuge"
 msgid "Synchronisation status"
 msgstr "Status der Synchronisation"

+msgid "Web clipper options"
+msgstr "Web Clipper Optionen"
+
 msgid "Encryption options"
-msgstr "Verschlüsselung"
+msgstr "Verschlüsselungsoptionen"

 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
@@ -708,6 +723,58 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"

+#, fuzzy
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+"Der Web Clipper Service ist bereits aktiviert und auf Autostart eingestellt."
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr "Status: Gestartet auf Port %d"
+
+#, javascript-format
+msgid "Status: %s"
+msgstr "Status: %s"
+
+msgid "Disable Web Clipper Service"
+msgstr "Web Clipper Service deaktivieren"
+
+msgid "The web clipper service is not enabled."
+msgstr "Der Web Clipper Service ist nicht aktiviert."
+
+msgid "Enable Web Clipper Service"
+msgstr "Web Clipper Service aktivieren"
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+"Joplin Web Clipper erlaubt im Browser das Speichern von Webseiten und "
+"Screenshots nach Joplin."
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr "Um den Web Clipper zu benutzen, musst du folgendes machen:"
+
+msgid "Step 1: Enable the clipper service"
+msgstr "Schritt 1: Clipper Service aktivieren"
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+"Dieser Service erlaubt es der Browser-Erweiterung mit Joplin zu "
+"kommunizieren. Beim Aktivieren kann deine Firewall dich nach der Erlaubnis "
+"bitten, dass Joplin auf einen bestimmten Port mithört."
+
+msgid "Step 2: Install the extension"
+msgstr "Schritt 2: Erweiterung installieren"
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+"Lade die entsprechende Erweiterung für deinen Browser herunter und "
+"installiere sie:"
+
 msgid "Check synchronisation configuration"
 msgstr "Überprüfen der Synchronisationseinstellungen"

@@ -719,7 +786,7 @@ msgid "Save"
 msgstr "Speichern"

 msgid "Submit"
-msgstr ""
+msgstr "Absenden"

 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -795,6 +862,8 @@ msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices 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):"

 msgid "Status"
 msgstr "Status"
@@ -830,15 +899,17 @@ msgstr "Trenne jede Markierung mit einem Komma."
 msgid "Rename notebook:"
 msgstr "Notizbuch umbenennen:"

+msgid "Rename tag:"
+msgstr "Markierung umbenennen:"
+
 msgid "Set alarm:"
 msgstr "Alarm erstellen:"

 msgid "Layout"
 msgstr "Layout"

-#, fuzzy
 msgid "Search..."
-msgstr "Suchen"
+msgstr "Suchen..."

 msgid "Some items cannot be synchronised."
 msgstr "Manche Objekte können nicht synchronisiert werden."
@@ -858,6 +929,9 @@ msgstr "Markierungen hinzufügen oder entfernen"
 msgid "Switch between note and to-do type"
 msgstr "Zwischen Notiz und To-Do Typ wechseln"

+msgid "Copy Markdown link"
+msgstr "Markdown-Link kopieren"
+
 msgid "Delete"
 msgstr "Löschen"

@@ -872,19 +946,46 @@ msgstr ""
 msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
-"Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf den "
-"(+) Knopf drückst."
+"Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf "
+"\"Neues Notizbuch\" drückst."

 msgid "Open..."
 msgstr "Öffne..."

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Dieses Notizbuch konnte nicht gespeichert werden: %s"
+
 msgid "Save as..."
 msgstr "Sichern unter..."

+msgid "Copy path to clipboard"
+msgstr "Pfad in Zwischenablage kopieren"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nicht unterstützter Link oder Nachricht: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Diese Notiz hat keinen Inhalt. Klicke auf „%s“ um den Editor zu aktivieren "
+"und die Notiz zu bearbeiten."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Datei anhängen"

@@ -894,13 +995,37 @@ msgstr "Markierungen"
 msgid "Set alarm"
 msgstr "Alarm erstellen"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""
-"Diese Notiz hat keinen Inhalt. Klicke auf „%s“ um den Editor zu aktivieren "
-"und die Notiz zu bearbeiten."
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Abbrechen..."

 msgid "to-do"
 msgstr "To-Do"
@@ -919,10 +1044,10 @@ msgid "Clear"
 msgstr "Leeren"

 msgid "OneDrive Login"
-msgstr "OneDrive Login"
+msgstr "OneDrive Anmeldung"

 msgid "Dropbox Login"
-msgstr ""
+msgstr "Dropbox Anmeldung"

 msgid "Options"
 msgstr "Optionen"
@@ -933,6 +1058,9 @@ msgstr "Synchronisations Status"
 msgid "Encryption Options"
 msgstr "Verschlüsselungsoptionen"

+msgid "Clipper Options"
+msgstr "Clipper Einstellungen"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Diese Markierung von allen Notizen entfernen?"

@@ -961,7 +1089,7 @@ msgid "Unknown flag: %s"
 msgstr "Unbekanntes Argument: %s"

 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"

 msgid "File system"
 msgstr "Dateisystem"
@@ -1040,9 +1168,9 @@ msgstr "Remote Objekte gelöscht: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Geladene Objekte: %d/%d."

-#, fuzzy, javascript-format
+#, javascript-format
 msgid "State: %s."
-msgstr "Status: \"%s\"."
+msgstr "Status: %s."

 msgid "Cancelling..."
 msgstr "Abbrechen..."
@@ -1074,6 +1202,9 @@ msgstr "Verschlüsselte Objekte können nicht verändert werden"
 msgid "Conflicts"
 msgstr "Konflikte"

+msgid "Cannot move notebook to this location"
+msgstr "Kann Notizbuch nicht an diesen Ort verschieben"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Ein Notizbuch mit diesem Titel existiert bereits : \"%s\""
@@ -1083,6 +1214,18 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
 "Notizbuch kann nicht \"%s\" genannt werden. Dies ist ein reservierter Titel."

+#, fuzzy
+msgid "title"
+msgstr "Unbenannt"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Aktualisiert: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Erstellt: %d."
+
 msgid "Untitled"
 msgstr "Unbenannt"

@@ -1129,6 +1272,9 @@ msgstr "Dunkel"
 msgid "Uncompleted to-dos on top"
 msgstr "Zeige unvollständige To-Dos an oberster Stelle"

+msgid "Show completed to-dos"
+msgstr "Abgeschlossene ToDos anzeigen"
+
 msgid "Sort notes by"
 msgstr "Sortiere Notizen nach"

@@ -1154,7 +1300,7 @@ msgid "Show tray icon"
 msgstr "Zeige Tray Icon"

 msgid "Note: Does not work in all desktop environments."
-msgstr ""
+msgstr "Hinweis: Funktioniert nicht in allen Desktopumgebungen."

 msgid "Global zoom percentage"
 msgstr "Zoomstufe der Benutzeroberfläche"
@@ -1163,11 +1309,12 @@ msgid "Editor font family"
 msgstr "Editor Schriftenfamilie"

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
-"Der Name der Schrift wird nicht überprüft. Ist dieser inkorrekt oder leer "
-"wird eine generische Monospace Schrift verwendet."
+"Dies muss eine *Monospace* Schriftart sein, sonst funktioniert es nicht "
+"richtig. Wenn die Schriftart falsch oder leer ist, wird eine "
+"voreingestellte, generische Monospace-Schriftart verwendet."

 msgid "Automatically update the application"
 msgstr "Die Applikation automatisch aktualisieren"
@@ -1229,6 +1376,18 @@ msgstr "WebDAV Benutzername"
 msgid "WebDAV password"
 msgstr "WebDAV Passwort"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ungültiger Optionswert: \"%s\". Mögliche Werte sind: %s."
@@ -1284,7 +1443,7 @@ msgid ""
 "(which is displayed in brackets above)."
 msgstr ""
 "Diese Objekte verbleiben auf dem Gerät, werden aber nicht zum "
-"Synchronisationsziel hochgeladen. Um diese Objekte zu finden, suchen Sie "
+"Synchronisationsziel hochgeladen. Um diese Objekte zu finden, suchst du "
 "entweder nach dem Titel oder der ID (die oben in Klammern angezeigt wird)."

 msgid "Sync status (synced items / total items)"
@@ -1350,6 +1509,9 @@ msgstr "%d Notizen in das Notizbuch \"%s\" verschieben?"
 msgid "Press to set the decryption password."
 msgstr "Tippe hier, um das Entschlüsselungspasswort festzulegen."

+msgid "Save alarm"
+msgstr "Alarm speichern"
+
 msgid "Select date"
 msgstr "Datum auswählen"

@@ -1359,18 +1521,43 @@ msgstr "Bestätigen"
 msgid "Cancel synchronisation"
 msgstr "Synchronisation abbrechen"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Geladene Objekte: %d/%d."
+
 msgid "New tags:"
-msgstr ""
+msgstr "Neue Markierungen:"

 msgid "Type new tags or select from list"
+msgstr "Neue Markierungen eingeben oder aus der Liste auswählen"
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
 msgstr ""
+"Um korrekt arbeiten zu können, benötigt die Anwendung die folgenden "
+"Berechtigungen. Bitte aktiviere diese in deinen Telefoneinstellungen, unter "
+"Apps > Joplin > Berechtigungen"
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+"- Speicher: um das Anhängen von Dateien an Notizen und die Synchronisation "
+"des Dateisystems zu ermöglichen."
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr "- Kamera: um ein Bild aufzunehmen und an eine Notiz anzuhängen."
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+"- Standort: zum Anhängen von Geolokalisierungsinformationen an eine Notiz."

 msgid "Joplin website"
 msgstr "Website von Joplin"

-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "Mit OneDrive anmelden"
+msgstr "Mit Dropbox anmelden"

 #, javascript-format
 msgid "Master Key %s"
@@ -1411,6 +1598,15 @@ msgstr "Änderungen speichern"
 msgid "Discard changes"
 msgstr "Änderungen verwerfen"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr "Kein Element mit ID %s"
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+"Die Joplin Handy-Applikation unterstützt derzeit diese Art von Link nicht: %s"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nicht unterstütztes Fotoformat: %s"
@@ -1421,6 +1617,9 @@ msgstr "Foto anhängen"
 msgid "Attach any file"
 msgstr "Beliebige Datei anhängen"

+msgid "Share"
+msgstr "Teilen"
+
 msgid "Convert to note"
 msgstr "In eine Notiz umwandeln"

--- a/CliClient/locales/en_GB.po
+++ b/CliClient/locales/en_GB.po
@@ -210,7 +210,7 @@ msgid "The possible commands are:"
 msgstr ""

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -332,7 +332,9 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""

 msgid "Deletes the notes matching <note-pattern>."
@@ -550,6 +552,15 @@ msgstr ""
 msgid "Paste"
 msgstr ""

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr ""

@@ -568,6 +579,9 @@ msgstr ""
 msgid "Synchronisation status"
 msgstr ""

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""

@@ -618,6 +632,49 @@ msgstr ""
 msgid "No"
 msgstr ""

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Status: %s"
+msgstr ""
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr ""

@@ -726,6 +783,9 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""

+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""

@@ -753,6 +813,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""

+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""

@@ -769,13 +832,38 @@ msgstr ""
 msgid "Open..."
 msgstr ""

+#, javascript-format
+msgid "This file could not be opened: %s"
+msgstr ""
+
 msgid "Save as..."
 msgstr ""

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr ""

@@ -786,9 +874,34 @@ msgid "Set alarm"
 msgstr ""

 #, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+msgid "In: %s"
+msgstr ""
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+msgid "Watching..."
 msgstr ""

 msgid "to-do"
@@ -822,6 +935,9 @@ msgstr ""
 msgid "Encryption Options"
 msgstr ""

+msgid "Clipper Options"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr ""

@@ -954,6 +1070,9 @@ msgstr ""
 msgid "Conflicts"
 msgstr ""

+msgid "Cannot move notebook to this location"
+msgstr ""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr ""
@@ -962,6 +1081,15 @@ msgstr ""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""

+msgid "title"
+msgstr ""
+
+msgid "updated date"
+msgstr ""
+
+msgid "created date"
+msgstr ""
+
 msgid "Untitled"
 msgstr ""

@@ -1005,6 +1133,9 @@ msgstr ""
 msgid "Uncompleted to-dos on top"
 msgstr ""

+msgid "Show completed to-dos"
+msgstr ""
+
 msgid "Sort notes by"
 msgstr ""

@@ -1039,8 +1170,8 @@ msgid "Editor font family"
 msgstr ""

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""

 msgid "Automatically update the application"
@@ -1098,6 +1229,18 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
@@ -1211,6 +1354,9 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""

+msgid "Save alarm"
+msgstr ""
+
 msgid "Select date"
 msgstr ""

@@ -1220,12 +1366,32 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""

+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr ""

@@ -1271,6 +1437,14 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
@@ -1281,6 +1455,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""

--- a/CliClient/locales/es_ES.po
+++ b/CliClient/locales/es_ES.po
@@ -230,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Los posibles comandos son:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -250,7 +250,6 @@ msgstr ""
 "Para desplazar en las listas y areas de texto (incluyendo la consola) "
 "utilice las flechas y re pág/av pág."

-#, fuzzy
 msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Para maximizar/minimizar la consola, presione \"tc\"."

@@ -369,10 +368,12 @@ msgstr "Elimina la libreta dada."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Elimina una libreta sin pedir confirmación."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
-"¿Desea eliminar la libreta? Todas las notas dentro de esta libreta también "
-"serán eliminadas."
+"¿Desea eliminar la libreta? Todas las notas y sublibretas dentro de esta "
+"libreta también serán eliminadas."

 msgid "Deletes the notes matching <note-pattern>."
 msgstr "Elimina las notas que coinciden con <note-pattern>."
@@ -627,6 +628,15 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Pegar"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Buscar en todas las notas"

@@ -634,7 +644,7 @@ msgid "View"
 msgstr "Ver"

 msgid "Toggle sidebar"
-msgstr ""
+msgstr "Cambia la barra lateral"

 msgid "Toggle editor layout"
 msgstr "Cambia el diseño del editor"
@@ -645,6 +655,9 @@ msgstr "Herramientas"
 msgid "Synchronisation status"
 msgstr "Estado de la sincronización"

+msgid "Web clipper options"
+msgstr "Opciones de recorte web"
+
 msgid "Encryption options"
 msgstr "Opciones de cifrado"

@@ -695,6 +708,57 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"

+#, fuzzy
+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+"El servicio de recorte web está habilitado y configurado para inicie "
+"automaticamente"
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr "Estado: Iniciado en el puerto %d"
+
+#, javascript-format
+msgid "Status: %s"
+msgstr "Estado: %s"
+
+msgid "Disable Web Clipper Service"
+msgstr "Deshabilitar el servicio de recorte web"
+
+msgid "The web clipper service is not enabled."
+msgstr "El servicio de recorte web no está habilitado."
+
+msgid "Enable Web Clipper Service"
+msgstr "Habilitar el servicio de recorte web"
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+"El recorte web de Joplin permite guardar páginas web y capturas de pantalla "
+"desde su navegador."
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr "Para utilizar el recorte web, necesita hacer lo siguiente:"
+
+msgid "Step 1: Enable the clipper service"
+msgstr "Paso 1: Habilitar el servicio de recorte"
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+"Este servicio permite a la extensión del navegador comunicarse con Joplin. "
+"Cuando la habilite su cortafuegos puede solicitar permisos para que Joplin "
+"escuche en un puerto concreto."
+
+msgid "Step 2: Install the extension"
+msgstr "Paso 2: Instalar la extensión"
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr "Descargar e instalar para su navegador:"
+
 msgid "Check synchronisation configuration"
 msgstr "Comprobar sincronización"

@@ -818,6 +882,9 @@ msgstr "Separar cada etiqueta por una coma."
 msgid "Rename notebook:"
 msgstr "Renombrar libreta:"

+msgid "Rename tag:"
+msgstr "Renombrar etiqueta:"
+
 msgid "Set alarm:"
 msgstr "Ajustar alarma:"

@@ -845,6 +912,9 @@ msgstr "Añadir o borrar etiquetas"
 msgid "Switch between note and to-do type"
 msgstr "Cambiar entre nota y lista de tareas"

+msgid "Copy Markdown link"
+msgstr "Copiar el enlace de Markdown"
+
 msgid "Delete"
 msgstr "Eliminar"

@@ -861,13 +931,40 @@ msgstr "No hay ninguna libreta. Cree una pulsando en «Libreta nueva»."
 msgid "Open..."
 msgstr "Abrir..."

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "No se ha podido guardar esta libreta: %s"
+
 msgid "Save as..."
 msgstr "Guardar como..."

+msgid "Copy path to clipboard"
+msgstr "Copiar la ruta en el portapapeles"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Enlace o mensaje no soportado: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Esta nota no tiene contenido. Pulse en \"%s\" para cambiar al editor y "
+"editar la nota."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Adjuntar archivo"

@@ -877,13 +974,37 @@ msgstr "Etiquetas"
 msgid "Set alarm"
 msgstr "Establecer alarma"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""
-"Esta nota no tiene contenido. Pulse en \"%s\" para cambiar al editor y "
-"editar la nota."
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Cancelando..."

 msgid "to-do"
 msgstr "lista de tareas"
@@ -916,6 +1037,9 @@ msgstr "Estado de la sincronización"
 msgid "Encryption Options"
 msgstr "Opciones de cifrado"

+msgid "Clipper Options"
+msgstr "Opciones de recorte"
+
 msgid "Remove this tag from all the notes?"
 msgstr "¿Desea eliminar esta etiqueta de todas las notas?"

@@ -1056,6 +1180,9 @@ msgstr "Los elementos cifrados no pueden ser modificados"
 msgid "Conflicts"
 msgstr "Conflictos"

+msgid "Cannot move notebook to this location"
+msgstr "No se puede mover la libreta a este lugar"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Ya existe una libreta con este nombre: «%s»"
@@ -1065,6 +1192,18 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
 "No se puede usar el nombre «%s» para una libreta; es un título reservado."

+#, fuzzy
+msgid "title"
+msgstr "Sin título"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Actualizado: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Creado: %d."
+
 msgid "Untitled"
 msgstr "Sin título"

@@ -1110,6 +1249,9 @@ msgstr "Oscuro"
 msgid "Uncompleted to-dos on top"
 msgstr "Mostrar tareas incompletas al inicio de las listas"

+msgid "Show completed to-dos"
+msgstr "Mostrar tareas completadas"
+
 msgid "Sort notes by"
 msgstr "Ordenar notas por"

@@ -1135,7 +1277,7 @@ msgid "Show tray icon"
 msgstr "Mostrar icono en la bandeja"

 msgid "Note: Does not work in all desktop environments."
-msgstr ""
+msgstr "Nota: No funciona en todos los entornos de escritorio."

 msgid "Global zoom percentage"
 msgstr "Establecer el porcentaje de aumento de la aplicación"
@@ -1144,11 +1286,12 @@ msgid "Editor font family"
 msgstr "Fuente del editor"

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
-"El nombre de la fuente no se comprobado. Si es incorrecto o está vacío, se "
-"utilizará una fuente genérica monoespaciada."
+"Esta debe ser una fuente *monoespaciada* o no funcionará correctamente. Si "
+"la fuente es incorrecta o vacía, se configurará una fuente monoespaciada "
+"genérica."

 msgid "Automatically update the application"
 msgstr "Actualizar la aplicación automáticamente"
@@ -1210,6 +1353,18 @@ msgstr "Usuario de WebDAV"
 msgid "WebDAV password"
 msgstr "Contraseña de WebDAV"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Opción inválida: «%s». Los valores posibles son: %s."
@@ -1328,6 +1483,10 @@ msgstr "¿Desea mover %d notas a libreta «%s»?"
 msgid "Press to set the decryption password."
 msgstr "Presione para establecer la contraseña de descifrado."

+#, fuzzy
+msgid "Save alarm"
+msgstr "Establecer alarma"
+
 msgid "Select date"
 msgstr "Seleccione fecha"

@@ -1337,12 +1496,39 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementos obtenidos: %d/%d."
+
 msgid "New tags:"
 msgstr "Nuevas etiquetas:"

 msgid "Type new tags or select from list"
 msgstr "Escriba nuevas etiquetas o seleccionelas de la lista"

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+"Para funcionar correctamente, la aplicación necesita los siguientes "
+"permisos. Por favor habilitelos en su teléfono, en Aplicaciones > Joplin > "
+"Permisos"
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+"- Almacenamiento: Permite adjuntar archivos a las notas y habilitar la "
+"sincronización del sistema de ficheros."
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr "- Cámara: permite tomar fotografías y adjuntarlas en una nota."
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+"- Localización: permite adjuntar la información de geolocalización en la "
+"nota."
+
 msgid "Joplin website"
 msgstr "Sitio web de Joplin"

@@ -1388,6 +1574,15 @@ msgstr "Guardar cambios"
 msgid "Discard changes"
 msgstr "Descartar cambios"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr "No hay elementos con el ID %s"
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+"La aplicación móvil de Joplin no soporta actualmente este tipo de enlace: %s"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagen no soportado: %s"
@@ -1398,6 +1593,9 @@ msgstr "Adjuntar foto"
 msgid "Attach any file"
 msgstr "Adjuntar cualquier archivo"

+msgid "Share"
+msgstr "Compartir"
+
 msgid "Convert to note"
 msgstr "Convertir a nota"

--- a/CliClient/locales/eu.po
+++ b/CliClient/locales/eu.po
@@ -227,7 +227,7 @@ msgid "The possible commands are:"
 msgstr "Litezkeen komandoak hauek dira:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -368,7 +368,10 @@ msgstr "Ezabatu emandako koadernoak."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Ezabatu koadernoak berrespenik gabe."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Koadernoa ezabatu? Dituen ohar guztiak ere ezabatuko dira."

 msgid "Deletes the notes matching <note-pattern>."
@@ -624,6 +627,15 @@ msgstr "Moztu"
 msgid "Paste"
 msgstr "Itsatsi"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Bilatu ohar guztietan"

@@ -642,6 +654,9 @@ msgstr "Tresnak"
 msgid "Synchronisation status"
 msgstr "Sinkronizazioaren egoera"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Zifratzeko aukerak"

@@ -694,6 +709,49 @@ msgstr ""
 msgid "No"
 msgstr "E"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Egoera: \"%s\"."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Sinkronizazioa utzi"
@@ -817,6 +875,10 @@ msgstr "Banatu etiketak koma erabiliaz."
 msgid "Rename notebook:"
 msgstr "Berrizendatu koadernoa:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Berrizendatu"
+
 msgid "Set alarm:"
 msgstr "Ezarri alarma:"

@@ -845,6 +907,9 @@ msgstr "Gehitu edo ezabatu etiketak"
 msgid "Switch between note and to-do type"
 msgstr "Aldatu oharra eta zeregin eren artean."

+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Ezabatu"

@@ -861,14 +926,39 @@ msgstr "Momentuz ez dago koadernorik. Sortu bat \"Koaderno berria\" sakatuta."
 msgid "Open..."
 msgstr ""

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Koadernoa ezin gorde daiteke: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Gorde aldaketak"

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Esteka edo mezu ez dago onartua: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Erantsi fitxategia"

@@ -878,12 +968,38 @@ msgstr "Etiketak"
 msgid "Set alarm"
 msgstr "Ezarri alarma"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""

+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Bertan behera uzten..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Zeregin berria"
@@ -918,6 +1034,10 @@ msgstr "Sinkronizazioaren egoera"
 msgid "Encryption Options"
 msgstr "Zifratzeko aukerak"

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Ezarpenak"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Kendu etiketa hori ohar guztietatik?"

@@ -1060,6 +1180,10 @@ msgstr "Zifratutako itemak ezin aldatu daitezke"
 msgid "Conflicts"
 msgstr "Gatazkak"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Ezin eraman daiteke oharra \"%s\" koadernora"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Dagoeneko bada koaderno bat izen horrekin: \"%s\""
@@ -1069,6 +1193,18 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
 "Koadernoak ezin izendatu daitezke \"%s\", izen hori Joplinek gordeta dauka"

+#, fuzzy
+msgid "title"
+msgstr "Titulu gabekoa"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Eguneratuta: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Sortuta: %d."
+
 msgid "Untitled"
 msgstr "Titulu gabekoa"

@@ -1115,6 +1251,10 @@ msgstr "Iluna"
 msgid "Uncompleted to-dos on top"
 msgstr "Bete gabeko zereginak erakutsi zerrendaren goiko partean"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Bete gabeko zereginak erakutsi zerrendaren goiko partean"
+
 msgid "Sort notes by"
 msgstr ""

@@ -1153,8 +1293,8 @@ msgid "Editor font family"
 msgstr ""

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""

 msgid "Automatically update the application"
@@ -1219,6 +1359,18 @@ msgstr "Nextcloud erabiltzaile-izena"
 msgid "WebDAV password"
 msgstr "Ezarri pasahitza"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Balio aukera baliogabea: \"%s\". Litezkeen balioak: %s."
@@ -1337,6 +1489,10 @@ msgstr "Mugitu %d oharrak \"%s\" koadernora?"
 msgid "Press to set the decryption password."
 msgstr "Sakatu deszifratze pasahitza ezartzeko."

+#, fuzzy
+msgid "Save alarm"
+msgstr "Ezarri alarma"
+
 msgid "Select date"
 msgstr "Data aukeratu"

@@ -1346,12 +1502,32 @@ msgstr "Baieztatu"
 msgid "Cancel synchronisation"
 msgstr "Sinkronizazioa utzi"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Itemak eskuratuta: %d%d."
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr ""

@@ -1398,6 +1574,14 @@ msgstr "Gorde aldaketak"
 msgid "Discard changes"
 msgstr "Bertan behera utzi aldaketak"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Irudi formatua ez onartua: %s"
@@ -1408,6 +1592,9 @@ msgstr "Argazkia erantsi"
 msgid "Attach any file"
 msgstr "Erantsi fitxategiren bat"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Oharra bihurtu"

--- a/CliClient/locales/fr_FR.po
+++ b/CliClient/locales/fr_FR.po
@@ -229,7 +229,7 @@ msgid "The possible commands are:"
 msgstr "Les commandes possibles sont :"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -365,10 +365,12 @@ msgstr "Supprimer le carnet."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Supprimer le carnet sans demander la confirmation."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
-"Effacer le carnet ? Toutes les notes dans ce carnet seront également "
-"effacées."
+"Effacer le carnet ? Toutes les notes et sous-carnets dans ce carnet seront "
+"également effacés."

 msgid "Deletes the notes matching <note-pattern>."
 msgstr "Supprimer les notes correspondants à <note-pattern>."
@@ -625,6 +627,15 @@ msgstr "Couper"
 msgid "Paste"
 msgstr "Coller"

+msgid "Bold"
+msgstr "Gras"
+
+msgid "Italic"
+msgstr "Italique"
+
+msgid "Edit in external editor"
+msgstr "Ouvrir dans un éditeur externe"
+
 msgid "Search in all the notes"
 msgstr "Chercher dans toutes les notes"

@@ -643,6 +654,9 @@ msgstr "Outils"
 msgid "Synchronisation status"
 msgstr "État de la synchronisation"

+msgid "Web clipper options"
+msgstr "Options du Web Clipper"
+
 msgid "Encryption options"
 msgstr "Options de cryptage"

@@ -694,6 +708,56 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr "Le service du Web Clipper est activé et démarrera automatiquement."
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr "État : Démarré sur le port %d"
+
+#, javascript-format
+msgid "Status: %s"
+msgstr "État : %s"
+
+msgid "Disable Web Clipper Service"
+msgstr "Désactiver le service du Web Clipper"
+
+msgid "The web clipper service is not enabled."
+msgstr "Le service du Web Clipper n'est pas activé."
+
+msgid "Enable Web Clipper Service"
+msgstr "Activer le service du Web Clipper"
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+"Le Web Clipper permet d'enregistrer des pages web et des captures d'écran "
+"depuis votre navigateur vers Joplin."
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr "Pour utiliser le Web Clipper, veuillez suivre ces instructions :"
+
+msgid "Step 1: Enable the clipper service"
+msgstr "Étape 1 : Activez le service du Web Clipper"
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+"Le service permet au module complémentaire de communiquer avec Joplin. "
+"Lorsque vous aller l'activer, il se pourrait que votre pare feu vous demande "
+"d'autoriser l'application Joplin."
+
+msgid "Step 2: Install the extension"
+msgstr "Étape 2 : Installez le module complémentaire"
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+"Téléchargez et installez le module complémentaire correspondant à votre "
+"navigateur :"
+
 msgid "Check synchronisation configuration"
 msgstr "Vérifier config synchronisation"

@@ -764,7 +828,7 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 "Note : seule une clef maître va être utilisée pour le cryptage (celle "
-"marquée comme \"actif\" ci-dessus). N'importe quel clef peut-être utilisée "
+"marquée comme \"actif\" ci-dessus). N'importe quelle clef peut être utilisée "
 "pour le décryptage, selon la façon dont les notes ou carnets étaient cryptés "
 "à l'origine."

@@ -821,6 +885,9 @@ msgstr "Séparez chaque étiquette par une virgule."
 msgid "Rename notebook:"
 msgstr "Renommer le carnet :"

+msgid "Rename tag:"
+msgstr "Renommer étiquette :"
+
 msgid "Set alarm:"
 msgstr "Régler alarme :"

@@ -848,6 +915,9 @@ msgstr "Gérer les étiquettes"
 msgid "Switch between note and to-do type"
 msgstr "Alterner entre note et tâche"

+msgid "Copy Markdown link"
+msgstr "Copier lien Markdown"
+
 msgid "Delete"
 msgstr "Supprimer"

@@ -867,13 +937,40 @@ msgstr ""
 msgid "Open..."
 msgstr "Ouvrir..."

+#, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Ce fichier n'a pas pu être ouvert : %s"
+
 msgid "Save as..."
 msgstr "Enregistrer sous..."

+msgid "Copy path to clipboard"
+msgstr "Copier le chemin"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Lien ou message non géré : %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Cette note n'a pas de contenu. Cliquer sur \"%s\" pour basculer vers "
+"l'éditeur et éditer cette note."
+
+msgid "strong text"
+msgstr "texte en gras"
+
+msgid "emphasized text"
+msgstr "texte en italique"
+
+msgid "List item"
+msgstr "Élément de liste"
+
+msgid "Insert Hyperlink"
+msgstr "Insérer lien"
+
 msgid "Attach file"
 msgstr "Attacher un fichier"

@@ -884,12 +981,35 @@ msgid "Set alarm"
 msgstr "Régler alarme"

 #, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-"Cette note n'a pas de contenu. Cliquer sur \"%s\" pour basculer vers "
-"l'éditeur et éditer cette note."
+msgid "In: %s"
+msgstr "Dans : %s"
+
+msgid "Hyperlink"
+msgstr "Lien"
+
+msgid "Code"
+msgstr "Code"
+
+msgid "Numbered List"
+msgstr "Liste numérotée"
+
+msgid "Bulleted List"
+msgstr "Liste à puces"
+
+msgid "Checkbox"
+msgstr "Case à cocher"
+
+msgid "Heading"
+msgstr "Titre"
+
+msgid "Horizontal Rule"
+msgstr "Règle horizontale"
+
+msgid "Click to stop external editing"
+msgstr "Cliquez pour arrêter l'édition externe"
+
+msgid "Watching..."
+msgstr "En cours..."

 msgid "to-do"
 msgstr "tâche"
@@ -922,6 +1042,9 @@ msgstr "État de la synchronisation"
 msgid "Encryption Options"
 msgstr "Options de cryptage"

+msgid "Clipper Options"
+msgstr "Options du Web Clipper"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Enlever cette étiquette de toutes les notes ?"

@@ -1063,6 +1186,9 @@ msgstr "Les objets cryptés ne peuvent être modifiés"
 msgid "Conflicts"
 msgstr "Conflits"

+msgid "Cannot move notebook to this location"
+msgstr "Impossible de déplacer le carnet vers le carnet \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Un carnet avec ce titre existe déjà : \"%s\""
@@ -1071,6 +1197,15 @@ msgstr "Un carnet avec ce titre existe déjà : \"%s\""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Les carnets ne peuvent être nommés \"%s\" car c'est un nom réservé."

+msgid "title"
+msgstr "titre"
+
+msgid "updated date"
+msgstr "Date modification"
+
+msgid "created date"
+msgstr "Date création"
+
 msgid "Untitled"
 msgstr "Sans titre"

@@ -1116,6 +1251,9 @@ msgstr "Sombre"
 msgid "Uncompleted to-dos on top"
 msgstr "Tâches non-terminées en haut"

+msgid "Show completed to-dos"
+msgstr "Afficher les tâches complétées"
+
 msgid "Sort notes by"
 msgstr "Trier les notes par"

@@ -1138,7 +1276,7 @@ msgid "When creating a new note:"
 msgstr "Lors de la création d'une note :"

 msgid "Show tray icon"
-msgstr "Afficher icône dans la zone de notifications"
+msgstr "Afficher l'icône dans la zone de notifications"

 msgid "Note: Does not work in all desktop environments."
 msgstr "Note : Ne fonctionne pas dans tous les environnements de bureau."
@@ -1150,10 +1288,11 @@ msgid "Editor font family"
 msgstr "Police de l'éditeur"

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
-"Le nom de la police ne sera pas vérifié. Si incorrect ou vide une police "
+"Il faut que ce soit une police *monospace* ou cela ne fonctionnera pas "
+"correctement. Si la police est incorrecte ou non-spécifiée, une police "
 "monospace sera utilisée par défaut."

 msgid "Automatically update the application"
@@ -1216,6 +1355,21 @@ msgstr "WebDAV : Nom utilisateur"
 msgid "WebDAV password"
 msgstr "WebDAV : Mot de passe"

+msgid "Custom TLS certificates"
+msgstr "Certificats TLS personnalisés"
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+"Liste séparée par des virgules contenant les chemins des répertoires "
+"contenants des certificats, ou les chemins de certificats individuels. Par "
+"exemple : /my/cert_dir, /other/custom.pem"
+
+msgid "Ignore TLS certificate errors"
+msgstr "Ignorer les erreurs de certificats TLS"
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Option invalide: \"%s\". Les valeurs possibles sont : %s."
@@ -1336,6 +1490,9 @@ msgstr "Déplacer %d notes vers carnet \"%s\" ?"
 msgid "Press to set the decryption password."
 msgstr "Définir mot de passe de synchronisation."

+msgid "Save alarm"
+msgstr "Enregistrer alarme"
+
 msgid "Select date"
 msgstr "Sélectionner date"

@@ -1345,12 +1502,38 @@ msgstr "Confirmer"
 msgid "Cancel synchronisation"
 msgstr "Annuler synchronisation"

+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Décryptage des objets : %d/%d."
+
 msgid "New tags:"
 msgstr "Nouvelles étiquettes :"

 msgid "Type new tags or select from list"
 msgstr "Entrez de nouvelles étiquettes ou sélectionnez de la liste"

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+"Pour fonctionner correctement, l'appli a besoin des autorisations suivantes. "
+"Veuillez les activer dans les paramètres de votre téléphone, dans le menu "
+"Applications > Joplin > Autorisations"
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+"- Stockage : Pour attacher des fichiers aux notes et pour activer la "
+"synchronisation vers le système de fichier."
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+"- Appareil photo : Pour pouvoir prendre une photo et l'attacher à une note."
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr "- Position : Pour attacher à une note les coordonnées GPS."
+
 msgid "Joplin website"
 msgstr "Site web de Joplin"

@@ -1396,6 +1579,15 @@ msgstr "Enregistrer les changements"
 msgid "Discard changes"
 msgstr "Ignorer les changements"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr "Aucun objet avec identifiant %s"
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+"L'application mobile Joplin ne gère pas pour l'instant ce type de lien : %s"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Type d'image non géré : %s"
@@ -1406,6 +1598,9 @@ msgstr "Attacher une photo"
 msgid "Attach any file"
 msgstr "Attacher un fichier"

+msgid "Share"
+msgstr "Partager"
+
 msgid "Convert to note"
 msgstr "Convertir en note"

--- a/CliClient/locales/gl_ES.po
+++ b/CliClient/locales/gl_ES.po
@@ -226,7 +226,7 @@ msgid "The possible commands are:"
 msgstr "As ordes posíbeis son:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -364,7 +364,10 @@ msgstr "Eliminar o carderno indicado."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Elimina o caderno indicado sen solicitar confirmación."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Desexa eliminar o caderno? Tamén se eliminarán todas as notas deste caderno."

@@ -616,6 +619,15 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Pegar"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Buscar en todas as notas"

@@ -634,6 +646,9 @@ msgstr "Ferramentas"
 msgid "Synchronisation status"
 msgstr "Estado da sincronización"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Opcións de cifrado"

@@ -684,6 +699,49 @@ msgstr "Si"
 msgid "No"
 msgstr "Non"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Estado: %s."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Comprobar a configuración da sincronización"

@@ -805,6 +863,10 @@ msgstr "Separar cada etiqueta por unha coma."
 msgid "Rename notebook:"
 msgstr "Renomear caderno:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Renomear"
+
 msgid "Set alarm:"
 msgstr "Estabelecer alarma:"

@@ -832,6 +894,10 @@ msgstr "Engadir ou eliminar etiquetas"
 msgid "Switch between note and to-do type"
 msgstr "Cambiar entre notas e tarefas"

+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Eliminar"

@@ -848,13 +914,40 @@ msgstr "Este no é un caderno. Cree un, premendo en «Novo caderno»."
 msgid "Open..."
 msgstr "Abrir…"

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Non foi posíbel gardar o caderno: %s"
+
 msgid "Save as..."
 msgstr "Gardar como…"

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Ligazón ou mensaxe incompatíbeis: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Esta nota non ten contido. Prema en «%s» para ir ao editor e modificar a "
+"nota."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Anexar un ficheiro"

@@ -864,13 +957,37 @@ msgstr "Etiquetas"
 msgid "Set alarm"
 msgstr "Estabelecer alarma"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""
-"Esta nota non ten contido. Prema en «%s» para ir ao editor e modificar a "
-"nota."
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Cancelando..."

 msgid "to-do"
 msgstr "tarefas pendentes"
@@ -903,6 +1020,10 @@ msgstr "Estado da sincronización"
 msgid "Encryption Options"
 msgstr "Opcións de cifrado"

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Opcións xerais"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Desexa eliminar esta etiqueta de todas as notas?"

@@ -1043,6 +1164,10 @@ msgstr "Non é posíbel modificar elementos cifrados"
 msgid "Conflicts"
 msgstr "Conflitos"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Non é posíbel mover a nota ao caderno «%s»"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Xa existe un caderno con ese título: «%s»"
@@ -1051,6 +1176,18 @@ msgstr "Xa existe un caderno con ese título: «%s»"
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Os cadernos non poden levar o nome «%s» porque é un título reservado."

+#, fuzzy
+msgid "title"
+msgstr "Sen título"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Actualizado: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Creado: %d."
+
 msgid "Untitled"
 msgstr "Sen título"

@@ -1096,6 +1233,10 @@ msgstr "Escuro"
 msgid "Uncompleted to-dos on top"
 msgstr "Tarefas sen completar arriba"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Tarefas sen completar arriba"
+
 msgid "Sort notes by"
 msgstr "Ordenar notas por"

@@ -1129,9 +1270,10 @@ msgstr "Porcentaxe de ampliación"
 msgid "Editor font family"
 msgstr "Familia de tipos de letra do editor"

+#, fuzzy
 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 "Non se comprobará o nome da fonte. Se é incorrecto ou está baleiro, "
 "estabelecerase por omisión un tipo de letra xenérico de largura única."
@@ -1195,6 +1337,18 @@ msgstr "Usuario de WebDAV"
 msgid "WebDAV password"
 msgstr "Contrasinal do WebDAV"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Valor incorrecto de opción: «%s». Os valores posíbeis son: %s."
@@ -1313,6 +1467,10 @@ msgstr "Mover %d notas para o caderno \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Prema para estabelecer o contrasinal de descifrado."

+#, fuzzy
+msgid "Save alarm"
+msgstr "Estabelecer alarma"
+
 msgid "Select date"
 msgstr "Seleccionar data"

@@ -1322,12 +1480,32 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementos obtidos: %d/%d."
+
 msgid "New tags:"
 msgstr "Etiquetas novas:"

 msgid "Type new tags or select from list"
 msgstr "Escriba etiquetas novas ou seleccione da lista"

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr "Sitio web de Joplin"

@@ -1374,6 +1552,14 @@ msgstr "Gardar cambios"
 msgid "Discard changes"
 msgstr "Desbotar os cambios"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imaxe incompatíbel: %s"
@@ -1384,6 +1570,9 @@ msgstr "Anexar foto"
 msgid "Attach any file"
 msgstr "Adxuntar calquera ficheiro"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converter para nota"

--- a/CliClient/locales/hr_HR.po
+++ b/CliClient/locales/hr_HR.po
@@ -229,15 +229,11 @@ msgstr ""
 msgid "The possible commands are:"
 msgstr "Moguće naredbe su:"

-#, fuzzy
 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
-"In any command, a note or notebook can be refered to by title or ID, or "
-"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
-"note or notebook. `$c` can be used to refer to the currently selected item."

 msgid "To move from one pane to another, press Tab or Shift+Tab."
 msgstr "Za prijelaz iz jednog okna u drugo, pritisni Tab ili Shift+Tab."
@@ -372,7 +368,10 @@ msgstr "Briše datu bilježnicu."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Briše bilježnicu bez traženja potvrde."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Obrisati bilježnicu? Sve bilješke u toj bilježnici će također biti obrisane."

@@ -626,6 +625,15 @@ msgstr "Izreži"
 msgid "Paste"
 msgstr "Zalijepi"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Pretraži u svim bilješkama"

@@ -644,6 +652,9 @@ msgstr "Alati"
 msgid "Synchronisation status"
 msgstr "Status sinkronizacije"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""

@@ -697,6 +708,49 @@ msgstr ""
 msgid "No"
 msgstr "N"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Stanje: \"%s\"."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Prekini sinkronizaciju"
@@ -808,6 +862,10 @@ msgstr "Odvoji oznake zarezom."
 msgid "Rename notebook:"
 msgstr "Preimenuj bilježnicu:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Preimenuj"
+
 msgid "Set alarm:"
 msgstr "Postavi upozorenje:"

@@ -837,6 +895,9 @@ msgstr "Dodaj ili makni oznake"
 msgid "Switch between note and to-do type"
 msgstr "Zamijeni bilješku i zadatak"

+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Obriši"

@@ -853,14 +914,39 @@ msgstr "Ovdje nema bilježnica. Stvori novu pritiskom na \"Nova bilježnica\"."
 msgid "Open..."
 msgstr ""

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Bilježnicu nije moguće snimiti: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Spremi promjene"

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana poveznica ili poruka: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Priloži datoteku"

@@ -870,12 +956,38 @@ msgstr "Oznake"
 msgid "Set alarm"
 msgstr "Postavi upozorenje"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""

+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Prekidam..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Novi zadatak"
@@ -909,6 +1021,10 @@ msgstr "Status Sinkronizacije"
 msgid "Encryption Options"
 msgstr ""

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Opcije"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Makni ovu oznaku iz svih bilješki?"

@@ -1048,6 +1164,10 @@ msgstr "Neke stavke se ne mogu sinkronizirati."
 msgid "Conflicts"
 msgstr "Sukobi"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Ne mogu premjestiti bilješku u bilježnicu %s"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Bilježnica s ovim naslovom već postoji: \"%s\""
@@ -1056,6 +1176,18 @@ msgstr "Bilježnica s ovim naslovom već postoji: \"%s\""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Naslov \"%s\" je rezerviran i ne može se koristiti."

+#, fuzzy
+msgid "title"
+msgstr "Nenaslovljen"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Ažurirano: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Stvoreno: %d."
+
 msgid "Untitled"
 msgstr "Nenaslovljen"

@@ -1102,6 +1234,10 @@ msgstr "Tamna"
 msgid "Uncompleted to-dos on top"
 msgstr "Prikaži nezavršene zadatke na vrhu liste"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Prikaži nezavršene zadatke na vrhu liste"
+
 msgid "Sort notes by"
 msgstr ""

@@ -1140,8 +1276,8 @@ msgid "Editor font family"
 msgstr ""

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""

 msgid "Automatically update the application"
@@ -1201,6 +1337,18 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Nevažeća vrijednost: \"%s\". Moguće vrijednosti su: %s."
@@ -1317,6 +1465,10 @@ msgstr "Premjesti %d bilješke u bilježnicu \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr ""

+#, fuzzy
+msgid "Save alarm"
+msgstr "Postavi upozorenje"
+
 msgid "Select date"
 msgstr "Odaberi datum"

@@ -1326,12 +1478,32 @@ msgstr "Potvrdi"
 msgid "Cancel synchronisation"
 msgstr "Prekini sinkronizaciju"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Stvorene lokalne stavke: %d."
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr ""

@@ -1379,6 +1551,14 @@ msgstr "Spremi promjene"
 msgid "Discard changes"
 msgstr "Odbaci promjene"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodržana vrsta slike: %s"
@@ -1389,6 +1569,9 @@ msgstr "Priloži sliku"
 msgid "Attach any file"
 msgstr "Priloži datoteku"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Pretvori u bilješku"

--- a/CliClient/locales/it_IT.po
+++ b/CliClient/locales/it_IT.po
@@ -226,7 +226,7 @@ msgid "The possible commands are:"
 msgstr "I possibili comandi sono:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -364,7 +364,9 @@ msgstr "Elimina il seguente blocco note."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Elimina il blocco note senza richiedere una conferma."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""

 msgid "Deletes the notes matching <note-pattern>."
@@ -608,6 +610,15 @@ msgstr "Taglia"
 msgid "Paste"
 msgstr "Incolla"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Cerca in tutte le note"

@@ -626,6 +637,9 @@ msgstr "Strumenti"
 msgid "Synchronisation status"
 msgstr "Stato di sincronizzazione"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""

@@ -679,6 +693,49 @@ msgstr ""
 msgid "No"
 msgstr "N"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Stato: \"%s\"."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Cancella la sincronizzazione"
@@ -790,6 +847,10 @@ msgstr "Separa ogni etichetta da una virgola."
 msgid "Rename notebook:"
 msgstr "Rinomina il blocco note:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Rinomina"
+
 msgid "Set alarm:"
 msgstr "Imposta allarme:"

@@ -819,6 +880,9 @@ msgstr "Aggiungi o rimuovi etichetta"
 msgid "Switch between note and to-do type"
 msgstr "Passa da un tipo di nota a un elenco di attività"

+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Elimina"

@@ -836,14 +900,39 @@ msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
 msgid "Open..."
 msgstr ""

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Il blocco note non può essere salvato: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Salva i cambiamenti"

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Collegamento o messaggio non supportato: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Allega file"

@@ -853,12 +942,38 @@ msgstr "Etichette"
 msgid "Set alarm"
 msgstr "Imposta allarme"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""

+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Cancellazione..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Nuova attività"
@@ -892,6 +1007,10 @@ msgstr "Stato della Sincronizzazione"
 msgid "Encryption Options"
 msgstr ""

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Opzioni"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Rimuovere questa etichetta da tutte le note?"

@@ -1034,6 +1153,10 @@ msgstr "Alcuni elementi non possono essere sincronizzati."
 msgid "Conflicts"
 msgstr "Conflitti"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Non posso spostare la nota nel blocco note \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Esiste già un blocco note col titolo \"%s\""
@@ -1042,6 +1165,18 @@ msgstr "Esiste già un blocco note col titolo \"%s\""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "I blocchi non possono essere chiamati \"%s\". È un titolo riservato."

+#, fuzzy
+msgid "title"
+msgstr "Senza titolo"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Aggiornato: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Creato: %d."
+
 msgid "Untitled"
 msgstr "Senza titolo"

@@ -1088,6 +1223,10 @@ msgstr "Scuro"
 msgid "Uncompleted to-dos on top"
 msgstr "Mostra todo inclompleti in cima alla lista"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Mostra todo inclompleti in cima alla lista"
+
 msgid "Sort notes by"
 msgstr ""

@@ -1126,8 +1265,8 @@ msgid "Editor font family"
 msgstr ""

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""

 msgid "Automatically update the application"
@@ -1187,6 +1326,18 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Oprione non valida: \"%s\". I valori possibili sono: %s."
@@ -1303,6 +1454,10 @@ msgstr "Spostare le note %d sul blocco note \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr ""

+#, fuzzy
+msgid "Save alarm"
+msgstr "Imposta allarme"
+
 msgid "Select date"
 msgstr "Seleziona la data"

@@ -1312,12 +1467,32 @@ msgstr "Conferma"
 msgid "Cancel synchronisation"
 msgstr "Cancella la sincronizzazione"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Elementi locali creati: %d."
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr ""

@@ -1365,6 +1540,14 @@ msgstr "Salva i cambiamenti"
 msgid "Discard changes"
 msgstr "Ignora modifiche"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"
@@ -1375,6 +1558,9 @@ msgstr "Allega foto"
 msgid "Attach any file"
 msgstr "Allega qualsiasi file"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converti in nota"

--- a/CliClient/locales/ja_JP.po
+++ b/CliClient/locales/ja_JP.po
@@ -224,7 +224,7 @@ msgid "The possible commands are:"
 msgstr "有効なコマンドは："

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -361,7 +361,10 @@ msgstr "指定されたノートブックを削除します。"
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "ノートブックを確認なしで削除します。"

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "ノートブックを削除しますか？中にあるノートはすべて消えてしまいます。"

 msgid "Deletes the notes matching <note-pattern>."
@@ -609,6 +612,15 @@ msgstr "切り取り"
 msgid "Paste"
 msgstr "貼り付け"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "すべてのノートを検索"

@@ -627,6 +639,9 @@ msgstr "ツール"
 msgid "Synchronisation status"
 msgstr "同期状況"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""

@@ -679,6 +694,49 @@ msgstr ""
 msgid "No"
 msgstr ""

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "状態: \"%s\"。"
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "同期の中止"
@@ -794,6 +852,10 @@ msgstr "それぞれのタグをカンマ(,)で区切ってください。"
 msgid "Rename notebook:"
 msgstr "ノートブックの名前を変更："

+#, fuzzy
+msgid "Rename tag:"
+msgstr "名前の変更"
+
 msgid "Set alarm:"
 msgstr "アラームをセット："

@@ -823,6 +885,9 @@ msgstr "タグの追加・削除"
 msgid "Switch between note and to-do type"
 msgstr "ノートとToDoを切り替え"

+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "削除"

@@ -839,14 +904,39 @@ msgstr "ノートブックがありません。新しいノートブックを作
 msgid "Open..."
 msgstr ""

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "ノートブックは保存できませんでした：%s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "変更を保存"

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "ファイルを添付"

@@ -857,11 +947,37 @@ msgid "Set alarm"
 msgstr "アラームをセット"

 #, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+msgid "In: %s"
 msgstr ""

+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "中止中..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "新しいToDo"
@@ -895,6 +1011,10 @@ msgstr "同期状況"
 msgid "Encryption Options"
 msgstr ""

+#, fuzzy
+msgid "Clipper Options"
+msgstr "オプション"
+
 msgid "Remove this tag from all the notes?"
 msgstr "すべてのノートからこのタグを削除しますか？"

@@ -1036,6 +1156,10 @@ msgstr "いくつかの項目は同期されませんでした。"
 msgid "Conflicts"
 msgstr "衝突"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "ノートをノートブック \"%s\"に移動できませんでした。"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "\"%s\"という名前のノートブックはすでに存在しています。"
@@ -1046,6 +1170,18 @@ msgstr ""
 "\"%s\"と言う名前はシステムで使用するために予約済みです。名前の変更が出来ませ"
 "ん。"

+#, fuzzy
+msgid "title"
+msgstr "名称未設定"
+
+#, fuzzy
+msgid "updated date"
+msgstr "アップデートしました：%d"
+
+#, fuzzy
+msgid "created date"
+msgstr "作成しました：%d"
+
 msgid "Untitled"
 msgstr "名称未設定"

@@ -1092,6 +1228,10 @@ msgstr "暗い"
 msgid "Uncompleted to-dos on top"
 msgstr "未完のToDoをリストの上部に表示"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "未完のToDoをリストの上部に表示"
+
 msgid "Sort notes by"
 msgstr ""

@@ -1130,8 +1270,8 @@ msgid "Editor font family"
 msgstr ""

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""

 msgid "Automatically update the application"
@@ -1191,6 +1331,18 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "無効な設定値: \"%s\"。有効な値は: %sです。"
@@ -1307,6 +1459,10 @@ msgstr "%d個のノートを\"%s\"に移動しますか？"
 msgid "Press to set the decryption password."
 msgstr ""

+#, fuzzy
+msgid "Save alarm"
+msgstr "アラームをセット"
+
 msgid "Select date"
 msgstr "日付の選択"

@@ -1316,12 +1472,32 @@ msgstr "確認"
 msgid "Cancel synchronisation"
 msgstr "同期の中止"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "ローカルアイテムの作成: %d."
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr ""

@@ -1369,6 +1545,14 @@ msgstr "変更を保存"
 msgid "Discard changes"
 msgstr "変更を破棄"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "サポートされていないイメージ形式: %s."
@@ -1379,6 +1563,9 @@ msgstr "写真を添付"
 msgid "Attach any file"
 msgstr "ファイルを添付"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "ノートに変換"

--- a/CliClient/locales/joplin.pot
+++ b/CliClient/locales/joplin.pot
@@ -210,7 +210,7 @@ msgid "The possible commands are:"
 msgstr ""

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -332,7 +332,9 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""

 msgid "Deletes the notes matching <note-pattern>."
@@ -550,6 +552,15 @@ msgstr ""
 msgid "Paste"
 msgstr ""

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr ""

@@ -568,6 +579,9 @@ msgstr ""
 msgid "Synchronisation status"
 msgstr ""

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr ""

@@ -618,6 +632,49 @@ msgstr ""
 msgid "No"
 msgstr ""

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, javascript-format
+msgid "Status: %s"
+msgstr ""
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr ""

@@ -726,6 +783,9 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""

+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""

@@ -753,6 +813,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""

+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""

@@ -769,13 +832,38 @@ msgstr ""
 msgid "Open..."
 msgstr ""

+#, javascript-format
+msgid "This file could not be opened: %s"
+msgstr ""
+
 msgid "Save as..."
 msgstr ""

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr ""

@@ -786,9 +874,34 @@ msgid "Set alarm"
 msgstr ""

 #, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+msgid "In: %s"
+msgstr ""
+
+msgid "Hyperlink"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+msgid "Watching..."
 msgstr ""

 msgid "to-do"
@@ -822,6 +935,9 @@ msgstr ""
 msgid "Encryption Options"
 msgstr ""

+msgid "Clipper Options"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr ""

@@ -954,6 +1070,9 @@ msgstr ""
 msgid "Conflicts"
 msgstr ""

+msgid "Cannot move notebook to this location"
+msgstr ""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr ""
@@ -962,6 +1081,15 @@ msgstr ""
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""

+msgid "title"
+msgstr ""
+
+msgid "updated date"
+msgstr ""
+
+msgid "created date"
+msgstr ""
+
 msgid "Untitled"
 msgstr ""

@@ -1005,6 +1133,9 @@ msgstr ""
 msgid "Uncompleted to-dos on top"
 msgstr ""

+msgid "Show completed to-dos"
+msgstr ""
+
 msgid "Sort notes by"
 msgstr ""

@@ -1039,8 +1170,8 @@ msgid "Editor font family"
 msgstr ""

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""

 msgid "Automatically update the application"
@@ -1098,6 +1229,18 @@ msgstr ""
 msgid "WebDAV password"
 msgstr ""

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
@@ -1211,6 +1354,9 @@ msgstr ""
 msgid "Press to set the decryption password."
 msgstr ""

+msgid "Save alarm"
+msgstr ""
+
 msgid "Select date"
 msgstr ""

@@ -1220,12 +1366,32 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""

+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr ""
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr ""

@@ -1271,6 +1437,14 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
@@ -1281,6 +1455,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""

--- a/CliClient/locales/nl_BE.po
+++ b/CliClient/locales/nl_BE.po
@@ -230,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Mogelijke commando's zijn:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -369,7 +369,10 @@ msgstr "Verwijdert het opgegeven notitieboek."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Verwijdert het notitieboek zonder te vragen om bevestiging."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Notitieboek verwijderen? Alle notities in dit notitieboek zullen ook "
 "verwijderd worden."
@@ -626,6 +629,15 @@ msgstr "Knip"
 msgid "Paste"
 msgstr "Plak"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Zoek in alle notities"

@@ -644,6 +656,9 @@ msgstr "Tools"
 msgid "Synchronisation status"
 msgstr "Synchronisatie status"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Versleutelopties"

@@ -696,6 +711,49 @@ msgstr ""
 msgid "No"
 msgstr "N"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Status: \"%s\""
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Annuleer synchronisatie"
@@ -819,6 +877,10 @@ msgstr "Scheid iedere tag met een komma."
 msgid "Rename notebook:"
 msgstr "Hernoem notitieboek:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Hernoem"
+
 msgid "Set alarm:"
 msgstr "Stel melding in:"

@@ -847,6 +909,9 @@ msgstr "Voeg tag toe of verwijder tag"
 msgid "Switch between note and to-do type"
 msgstr "Wissel tussen notitie en to-do type"

+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "Verwijderen"

@@ -865,14 +930,39 @@ msgstr ""
 msgid "Open..."
 msgstr ""

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Het notitieboek kon niet opgeslaan worden: %s"
+
 #, fuzzy
 msgid "Save as..."
 msgstr "Sla wijzigingen op"

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Link of bericht \"%s\" wordt niet ondersteund"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Voeg bestand toe"

@@ -882,12 +972,38 @@ msgstr "Tags"
 msgid "Set alarm"
 msgstr "Zet melding"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""

+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Annuleren..."
+
 #, fuzzy
 msgid "to-do"
 msgstr "Nieuwe to-do"
@@ -921,6 +1037,10 @@ msgstr "Synchronisatie status"
 msgid "Encryption Options"
 msgstr "Versleutelopties"

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Algemene opties"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Deze tag verwijderen van alle notities?"

@@ -1062,6 +1182,10 @@ msgstr "Versleutelde items kunnen niet aangepast worden"
 msgid "Conflicts"
 msgstr "Conflicten"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Kan notitie niet naar notitieboek \"%s\" verplaatsen."
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Er bestaat al een notitieboek met \"%s\" als titel"
@@ -1072,6 +1196,18 @@ msgstr ""
 "Notitieboeken kunnen niet \"%s\" genoemd worden, dit is een gereserveerd "
 "woord."

+#, fuzzy
+msgid "title"
+msgstr "Untitled"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Bijgewerkt: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Aangemaakt: %d."
+
 msgid "Untitled"
 msgstr "Untitled"

@@ -1119,6 +1255,10 @@ msgstr "Donker"
 msgid "Uncompleted to-dos on top"
 msgstr "Toon onvoltooide to-do's aan de top van de lijsten"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Toon onvoltooide to-do's aan de top van de lijsten"
+
 msgid "Sort notes by"
 msgstr ""

@@ -1156,8 +1296,8 @@ msgid "Editor font family"
 msgstr ""

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""

 msgid "Automatically update the application"
@@ -1219,6 +1359,18 @@ msgstr ""
 msgid "WebDAV password"
 msgstr "Stel wachtwoord in"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ongeldige optie: \"%s\". Geldige waarden zijn: %s."
@@ -1339,6 +1491,10 @@ msgstr "Verplaats %d notities naar notitieboek \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Klik om het decryptie wachtwoord in te stellen"

+#, fuzzy
+msgid "Save alarm"
+msgstr "Zet melding"
+
 msgid "Select date"
 msgstr "Selecteer datum"

@@ -1348,12 +1504,32 @@ msgstr "Bevestig"
 msgid "Cancel synchronisation"
 msgstr "Annuleer synchronisatie"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Opgehaalde items: %d/%d."
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr ""

@@ -1400,6 +1576,14 @@ msgstr "Sla wijzigingen op"
 msgid "Discard changes"
 msgstr "Verwijder wijzigingen"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Afbeeldingstype %s wordt niet ondersteund"
@@ -1410,6 +1594,9 @@ msgstr "Voeg foto toe"
 msgid "Attach any file"
 msgstr "Voeg bestand toe"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converteer naar notitie"

--- a/CliClient/locales/pt_BR.po
+++ b/CliClient/locales/pt_BR.po
@@ -227,7 +227,7 @@ msgid "The possible commands are:"
 msgstr "Os comandos possíveis são:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -363,7 +363,10 @@ msgstr "Exclui o caderno informado."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Exclui o caderno sem pedir confirmação."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr ""
 "Excluir o caderno? Todas as notas deste caderno notebook também serão "
 "excluídas."
@@ -623,6 +626,15 @@ msgstr "Cortar"
 msgid "Paste"
 msgstr "Colar"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Pesquisar em todas as notas"

@@ -641,6 +653,9 @@ msgstr "Ferramentas"
 msgid "Synchronisation status"
 msgstr "Status de sincronização"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Opções de Encriptação"

@@ -691,6 +706,49 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Estado: \"%s\"."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Verificar a configuração da sincronização"

@@ -815,6 +873,10 @@ msgstr "Separe cada tag por vírgula."
 msgid "Rename notebook:"
 msgstr "Renomear caderno:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Renomear"
+
 msgid "Set alarm:"
 msgstr "Definir alarme:"

@@ -842,6 +904,10 @@ msgstr "Adicionar ou remover tags"
 msgid "Switch between note and to-do type"
 msgstr "Alternar entre os tipos Nota e Tarefa"

+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Excluir"

@@ -858,13 +924,40 @@ msgstr "Atualmente, não há cadernos. Crie um, clicando em \"Novo caderno\"."
 msgid "Open..."
 msgstr "Abrir..."

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "O caderno não pôde ser salvo: %s"
+
 msgid "Save as..."
 msgstr "Salvar como..."

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Link ou mensagem não suportada: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Esta nota não possui conteúdo. Clique em \"%s\" para alternar para o editor, "
+"e edite a nota."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Anexar arquivo"

@@ -874,13 +967,37 @@ msgstr "Tags"
 msgid "Set alarm"
 msgstr "Definir alarme"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""
-"Esta nota não possui conteúdo. Clique em \"%s\" para alternar para o editor, "
-"e edite a nota."
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Cancelando..."

 msgid "to-do"
 msgstr "tarefa"
@@ -913,6 +1030,10 @@ msgstr "Status de sincronização"
 msgid "Encryption Options"
 msgstr "Opções de Encriptação"

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Opções Gerais"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Remover esta tag de todas as notas?"

@@ -1055,6 +1176,10 @@ msgstr "Itens encriptados não podem ser modificados"
 msgid "Conflicts"
 msgstr "Conflitos"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Não é possível mover a nota para o caderno \"%s\""
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Já existe caderno com este título: \"%s\""
@@ -1064,6 +1189,18 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr ""
 "Os cadernos não podem ser nomeados como\"%s\", que é um título reservado."

+#, fuzzy
+msgid "title"
+msgstr "Sem título"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Atualizado: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Criado: %d."
+
 msgid "Untitled"
 msgstr "Sem título"

@@ -1109,6 +1246,10 @@ msgstr "Dark"
 msgid "Uncompleted to-dos on top"
 msgstr "Mostrar tarefas incompletas no topo"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Mostrar tarefas incompletas no topo"
+
 msgid "Sort notes by"
 msgstr "Ordenar notas por"

@@ -1142,9 +1283,10 @@ msgstr "Porcentagem global do zoom"
 msgid "Editor font family"
 msgstr "Família de fontes do editor"

+#, fuzzy
 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 "O nomes da fonte não será verificado. Se estiver incorreto ou vazio, será "
 "usado por default uma fonte genérica monospace."
@@ -1208,6 +1350,18 @@ msgstr "Usuário do WebDAV"
 msgid "WebDAV password"
 msgstr "Senha do WebDAV"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Valor da opção inválida: \"%s\". Os valores possíveis são: %s."
@@ -1327,6 +1481,10 @@ msgstr "Mover %d notas para o caderno \"%s\"?"
 msgid "Press to set the decryption password."
 msgstr "Pressione para configurar a senha de decriptação."

+#, fuzzy
+msgid "Save alarm"
+msgstr "Definir alarme"
+
 msgid "Select date"
 msgstr "Selecionar data"

@@ -1336,12 +1494,32 @@ msgstr "Confirmar"
 msgid "Cancel synchronisation"
 msgstr "Cancelar sincronização"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Itens pesquisados: %d/%d."
+
 msgid "New tags:"
 msgstr "Novas tags:"

 msgid "Type new tags or select from list"
 msgstr "Digite novsa tags, ou selecione da lista"

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr "Site do Joplin"

@@ -1387,6 +1565,14 @@ msgstr "Gravar alterações"
 msgid "Discard changes"
 msgstr "Descartar alterações"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagem não suportada: %s"
@@ -1397,6 +1583,9 @@ msgstr "Anexar foto"
 msgid "Attach any file"
 msgstr "Anexar qualquer arquivo"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converter para nota"

--- a/CliClient/locales/ru_RU.po
+++ b/CliClient/locales/ru_RU.po
@@ -230,7 +230,7 @@ msgid "The possible commands are:"
 msgstr "Доступные команды:"

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
@@ -369,7 +369,10 @@ msgstr "Удаляет заданный блокнот."
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "Удаляет блокнот без запроса подтверждения."

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, fuzzy
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "Удалить блокнот? Все заметки в этом блокноте также будут удалены."

 msgid "Deletes the notes matching <note-pattern>."
@@ -623,6 +626,15 @@ msgstr "Вырезать"
 msgid "Paste"
 msgstr "Вставить"

+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Edit in external editor"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Поиск во всех заметках"

@@ -641,6 +653,9 @@ msgstr "Инструменты"
 msgid "Synchronisation status"
 msgstr "Статус синхронизации"

+msgid "Web clipper options"
+msgstr ""
+
 msgid "Encryption options"
 msgstr "Настройки шифрования"

@@ -691,6 +706,49 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr ""
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Status: %s"
+msgstr "Статус: «%s»."
+
+msgid "Disable Web Clipper Service"
+msgstr ""
+
+msgid "The web clipper service is not enabled."
+msgstr ""
+
+msgid "Enable Web Clipper Service"
+msgstr ""
+
+msgid ""
+"Joplin Web Clipper allows saving web pages and screenshots from your browser "
+"to Joplin."
+msgstr ""
+
+msgid "In order to use the web clipper, you need to do the following:"
+msgstr ""
+
+msgid "Step 1: Enable the clipper service"
+msgstr ""
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"enabling it your firewall may ask you to give permission to Joplin to listen "
+"to a particular port."
+msgstr ""
+
+msgid "Step 2: Install the extension"
+msgstr ""
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr ""
+
 msgid "Check synchronisation configuration"
 msgstr "Проверить настройки синхронизации"

@@ -814,6 +872,10 @@ msgstr "Каждый тег отделяется запятой."
 msgid "Rename notebook:"
 msgstr "Переименовать блокнот:"

+#, fuzzy
+msgid "Rename tag:"
+msgstr "Переименовать"
+
 msgid "Set alarm:"
 msgstr "Установить напоминание:"

@@ -842,6 +904,10 @@ msgstr "Добавить или удалить теги"
 msgid "Switch between note and to-do type"
 msgstr "Переключить тип между заметкой и задачей"

+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Удалить"

@@ -858,13 +924,40 @@ msgstr "Сейчас здесь нет блокнотов. Создайте но
 msgid "Open..."
 msgstr "Открыть..."

+#, fuzzy, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "Не удалось сохранить блокнот: %s"
+
 msgid "Save as..."
 msgstr "Сохранить как..."

+msgid "Copy path to clipboard"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Неподдерживаемая ссыка или сообщение: %s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr ""
+"Заметка пуста. Нажмите на «%s», чтобы переключиться в редактор и "
+"отредактировать её."
+
+msgid "strong text"
+msgstr ""
+
+msgid "emphasized text"
+msgstr ""
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr ""
+
 msgid "Attach file"
 msgstr "Прикрепить файл"

@@ -874,13 +967,37 @@ msgstr "Теги"
 msgid "Set alarm"
 msgstr "Установить напоминание"

-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
+#, fuzzy, javascript-format
+msgid "In: %s"
+msgstr "%s: %s"
+
+msgid "Hyperlink"
 msgstr ""
-"Заметка пуста. Нажмите на «%s», чтобы переключиться в редактор и "
-"отредактировать её."
+
+msgid "Code"
+msgstr ""
+
+msgid "Numbered List"
+msgstr ""
+
+msgid "Bulleted List"
+msgstr ""
+
+msgid "Checkbox"
+msgstr ""
+
+msgid "Heading"
+msgstr ""
+
+msgid "Horizontal Rule"
+msgstr ""
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "Отмена..."

 msgid "to-do"
 msgstr "задача"
@@ -913,6 +1030,10 @@ msgstr "Статус синхронизации"
 msgid "Encryption Options"
 msgstr "Настройки шифрования"

+#, fuzzy
+msgid "Clipper Options"
+msgstr "Основные настройки"
+
 msgid "Remove this tag from all the notes?"
 msgstr "Убрать этот тег со всех заметок?"

@@ -1053,6 +1174,10 @@ msgstr "Зашифрованные элементы не могут быть и
 msgid "Conflicts"
 msgstr "Конфликты"

+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Не удалось переместить заметку в блокнот «%s»"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Блокнот с таким названием уже существует: «%s»"
@@ -1061,6 +1186,18 @@ msgstr "Блокнот с таким названием уже существу
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
 msgstr "Блокнот не может быть назван «%s», это зарезервированное название."

+#, fuzzy
+msgid "title"
+msgstr "Без имени"
+
+#, fuzzy
+msgid "updated date"
+msgstr "Обновлено: %d."
+
+#, fuzzy
+msgid "created date"
+msgstr "Создано: %d."
+
 msgid "Untitled"
 msgstr "Без имени"

@@ -1106,6 +1243,10 @@ msgstr "Тёмная"
 msgid "Uncompleted to-dos on top"
 msgstr "Незавершённые задачи сверху"

+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Незавершённые задачи сверху"
+
 msgid "Sort notes by"
 msgstr "Сортировать заметки по"

@@ -1139,9 +1280,10 @@ msgstr "Глобальный масштаб в процентах"
 msgid "Editor font family"
 msgstr "Семейство шрифтов редактора"

+#, fuzzy
 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
 "Название шрифта не проверяется. Если оно указано некорректно или не задано, "
 "будет использоваться стандартный моноширинный шрифт."
@@ -1205,6 +1347,18 @@ msgstr "Имя пользователя WebDAV"
 msgid "WebDAV password"
 msgstr "Пароль WebDAV"

+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Неверное значение параметра: «%s». Доступные значения: %s."
@@ -1324,6 +1478,10 @@ msgstr "Переместить %d заметок в блокнот «%s»?"
 msgid "Press to set the decryption password."
 msgstr "Нажмите, чтобы установить пароль для расшифровки."

+#, fuzzy
+msgid "Save alarm"
+msgstr "Установить напоминание"
+
 msgid "Select date"
 msgstr "Выбрать дату"

@@ -1333,12 +1491,32 @@ msgstr "Подтвердить"
 msgid "Cancel synchronisation"
 msgstr "Отменить синхронизацию"

+#, fuzzy, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "Получено элементов: %d/%d."
+
 msgid "New tags:"
 msgstr ""

 msgid "Type new tags or select from list"
 msgstr ""

+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
+msgstr ""
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr ""
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr ""
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr ""
+
 msgid "Joplin website"
 msgstr "Сайт Joplin"

@@ -1385,6 +1563,14 @@ msgstr "Сохранить изменения"
 msgid "Discard changes"
 msgstr "Отменить изменения"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr ""
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Неподдерживаемый формат изображения: %s"
@@ -1395,6 +1581,9 @@ msgstr "Прикрепить фото"
 msgid "Attach any file"
 msgstr "Прикрепить любой файл"

+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Преобразовать в заметку"

--- a/CliClient/locales/sl_SI.po
+++ b/CliClient/locales/sl_SI.po
--- a/CliClient/locales/zh_CN.po
+++ b/CliClient/locales/zh_CN.po
@@ -7,12 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.8\n"

 msgid "To delete a tag, untag the associated notes."
 msgstr "移除相关笔记的标签后才可删除此标签。"
@@ -21,7 +22,7 @@ msgid "Please select the note or notebook to be deleted first."
 msgstr "请选择最先删除的笔记或笔记本。"

 msgid "Press Ctrl+D or type \"exit\" to exit the application"
-msgstr "按Ctrl+D或输入\"exit\"退出程序"
+msgstr "按 Ctrl+D 或输入 \"exit\" 退出程序"

 #, javascript-format
 msgid "More than one item match \"%s\". Please narrow down your query."
@@ -54,7 +55,7 @@ msgstr "无以下命令：%s"

 #, javascript-format
 msgid "The command \"%s\" is only available in GUI mode"
-msgstr "命令\"%s\"仅在GUI模式下可用"
+msgstr "命令 \"%s\" 仅在GUI模式下可用"

 msgid "Cannot change encrypted item"
 msgstr "无法更改加密项目"
@@ -65,7 +66,7 @@ msgstr "缺失所需参数：%s"

 #, javascript-format
 msgid "%s: %s"
-msgstr ""
+msgstr "%s: %s"

 msgid "Your choice: "
 msgstr "您的选择： "
@@ -92,27 +93,26 @@ msgid ""
 "value of [name]. If neither [name] nor [value] is provided, it will list the "
 "current configuration."
 msgstr ""
-"读取或设置配置数值。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."
+"读取或设置配置数值。如果 [value] 没有提供，它将显示 [name] 值。如果没有提供 "
+"[name] 或 [value] 值，它将列出当前配置。"

 msgid "Also displays unset and hidden config variables."
 msgstr "同时显示未设置的与隐藏的配置变量。"

 #, javascript-format
 msgid "%s = %s (%s)"
-msgstr ""
+msgstr "%s = %s (%s)"

 #, javascript-format
 msgid "%s = %s"
-msgstr ""
+msgstr "%s = %s"

 msgid ""
 "Duplicates the notes matching <note> to [notebook]. If no notebook is "
 "specified the note is duplicated in the current notebook."
 msgstr ""
-"复制符合<note>的笔记至[notebook]。若无指定的笔记本，该笔记将被复制至当前笔记"
-"本。"
+"复制符合 <note> 的笔记至 [notebook]。若无指定的笔记本，该笔记将被复制至当前笔"
+"记本。"

 msgid "Marks a to-do as done."
 msgstr "标记待办事项为完成。"
@@ -184,8 +184,8 @@ msgid ""
 "Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
-"导出Joplin数据至给定路径。默认为导出包含笔记本、笔记、标签与资源等完整的数据"
-"库。"
+"导出 Joplin 数据至给定路径。默认为导出包含笔记本、笔记、标签与资源等完整的数"
+"据库。"

 #, javascript-format
 msgid "Destination format: %s"
@@ -208,49 +208,49 @@ msgid "For information on how to customise the shortcuts please visit %s"
 msgstr "请访问以下链接了解如何设置快捷键：%s"

 msgid "Shortcuts are not available in CLI mode."
-msgstr "快捷键在CLI模式下不可用。"
+msgstr "快捷键在 CLI 模式下不可用。"

 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
 "all` for the complete usage information."
 msgstr ""
-"输入`help [command]`来了解关于某命令；或输入`help all`获取完整的使用说明。"
+"输入 `help [command]` 来了解关于某命令；或输入 `help all` 获取完整的使用说"
+"明。"

 msgid "The possible commands are:"
 msgstr "可用命令为："

 msgid ""
-"In any command, a note or notebook can be refered to by title or ID, or "
+"In any command, a note or notebook can be referred to by title or ID, or "
 "using the shortcuts `$n` or `$b` for, respectively, the currently selected "
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
 "在任何命令中，某个笔记或笔记本可通过它名称或ID引用，也可使用代表当前所选笔记"
-"和笔记本的快捷变量‘$n'和'$b'。`$c`可用于引用当前所选的项目。"
+"和笔记本的快捷变量 ‘$n' 和 '$b'。`$c` 可用于引用当前所选的项目。"

 msgid "To move from one pane to another, press Tab or Shift+Tab."
-msgstr "按Tab或Shift+Tab切换面板。"
+msgstr "按 Tab 键或 Shift+Tab 组合键切换面板。"

 msgid ""
 "Use the arrows and page up/down to scroll the lists and text areas "
 "(including this console)."
-msgstr "通过上下左右与page up/down键来滚动列表与文本区域（包含此控制台）。"
+msgstr "通过方向键与 page up/down 键来滚动列表与文本区域（包含此控制台）。"

-#, fuzzy
 msgid "To maximise/minimise the console, press \"tc\"."
-msgstr "按\"TC\"最大化/最小化控制台。"
+msgstr "按 \"TC\" 最大化/最小化控制台。"

 msgid "To enter command line mode, press \":\""
-msgstr "按\":\"键进入命令行模式"
+msgstr "按 \":\" 键进入命令行模式"

 msgid "To exit command line mode, press ESCAPE"
-msgstr "按ESC键退出命令行模式"
+msgstr "按 ESC 键退出命令行模式"

 msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
-msgstr "输入`help keymap`来获取完整的键盘快捷键列表。"
+msgstr "输入 `help keymap` 来获取完整的键盘快捷键列表。"

 msgid "Imports data into Joplin."
-msgstr "导入数据至Jolin。"
+msgstr "导入数据至 Jolin。"

 #, javascript-format
 msgid "Source format: %s"
@@ -293,13 +293,13 @@ msgstr "以下笔记已被导入：%s"
 msgid ""
 "Displays the notes in the current notebook. Use `ls /` to display the list "
 "of notebooks."
-msgstr "在当前笔记本中显示笔记。使用`ls /`显示笔记本列表。"
+msgstr "在当前笔记本中显示笔记。使用 `ls /` 显示笔记本列表。"

 msgid "Displays only the first top <num> notes."
-msgstr "只显示最上方的<num>条笔记。"
+msgstr "只显示最上方的 <num> 条笔记。"

 msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
-msgstr "通过<field>排序项目（例. title, updated_time, created_time）。"
+msgstr "通过 <field> 排序项目（示例：title, updated_time, created_time）。"

 msgid "Reverses the sorting order."
 msgstr "反转排序顺序。"
@@ -309,12 +309,12 @@ msgid ""
 "for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the "
 "to-dos, while `-ttd` would display notes and to-dos."
 msgstr ""
-"仅显示指定类型的项目。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."
+"仅显示指定类型的项目。可以把  `n`  用于笔记，`t` 用于待办事项，或者 `nt` 用于"
+"笔记和待办事项 (示例：`-tt` 只会显示待办事项，当使用 `-ttd` 时将会显示笔记和"
+"待办事项。"

 msgid "Either \"text\" or \"json\""
-msgstr "\"文本\"或\"json\""
+msgstr "\"text\" 或 \"json\""

 msgid ""
 "Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
@@ -339,10 +339,10 @@ msgid "Creates a new to-do."
 msgstr "创建新待办事项。"

 msgid "Moves the notes matching <note> to [notebook]."
-msgstr "移动符合<note>的笔记至[notebook]。"
+msgstr "移动符合 <note> 的笔记至 [notebook]。"

 msgid "Renames the given <item> (note or notebook) to <name>."
-msgstr "重命名给定的<item>（笔记或笔记本）至<name>。"
+msgstr "重命名给定的 <item>（笔记或笔记本）至 <name>。"

 msgid "Deletes the given notebook."
 msgstr "删除给定笔记本。"
@@ -350,11 +350,13 @@ msgstr "删除给定笔记本。"
 msgid "Deletes the notebook without asking for confirmation."
 msgstr "删除笔记本（不要求确认）。"

-msgid "Delete notebook? All notes within this notebook will also be deleted."
+msgid ""
+"Delete notebook? All notes and sub-notebooks within this notebook will also "
+"be deleted."
 msgstr "是否删除笔记本？此笔记本内所有笔记也将被删除。"

 msgid "Deletes the notes matching <note-pattern>."
-msgstr "删除符合<note-pattern>的笔记。"
+msgstr "删除符合 <note-pattern> 的笔记。"

 msgid "Deletes the notes without asking for confirmation."
 msgstr "删除笔记（不要求确认）。"
@@ -367,7 +369,7 @@ msgid "Delete note?"
 msgstr "是否删除笔记？"

 msgid "Searches for the given <pattern> in all the notes."
-msgstr "在所有笔记内搜索给定的<pattern>。"
+msgstr "在所有笔记内搜索给定的 <pattern>。"

 #, javascript-format
 msgid ""
@@ -376,7 +378,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"将给定的<note>的属性<name>设置为[value]。可用属性为：\n"
+"将给定的 <note> 的属性 <name> 设置为 [value]。可用属性为：\n"
 "\n"
 "%s"

@@ -395,17 +397,17 @@ msgstr "认证未完成（未收到认证令牌）。"

 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
-msgstr ""
+msgstr "为了让 Joplin 与 Dropbox 同步，请遵循以下步骤："

 msgid "Step 1: Open this URL in your browser to authorise the application:"
-msgstr ""
+msgstr "步骤一：在浏览器中打开此 URL 来授权应用程序："

 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "步骤二：输入 Dropbox 提供的代码："

 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr "Not authentified with %s. 请提供缺少的凭证。"
+msgstr "%s 并未被验证。请提供缺少的凭证。"

 msgid "Synchronisation is already in progress."
 msgstr "同步正在进行中。"
@@ -416,8 +418,8 @@ msgid ""
 "taking place, you may delete the lock file at \"%s\" and resume the "
 "operation."
 msgstr ""
-"Lock file is already being hold. 如果您确认当前未在进行任何同步，可删除锁定文"
-"件\"%s\"后继续上一部操作。"
+"锁定文件已被保存。如果您确认当前未在进行任何同步，可删除锁定文件 \"%s\" 后继"
+"续上一部操作。"

 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
@@ -437,9 +439,8 @@ msgid ""
 "[tag] from [note], or to list the notes associated with [tag]. The command "
 "`tag list` can be used to list all the tags."
 msgstr ""
-"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
-"[tag] from [note], or to list the notes associated with [tag]. `tag list`命令"
-"将列出所有的标签。"
+"<tag-command> 可以是 \"add\", \"remove\" 或者 \"list\" 从 [note] 中分配或删"
+"除 [tag]，或者列出与 [tag] 相关的笔记。`tag list` 命令将列出所有的标签。"

 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -451,9 +452,9 @@ msgid ""
 "target is a regular note it will be converted to a to-do). Use \"clear\" to "
 "convert the to-do back to a regular note."
 msgstr ""
-"<todo-command> can either be \"toggle\" or \"clear\". 使用\"toggle\"命令来切"
-"换待办事项的完成状态（若目标为普通笔记则将会转换成待办事项）。使用\"clear\"命"
-"令来把待办事项转换至普通笔记。"
+"<todo-command> 可以是 \"toggle\" 或者 \"clear\"。使用 \"toggle\" 命令来切换待"
+"办事项的完成状态（若目标为普通笔记则将会转换成待办事项）。使用 \"clear\" 命令"
+"来把待办事项转换至普通笔记。"

 msgid "Marks a to-do as non-completed."
 msgstr "标记待办事项为未完成。"
@@ -461,14 +462,14 @@ msgstr "标记待办事项为未完成。"
 msgid ""
 "Switches to [notebook] - all further operations will happen within this "
 "notebook."
-msgstr "切换至[notebook] - 所有进一步处理将在此笔记本中进行。"
+msgstr "切换至 [notebook] - 所有进一步处理将在此笔记本中进行。"

 msgid "Displays version information"
 msgstr "显示版本信息。"

 #, javascript-format
 msgid "%s %s (%s)"
-msgstr ""
+msgstr "%s %s (%s)"

 msgid "Enum"
 msgstr "枚举"
@@ -489,7 +490,7 @@ msgid "Possible keys/values:"
 msgstr "可用键/值："

 msgid "Type `joplin help` for usage information."
-msgstr "输入`joplin help`获取使用信息。"
+msgstr "输入 `joplin help` 获取使用信息。"

 msgid "Fatal error:"
 msgstr "严重错误："
@@ -508,9 +509,9 @@ msgid ""
 "any files outside this directory nor to any other personal data. No data "
 "will be shared with any third party."
 msgstr ""
-"请在网络浏览器中打开以下链接激活此应用程序。此应用会建立\"Apps/Joplin\"文件目"
-"录，并只会读写该目录中的文件。它没有任何权限访问此目录以外的任何文件或个人信"
-"息。也不会与第三方分享任何数据。"
+"请在网络浏览器中打开以下链接激活此应用程序。此应用会建立 \"Apps/Joplin\" 文件"
+"目录，并只会读写该目录中的文件。它没有任何权限访问此目录以外的任何文件或个人"
+"信息。也不会与第三方分享任何数据。"

 msgid "Search:"
 msgstr "搜索："
@@ -523,11 +524,11 @@ msgid ""
 "\n"
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
-"欢迎使用Joplin！\n"
+"欢迎使用 Joplin！\n"
 "\n"
-"输入`:help shortcuts`获取键盘快捷键列表，或输入`:help`获取使用信息。\n"
+"输入 `:help shortcuts` 获取键盘快捷键列表，或输入 `:help` 获取使用信息。\n"
 "\n"
-"例：输入`mb`建立新笔记本；输入`mn`建立新笔记。"
+"例：输入 `mb` 建立新笔记本；输入 `mn` 建立新笔记。"

 msgid ""
 "One or more items are currently encrypted and you may need to supply a "
@@ -535,19 +536,19 @@ msgid ""
 "supplied the password, the encrypted items are being decrypted in the "
 "background and will be available soon."
 msgstr ""
-"有一条或更多项目被加密可能需要提供主密码。若需进行此操作请输入`e2ee "
-"decrypt`。若您已提供密码，此时加密文件正在背景解密，解锁之后即可使用。"
+"有一条或更多项目被加密可能需要提供主密码。若需进行此操作请输入 `e2ee "
+"decrypt` 。若您已提供密码，此时加密文件正在背景解密，解锁之后即可使用。"

 #, javascript-format
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr "导出至\"%s\" 并转换成 \"%s\" 格式。请稍等…"
+msgstr "导出至 \"%s\" 并转换成 \"%s\" 格式。请稍等…"

 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "从\"%s\"导入为 \"%s\"格式。请稍等…"
+msgstr "从 \"%s\" 导入为 \"%s\" 格式。请稍等…"

 msgid "PDF File"
-msgstr "PDF文件"
+msgstr "PDF 文件"

 msgid "File"
 msgstr "文件"
@@ -572,7 +573,7 @@ msgstr "打印"

 #, javascript-format
 msgid "Hide %s"
-msgstr "隐藏%s"
+msgstr "隐藏 %s"

 msgid "Quit"
 msgstr "退出"
@@ -589,6 +590,16 @@ msgstr "剪切"
 msgid "Paste"
 msgstr "粘贴"

+msgid "Bold"
+msgstr "粗体"
+
+msgid "Italic"
+msgstr "斜体"
+
+#, fuzzy
+msgid "Edit in external editor"
+msgstr "在外部编辑器中打开"
+
 msgid "Search in all the notes"
 msgstr "在所有笔记内搜索"

@@ -596,7 +607,7 @@ msgid "View"
 msgstr "显示"

 msgid "Toggle sidebar"
-msgstr ""
+msgstr "切换边栏"

 msgid "Toggle editor layout"
 msgstr "切换编辑器布局"
@@ -607,6 +618,9 @@ msgstr "工具"
 msgid "Synchronisation status"
 msgstr "同步状态"

+msgid "Web clipper options"
+msgstr "网页剪辑选项"
+
 msgid "Encryption options"
 msgstr "加密选项"

@@ -626,15 +640,15 @@ msgid "Check for updates..."
 msgstr "检查更新..."

 msgid "About Joplin"
-msgstr "关于Joplin"
+msgstr "关于 Joplin"

 #, javascript-format
 msgid "%s %s (%s, %s)"
-msgstr ""
+msgstr "%s %s (%s, %s)"

 #, javascript-format
 msgid "Open %s"
-msgstr "打开%s"
+msgstr "打开 %s"

 msgid "Exit"
 msgstr "退出"
@@ -657,6 +671,51 @@ msgstr "是"
 msgid "No"
 msgstr "否"

+msgid "The web clipper service is enabled and set to auto-start."
+msgstr "网页剪辑服务已启用并设置为自动启动。"
+
+#, javascript-format
+msgid "Status: Started on port %d"
+msgstr "状态：从端口 %d 开始"
+
+#, javascript-format
+msgid "Status: %s"
+msgstr "状态：\"%s\"。"
+
+msgid "Disable Web Clipper Service"
+msgstr "禁用网页剪辑服务"
+
+msgid "The web clipper service is not enabled."
+msgstr "网页剪辑未启用。"
+
+msgid "Enable Web Clipper Service"
+msgstr "启用网页剪辑"
+
+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:"
+msgstr "要使用网页剪辑功能，你需要按照以下步骤："
+
+msgid "Step 1: Enable the clipper service"
+msgstr "步骤一：启用网页剪辑服务"
+
+msgid ""
+"This service allows the browser extension to communicate with Joplin. When "
+"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 "步骤二：安装扩展"
+
+msgid "Download and install the relevant extension for your browser:"
+msgstr "为您的浏览器下载并安装相关的扩展："
+
 msgid "Check synchronisation configuration"
 msgstr "检查同步配置"

@@ -668,7 +727,7 @@ msgid "Save"
 msgstr "保存"

 msgid "Submit"
-msgstr ""
+msgstr "提交"

 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -701,7 +760,7 @@ msgid "Active"
 msgstr "活动状态"

 msgid "ID"
-msgstr ""
+msgstr "ID"

 msgid "Source"
 msgstr "来源"
@@ -740,7 +799,7 @@ msgstr ""
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
 "to enable it please check the documentation:"
-msgstr ""
+msgstr "有关端到端加密（E2EE）的更多信息，以及如何启用它的建议，请查看文档："

 msgid "Status"
 msgstr "状态"
@@ -754,7 +813,7 @@ msgstr "返回"
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
-msgstr "将新建笔记本\"%s\"并将文件\"%s\"导入至其中"
+msgstr "将新建笔记本 \"%s\" 并将文件 \"%s\" 导入至其中"

 msgid "Please create a notebook first."
 msgstr "请先创建笔记本。"
@@ -769,20 +828,22 @@ msgid "Add or remove tags:"
 msgstr "添加或删除标签："

 msgid "Separate each tag by a comma."
-msgstr "用逗号\",\"分开每个标签。"
+msgstr "用逗号 \",\" 分开每个标签。"

 msgid "Rename notebook:"
 msgstr "重命名笔记本："

+msgid "Rename tag:"
+msgstr "重命名标签"
+
 msgid "Set alarm:"
 msgstr "设置提醒："

 msgid "Layout"
 msgstr "布局"

-#, fuzzy
 msgid "Search..."
-msgstr "搜索"
+msgstr "搜索..."

 msgid "Some items cannot be synchronised."
 msgstr "一些项目无法被同步。"
@@ -802,6 +863,9 @@ msgstr "添加或删除标签"
 msgid "Switch between note and to-do type"
 msgstr "在笔记和待办事项类型之间切换"

+msgid "Copy Markdown link"
+msgstr "复制 Markdown 链接"
+
 msgid "Delete"
 msgstr "删除"

@@ -818,13 +882,38 @@ msgstr "此处没有任何笔记本。点击\"新笔记本\"创建。"
 msgid "Open..."
 msgstr "打开…"

+#, javascript-format
+msgid "This file could not be opened: %s"
+msgstr "此笔记本无法打开：%s"
+
 msgid "Save as..."
 msgstr "另存为…"

+msgid "Copy path to clipboard"
+msgstr "复制路径到剪切板"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "不支持的链接或信息：%s"

+#, javascript-format
+msgid ""
+"This note has no content. Click on \"%s\" to toggle the editor and edit the "
+"note."
+msgstr "此笔记没有任何内容。点击 \"%s\" 切换至编辑器并编辑笔记。"
+
+msgid "strong text"
+msgstr "加粗文本"
+
+msgid "emphasized text"
+msgstr "强调文本"
+
+msgid "List item"
+msgstr ""
+
+msgid "Insert Hyperlink"
+msgstr "插入超链接"
+
 msgid "Attach file"
 msgstr "附加文件"

@@ -835,10 +924,36 @@ msgid "Set alarm"
 msgstr "设置提醒"

 #, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr "此笔记没有任何内容。点击 \"%s\" 切换至编辑器并编辑笔记。"
+msgid "In: %s"
+msgstr "In: %s"
+
+msgid "Hyperlink"
+msgstr "超链接"
+
+msgid "Code"
+msgstr "代码"
+
+msgid "Numbered List"
+msgstr "有序列表"
+
+msgid "Bulleted List"
+msgstr "无序列表"
+
+msgid "Checkbox"
+msgstr "复选框"
+
+msgid "Heading"
+msgstr "标题"
+
+msgid "Horizontal Rule"
+msgstr "水平线"
+
+msgid "Click to stop external editing"
+msgstr ""
+
+#, fuzzy
+msgid "Watching..."
+msgstr "正在取消..."

 msgid "to-do"
 msgstr "待办事项"
@@ -857,10 +972,10 @@ msgid "Clear"
 msgstr "清除"

 msgid "OneDrive Login"
-msgstr "登陆OneDrive"
+msgstr "登陆 OneDrive"

 msgid "Dropbox Login"
-msgstr ""
+msgstr "登陆 Dropbox"

 msgid "Options"
 msgstr "选项"
@@ -871,6 +986,9 @@ msgstr "同步状态"
 msgid "Encryption Options"
 msgstr "加密选项"

+msgid "Clipper Options"
+msgstr "网页剪辑选项"
+
 msgid "Remove this tag from all the notes?"
 msgstr "从所有笔记中删除此标签？"

@@ -898,26 +1016,26 @@ msgid "Unknown flag: %s"
 msgstr "未知标记：%s"

 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"

 msgid "File system"
 msgstr "文件系统"

 msgid "Nextcloud"
-msgstr ""
+msgstr "Nextcloud"

 msgid "OneDrive"
-msgstr ""
+msgstr "OneDrive"

 msgid "OneDrive Dev (For testing only)"
-msgstr "OneDrive开发员（仅测试用）"
+msgstr "OneDrive 开发版（仅测试用）"

 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"

 #, javascript-format
 msgid "Unknown log level: %s"
-msgstr "未知日志level：%s"
+msgstr "未知日志级别：%s"

 #, javascript-format
 msgid "Unknown level ID: %s"
@@ -936,15 +1054,16 @@ msgid ""
 "\n"
 "Please consider using a regular OneDrive account."
 msgstr ""
-"无法与OneDrive同步。\n"
+"无法与 OneDrive 同步。\n"
 "\n"
-"此错误通常在使用OneDrive企业版时出现，很遗憾此软件并不支持OneDrive企业版。\n"
+"此错误通常在使用 OneDrive 企业版时出现，很遗憾此软件并不支持 OneDrive 企业"
+"版。\n"
 "\n"
-"请考虑使用OneDrive个人版。"
+"请考虑使用 OneDrive 个人版。"

 #, javascript-format
 msgid "Cannot access %s"
-msgstr "无法访问%s"
+msgstr "无法访问 %s"

 #, javascript-format
 msgid "Created local items: %d."
@@ -974,16 +1093,16 @@ msgstr "已删除远程项目: %d。"
 msgid "Fetched items: %d/%d."
 msgstr "已提取项目：%d/%d."

-#, fuzzy, javascript-format
+#, javascript-format
 msgid "State: %s."
-msgstr "状态：\"%s\"。"
+msgstr "状态：%s。"

 msgid "Cancelling..."
 msgstr "正在取消..."

 #, javascript-format
 msgid "Completed: %s"
-msgstr "已完成：\"%s\""
+msgstr "已完成：%s"

 #, javascript-format
 msgid "Last error: %s"
@@ -1008,13 +1127,25 @@ msgstr "无法修改加密项目。"
 msgid "Conflicts"
 msgstr "冲突文件"

+msgid "Cannot move notebook to this location"
+msgstr "无法移动笔记本到该位置"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "以此标题命名的笔记本已存在：\"%s\""

 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
-msgstr "笔记本无法被命名为\"%s\"，此标题为保留标题。"
+msgstr "笔记本无法被命名为 \"%s\"，此标题为保留标题。"
+
+msgid "title"
+msgstr "标题"
+
+msgid "updated date"
+msgstr "更新日期"
+
+msgid "created date"
+msgstr "创建日期"

 msgid "Untitled"
 msgstr "无标题"
@@ -1024,11 +1155,11 @@ msgstr "此笔记不包含地理定位信息。"

 #, javascript-format
 msgid "Cannot copy note to \"%s\" notebook"
-msgstr "无法复制笔记至\"%s\"笔记本"
+msgstr "无法复制笔记至 \"%s\" 笔记本"

 #, javascript-format
 msgid "Cannot move note to \"%s\" notebook"
-msgstr "无法移动笔记至\"%s\"笔记本"
+msgstr "无法移动笔记至 \"%s\" 笔记本"

 msgid "Text editor"
 msgstr "文本编辑器"
@@ -1059,6 +1190,9 @@ msgstr "深色"
 msgid "Uncompleted to-dos on top"
 msgstr "未完成的待办事项在顶端"

+msgid "Show completed to-dos"
+msgstr "显示已完成的待办事项"
+
 msgid "Sort notes by"
 msgstr "排序笔记"

@@ -1084,7 +1218,7 @@ msgid "Show tray icon"
 msgstr "显示托盘图标"

 msgid "Note: Does not work in all desktop environments."
-msgstr ""
+msgstr "注意：在所有的桌面环境中都不能工作。"

 msgid "Global zoom percentage"
 msgstr "全局缩放比例"
@@ -1093,11 +1227,11 @@ msgid "Editor font family"
 msgstr "编辑器字体"

 msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
+"This must be *monospace* font or it will not work properly. If the font is "
+"incorrect or empty, it will default to a generic monospace font."
 msgstr ""
-"此软件不会检查所设置字体的有效性。若无效或空白，此处将会设置成一款通用等宽字"
-"体。"
+"必须是 *等宽* 字体，否则将无法正常工作。若无效或留空，此处将会设置成一款通用"
+"等宽字体。"

 msgid "Automatically update the application"
 msgstr "自动更新此程序"
@@ -1127,7 +1261,7 @@ msgid ""
 "The target to synchonise to. Each sync target may have additional parameters "
 "which are named as `sync.NUM.NAME` (all documented below)."
 msgstr ""
-"所同步的目标。每个同步目标可以拥有一些附加属性，命名为`sync.NUM.NAME`（见下"
+"所同步的目标。每个同步目标可以拥有一些附加属性，命名为 `sync.NUM.NAME`（见下"
 "文）。"

 msgid "Directory to synchronise with (absolute path)"
@@ -1136,52 +1270,64 @@ msgstr "同步至此文件目录（绝对路径）。"
 msgid ""
 "The path to synchronise with when file system synchronisation is enabled. "
 "See `sync.target`."
-msgstr "文件系统同步启用时的同步目录。见`sync.target`。"
+msgstr "文件系统同步启用时的同步目录。见 `sync.target`。"

 msgid "Nextcloud WebDAV URL"
-msgstr ""
+msgstr "Nextcloud WebDAV URL"

 msgid "Nextcloud username"
-msgstr "Nextcloud用户名"
+msgstr "Nextcloud 用户名"

 msgid "Nextcloud password"
-msgstr "Nextcloud密码"
+msgstr "Nextcloud 密码"

 msgid "WebDAV URL"
-msgstr ""
+msgstr "WebDAV URL"

 msgid "WebDAV username"
-msgstr "WebDAV用户名"
+msgstr "WebDAV 用户名"

 msgid "WebDAV password"
-msgstr "WebDAV密码"
+msgstr "WebDAV 密码"
+
+msgid "Custom TLS certificates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of paths to directories to load the certificates from, "
+"or path to individual cert files. For example: /my/cert_dir, /other/custom."
+"pem"
+msgstr ""
+
+msgid "Ignore TLS certificate errors"
+msgstr ""

 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "无效设置数值：\"%s\"。可用值为：%s。"

 msgid "Joplin Export File"
-msgstr "Joplin输出文件"
+msgstr "Joplin 输出文件"

 msgid "Markdown"
-msgstr ""
+msgstr "Markdown"

 msgid "Joplin Export Directory"
-msgstr "Joplin输出文件目录"
+msgstr "Joplin 输出文件目录"

 msgid "Evernote Export File"
-msgstr "Evernote导出文件"
+msgstr "Evernote 导出文件"

 msgid "Directory"
 msgstr "文件目录"

 #, javascript-format
 msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr "无法加载\"%s\"模块读取\"%s\"格式"
+msgstr "无法加载 \"%s\" 模块读取 \"%s\" 格式"

 #, javascript-format
 msgid "Please specify import format for %s"
-msgstr "请指定%s的导入格式"
+msgstr "请指定 %s 的导入格式"

 #, javascript-format
 msgid ""
@@ -1200,7 +1346,7 @@ msgstr "项目无法被同步。"

 #, javascript-format
 msgid "%s (%s): %s"
-msgstr ""
+msgstr "%s (%s): %s"

 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1271,6 +1417,9 @@ msgstr "移动%d条笔记至笔记本\"%s\"？"
 msgid "Press to set the decryption password."
 msgstr "按键将设置解密密码。"

+msgid "Save alarm"
+msgstr "设置提醒"
+
 msgid "Select date"
 msgstr "选择日期"

@@ -1280,18 +1429,39 @@ msgstr "确认"
 msgid "Cancel synchronisation"
 msgstr "取消同步"

+#, javascript-format
+msgid "Decrypting items: %d/%d"
+msgstr "解密项目：%d/%d"
+
 msgid "New tags:"
-msgstr ""
+msgstr "新标签："

 msgid "Type new tags or select from list"
+msgstr "输入新的标签或从列表中选择"
+
+msgid ""
+"To work correctly, the app needs the following permissions. Please enable "
+"them in your phone settings, in Apps > Joplin > Permissions"
 msgstr ""
+"为了正确地工作，应用需要以下权限。请在你的手机设置（应用 > Joplin > 权限）中"
+"启用它们。"
+
+msgid ""
+"- Storage: to allow attaching files to notes and to enable filesystem "
+"synchronisation."
+msgstr "- 存储：允许将文件附加到笔记中并启用文件系统同步。"
+
+msgid "- Camera: to allow taking a picture and attaching it to a note."
+msgstr "- 相机：允许拍照并将其添加到一条笔记中。"
+
+msgid "- Location: to allow attaching geo-location information to a note."
+msgstr "- 定位：允许将地理位置信息附加到一条笔记中。"

 msgid "Joplin website"
-msgstr "Joplin官网"
+msgstr "Joplin 官网"

-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "用OneDrive登陆"
+msgstr "通过 Dropbox 登陆"

 #, javascript-format
 msgid "Master Key %s"
@@ -1332,6 +1502,14 @@ msgstr "保存更改"
 msgid "Discard changes"
 msgstr "放弃更改"

+#, javascript-format
+msgid "No item with ID %s"
+msgstr "没有 ID %s 项"
+
+#, javascript-format
+msgid "The Joplin mobile app does not currently support this type of link: %s"
+msgstr "Joplin 手机应用目前不支持这种类型的链接：%s"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "不支持的图片格式：%s"
@@ -1342,6 +1520,9 @@ msgstr "附加照片"
 msgid "Attach any file"
 msgstr "附加任何文件"

+msgid "Share"
+msgstr "分享"
+
 msgid "Convert to note"
 msgstr "转换至笔记"

@@ -1361,7 +1542,7 @@ msgid "Delete notebook"
 msgstr "删除笔记本"

 msgid "Login with OneDrive"
-msgstr "用OneDrive登陆"
+msgstr "通过 OneDrive 登陆"

 msgid "Search"
 msgstr "搜索"
--- a/CliClient/locales/zh_TW.po
+++ b/CliClient/locales/zh_TW.po
--- a/CliClient/package-lock.json
+++ b/CliClient/package-lock.json
--- a/CliClient/package.json
+++ b/CliClient/package.json
@@ -19,7 +19,7 @@
    ],
    "owner": "Laurent Cozic"
  },
-  "version": "1.0.106",
+  "version": "1.0.108",
  "bin": {
    "joplin": "./main.js"
  },
@@ -31,10 +31,15 @@
    "async-mutex": "^0.1.3",
    "base-64": "^0.1.0",
    "compare-version": "^0.1.2",
+    "es6-promise-pool": "^2.5.0",
    "follow-redirects": "^1.2.4",
    "form-data": "^2.1.4",
    "fs-extra": "^5.0.0",
    "html-entities": "^1.2.1",
+    "html-minifier": "^3.5.15",
+    "image-type": "^3.0.0",
+    "joplin-turndown": "^4.0.3",
+    "joplin-turndown-plugin-gfm": "^1.0.2",
    "jssha": "^2.3.0",
    "levenshtein": "^1.0.5",
    "lodash": "^4.17.4",
@@ -47,6 +52,7 @@
    "promise": "^7.1.1",
    "proper-lockfile": "^2.0.1",
    "query-string": "4.3.4",
+    "read-chunk": "^2.1.0",
    "redux": "^3.7.2",
    "sax": "^1.2.2",
    "server-destroy": "^1.0.1",
@@ -58,9 +64,10 @@
    "strip-ansi": "^4.0.0",
    "tar": "^4.4.0",
    "tcp-port-used": "^0.1.2",
-    "tkwidgets": "^0.5.25",
+    "tkwidgets": "^0.5.26",
    "url-parse": "^1.2.0",
    "uuid": "^3.0.1",
+    "valid-url": "^1.0.9",
    "word-wrap": "^1.2.3",
    "xml2js": "^0.4.19",
    "yargs-parser": "^7.0.0"
--- a/CliClient/run_test.sh
+++ b/CliClient/run_test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+START_DIR="$(pwd)"
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$ROOT_DIR/tests-build"
 TEST_FILE="$1"
@@ -8,8 +9,27 @@ rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
 rsync -a "$ROOT_DIR/build/locales/" "$BUILD_DIR/locales/"
 mkdir -p "$BUILD_DIR/data"

-if [[ $TEST_FILE == "" ]]; then
-	(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js tests-build/encryption.js tests-build/ArrayUtils.js tests-build/models_Setting.js tests-build/services_InteropService.js)
-else
+if [[ $TEST_FILE != "" ]]; then
 	(cd "$ROOT_DIR" && npm test tests-build/$TEST_FILE.js)
-fi
+	exit
+fi
+
+function finish {
+	cd "$START_DIR"
+}
+
+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_Folder.js
+npm test tests-build/models_Note.js
+npm test tests-build/models_Setting.js
+npm test tests-build/services_InteropService.js
+npm test tests-build/services_ResourceService.js
+npm test tests-build/synchronizer.js
+npm test tests-build/urlUtils.js
--- a/CliClient/tests/ArrayUtils.js
+++ b/CliClient/tests/ArrayUtils.js
@@ -44,4 +44,13 @@ describe('ArrayUtils', function() {
 		done();
 	});

+	it('should compare arrays', async (done) => {
+		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();
+	});
+
 });
--- a/CliClient/tests/EnexToMd.js
+++ b/CliClient/tests/EnexToMd.js
@@ -0,0 +1,62 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { filename } = require('lib/path-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+const { enexXmlToMd } = require('lib/import-enex-md-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.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('EnexToMd', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should convert from Enex to Markdown', asyncTest(async () => {
+		const basePath = __dirname + '/enex_to_md';
+		const files = await shim.fsDriver().readDirStats(basePath);
+		
+		for (let i = 0; i < files.length; i++) {
+			const htmlFilename = files[i].path;
+			if (htmlFilename.indexOf('.html') < 0) continue;
+
+			const htmlPath = basePath + '/' + htmlFilename;
+			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
+
+			// if (htmlFilename !== 'text2.html') continue;
+
+			const html = await shim.fsDriver().readFile(htmlPath);
+			const expectedMd = await shim.fsDriver().readFile(mdPath);
+
+			const actualMd = await enexXmlToMd('<div>' + html + '</div>', []);
+
+			if (actualMd !== expectedMd) {
+				console.info('');
+				console.info('Error converting file: ' + htmlFilename);
+				console.info('--------------------------------- Got:');
+				console.info(actualMd.split('\n'));
+				console.info('--------------------------------- Expected:');
+				console.info(expectedMd.split('\n'));
+				console.info('--------------------------------------------');
+				console.info('');
+
+				expect(false).toBe(true);
+				// return;
+			} else {
+				expect(true).toBe(true)
+			}
+		}
+	}));
+
+});
--- a/CliClient/tests/HtmlToMd.js
+++ b/CliClient/tests/HtmlToMd.js
@@ -0,0 +1,66 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { filename } = require('lib/path-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+const HtmlToMd = require('lib/HtmlToMd');
+const { enexXmlToMd } = require('lib/import-enex-md-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.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('HtmlToMd', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should convert from Html to Markdown', asyncTest(async () => {
+		const basePath = __dirname + '/html_to_md';
+		const files = await shim.fsDriver().readDirStats(basePath);
+		const htmlToMd = new HtmlToMd();
+		
+		for (let i = 0; i < files.length; i++) {
+			const htmlFilename = files[i].path;
+			if (htmlFilename.indexOf('.html') < 0) continue;
+
+			const htmlPath = basePath + '/' + htmlFilename;
+			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
+
+			// if (htmlFilename !== 'code_1.html') continue;
+
+			const html = await shim.fsDriver().readFile(htmlPath);
+			const expectedMd = await shim.fsDriver().readFile(mdPath);
+
+			const actualMd = await htmlToMd.parse('<div>' + html + '</div>', []);
+
+			if (actualMd !== expectedMd) {
+				console.info('');
+				console.info('Error converting file: ' + htmlFilename);
+				console.info('--------------------------------- Got:');
+				console.info(actualMd);
+				console.info('--------------------------------- Raw:');
+				console.info(actualMd.split('\n'));
+				console.info('--------------------------------- Expected:');
+				console.info(expectedMd.split('\n'));
+				console.info('--------------------------------------------');
+				console.info('');
+
+				expect(false).toBe(true);
+				// return;
+			} else {
+				expect(true).toBe(true)
+			}
+		}
+	}));
+
+});
--- a/CliClient/tests/enex_to_md/code1.html
+++ b/CliClient/tests/enex_to_md/code1.html
@@ -0,0 +1,16 @@
+<div>
+	<p>For example, consider a web page like this:</p>
+
+<pre class="brush: html line-numbers  language-html"><code class=" language-html"><span class="token doctype">&lt;!DOCTYPE html&gt;</span>
+<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>html</span><span class="token punctuation">&gt;</span></span>
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>head</span><span class="token punctuation">&gt;</span></span>
+    <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>meta</span> <span class="token attr-name">http-equiv</span><span class="token attr-value"><span class="token punctuation">=</span><span class="token punctuation">"</span>content-type<span class="token punctuation">"</span></span> <span class="token attr-name">content</span><span class="token attr-value"><span class="token punctuation">=</span><span class="token punctuation">"</span>text/html; charset<span class="token punctuation">=</span>utf-8<span class="token punctuation">"</span></span> <span class="token punctuation">/&gt;</span></span>
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>head</span><span class="token punctuation">&gt;</span></span>
+
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>body</span><span class="token punctuation">&gt;</span></span>
+    <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>script</span> <span class="token attr-name">src</span><span class="token attr-value"><span class="token punctuation">=</span><span class="token punctuation">"</span>page-scripts/page-script.js<span class="token punctuation">"</span></span><span class="token punctuation">&gt;</span></span><span class="token script language-javascript"></span><span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>script</span><span class="token punctuation">&gt;</span></span>
+  <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>body</span><span class="token punctuation">&gt;</span></span>
+<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>html</span><span class="token punctuation">&gt;</span></span><span class="line-numbers-rows"><span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span></span></code></pre>
+
+	<p>The script "page-script.js" does this:</p>
+</div>
--- a/CliClient/tests/enex_to_md/code1.md
+++ b/CliClient/tests/enex_to_md/code1.md
@@ -0,0 +1,14 @@
+For example, consider a web page like this:
+
+	<!DOCTYPE html>
+	<html>
+	  <head>
+	    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	  </head>
+
+	  <body>
+	    <script src="page-scripts/page-script.js"></script>
+	  </body>
+	</html>
+
+The script "page-script.js" does this:
--- a/CliClient/tests/enex_to_md/code2.html
+++ b/CliClient/tests/enex_to_md/code2.html
@@ -0,0 +1,7 @@
+<p>Subshell:</p>
+<pre><code>(
+    set -e
+    false
+    echo Unreachable
+) &amp;&amp; echo Great success
+</code></pre>
--- a/CliClient/tests/enex_to_md/code2.md
+++ b/CliClient/tests/enex_to_md/code2.md
@@ -0,0 +1,7 @@
+Subshell:
+
+	(
+	    set -e
+	    false
+	    echo Unreachable
+	) && echo Great success
--- a/CliClient/tests/enex_to_md/heading.html
+++ b/CliClient/tests/enex_to_md/heading.html
@@ -0,0 +1,9 @@
+<div>
+	<div class="note">
+		<p>Values added to the global scope of a content script with</p>
+	</div>
+
+	<h2 id="Loading_content_scripts">Loading content scripts</h2>
+
+	<p>You can load a content script into a web page in one of three ways:</p>
+</div>
--- a/CliClient/tests/enex_to_md/heading.md
+++ b/CliClient/tests/enex_to_md/heading.md
@@ -0,0 +1,5 @@
+Values added to the global scope of a content script with
+
+## Loading content scripts
+
+You can load a content script into a web page in one of three ways:
--- a/CliClient/tests/enex_to_md/inlineCode.html
+++ b/CliClient/tests/enex_to_md/inlineCode.html
@@ -0,0 +1,3 @@
+<div>
+	<p>Similarly, I need another regex to match double newlines (<code>\n\n</code>) that are not part of a longer run of newline characters like <code>\n\n\n</code> or <code>\n\n\n\n\n\n</code> etc.</p>
+</div>
--- a/CliClient/tests/enex_to_md/inlineCode.md
+++ b/CliClient/tests/enex_to_md/inlineCode.md
@@ -0,0 +1 @@
+Similarly, I need another regex to match double newlines (`\n\n`) that are not part of a longer run of newline characters like `\n\n\n` or `\n\n\n\n\n\n` etc.
--- a/CliClient/tests/enex_to_md/inlineCodeWithLink.html
+++ b/CliClient/tests/enex_to_md/inlineCodeWithLink.html
@@ -0,0 +1,3 @@
+<div>
+<p>the&nbsp;<code><a href="/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onConnect">runtime.onConnect</a></code> listener gets passed its own <code><a href="/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/Port">runtime.Port</a></code> object.</p>
+</div>
--- a/CliClient/tests/enex_to_md/inlineCodeWithLink.md
+++ b/CliClient/tests/enex_to_md/inlineCodeWithLink.md
@@ -0,0 +1 @@
+the `[runtime.onConnect](/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onConnect)` listener gets passed its own `[runtime.Port](/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/Port)` object.
--- a/CliClient/tests/enex_to_md/link1.html
+++ b/CliClient/tests/enex_to_md/link1.html
@@ -0,0 +1,4 @@
+<a href="https://arstechnica.com/civis/ucp.php?mode=login&return_to=%2Ftech-policy%2F2018%2F05%2Fjails-are-replacing-in-person-visits-with-video-calling-services-theyre-awful%2F" class="dropdown-toggle">
+      Sign in
+      <span class="icon dropdown-indicator icon-drop-indicator"></span>
+    </a>
--- a/CliClient/tests/enex_to_md/link1.md
+++ b/CliClient/tests/enex_to_md/link1.md
@@ -0,0 +1 @@
+[Sign in](https://arstechnica.com/civis/ucp.php?mode=login&return_to=%2Ftech-policy%2F2018%2F05%2Fjails-are-replacing-in-person-visits-with-video-calling-services-theyre-awful%2F)
--- a/CliClient/tests/enex_to_md/list.html
+++ b/CliClient/tests/enex_to_md/list.html
@@ -0,0 +1,17 @@
+<div>
+	<p>Liste de courses</p>
+
+	<div>
+		<div><en-todo checked="true"/>Pizzas</div>
+		<div><en-todo checked="true"/>Pain</div>
+		<div><en-todo checked="true"/>Jambon</div>
+	</div>
+
+	<div><br/></div>
+
+	<div>
+		<div><en-todo checked="true"/>On its own</div>
+	</div>
+
+	<p>End</p>
+</div>
--- a/CliClient/tests/enex_to_md/list.md
+++ b/CliClient/tests/enex_to_md/list.md
@@ -0,0 +1,9 @@
+Liste de courses
+
+- [X] Pizzas
+- [X] Pain
+- [X] Jambon
+
+- [X] On its own
+
+End
--- a/CliClient/tests/enex_to_md/list2.html
+++ b/CliClient/tests/enex_to_md/list2.html
@@ -0,0 +1 @@
+<ul class="find-me-on"><li><a href="https://github.com/zetter">Github</a></li><li><a href="https://twitter.com/czetter">Twitter</a></li><li><a href="http://lanyrd.com/profile/czetter/">Lanyrd</a></li></ul>
--- a/CliClient/tests/enex_to_md/list2.md
+++ b/CliClient/tests/enex_to_md/list2.md
@@ -0,0 +1,3 @@
+- [Github](https://github.com/zetter)
+- [Twitter](https://twitter.com/czetter)
+- [Lanyrd](http://lanyrd.com/profile/czetter/)
--- a/CliClient/tests/enex_to_md/list3.html
+++ b/CliClient/tests/enex_to_md/list3.html
@@ -0,0 +1 @@
+<ul class="find-me-on"><li>Github</li><li>Twitter</li></ul>
--- a/CliClient/tests/enex_to_md/list3.md
+++ b/CliClient/tests/enex_to_md/list3.md
@@ -0,0 +1,2 @@
+- Github
+- Twitter
--- a/CliClient/tests/enex_to_md/paragraph.html
+++ b/CliClient/tests/enex_to_md/paragraph.html
@@ -0,0 +1,11 @@
+<div>
+	<p>Short paragraphs are merged together:</p>
+	<p>Something something</p>
+	<p>Blablbla blabla lbla</p>
+	<p>Last line</p>
+</div>
+
+<div>
+	<p>Longer ones are separated by new lines. In 1894 Joplin arrived in Sedalia, Missouri. At first, Joplin stayed with the family of Arthur Marshall, at the time a 13-year-old boy but later one of Joplin's students and a rag-time composer in his own right.[26] There is no record of Joplin having a permanent residence in the town until 1904, as Joplin was making a living as a touring musician.</p>
+	<p>There is little precise evidence known about Joplin's activities at this time, although he performed as a solo musician at dances and at the major black clubs in Sedalia, the Black 400 club and the Maple Leaf Club. He performed in the Queen City Cornet Band, and his own six-piece dance orchestra.</p>
+</div>
--- a/CliClient/tests/enex_to_md/paragraph.md
+++ b/CliClient/tests/enex_to_md/paragraph.md
@@ -0,0 +1,8 @@
+Short paragraphs are merged together:
+Something something
+Blablbla blabla lbla
+Last line
+
+Longer ones are separated by new lines. In 1894 Joplin arrived in Sedalia, Missouri. At first, Joplin stayed with the family of Arthur Marshall, at the time a 13-year-old boy but later one of Joplin's students and a rag-time composer in his own right.[26] There is no record of Joplin having a permanent residence in the town until 1904, as Joplin was making a living as a touring musician.
+
+There is little precise evidence known about Joplin's activities at this time, although he performed as a solo musician at dances and at the major black clubs in Sedalia, the Black 400 club and the Maple Leaf Club. He performed in the Queen City Cornet Band, and his own six-piece dance orchestra.
--- a/CliClient/tests/enex_to_md/table1.html
+++ b/CliClient/tests/enex_to_md/table1.html
@@ -0,0 +1,12 @@
+<table>
+<tr>
+<td>
+<div>$ sudo ethtool --set-priv-flags p2p1 mlx4_rss_xor_hash_function on</div>
+<div># Three empty lines follow</div>
+<div><br/></div>
+<div><br/></div>
+</td>
+</tr>
+</table>
+
+Some text
--- a/CliClient/tests/enex_to_md/table1.md
+++ b/CliClient/tests/enex_to_md/table1.md
@@ -0,0 +1,5 @@
+|     |
+| --- |
+| $ sudo ethtool --set-priv-flags p2p1 mlx4_rss_xor_hash_function on<br># Three empty lines follow |
+
+Some text
--- a/CliClient/tests/enex_to_md/tableWithNewLines.html
+++ b/CliClient/tests/enex_to_md/tableWithNewLines.html
@@ -0,0 +1,3 @@
+<div>
+<table style="-evernote-table:true;border-collapse:collapse;width:100%;table-layout:fixed;margin-left:0px;"><tr><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div>line 1</div><div>line 2</div></td><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div><br/></div></td></tr><tr><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div>aaaaaa</div></td><td style="border-style:solid;border-width:1px;border-color:rgb(211,211,211);padding:10px;margin:0px;width:50%;"><div>line 3</div><div>line 4</div></td></tr></table>
+</div>
--- a/CliClient/tests/enex_to_md/tableWithNewLines.md
+++ b/CliClient/tests/enex_to_md/tableWithNewLines.md
@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| line 1<br>line 2 |     |
+| aaaaaa | line 3<br>line 4 |
--- a/CliClient/tests/html_to_md/anchor_with_inner_tags.html
+++ b/CliClient/tests/html_to_md/anchor_with_inner_tags.html
@@ -0,0 +1 @@
+<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
--- a/CliClient/tests/html_to_md/anchor_with_inner_tags.md
+++ b/CliClient/tests/html_to_md/anchor_with_inner_tags.md
@@ -0,0 +1 @@
+[# ![](https://joplin.cozic.net/images/Icon512.png)oplin](https://joplin.cozic.net)
--- a/CliClient/tests/html_to_md/anchor_with_js.html
+++ b/CliClient/tests/html_to_md/anchor_with_js.html
@@ -0,0 +1 @@
+<a href="javascript:alert('js')">Some text</a>
--- a/CliClient/tests/html_to_md/anchor_with_js.md
+++ b/CliClient/tests/html_to_md/anchor_with_js.md
@@ -0,0 +1 @@
+[Some text]()
--- a/CliClient/tests/html_to_md/anchor_with_newlines.html
+++ b/CliClient/tests/html_to_md/anchor_with_newlines.html
@@ -0,0 +1 @@
+<a href="http://example.com"><p>That</p><p>Shouldn't be allowed</p></a>
--- a/CliClient/tests/html_to_md/anchor_with_newlines.md
+++ b/CliClient/tests/html_to_md/anchor_with_newlines.md
@@ -0,0 +1 @@
+[That<br>Shouldn't be allowed](http://example.com)
--- a/CliClient/tests/html_to_md/code_1.html
+++ b/CliClient/tests/html_to_md/code_1.html
@@ -0,0 +1,8 @@
+<div>
+	<table><tbody><tr><td class="code"><pre class="python" style="font-family:monospace;"><span style="color: #ff7700;font-weight:bold;">def</span> ma_fonction<span style="color: black;">(</span><span style="color: black;">)</span>:
+    <span style="color: #483d8b;">"""
+        C'est une super fonction
+    """</span>
+    <span style="color: #ff7700;font-weight:bold;">pass</span></pre></td></tr></tbody></table>
+
+</div>
--- a/CliClient/tests/html_to_md/code_1.md
+++ b/CliClient/tests/html_to_md/code_1.md
@@ -0,0 +1,5 @@
+    def ma_fonction():
+        """
+            C'est une super fonction
+        """
+        pass
--- a/CliClient/tests/html_to_md/list_with_many_items.html
+++ b/CliClient/tests/html_to_md/list_with_many_items.html
@@ -0,0 +1,13 @@
+<!-- Make sure in particular that indentation is correct after the 9th item -->
+<ol>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+	<li><p>One</p><p>Two</p></li>
+</ol>
--- a/CliClient/tests/html_to_md/list_with_many_items.md
+++ b/CliClient/tests/html_to_md/list_with_many_items.md
@@ -0,0 +1,39 @@
+1.  One
+    
+    Two
+    
+2.  One
+    
+    Two
+    
+3.  One
+    
+    Two
+    
+4.  One
+    
+    Two
+    
+5.  One
+    
+    Two
+    
+6.  One
+    
+    Two
+    
+7.  One
+    
+    Two
+    
+8.  One
+    
+    Two
+    
+9.  One
+    
+    Two
+    
+10. One
+    
+    Two
--- a/CliClient/tests/html_to_md/skip_script.html
+++ b/CliClient/tests/html_to_md/skip_script.html
@@ -0,0 +1 @@
+<script id="appnexus-adload" data-reactid="7">window.apntag=window.apntag||{};window.apntag.anq=window.apntag.anq||[];</script>
--- a/CliClient/tests/html_to_md/skip_script.md
+++ b/CliClient/tests/html_to_md/skip_script.md
--- a/CliClient/tests/html_to_md/skip_style.html
+++ b/CliClient/tests/html_to_md/skip_style.html
--- a/CliClient/tests/html_to_md/skip_style.md
+++ b/CliClient/tests/html_to_md/skip_style.md
--- a/CliClient/tests/html_to_md/table_no_header.html
+++ b/CliClient/tests/html_to_md/table_no_header.html
@@ -0,0 +1,4 @@
+<table>
+	<tr><td>No</td><td>header</td></tr>
+	<tr><td>And no</td><td>suprises</td></tr>
+</table>
--- a/CliClient/tests/html_to_md/table_no_header.md
+++ b/CliClient/tests/html_to_md/table_no_header.md
@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| No  | header |
+| And no | suprises |
--- a/CliClient/tests/html_to_md/table_with_colspan.html
+++ b/CliClient/tests/html_to_md/table_with_colspan.html
@@ -0,0 +1,15 @@
+<table>
+	<tr>
+		<td colspan="2">
+			Something that was originally spanning two columns
+		</td>
+	</tr>
+	<tr>
+		<td>
+			One
+		</td>
+		<td>
+			Two
+		</td>
+	</tr>
+</table>
--- a/CliClient/tests/html_to_md/table_with_colspan.md
+++ b/CliClient/tests/html_to_md/table_with_colspan.md
@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| Something that was originally spanning two columns |     |
+| One | Two |
--- a/CliClient/tests/html_to_md/table_with_empty_cells.html
+++ b/CliClient/tests/html_to_md/table_with_empty_cells.html
@@ -0,0 +1,10 @@
+<table>
+	<tr>
+		<td></td>
+		<td>Previous is empty</td>
+	</tr>
+	<tr>
+		<td>Next is empty</td>
+		<td></td>
+	</tr>
+</table>
--- a/CliClient/tests/html_to_md/table_with_empty_cells.md
+++ b/CliClient/tests/html_to_md/table_with_empty_cells.md
@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+|     | Previous is empty |
+| Next is empty |     |
--- a/CliClient/tests/html_to_md/table_with_empty_row.html
+++ b/CliClient/tests/html_to_md/table_with_empty_row.html
@@ -0,0 +1,13 @@
+<table>
+	<tr>
+		<td>One</td><td>Two</td>
+	</tr>
+	<tr></tr>
+	<tr>
+		<td>One</td><td>Two</td>
+	</tr>
+	<tr></tr>
+	<tr>
+		<td>One</td><td>Two</td>
+	</tr>
+</table>
--- a/CliClient/tests/html_to_md/table_with_empty_row.md
+++ b/CliClient/tests/html_to_md/table_with_empty_row.md
@@ -0,0 +1,5 @@
+|     |     |
+| --- | --- |
+| One | Two |
+| One | Two |
+| One | Two |
--- a/CliClient/tests/html_to_md/table_with_newlines.html
+++ b/CliClient/tests/html_to_md/table_with_newlines.html
@@ -0,0 +1,6 @@
+<table>
+	<tr>
+		<td><p>Some paragraph</p><p>inside a table cell</p></td>
+		<td>Second column</td>
+	</tr>
+</table>
--- a/CliClient/tests/html_to_md/table_with_newlines.md
+++ b/CliClient/tests/html_to_md/table_with_newlines.md
@@ -0,0 +1,3 @@
+|     |     |
+| --- | --- |
+| Some paragraph<br><br>inside a table cell | Second column |
--- a/CliClient/tests/html_to_md/table_within_table.html
+++ b/CliClient/tests/html_to_md/table_within_table.html
@@ -0,0 +1,16 @@
+<!--
+The inner table is rendered but not the outer one.
+Basically if any table contains another table, it is rendered as plain text
+-->
+<table>
+	<tr><td>
+		First column, and an inner table:
+
+		<table>
+			<tr><td>One</td><td>Two</td></tr>
+			<tr><td>One</td><td>Two</td></tr>
+		</table>
+	</td>
+	<td>Second column</td>
+	</tr>
+</table>
--- a/CliClient/tests/html_to_md/table_within_table.md
+++ b/CliClient/tests/html_to_md/table_within_table.md
@@ -0,0 +1,8 @@
+First column, and an inner table:
+
+|     |     |
+| --- | --- |
+| One | Two |
+| One | Two |
+
+Second column
--- a/CliClient/tests/markdownUtils.js
+++ b/CliClient/tests/markdownUtils.js
@@ -0,0 +1,54 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const markdownUtils = require('lib/markdownUtils.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('markdownUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should prepend a base URL', async (done) => {
+		const baseUrl = 'https://test.com/site';
+
+		const testCases = [
+			['[something](testing.html)', '[something](https://test.com/site/testing.html)'],
+			['![something](/img/test.png)', '![something](https://test.com/img/test.png)'],
+			['[![something](/img/test.png)](/index.html "Home page")', '[![something](https://test.com/img/test.png)](https://test.com/index.html "Home page")'],
+			['[onelink.com](/jmp/?id=123&u=http://something.com/test)', '[onelink.com](https://test.com/jmp/?id=123&u=http://something.com/test)'],
+			['[![some text](/img/test.png)](/jmp/?s=80&l=related&u=http://example.com "some decription")', '[![some text](https://test.com/img/test.png)](https://test.com/jmp/?s=80&l=related&u=http://example.com "some decription")'],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const expected = testCases[i][1];
+			expect(markdownUtils.prependBaseUrl(md, baseUrl)).toBe(expected);
+		}
+
+		done();
+	});
+
+	it('should extract image URLs', async (done) => {
+		const testCases = [
+			['![something](http://test.com/img.png)', ['http://test.com/img.png']],
+			['![something](http://test.com/img.png) ![something2](http://test.com/img2.png)', ['http://test.com/img.png', 'http://test.com/img2.png']],
+			['![something](http://test.com/img.png "Some description")', ['http://test.com/img.png']],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const expected = testCases[i][1];
+
+			expect(markdownUtils.extractImageUrls(md).join('')).toBe(expected.join(''));
+		}
+
+		done();
+	});
+
+});
--- a/CliClient/tests/models_Folder.js
+++ b/CliClient/tests/models_Folder.js
@@ -0,0 +1,55 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+async function allItems() {
+	let folders = await Folder.all();
+	let notes = await Note.all();
+	return folders.concat(notes);
+}
+
+describe('models_Folder', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should tell if a notebook can be nested under another one', asyncTest(async () => {
+		let f1 = await Folder.save({ title: "folder1" });
+		let f2 = await Folder.save({ title: "folder2", parent_id: f1.id });
+		let f3 = await Folder.save({ title: "folder3", parent_id: f2.id });
+		let f4 = await Folder.save({ title: "folder4" });
+
+		expect(await Folder.canNestUnder(f1.id, f2.id)).toBe(false);
+		expect(await Folder.canNestUnder(f2.id, f2.id)).toBe(false);
+		expect(await Folder.canNestUnder(f3.id, f1.id)).toBe(true);
+		expect(await Folder.canNestUnder(f4.id, f1.id)).toBe(true);
+		expect(await Folder.canNestUnder(f2.id, f3.id)).toBe(false);
+		expect(await Folder.canNestUnder(f3.id, f2.id)).toBe(true);
+		expect(await Folder.canNestUnder(f1.id, '')).toBe(true);
+		expect(await Folder.canNestUnder(f2.id, '')).toBe(true);
+	}));
+
+	it('should recursively delete notes and sub-notebooks', asyncTest(async () => {
+		let f1 = await Folder.save({ title: "folder1" });
+		let f2 = await Folder.save({ title: "folder2", parent_id: f1.id });
+		let n1 = await Note.save({ title: 'note1', parent_id: f2.id });
+
+		await Folder.delete(f1.id);
+
+		const all = await allItems();
+		expect(all.length).toBe(0);
+	}));
+
+});
--- a/CliClient/tests/models_Note.js
+++ b/CliClient/tests/models_Note.js
@@ -0,0 +1,39 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
+const { shim } = require('lib/shim');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('models_Note', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should find resource and note IDs', asyncTest(async () => {
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+
+		let items = await Note.linkedItems(note2.body);
+		expect(items.length).toBe(1);
+		expect(items[0].id).toBe(note1.id);
+
+		await shim.attachFileToNote(note2, __dirname + '/../tests/support/photo.jpg');
+		note2 = await Note.load(note2.id);
+		items = await Note.linkedItems(note2.body);
+		expect(items.length).toBe(2);
+		expect(items[0].type_).toBe(BaseModel.TYPE_NOTE);
+		expect(items[1].type_).toBe(BaseModel.TYPE_RESOURCE);
+	}));
+
+});
--- a/CliClient/tests/services_InteropService.js
+++ b/CliClient/tests/services_InteropService.js
@@ -13,6 +13,8 @@ const ArrayUtils = require('lib/ArrayUtils');
 const ObjectUtils = require('lib/ObjectUtils');
 const { shim } = require('lib/shim.js');

+jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
@@ -180,7 +182,7 @@ describe('services_InteropService', function() {
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
 		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
 		note1 = await Note.load(note1.id);
-		let resourceIds = Note.linkedResourceIds(note1.body);
+		let resourceIds = await Note.linkedResourceIds(note1.body);
 		let resource1 = await Resource.load(resourceIds[0]);

 		await service.export({ path: filePath });
@@ -193,7 +195,7 @@ describe('services_InteropService', function() {

 		let note2 = (await Note.all())[0];
 		expect(note2.body).not.toBe(note1.body);
-		resourceIds = Note.linkedResourceIds(note2.body);
+		resourceIds = await Note.linkedResourceIds(note2.body);
 		expect(resourceIds.length).toBe(1);
 		let resource2 = await Resource.load(resourceIds[0]);
 		expect(resource2.id).not.toBe(resource1.id);
@@ -249,4 +251,63 @@ describe('services_InteropService', function() {
 		expect(folder2.title).toBe('folder1');
 	}));

+	it('should export and import folder and its sub-folders', asyncTest(async () => {
+		
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let folder2 = await Folder.save({ title: "folder2", parent_id: folder1.id });
+		let folder3 = await Folder.save({ title: "folder3", parent_id: folder2.id });
+		let folder4 = await Folder.save({ title: "folder4", parent_id: folder2.id });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder4.id });
+
+		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
+		
+		await Note.delete(note1.id);
+		await Folder.delete(folder1.id);
+		await Folder.delete(folder2.id);
+		await Folder.delete(folder3.id);
+		await Folder.delete(folder4.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(1);
+		expect(await Folder.count()).toBe(4);
+		
+		let folder1_2 = await Folder.loadByTitle('folder1');
+		let folder2_2 = await Folder.loadByTitle('folder2');
+		let folder3_2 = await Folder.loadByTitle('folder3');
+		let folder4_2 = await Folder.loadByTitle('folder4');
+		let note1_2 = await Note.loadByTitle('ma note');
+
+		expect(folder2_2.parent_id).toBe(folder1_2.id);
+		expect(folder3_2.parent_id).toBe(folder2_2.id);
+		expect(folder4_2.parent_id).toBe(folder2_2.id);
+		expect(note1_2.parent_id).toBe(folder4_2.id);
+	}));
+
+	it('should export and import links to notes', asyncTest(async () => {
+		const service = new InteropService();
+		const filePath = exportDir() + '/test.jex';
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		let note2 = await Note.save({ title: 'ma deuxième note', body: 'Lien vers première note : ' + Note.markdownTag(note1), parent_id: folder1.id });
+
+		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
+		
+		await Note.delete(note1.id);
+		await Note.delete(note2.id);
+		await Folder.delete(folder1.id);
+
+		await service.import({ path: filePath });
+
+		expect(await Note.count()).toBe(2);
+		expect(await Folder.count()).toBe(1);
+
+		let note1_2 = await Note.loadByTitle('ma note');
+		let note2_2 = await Note.loadByTitle('ma deuxième note');
+
+		expect(note2_2.body.indexOf(note1_2.id) >= 0).toBe(true);
+	}));
+
 });
--- a/CliClient/tests/services_ResourceService.js
+++ b/CliClient/tests/services_ResourceService.js
@@ -96,4 +96,14 @@ describe('services_ResourceService', function() {
 		expect(!!(await Resource.load(resource1.id))).toBe(true);
 	}));

+	it('should not delete a resource that has never been associated with any note, because it probably means the resource came via sync, and associated note has not arrived yet', asyncTest(async () => {
+		const service = new ResourceService();
+		const resource = await shim.createResourceFromPath(__dirname + '/../tests/support/photo.jpg');
+
+		await service.indexNoteResources();
+		await service.deleteOrphanResources(0);
+
+		expect((await Resource.all()).length).toBe(1);
+	}));
+
 });
--- a/CliClient/tests/urlUtils.js
+++ b/CliClient/tests/urlUtils.js
@@ -0,0 +1,37 @@
+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 urlUtils = require('lib/urlUtils.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('urlUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should prepend a base URL', async (done) => {
+		expect(urlUtils.prependBaseUrl('testing.html', 'http://example.com')).toBe('http://example.com/testing.html');
+		expect(urlUtils.prependBaseUrl('testing.html', 'http://example.com/')).toBe('http://example.com/testing.html');
+		expect(urlUtils.prependBaseUrl('/jmp/?id=123&u=http://something.com/test', 'http://example.com/')).toBe('http://example.com/jmp/?id=123&u=http://something.com/test');
+		expect(urlUtils.prependBaseUrl('/testing.html', 'http://example.com/')).toBe('http://example.com/testing.html');
+		expect(urlUtils.prependBaseUrl('/testing.html', 'http://example.com/something')).toBe('http://example.com/testing.html');
+		expect(urlUtils.prependBaseUrl('/testing.html', 'https://example.com/something')).toBe('https://example.com/testing.html');
+		expect(urlUtils.prependBaseUrl('//somewhereelse.com/testing.html', 'https://example.com/something')).toBe('https://somewhereelse.com/testing.html');
+		expect(urlUtils.prependBaseUrl('//somewhereelse.com/testing.html', 'http://example.com/something')).toBe('http://somewhereelse.com/testing.html');
+		expect(urlUtils.prependBaseUrl('', 'http://example.com/something')).toBe('http://example.com/something');
+		expect(urlUtils.prependBaseUrl('testing.html', '')).toBe('testing.html');
+
+		// It shouldn't prepend anyting for these:
+		expect(urlUtils.prependBaseUrl('mailto:emailme@example.com', 'http://example.com')).toBe('mailto:emailme@example.com');
+		expect(urlUtils.prependBaseUrl('javascript:var%20testing=true', 'http://example.com')).toBe('javascript:var%20testing=true');
+		expect(urlUtils.prependBaseUrl('http://alreadyabsolute.com', 'http://example.com')).toBe('http://alreadyabsolute.com');
+
+		done();
+	});
+
+});
--- a/Clipper/joplin-webclipper/.gitignore
+++ b/Clipper/joplin-webclipper/.gitignore
@@ -0,0 +1 @@
+dist/
--- a/Clipper/joplin-webclipper/background.js
+++ b/Clipper/joplin-webclipper/background.js
@@ -0,0 +1,79 @@
+let browser_ = null;
+let browserName_ = null;
+if (typeof browser !== 'undefined') {
+	browser_ = browser;
+	browserSupportsPromises_ = true;
+	browserName_ = 'firefox';
+} else if (typeof chrome !== 'undefined') {
+	browser_ = chrome;
+	browserSupportsPromises_ = false;
+	browserName_ = 'chrome';
+}
+
+let env_ = null;
+
+// Make this function global so that it can be accessed
+// from the popup too.
+// https://stackoverflow.com/questions/6323184/communication-between-background-page-and-popup-page-in-a-chrome-extension
+window.joplinEnv = function() {
+	if (env_) return env_;
+
+	const manifest = browser_.runtime.getManifest();
+	env_ = manifest.name.indexOf('[DEV]') >= 0 ? 'dev' : 'prod';
+	return env_;
+}
+
+async function browserCaptureVisibleTabs(windowId, options) {
+	if (browserSupportsPromises_) return browser_.tabs.captureVisibleTab(windowId, { format: 'jpeg' });
+
+	return new Promise((resolve, reject) => {
+		browser_.tabs.captureVisibleTab(windowId, { format: 'jpeg' }, (image) => {
+			resolve(image);
+		});
+	});
+}
+
+async function browserGetZoom(tabId) {
+	if (browserSupportsPromises_) return browser_.tabs.getZoom(tabId);
+
+	return new Promise((resolve, reject) => {
+		browser_.tabs.getZoom(tabId, (zoom) => {
+			resolve(zoom);
+		});
+	});
+}
+
+browser_.runtime.onInstalled.addListener(function(details) {
+	if (window.joplinEnv() === 'dev') {
+		browser_.browserAction.setIcon({
+			path: 'icons/32-dev.png',
+		});
+	}
+});
+
+browser_.runtime.onMessage.addListener(async (command) => {
+	if (command.name === 'screenshotArea') {
+
+		const zoom = await browserGetZoom();
+
+		const imageDataUrl = await browserCaptureVisibleTabs(null, { format: 'jpeg' });
+		content = Object.assign({}, command.content);
+		content.image_data_url = imageDataUrl;
+
+		const newArea = Object.assign({}, command.content.crop_rect);
+		newArea.x *= zoom;
+		newArea.y *= zoom;
+		newArea.width *= zoom;
+		newArea.height *= zoom;
+		content.crop_rect = newArea;
+
+		fetch(command.api_base_url + "/notes", {
+			method: "POST",
+			headers: {
+				'Accept': 'application/json',
+				'Content-Type': 'application/json'
+			},
+			body: JSON.stringify(content)
+		});
+	}
+});
--- a/Clipper/joplin-webclipper/content_scripts/.gitignore
+++ b/Clipper/joplin-webclipper/content_scripts/.gitignore
@@ -0,0 +1 @@
+*.bundle.js
--- a/Clipper/joplin-webclipper/content_scripts/JSDOMParser.js
+++ b/Clipper/joplin-webclipper/content_scripts/JSDOMParser.js
--- a/Clipper/joplin-webclipper/content_scripts/Readability.js
+++ b/Clipper/joplin-webclipper/content_scripts/Readability.js
--- a/Clipper/joplin-webclipper/content_scripts/index.js
+++ b/Clipper/joplin-webclipper/content_scripts/index.js
@@ -0,0 +1,247 @@
+(function() {
+
+	if (window.jopext_hasRun) return;
+	window.jopext_hasRun = true;
+
+	console.info('jopext: Loading content script');
+
+	let browser_ = null;
+	if (typeof browser !== 'undefined') {
+		browser_ = browser;
+		browserSupportsPromises_ = true;
+	} else if (typeof chrome !== 'undefined') {
+		browser_ = chrome;
+		browserSupportsPromises_ = false;
+	}
+
+	function pageTitle() {
+		const titleElements = document.getElementsByTagName("title");
+		if (titleElements.length) return titleElements[0].text.trim();
+		return document.title.trim();
+	}
+
+	function baseUrl() {
+		let output = location.origin + location.pathname;
+		if (output[output.length - 1] !== '/') {
+			output = output.split('/');
+			output.pop();
+			output = output.join('/');
+		}
+		return output;
+	}
+
+	// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
+	function cleanUpElement(element) {
+		const childNodes = element.childNodes;
+
+		for (let i = 0; i < childNodes.length; i++) {
+			const node = childNodes[i];
+
+			let isVisible = node.nodeType === 1 ? window.getComputedStyle(node).display !== 'none' : true;
+			if (isVisible && ['input', 'textarea', 'script', 'style', 'select', 'option', 'button'].indexOf(node.nodeName.toLowerCase()) >= 0) isVisible = false;
+
+			if (!isVisible) {
+				element.removeChild(node);
+			} else {
+				cleanUpElement(node);
+			}
+		}
+	}
+
+	function readabilityProcess() {
+		var uri = {
+			spec: location.href,
+			host: location.host,
+			prePath: location.protocol + "//" + location.host,
+			scheme: location.protocol.substr(0, location.protocol.indexOf(":")),
+			pathBase: location.protocol + "//" + location.host + location.pathname.substr(0, location.pathname.lastIndexOf("/") + 1)
+		};
+
+		// Readability directly change the passed document so clone it so as
+		// to preserve the original web page.
+		const documentClone = document.cloneNode(true);
+		const readability = new Readability(documentClone); // new window.Readability(uri, documentClone);
+		const article = readability.parse();
+
+		if (!article) throw new Error('Could not parse HTML document with Readability');
+
+		return {
+			title: article.title,
+			body: article.content,
+		}
+	}
+
+	async function prepareCommandResponse(command) {
+		console.info('Got command: ' + command.name);
+
+		if (command.name === "simplifiedPageHtml") {
+
+			let article = null;
+			try {
+				article = readabilityProcess();
+			} catch (error) {
+				console.warn(error);
+				console.warn('Sending full page HTML instead');
+				const newCommand = Object.assign({}, command, { name: 'completePageHtml' });
+				const response = await prepareCommandResponse(newCommand);
+				response.warning = 'Could not retrieve simplified version of page - full page has been saved instead.';
+				return response;
+			}
+
+			return {
+				name: 'clippedContent',
+				html: article.body,
+				title: article.title,
+				base_url: baseUrl(),
+				url: location.origin + location.pathname,
+				parent_id: command.parent_id,
+			};
+
+		} else if (command.name === "completePageHtml") {
+
+			const cleanDocument = document.body.cloneNode(true);
+			cleanUpElement(cleanDocument);
+
+			return {
+				name: 'clippedContent',
+				html: cleanDocument.innerHTML,
+				title: pageTitle(),
+				base_url: baseUrl(),
+				url: location.origin + location.pathname,
+				parent_id: command.parent_id,
+			};
+
+		} else if (command.name === 'screenshot') {
+
+			const overlay = document.createElement('div');
+			overlay.style.opacity = '0.6';
+			overlay.style.background = 'black';
+			overlay.style.width = '100%';
+			overlay.style.height = '100%';
+			overlay.style.zIndex = 99999999;
+			overlay.style.top = 0;
+			overlay.style.left = 0;
+			overlay.style.position = 'fixed';
+
+			document.body.appendChild(overlay);
+
+			const messageComp = document.createElement('div');
+
+			const messageCompWidth = 300;
+			messageComp.style.position = 'fixed'
+			messageComp.style.opacity = '0.95'
+			messageComp.style.fontSize = '14px';
+			messageComp.style.width = messageCompWidth + 'px'
+			messageComp.style.maxWidth = messageCompWidth + 'px'
+			messageComp.style.border = '1px solid black'
+			messageComp.style.background = 'white'
+			messageComp.style.top = '10px'
+			messageComp.style.textAlign = 'center';
+			messageComp.style.padding = '10px'
+			messageComp.style.left = Math.round(document.body.clientWidth / 2 - messageCompWidth / 2) + 'px'
+			messageComp.style.zIndex = overlay.style.zIndex + 1
+
+			messageComp.textContent = 'Drag and release to capture a screenshot';
+
+			document.body.appendChild(messageComp);
+
+			const selection = document.createElement('div');
+			selection.style.opacity = '0.4';
+			selection.style.border = '1px solid red';
+			selection.style.background = 'white';
+			selection.style.border = '2px solid black';
+			selection.style.zIndex = overlay.style.zIndex - 1;
+			selection.style.top = 0;
+			selection.style.left = 0;
+			selection.style.position = 'fixed';
+
+			document.body.appendChild(selection);
+
+			let isDragging = false;
+			let draggingStartPos = null;
+			let selectionArea = {};
+
+			function updateSelection() {
+				selection.style.left = selectionArea.x + 'px';
+				selection.style.top = selectionArea.y + 'px';
+				selection.style.width = selectionArea.width + 'px';
+				selection.style.height = selectionArea.height + 'px';
+			}
+
+			function setSelectionSizeFromMouse(event) {
+				selectionArea.width = Math.max(1, event.clientX - draggingStartPos.x);
+				selectionArea.height = Math.max(1, event.clientY - draggingStartPos.y);
+				updateSelection();
+			}
+
+			function selection_mouseDown(event) {
+				selectionArea = { x: event.clientX, y: event.clientY, width: 0, height: 0 }
+				draggingStartPos = { x: event.clientX, y: event.clientY };
+				isDragging = true;
+				updateSelection();
+			}
+
+			function selection_mouseMove(event) {
+				if (!isDragging) return;
+				setSelectionSizeFromMouse(event);
+			}
+
+			function selection_mouseUp(event) {
+				setSelectionSizeFromMouse(event);
+
+				isDragging = false;
+
+				overlay.removeEventListener('mousedown', selection_mouseDown);
+				overlay.removeEventListener('mousemove', selection_mouseMove);
+				overlay.removeEventListener('mouseup', selection_mouseUp);
+
+				document.body.removeChild(overlay);
+				document.body.removeChild(selection);
+				document.body.removeChild(messageComp);
+
+				console.info('jopext: selectionArea:', selectionArea);
+
+				if (!selectionArea || !selectionArea.width || !selectionArea.height) return;
+
+				// Need to wait a bit before taking the screenshot to make sure
+				// the overlays have been removed and don't appear in the
+				// screenshot. 10ms is not enough.
+				setTimeout(() => {
+					const content = {
+						title: pageTitle(),
+						crop_rect: selectionArea,
+						url: location.origin + location.pathname,
+						parent_id: command.parent_id,
+					};
+
+					browser_.runtime.sendMessage({
+						name: 'screenshotArea',
+						content: content,
+						api_base_url: command.api_base_url,
+					});
+				}, 100);
+			}
+
+			overlay.addEventListener('mousedown', selection_mouseDown);
+			overlay.addEventListener('mousemove', selection_mouseMove);
+			overlay.addEventListener('mouseup', selection_mouseUp);
+
+			return {};
+
+		} else {
+			throw new Error('Unknown command: ' + JSON.stringify(command));
+		}
+	}
+
+	async function execCommand(command) {
+		const response = await prepareCommandResponse(command);
+		browser_.runtime.sendMessage(response);
+	}
+
+	browser_.runtime.onMessage.addListener((command) => {
+		console.info('jopext: Got command:', command);
+
+		execCommand(command);
+	});
+
+})();
--- a/Clipper/joplin-webclipper/content_scripts/vendor.js
+++ b/Clipper/joplin-webclipper/content_scripts/vendor.js
@@ -0,0 +1,3 @@
+// Add here all the external scripts that the content script might need
+// and run browserify on it to create vendor.bundle.js
+const Readability = require('readability-node').Readability;
--- a/Clipper/joplin-webclipper/icons/32-dev.png
+++ b/Clipper/joplin-webclipper/icons/32-dev.png
--- a/Clipper/joplin-webclipper/icons/32.png
+++ b/Clipper/joplin-webclipper/icons/32.png
--- a/Clipper/joplin-webclipper/icons/48.png
+++ b/Clipper/joplin-webclipper/icons/48.png
--- a/Clipper/joplin-webclipper/icons/96.png
+++ b/Clipper/joplin-webclipper/icons/96.png
--- a/Clipper/joplin-webclipper/main.js
+++ b/Clipper/joplin-webclipper/main.js
--- a/Clipper/joplin-webclipper/manifest.json
+++ b/Clipper/joplin-webclipper/manifest.json
@@ -0,0 +1,45 @@
+{
+    "manifest_version": 2,
+    "name": "Joplin Web Clipper [DEV]",
+    "version": "1.0.5",
+    "description": "Capture and save web pages and screenshots from your browser to Joplin.",
+    "homepage_url": "https://joplin.cozic.net",
+    "icons": {
+        "48": "icons/48.png",
+        "96": "icons/96.png"
+    },
+    "permissions": [
+        "activeTab",
+        "tabs",
+        "http://*/",
+        "https://*/",
+        "<all_urls>",
+        "storage"
+    ],
+    "browser_action": {
+        "default_icon": "icons/32.png",
+        "default_title": "Joplin Web Clipper",
+        "default_popup": "popup/build/index.html"
+    },
+    "content_scripts": [
+        {
+            "matches": [
+                "*://*/"
+            ],
+            "js": [
+                "main.js"
+            ]
+        }
+    ],
+    "background": {
+        "scripts": [
+            "background.js"
+        ],
+        "persistent": false
+    },
+    "applications": {
+        "gecko": {
+            "id": "{8419486a-54e9-11e8-9401-ac9e17909436}"
+        }
+    }
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				Similarly, I need another regex to match double newlines (`\n\n`) that are not part of a longer run of newline characters like `\n\n\n` or `\n\n\n\n\n\n` etc.
				`@@ -0,0 +1 @@`
				the `[runtime.onConnect](/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/onConnect)` listener gets passed its own `[runtime.Port](/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/Port)` object.
				`@@ -0,0 +1 @@`
				`[Sign in](https://arstechnica.com/civis/ucp.php?mode=login&return_to=%2Ftech-policy%2F2018%2F05%2Fjails-are-replacing-in-person-visits-with-video-calling-services-theyre-awful%2F)`
				`@@ -0,0 +1 @@`
				`<ul class="find-me-on"><li><a href="https://github.com/zetter">Github</a></li><li><a href="https://twitter.com/czetter">Twitter</a></li><li><a href="http://lanyrd.com/profile/czetter/">Lanyrd</a></li></ul>`
				`@@ -0,0 +1 @@`
				`<ul class="find-me-on"><li>Github</li><li>Twitter</li></ul>`
				`@@ -0,0 +1 @@`
				`<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>`
				`@@ -0,0 +1 @@`
				`[# ![](https://joplin.cozic.net/images/Icon512.png)oplin](https://joplin.cozic.net)`
				`@@ -0,0 +1 @@`
				`<a href="javascript:alert('js')">Some text</a>`
				`@@ -0,0 +1 @@`
				`<a href="http://example.com"><p>That</p><p>Shouldn't be allowed</p></a>`
				`@@ -0,0 +1 @@`
				`[That<br>Shouldn't be allowed](http://example.com)`