Electron release v1.0.95

Adds functionality to allow for renaming of tags.

Assets/JoplinLetter.svg

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="116.54575mm"
+   height="131.19589mm"
+   viewBox="0 0 116.54575 131.19589"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="JoplinLetter.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="152.11122"
+     inkscape:cy="-26.090631"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-2.7903623,-2.175533)">
+    <path
+       style="fill:#000000;stroke-width:0.26458332"
+       d="m 43.790458,133.13317 c -8.32317,-1.11843 -12.937,-2.40956 -18.46857,-5.16822 -10.21924,-5.09644 -18.1023498,-13.95338 -21.1745998,-23.79038 -1.22214,-3.91319 -1.3607,-4.872332 -1.35685,-9.392712 0.003,-3.72804 0.0907,-4.66941 0.59927,-6.44569 1.0664,-3.7246 2.49409,-6.1704 5.19529,-8.90014 3.2574198,-3.29184 6.6565798,-4.77332 11.3929598,-4.96548 4.53189,-0.18388 7.54661,0.59927 10.40386,2.70266 1.82035,1.34007 3.67693,3.96421 4.71565,6.66525 0.65839,1.71204 0.70959,2.1839 0.90042,8.29756 0.19973,6.39855 0.36372,7.6318 1.39223,10.469902 1.40468,3.87611 3.78939,6.56189 7.33039,8.25588 3.20047,1.53108 5.63801,2.00183 9.60817,1.8556 2.58182,-0.0951 3.60332,-0.25442 5.15337,-0.80371 4.61358,-1.63493 8.46322,-5.31381 10.31326,-9.85579 1.91154,-4.693002 1.90785,-4.609372 1.90213,-43.127082 -0.005,-33.78395 -0.0106,-34.14337 -0.54484,-35.32188 -1.30698,-2.882895 -2.68223,-3.398165 -9.66971,-3.622945 l -5.12472,-0.16486 V 10.998334 2.175533 l 31.41927,0.06723 31.419272,0.06723 0.0697,8.755726 0.0697,8.755724 -5.09675,0.1793 c -2.82759,0.0995 -5.60596,0.33101 -6.24051,0.52006 -1.72896,0.5151 -2.82899,1.538795 -3.52569,3.281045 l -0.61059,1.5269 -0.16762,34.7927 c -0.16988,35.26321 -0.19381,36.08914 -1.18496,40.914372 -1.81292,8.82581 -8.301582,17.89221 -16.959672,23.69719 -6.95182,4.66099 -14.48972,7.21214 -24.82645,8.40235 -2.7431,0.31585 -14.57797,0.31433 -16.93333,-0.002 z"
+       id="path21"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

BUILD.md

@@ -37,8 +37,6 @@ yarn dist
 
 If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
 
-For node-gyp to work, you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
-
 That will create the executable file in the `dist` directory.
 
 From `/ElectronClient` you can also run `run.sh` to run the app for testing.
@@ -54,6 +52,10 @@ npm install
 yarn dist
 ```
 
+If node-gyp does not works (MSBUILD: error MSB3428: Could not load the Visual C++ component "VCBuild.exe"), you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
+
+If `yarn dist` fails, it may need administrative rights.
+
 # Building the Mobile application
 
 First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "Building Projects with Native Code" tab.

CONTRIBUTING.md

@@ -1,3 +1,7 @@
+# User support
+
+For general discussion about Joplin, user support, software development questions, and to discuss new features, please go to the [Joplin Forum](https://discourse.joplin.cozic.net/). It is possible to login with your GitHub account.
+
 # Reporting a bug
 
 Please check first that it [has not already been reported](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). Also consider [enabling debug mode](https://github.com/laurent22/joplin/blob/master/readme/debugging.md) before reporting the issue so that you can provide as much details as possible to help fix it.
@@ -6,7 +10,7 @@ If possible, **please provide a screenshot**. A screenshot showing the problem i
 
 # Feature requests
 
-Again, please check that it has not already been requested. If it has, simply **up-vote the issue** - the ones with the most up-votes are likely to be implemented. Adding a "+1" comment does nothing.
+Again, please check that it has not already been requested. If it has, simply **up-vote the issue** - the ones with the most up-votes are likely to be implemented. "+1" comments are not tracked.
 
 # Adding new features
 

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'])) {

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);

CliClient/app/command-help.js

@@ -72,11 +72,11 @@ 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).'));
-			this.stdout(_('To maximise/minimise the console, press "TC".'));
+			this.stdout(_('To maximise/minimise the console, press "tc".'));
 			this.stdout(_('To enter command line mode, press ":"'));
 			this.stdout(_('To exit command line mode, press ESCAPE'));
 			this.stdout(_('For the list of keyboard shortcuts and config options, type `help keymap`'));

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);

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_;
 	}

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);

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 ""
@@ -247,7 +247,8 @@ msgstr ""
 "Pro pohyb v seznamech a textových polích (včetně této konzole) používejte "
 "šipky a page up/down."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Pro maximalizaci/minimalizaci konzole stiskněte \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -363,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>."
@@ -616,6 +620,9 @@ msgstr "Hledat ve všech poznámkách"
 msgid "View"
 msgstr "Zobrazit"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Změňit layout editoru"
 
@@ -759,7 +766,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -794,6 +801,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:"
 
@@ -822,6 +833,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"
 
@@ -841,10 +856,19 @@ msgstr "Otevřít..."
 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 "Attach file"
 msgstr "Přiložit soubor"
 
@@ -854,12 +878,6 @@ 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."
-
 msgid "to-do"
 msgstr "to-do"
 
@@ -1031,6 +1049,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\""
@@ -1084,6 +1106,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"
 
@@ -1108,15 +1134,19 @@ msgstr "Při vytváření nové poznámky:"
 msgid "Show tray icon"
 msgstr "Zobrazovat ikonu v panelu"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 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."
@@ -1313,6 +1343,22 @@ 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"
 
@@ -1337,11 +1383,6 @@ msgstr "Heslo nemůže být prázdné"
 msgid "Enable"
 msgstr "Zapnout"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Nebylo možné uložit zápisník: %s"
@@ -1364,6 +1405,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"
@@ -1374,6 +1423,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"
 

CliClient/locales/da_DK.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk."
+"dk>Language-Team: \n"
 "Language: da_DK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,7 +127,7 @@ msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
 "`status` and `target-status`."
 msgstr ""
-"Udfører E2EEE konfiguration. Kommandoer er `enable`(aktiver), "
+"Udfører E2EE konfiguration. Kommandoer er `enable`(aktiver), "
 "`disable`(sluk), `decrypt`(dekrypter), `status` og `target-status` (modtager-"
 "status)."
 
@@ -163,8 +163,8 @@ msgstr "Rediger note."
 msgid ""
 "No text editor is defined. Please set it using `config editor <editor-path>`"
 msgstr ""
-"Ingen tekst editor er valgt.  Vælg en ved at indstille `config editor "
-"<editor-path>`"
+"Ingen teksteditor er valgt.  Vælg en ved at indstille `config editor <editor-"
+"path>`"
 
 msgid "No active notebook."
 msgstr "Ingen aktiv notesbog."
@@ -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 ""
@@ -247,7 +247,8 @@ msgstr ""
 "Brug pilene og PageUp/PageDown for at rulle lister og tekst-områder (inkl. "
 "denne konsol)"
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "For at maximere/ninimere konsollen, tryk \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -366,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>."
@@ -413,12 +417,14 @@ msgstr "Godkendelse  blev ikke fuldført (modtog ikke godkendelses token)."
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"For at Joplin kan synkronisere med Dropbox, skal man igennem nedenstående "
+"trin:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
-msgstr ""
+msgstr "Trin 1: Åben denne  URL i din browser for at autorisere applikationen:"
 
 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Trin 2: Indtast koden, som er oplyst af Dropbox:"
 
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -433,8 +439,8 @@ msgid ""
 "taking place, you may delete the lock file at \"%s\" and resume the "
 "operation."
 msgstr ""
-"Låse fil er allerede i brug. Hvis du ved at ingen synkronisering er i gang "
-"kan du slette låse-filen \"%s\" og genoptage synkroniseringen."
+"Låsefil er allerede i brug. Hvis du ved at ingen synkronisering er i gang "
+"kan du slette låsefilen \"%s\" og genoptage synkroniseringen."
 
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
@@ -619,6 +625,9 @@ msgstr "Søg i alle noter"
 msgid "View"
 msgstr "Vis"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Skift editor layout"
 
@@ -689,7 +698,7 @@ msgid "Save"
 msgstr "Gem"
 
 msgid "Submit"
-msgstr ""
+msgstr "Gem"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -764,8 +773,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
+"Se dokumentationen for nærmere oplysninger om End-To-End-kryptering (E2EE) "
+"og vejledning om hvordan det skal opsættes_"
 
 msgid "Status"
 msgstr "Status"
@@ -799,6 +810,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:"
 
@@ -827,6 +842,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"
 
@@ -846,10 +865,19 @@ msgstr "Åben..."
 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 "Attach file"
 msgstr "Vedhæft fil"
 
@@ -859,12 +887,6 @@ 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."
-
 msgid "to-do"
 msgstr "opgave"
 
@@ -885,7 +907,7 @@ msgid "OneDrive Login"
 msgstr "OneDrive login"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Dropbox Login"
 
 msgid "Options"
 msgstr "Muligheder"
@@ -923,7 +945,7 @@ msgid "Unknown flag: %s"
 msgstr "Ukendt flag: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Fil system"
@@ -1036,6 +1058,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\""
@@ -1089,6 +1115,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"
 
@@ -1113,15 +1143,19 @@ msgstr "Ved oprettelse af ny note:"
 msgid "Show tray icon"
 msgstr "Vis ikon på bundbjælke"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 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."
@@ -1313,9 +1347,25 @@ msgid "Cancel synchronisation"
 msgstr "Afbryd synkronisering"
 
 msgid "New tags:"
-msgstr ""
+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"
@@ -1342,11 +1392,6 @@ msgstr "Kodeord må ikke være tomt"
 msgid "Enable"
 msgstr "Tænd"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Notesbogen kan ikke gemmes: %s"
@@ -1369,6 +1414,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"
@@ -1379,6 +1432,9 @@ msgstr "Vedhæft foto"
 msgid "Attach any file"
 msgstr "Vedhæft fil"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Konverter til note"
 
@@ -1416,5 +1472,12 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
 msgid "Welcome"
 msgstr "Velkommen"
 
+#~ msgid ""
+#~ "For more information about End-To-End Encryption (E2EE) and advices on "
+#~ "how to enable it please check the documentation"
+#~ msgstr ""
+#~ "Se dokumentationen for nærmere oplysninger om End-To-End-kryptering "
+#~ "(E2EE) og vejledning om hvordan det skal opsættes"
+
 #~ msgid "Searches"
 #~ msgstr "Søgninger"

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,8 +259,8 @@ msgstr ""
 "Benutze die Pfeiltasten und Bild hoch/runter um durch Listen und Texte zu "
 "scrollen (inklusive diesem Terminal)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
-msgstr "Um das Terminal zu maximieren/minimieren, drücke \"TC\"."
+msgid "To maximise/minimise the console, press \"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 \":\""
@@ -379,7 +379,10 @@ 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."
+#, fuzzy
+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."
 
@@ -432,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."
@@ -530,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:"
@@ -540,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."
@@ -645,6 +649,9 @@ msgstr "Alle Notizen durchsuchen"
 msgid "View"
 msgstr "Ansicht"
 
+msgid "Toggle sidebar"
+msgstr "Seitenleiste ein/aus"
+
 msgid "Toggle editor layout"
 msgstr "Editor Layout umschalten"
 
@@ -715,7 +722,7 @@ msgid "Save"
 msgstr "Speichern"
 
 msgid "Submit"
-msgstr ""
+msgstr "Absenden"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -789,8 +796,10 @@ msgstr "Die Master-Keas dieser IDs werden für die Verschlüsselung einiger ..."
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"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"
@@ -826,15 +835,18 @@ msgstr "Trenne jede Markierung mit einem Komma."
 msgid "Rename notebook:"
 msgstr "Notizbuch umbenennen:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "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."
@@ -854,6 +866,10 @@ msgstr "Markierungen hinzufügen oder entfernen"
 msgid "Switch between note and to-do type"
 msgstr "Zwischen Notiz und To-Do Typ wechseln"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Löschen"
 
@@ -868,8 +884,8 @@ 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..."
@@ -877,10 +893,21 @@ msgstr "Öffne..."
 msgid "Save as..."
 msgstr "Sichern unter..."
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, 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 "Attach file"
 msgstr "Datei anhängen"
 
@@ -890,14 +917,6 @@ 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."
-msgstr ""
-"Diese Notiz hat keinen Inhalt. Klicke auf „%s“ um den Editor zu aktivieren "
-"und die Notiz zu bearbeiten."
-
 msgid "to-do"
 msgstr "To-Do"
 
@@ -918,7 +937,7 @@ msgid "OneDrive Login"
 msgstr "OneDrive Login"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Dropbox Anmeldung"
 
 msgid "Options"
 msgstr "Optionen"
@@ -957,7 +976,7 @@ msgid "Unknown flag: %s"
 msgstr "Unbekanntes Argument: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Dateisystem"
@@ -1036,9 +1055,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..."
@@ -1070,6 +1089,10 @@ msgstr "Verschlüsselte Objekte können nicht verändert werden"
 msgid "Conflicts"
 msgstr "Konflikte"
 
+#, fuzzy
+msgid "Cannot move notebook to this location"
+msgstr "Kann Notiz nicht zu Notizbuch \"%s\" verschieben"
+
 #, javascript-format
 msgid "A notebook with this title already exists: \"%s\""
 msgstr "Ein Notizbuch mit diesem Titel existiert bereits : \"%s\""
@@ -1125,6 +1148,10 @@ msgstr "Dunkel"
 msgid "Uncompleted to-dos on top"
 msgstr "Zeige unvollständige To-Dos an oberster Stelle"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Zeige unvollständige To-Dos an oberster Stelle"
+
 msgid "Sort notes by"
 msgstr "Sortiere Notizen nach"
 
@@ -1149,15 +1176,19 @@ msgstr "Wenn eine neue Notiz erstellt wird:"
 msgid "Show tray icon"
 msgstr "Zeige Tray Icon"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr "Hinweis: Funktioniert nicht in allen Desktopumgebungen."
+
 msgid "Global zoom percentage"
 msgstr "Zoomstufe der Benutzeroberfläche"
 
 msgid "Editor font family"
 msgstr "Editor Schriftenfamilie"
 
+#, 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 ""
 "Der Name der Schrift wird nicht überprüft. Ist dieser inkorrekt oder leer "
 "wird eine generische Monospace Schrift verwendet."
@@ -1277,7 +1308,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)"
@@ -1353,17 +1384,32 @@ msgid "Cancel synchronisation"
 msgstr "Synchronisation abbrechen"
 
 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 ""
+
+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 "Website von Joplin"
 
-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "Mit OneDrive anmelden"
+msgstr "Mit Dropbox anmelden"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1382,11 +1428,6 @@ msgstr "Passwort darf nicht leer sein"
 msgid "Enable"
 msgstr "Aktivieren"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Dieses Notizbuch konnte nicht gespeichert werden: %s"
@@ -1409,6 +1450,14 @@ msgstr "Änderungen speichern"
 msgid "Discard changes"
 msgstr "Änderungen verwerfen"
 
+#, 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 "Nicht unterstütztes Fotoformat: %s"
@@ -1419,6 +1468,9 @@ msgstr "Foto anhängen"
 msgid "Attach any file"
 msgstr "Beliebige Datei anhängen"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "In eine Notiz umwandeln"
 

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 ""
@@ -223,7 +223,7 @@ msgid ""
 "(including this console)."
 msgstr ""
 
-msgid "To maximise/minimise the console, press \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr ""
 
 msgid "To enter command line mode, press \":\""
@@ -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>."
@@ -556,6 +558,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -688,7 +693,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -723,6 +728,9 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""
 
+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""
 
@@ -750,6 +758,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -769,10 +780,19 @@ 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 "Attach file"
 msgstr ""
 
@@ -782,12 +802,6 @@ msgstr ""
 msgid "Set alarm"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-
 msgid "to-do"
 msgstr ""
 
@@ -951,6 +965,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 ""
@@ -1002,6 +1019,9 @@ msgstr ""
 msgid "Uncompleted to-dos on top"
 msgstr ""
 
+msgid "Show completed to-dos"
+msgstr ""
+
 msgid "Sort notes by"
 msgstr ""
 
@@ -1026,6 +1046,9 @@ msgstr ""
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1033,8 +1056,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"
@@ -1220,6 +1243,22 @@ 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 ""
 
@@ -1243,11 +1282,6 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -1270,6 +1304,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 ""
@@ -1280,6 +1322,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""
 

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,8 +250,8 @@ msgstr ""
 "Para desplazar en las listas y areas de texto (incluyendo la consola) "
 "utilice las flechas y re pág/av pág."
 
-msgid "To maximise/minimise the console, press \"TC\"."
-msgstr "Para maximizar/minimizar la consola, presione \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
+msgstr "Para maximizar/minimizar la consola, presione \"tc\"."
 
 msgid "To enter command line mode, press \":\""
 msgstr "Para entrar a modo línea de comando, presione \":\""
@@ -368,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>."
@@ -419,12 +421,14 @@ msgstr "Autenticación no completada (no se recibió token de autenticación)."
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"Para permitir a Joplin sincronizar con Dropbox, por favor siga estos pasos:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr ""
+"Paso 1: Abra esta dirección en su navegador para autorizar a la aplicación:"
 
 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Paso 2: Introduzca el código provisto por Dropbox:"
 
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -630,6 +634,9 @@ msgstr "Buscar en todas las notas"
 msgid "View"
 msgstr "Ver"
 
+msgid "Toggle sidebar"
+msgstr "Cambia la barra lateral"
+
 msgid "Toggle editor layout"
 msgstr "Cambia el diseño del editor"
 
@@ -700,7 +707,7 @@ msgid "Save"
 msgstr "Guardar"
 
 msgid "Submit"
-msgstr ""
+msgstr "Aceptar"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -775,8 +782,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
+"Para más información acerca del cifrado extremo a extremo (E2EE) y "
+"advertencias de como habilitarlo por favor revise la documentación:"
 
 msgid "Status"
 msgstr "Estado"
@@ -810,15 +819,18 @@ msgstr "Separar cada etiqueta por una coma."
 msgid "Rename notebook:"
 msgstr "Renombrar libreta:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Renombrar"
+
 msgid "Set alarm:"
 msgstr "Ajustar alarma:"
 
 msgid "Layout"
 msgstr "Diseño"
 
-#, fuzzy
 msgid "Search..."
-msgstr "Buscar"
+msgstr "Buscar..."
 
 msgid "Some items cannot be synchronised."
 msgstr "No se han podido sincronizar algunos de los elementos."
@@ -838,6 +850,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"
 
@@ -857,10 +872,21 @@ msgstr "Abrir..."
 msgid "Save as..."
 msgstr "Guardar como..."
 
+msgid "Copy path to clipboard"
+msgstr ""
+
 #, 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 "Attach file"
 msgstr "Adjuntar archivo"
 
@@ -870,14 +896,6 @@ 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."
-msgstr ""
-"Esta nota no tiene contenido. Pulse en \"%s\" para cambiar al editor y "
-"editar la nota."
-
 msgid "to-do"
 msgstr "lista de tareas"
 
@@ -898,7 +916,7 @@ msgid "OneDrive Login"
 msgstr "Inicio de sesión de OneDrive"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Inicio de sesión de Dropbox"
 
 msgid "Options"
 msgstr "Opciones"
@@ -936,7 +954,7 @@ msgid "Unknown flag: %s"
 msgstr "Etiqueta desconocida: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Sistema de archivos"
@@ -1015,7 +1033,7 @@ msgstr "Elementos remotos borrados: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Elementos obtenidos: %d/%d."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "State: %s."
 msgstr "Estado: «%s»."
 
@@ -1049,6 +1067,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»"
@@ -1103,6 +1124,10 @@ msgstr "Oscuro"
 msgid "Uncompleted to-dos on top"
 msgstr "Mostrar tareas incompletas al inicio de las listas"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Mostrar tareas incompletas al inicio de las listas"
+
 msgid "Sort notes by"
 msgstr "Ordenar notas por"
 
@@ -1127,15 +1152,19 @@ msgstr "Cuando se crear una nota nueva:"
 msgid "Show tray icon"
 msgstr "Mostrar icono en la bandeja"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr "Nota: No funciona en todos los entornos de escritorio."
+
 msgid "Global zoom percentage"
 msgstr "Establecer el porcentaje de aumento de la aplicación"
 
 msgid "Editor font family"
 msgstr "Fuente del 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 ""
 "El nombre de la fuente no se comprobado. Si es incorrecto o está vacío, se "
 "utilizará una fuente genérica monoespaciada."
@@ -1328,17 +1357,32 @@ msgid "Cancel synchronisation"
 msgstr "Cancelar sincronización"
 
 msgid "New tags:"
-msgstr ""
+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 ""
+
+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"
 
-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "Acceder con OneDrive"
+msgstr "Acceder con Dropbox"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1357,11 +1401,6 @@ msgstr "La contraseña no puede estar vacía"
 msgid "Enable"
 msgstr "Habilitado"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "No se ha podido guardar esta libreta: %s"
@@ -1384,6 +1423,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"
@@ -1394,6 +1442,9 @@ msgstr "Adjuntar foto"
 msgid "Attach any file"
 msgstr "Adjuntar cualquier archivo"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Convertir a nota"
 
@@ -1432,6 +1483,13 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenido"
 
+#~ msgid ""
+#~ "For more information about End-To-End Encryption (E2EE) and advices on "
+#~ "how to enable it please check the documentation"
+#~ msgstr ""
+#~ "Para más información acerca del cifrado extremo a extremo (E2EE) y "
+#~ "advertencias de como habilitarlo por favor revise la documentación"
+
 #~ msgid "Searches"
 #~ msgstr "Búsquedas"
 

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 ""
@@ -246,7 +246,8 @@ msgstr ""
 "Erabili geziak edo page up/down list eta testu guneen artean aldatzeko "
 "(kontsola hau ere kontuan izanda)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Kontsola maximizatu edo minimizatzeko, saka \"TC\" ."
 
 msgid "To enter command line mode, press \":\""
@@ -367,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>."
@@ -629,6 +633,9 @@ msgstr "Bilatu ohar guztietan"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -776,7 +783,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -813,6 +820,10 @@ msgstr "Banatu etiketak koma erabiliaz."
 msgid "Rename notebook:"
 msgstr "Berrizendatu koadernoa:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Berrizendatu"
+
 msgid "Set alarm:"
 msgstr "Ezarri alarma:"
 
@@ -841,6 +852,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,10 +875,19 @@ msgstr ""
 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 "Attach file"
 msgstr "Erantsi fitxategia"
 
@@ -874,12 +897,6 @@ 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."
-msgstr ""
-
 #, fuzzy
 msgid "to-do"
 msgstr "Zeregin berria"
@@ -1056,6 +1073,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\""
@@ -1111,6 +1132,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 ""
 
@@ -1138,6 +1163,9 @@ msgstr "Ohar berria sortzen du."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 #, fuzzy
 msgid "Global zoom percentage"
 msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
@@ -1146,8 +1174,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"
@@ -1345,6 +1373,22 @@ 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,11 +1413,6 @@ msgstr "Pasahitza ezin utz daiteke hutsik"
 msgid "Enable"
 msgstr "Gaituta"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Koadernoa ezin gorde daiteke: %s"
@@ -1396,6 +1435,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"
@@ -1406,6 +1453,9 @@ msgstr "Argazkia erantsi"
 msgid "Attach any file"
 msgstr "Erantsi fitxategiren bat"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Oharra bihurtu"
 

CliClient/locales/fr_FR.po

@@ -14,6 +14,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.3\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "Pour supprimer une vignette, enlever là des notes associées."
@@ -229,7 +231,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 ""
@@ -248,8 +250,8 @@ msgstr ""
 "Utilisez les touches fléchées et page précédente/suivante pour faire défiler "
 "les listes et zones de texte (y compris cette console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
-msgstr "Pour maximiser ou minimiser la console, pressez \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
+msgstr "Pour maximiser ou minimiser la console, pressez \"tc\"."
 
 msgid "To enter command line mode, press \":\""
 msgstr "Pour démarrer le mode ligne de commande, pressez \":\""
@@ -365,10 +367,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>."
@@ -631,6 +635,9 @@ msgstr "Chercher dans toutes les notes"
 msgid "View"
 msgstr "Affichage"
 
+msgid "Toggle sidebar"
+msgstr "Basculer barre latérale"
+
 msgid "Toggle editor layout"
 msgstr "Basculer l'agencement de l'éditeur"
 
@@ -761,7 +768,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."
 
@@ -779,10 +786,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 "Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
-"conseils pour l'activer, veuillez consulter la documentation"
+"conseils pour l'activer, veuillez consulter la documentation :"
 
 msgid "Status"
 msgstr "État"
@@ -818,6 +825,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 :"
 
@@ -845,6 +855,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,10 +880,21 @@ msgstr "Ouvrir..."
 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 "Attach file"
 msgstr "Attacher un fichier"
 
@@ -880,14 +904,6 @@ msgstr "Étiquettes"
 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 "to-do"
 msgstr "tâche"
 
@@ -1060,6 +1076,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\""
@@ -1113,6 +1132,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"
 
@@ -1137,6 +1159,9 @@ msgstr "Lors de la création d'une note :"
 msgid "Show tray icon"
 msgstr "Afficher 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."
+
 msgid "Global zoom percentage"
 msgstr "Niveau de zoom"
 
@@ -1144,10 +1169,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"
@@ -1345,6 +1371,28 @@ 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"
 
@@ -1368,13 +1416,6 @@ msgstr "Mot de passe ne peut être vide"
 msgid "Enable"
 msgstr "Activer"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-"Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
-"conseils pour l'activer, veuillez consulter la documentation :"
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Ce carnet n'a pas pu être sauvegardé : %s"
@@ -1397,6 +1438,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"
@@ -1407,6 +1457,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"
 
@@ -1446,6 +1499,13 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
+#~ msgid ""
+#~ "For more information about End-To-End Encryption (E2EE) and advices on "
+#~ "how to enable it please check the documentation"
+#~ msgstr ""
+#~ "Pour plus d'informations sur l'encryption de bout en bout, ainsi que des "
+#~ "conseils pour l'activer, veuillez consulter la documentation"
+
 #~ msgid "Searches"
 #~ msgstr "Recherches"
 

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."
@@ -250,7 +246,8 @@ msgstr ""
 "Use the arrows and page up/down to scroll the lists and text areas "
 "(including this console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Za maksimiziranje/minimiziranje konzole, pritisni \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -371,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."
 
@@ -631,6 +631,9 @@ msgstr "Pretraži u svim bilješkama"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -767,7 +770,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -804,6 +807,10 @@ msgstr "Odvoji oznake zarezom."
 msgid "Rename notebook:"
 msgstr "Preimenuj bilježnicu:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Preimenuj"
+
 msgid "Set alarm:"
 msgstr "Postavi upozorenje:"
 
@@ -833,6 +840,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,10 +863,19 @@ msgstr ""
 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 "Attach file"
 msgstr "Priloži datoteku"
 
@@ -866,12 +885,6 @@ msgstr "Oznake"
 msgid "Set alarm"
 msgstr "Postavi upozorenje"
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-
 #, fuzzy
 msgid "to-do"
 msgstr "Novi zadatak"
@@ -1044,6 +1057,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\""
@@ -1098,6 +1115,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 ""
 
@@ -1126,6 +1147,9 @@ msgstr "Stvara novu bilješku."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1133,8 +1157,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"
@@ -1325,6 +1349,22 @@ 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 ""
 
@@ -1350,11 +1390,6 @@ msgstr ""
 msgid "Enable"
 msgstr "Onemogućeno"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Bilježnicu nije moguće snimiti: %s"
@@ -1377,6 +1412,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"
@@ -1387,6 +1430,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"
 

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 ""
@@ -245,7 +245,8 @@ msgstr ""
 "Usa le frecce e pagina su/giù per scorrere le liste e le aree di testo "
 "(compresa questa console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Per massimizzare/minimizzare la console, premi \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -363,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>."
@@ -613,6 +616,9 @@ msgstr "Cerca in tutte le note"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -751,7 +757,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -786,6 +792,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:"
 
@@ -815,6 +825,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,10 +849,19 @@ msgstr ""
 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 "Attach file"
 msgstr "Allega file"
 
@@ -849,12 +871,6 @@ msgstr "Etichette"
 msgid "Set alarm"
 msgstr "Imposta allarme"
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-
 #, fuzzy
 msgid "to-do"
 msgstr "Nuova attività"
@@ -1030,6 +1046,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\""
@@ -1084,6 +1104,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 ""
 
@@ -1112,6 +1136,9 @@ msgstr "Crea una nuova nota."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1119,8 +1146,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"
@@ -1311,6 +1338,22 @@ 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 ""
 
@@ -1336,11 +1379,6 @@ msgstr ""
 msgid "Enable"
 msgstr "Disabilitato"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Il blocco note non può essere salvato: %s"
@@ -1363,6 +1401,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"
@@ -1373,6 +1419,9 @@ msgstr "Allega foto"
 msgid "Attach any file"
 msgstr "Allega qualsiasi file"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converti in nota"
 

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 ""
@@ -240,7 +240,8 @@ msgid ""
 "(including this console)."
 msgstr "リストや入力エリアの移動には矢印キーまたはPage Up/Downを使用します。"
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "コンソールの最大化・最小化には\"TC\"と入力してください。"
 
 msgid "To enter command line mode, press \":\""
@@ -360,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>."
@@ -614,6 +618,9 @@ msgstr "すべてのノートを検索"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -753,7 +760,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -790,6 +797,10 @@ msgstr "それぞれのタグをカンマ(,)で区切ってください。"
 msgid "Rename notebook:"
 msgstr "ノートブックの名前を変更："
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "名前の変更"
+
 msgid "Set alarm:"
 msgstr "アラームをセット："
 
@@ -819,6 +830,9 @@ msgstr "タグの追加・削除"
 msgid "Switch between note and to-do type"
 msgstr "ノートとToDoを切り替え"
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr "削除"
 
@@ -839,10 +853,19 @@ 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 "Attach file"
 msgstr "ファイルを添付"
 
@@ -852,12 +875,6 @@ msgstr "タグ"
 msgid "Set alarm"
 msgstr "アラームをセット"
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-
 #, fuzzy
 msgid "to-do"
 msgstr "新しいToDo"
@@ -1032,6 +1049,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\"という名前のノートブックはすでに存在しています。"
@@ -1088,6 +1109,10 @@ msgstr "暗い"
 msgid "Uncompleted to-dos on top"
 msgstr "未完のToDoをリストの上部に表示"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "未完のToDoをリストの上部に表示"
+
 msgid "Sort notes by"
 msgstr ""
 
@@ -1116,6 +1141,9 @@ msgstr "あたらしいノートを作成します。"
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1123,8 +1151,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"
@@ -1315,6 +1343,22 @@ 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 ""
 
@@ -1340,11 +1384,6 @@ msgstr ""
 msgid "Enable"
 msgstr "無効"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "ノートブックは保存できませんでした：%s"
@@ -1367,6 +1406,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."
@@ -1377,6 +1424,9 @@ msgstr "写真を添付"
 msgid "Attach any file"
 msgstr "ファイルを添付"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "ノートに変換"
 

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 ""
@@ -223,7 +223,7 @@ msgid ""
 "(including this console)."
 msgstr ""
 
-msgid "To maximise/minimise the console, press \"TC\"."
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr ""
 
 msgid "To enter command line mode, press \":\""
@@ -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>."
@@ -556,6 +558,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -688,7 +693,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -723,6 +728,9 @@ msgstr ""
 msgid "Rename notebook:"
 msgstr ""
 
+msgid "Rename tag:"
+msgstr ""
+
 msgid "Set alarm:"
 msgstr ""
 
@@ -750,6 +758,9 @@ msgstr ""
 msgid "Switch between note and to-do type"
 msgstr ""
 
+msgid "Copy Markdown link"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -769,10 +780,19 @@ 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 "Attach file"
 msgstr ""
 
@@ -782,12 +802,6 @@ msgstr ""
 msgid "Set alarm"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-
 msgid "to-do"
 msgstr ""
 
@@ -951,6 +965,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 ""
@@ -1002,6 +1019,9 @@ msgstr ""
 msgid "Uncompleted to-dos on top"
 msgstr ""
 
+msgid "Show completed to-dos"
+msgstr ""
+
 msgid "Sort notes by"
 msgstr ""
 
@@ -1026,6 +1046,9 @@ msgstr ""
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1033,8 +1056,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"
@@ -1220,6 +1243,22 @@ 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 ""
 
@@ -1243,11 +1282,6 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -1270,6 +1304,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 ""
@@ -1280,6 +1322,9 @@ msgstr ""
 msgid "Attach any file"
 msgstr ""
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr ""
 

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 ""
@@ -249,7 +249,8 @@ msgstr ""
 "Gebruik de pijltjes en page up/down om door de lijsten en de tekstvelden te "
 "scrollen (ook deze console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Om de console te maximaliseren/minimaliseren, typ \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -368,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."
@@ -631,6 +635,9 @@ msgstr "Zoek in alle notities"
 msgid "View"
 msgstr ""
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr ""
 
@@ -778,7 +785,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -815,6 +822,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:"
 
@@ -843,6 +854,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,10 +879,19 @@ msgstr ""
 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 "Attach file"
 msgstr "Voeg bestand toe"
 
@@ -878,12 +901,6 @@ 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."
-msgstr ""
-
 #, fuzzy
 msgid "to-do"
 msgstr "Nieuwe to-do"
@@ -1058,6 +1075,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"
@@ -1115,6 +1136,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 ""
 
@@ -1142,6 +1167,9 @@ msgstr "Maakt een nieuwe notitie aan."
 msgid "Show tray icon"
 msgstr ""
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 msgstr ""
 
@@ -1149,8 +1177,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"
@@ -1347,6 +1375,22 @@ 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 ""
 
@@ -1371,11 +1415,6 @@ msgstr "Wachtwoord kan niet leeg zijn"
 msgid "Enable"
 msgstr "Activeer"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Het notitieboek kon niet opgeslaan worden: %s"
@@ -1398,6 +1437,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"
@@ -1408,6 +1455,9 @@ msgstr "Voeg foto toe"
 msgid "Attach any file"
 msgstr "Voeg bestand toe"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converteer naar notitie"
 

CliClient/locales/pt_BR.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.7\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -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 ""
@@ -246,7 +246,8 @@ msgstr ""
 "Use as setas e a Page Up/Page Down para rolar as listas e áreas de texto "
 "(incluindo este console)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Para maximizar / minimizar o console, pressione \"TC\"."
 
 msgid "To enter command line mode, press \":\""
@@ -362,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."
@@ -414,12 +418,14 @@ msgstr ""
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
 msgstr ""
+"Para permitir o Joplin sincronizar com o Dropbox, por favor, execute os "
+"seguintes passos:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
-msgstr ""
+msgstr "Passo 1: Abra essa URL em seu navegador para autorizar:"
 
 msgid "Step 2: Enter the code provided by Dropbox:"
-msgstr ""
+msgstr "Passo 2: Entre o código fornecido pelo Dropbox:"
 
 #, javascript-format
 msgid "Not authentified with %s. Please provide any missing credentials."
@@ -577,9 +583,8 @@ msgstr "Exportando para \"%s\" com o formato \"%s\". Por favor, aguarde..."
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
 msgstr "Importando de \"%s\" com o formato \"%s\". Por favor, aguarde..."
 
-#, fuzzy
 msgid "PDF File"
-msgstr "Arquivo"
+msgstr "Arquivo PDF"
 
 msgid "File"
 msgstr "Arquivo"
@@ -600,7 +605,7 @@ msgid "Export"
 msgstr "Exportar"
 
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #, javascript-format
 msgid "Hide %s"
@@ -627,6 +632,9 @@ msgstr "Pesquisar em todas as notas"
 msgid "View"
 msgstr "Visualizar"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Alternar layout do editor"
 
@@ -697,7 +705,7 @@ msgid "Save"
 msgstr "Salvar"
 
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 msgid ""
 "Disabling encryption means *all* your notes and attachments are going to be "
@@ -772,8 +780,10 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
+"Para mais informações sobre Encriptação ponto-a-ponto (E2EE) e recomendações "
+"sobre como habilitar, favor verificar a documentação:"
 
 msgid "Status"
 msgstr "Status"
@@ -808,15 +818,18 @@ 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:"
 
 msgid "Layout"
 msgstr "Layout"
 
-#, fuzzy
 msgid "Search..."
-msgstr "Procurar"
+msgstr "Pesquisar..."
 
 msgid "Some items cannot be synchronised."
 msgstr "Alguns itens não podem ser sincronizados."
@@ -836,6 +849,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"
 
@@ -855,10 +872,21 @@ msgstr "Abrir..."
 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 "Attach file"
 msgstr "Anexar arquivo"
 
@@ -868,14 +896,6 @@ 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."
-msgstr ""
-"Esta nota não possui conteúdo. Clique em \"%s\" para alternar para o editor, "
-"e edite a nota."
-
 msgid "to-do"
 msgstr "tarefa"
 
@@ -896,7 +916,7 @@ msgid "OneDrive Login"
 msgstr "Login no OneDrive"
 
 msgid "Dropbox Login"
-msgstr ""
+msgstr "Login no Dropbox"
 
 msgid "Options"
 msgstr "Opções"
@@ -936,7 +956,7 @@ msgid "Unknown flag: %s"
 msgstr "Flag desconhecido: %s"
 
 msgid "Dropbox"
-msgstr ""
+msgstr "Dropbox"
 
 msgid "File system"
 msgstr "Sistema de arquivos"
@@ -1015,7 +1035,7 @@ msgstr "Itens remotos excluídos: %d."
 msgid "Fetched items: %d/%d."
 msgstr "Itens pesquisados: %d/%d."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "State: %s."
 msgstr "Estado: \"%s\"."
 
@@ -1026,15 +1046,15 @@ msgstr "Cancelando..."
 msgid "Completed: %s"
 msgstr "Completado: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Last error: %s"
-msgstr "Erro fatal:"
+msgstr "Último erro: %s"
 
 msgid "Idle"
-msgstr ""
+msgstr "Inativo"
 
 msgid "In progress"
-msgstr ""
+msgstr "Em andamento"
 
 #, javascript-format
 msgid "Synchronisation is already in progress. State: %s"
@@ -1049,6 +1069,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\""
@@ -1103,6 +1127,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"
 
@@ -1127,15 +1155,19 @@ msgstr "Quando criar uma nota nova:"
 msgid "Show tray icon"
 msgstr "Exibir tray icon"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 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."
@@ -1328,17 +1360,32 @@ msgid "Cancel synchronisation"
 msgstr "Cancelar sincronização"
 
 msgid "New tags:"
-msgstr ""
+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"
 
-#, fuzzy
 msgid "Login with Dropbox"
-msgstr "Login com OneDrive"
+msgstr "Login com Dropbox"
 
 #, javascript-format
 msgid "Master Key %s"
@@ -1357,11 +1404,6 @@ msgstr "Senha não pode ser vazia"
 msgid "Enable"
 msgstr "Habilitar"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "O caderno não pôde ser salvo: %s"
@@ -1384,6 +1426,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"
@@ -1394,6 +1444,9 @@ msgstr "Anexar foto"
 msgid "Attach any file"
 msgstr "Anexar qualquer arquivo"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Converter para nota"
 

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 ""
@@ -249,7 +249,8 @@ msgstr ""
 "Используйте стрелки и клавиши перелистывания страницы вверх/вниз для "
 "прокрутки списков и текстовых областей (включая эту консоль)."
 
-msgid "To maximise/minimise the console, press \"TC\"."
+#, fuzzy
+msgid "To maximise/minimise the console, press \"tc\"."
 msgstr "Чтобы развернуть/свернуть консоль, нажимайте «TC»."
 
 msgid "To enter command line mode, press \":\""
@@ -368,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>."
@@ -628,6 +632,9 @@ msgstr "Поиск во всех заметках"
 msgid "View"
 msgstr "Вид"
 
+msgid "Toggle sidebar"
+msgstr ""
+
 msgid "Toggle editor layout"
 msgstr "Переключить вид редактора"
 
@@ -775,7 +782,7 @@ msgstr ""
 
 msgid ""
 "For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation"
+"to enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -810,6 +817,10 @@ msgstr "Каждый тег отделяется запятой."
 msgid "Rename notebook:"
 msgstr "Переименовать блокнот:"
 
+#, fuzzy
+msgid "Rename tag:"
+msgstr "Переименовать"
+
 msgid "Set alarm:"
 msgstr "Установить напоминание:"
 
@@ -838,6 +849,10 @@ msgstr "Добавить или удалить теги"
 msgid "Switch between note and to-do type"
 msgstr "Переключить тип между заметкой и задачей"
 
+#, fuzzy
+msgid "Copy Markdown link"
+msgstr "Markdown"
+
 msgid "Delete"
 msgstr "Удалить"
 
@@ -857,10 +872,21 @@ msgstr "Открыть..."
 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 "Attach file"
 msgstr "Прикрепить файл"
 
@@ -870,14 +896,6 @@ msgstr "Теги"
 msgid "Set alarm"
 msgstr "Установить напоминание"
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-"Заметка пуста. Нажмите на «%s», чтобы переключиться в редактор и "
-"отредактировать её."
-
 msgid "to-do"
 msgstr "задача"
 
@@ -1049,6 +1067,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»"
@@ -1102,6 +1124,10 @@ msgstr "Тёмная"
 msgid "Uncompleted to-dos on top"
 msgstr "Незавершённые задачи сверху"
 
+#, fuzzy
+msgid "Show completed to-dos"
+msgstr "Незавершённые задачи сверху"
+
 msgid "Sort notes by"
 msgstr "Сортировать заметки по"
 
@@ -1126,15 +1152,19 @@ msgstr "При создании новой заметки:"
 msgid "Show tray icon"
 msgstr "Показывать иконку в панели задач"
 
+msgid "Note: Does not work in all desktop environments."
+msgstr ""
+
 msgid "Global zoom percentage"
 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 ""
 "Название шрифта не проверяется. Если оно указано некорректно или не задано, "
 "будет использоваться стандартный моноширинный шрифт."
@@ -1332,6 +1362,22 @@ 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"
 
@@ -1356,11 +1402,6 @@ msgstr "Пароль не может быть пустым"
 msgid "Enable"
 msgstr "Включено"
 
-msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr "Не удалось сохранить блокнот: %s"
@@ -1383,6 +1424,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"
@@ -1393,6 +1442,9 @@ msgstr "Прикрепить фото"
 msgid "Attach any file"
 msgstr "Прикрепить любой файл"
 
+msgid "Share"
+msgstr ""
+
 msgid "Convert to note"
 msgstr "Преобразовать в заметку"
 

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.106",
+  "version": "1.0.107",
   "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"

CliClient/run_test.sh

@@ -8,8 +8,20 @@ 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
+
+(cd "$ROOT_DIR" && npm test tests-build/ArrayUtils.js)
+(cd "$ROOT_DIR" && npm test tests-build/encryption.js
+(cd "$ROOT_DIR" && npm test tests-build/EnexToMd.js)
+(cd "$ROOT_DIR" && npm test tests-build/HtmlToMd.js)
+(cd "$ROOT_DIR" && npm test tests-build/markdownUtils.js)
+(cd "$ROOT_DIR" && npm test tests-build/models_Folder.js)
+(cd "$ROOT_DIR" && npm test tests-build/models_Note.js)
+(cd "$ROOT_DIR" && npm test tests-build/models_Setting.js)
+(cd "$ROOT_DIR" && npm test tests-build/services_InteropService.js)
+(cd "$ROOT_DIR" && npm test tests-build/services_ResourceService.js)
+(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js)
+(cd "$ROOT_DIR" && npm test tests-build/urlUtils.js)

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();
+	});
+
 });

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)
+			}
+		}
+	}));
+
+});

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 !== 'table_with_colspan.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)
+			}
+		}
+	}));
+
+});

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>

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:

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>

CliClient/tests/enex_to_md/code2.md

@@ -0,0 +1,7 @@
+Subshell:
+
+	(
+	    set -e
+	    false
+	    echo Unreachable
+	) && echo Great success

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>

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:

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>

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.

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>

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.

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>

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)

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>

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

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>

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/)

CliClient/tests/enex_to_md/list3.html

@@ -0,0 +1 @@
+<ul class="find-me-on"><li>Github</li><li>Twitter</li></ul>

CliClient/tests/enex_to_md/list3.md

@@ -0,0 +1,2 @@
+- Github
+- Twitter

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>

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.

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

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

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>

CliClient/tests/enex_to_md/tableWithNewLines.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| line 1<br>line 2 |     |
+| aaaaaa | line 3<br>line 4 |

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>

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)

CliClient/tests/html_to_md/anchor_with_js.html

@@ -0,0 +1 @@
+<a href="javascript:alert('js')">Some text</a>

CliClient/tests/html_to_md/anchor_with_js.md

@@ -0,0 +1 @@
+[Some text]()

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>

CliClient/tests/html_to_md/anchor_with_newlines.md

@@ -0,0 +1 @@
+[That<br>Shouldn't be allowed](http://example.com)

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>

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

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>

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>

CliClient/tests/html_to_md/table_no_header.md

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

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>

CliClient/tests/html_to_md/table_with_colspan.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| Something that was originally spanning two columns |     |
+| One | Two |

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>

CliClient/tests/html_to_md/table_with_empty_cells.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+|     | Previous is empty |
+| Next is empty |     |

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>

CliClient/tests/html_to_md/table_with_empty_row.md

@@ -0,0 +1,5 @@
+|     |     |
+| --- | --- |
+| One | Two |
+| One | Two |
+| One | Two |

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>

CliClient/tests/html_to_md/table_with_newlines.md

@@ -0,0 +1,3 @@
+|     |     |
+| --- | --- |
+| Some paragraph<br><br>inside a table cell | Second column |

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>

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

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();
+	});
+
+});

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);
+	}));
+
+});

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);
+	}));
+
+});

CliClient/tests/services_InteropService.js

@@ -180,7 +180,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 +193,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 +249,28 @@ describe('services_InteropService', function() {
 		expect(folder2.title).toBe('folder1');
 	}));
 
+	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);
+	}));
+
 });

CliClient/tests/test-utils.js

@@ -56,8 +56,8 @@ SyncTargetRegistry.addClass(SyncTargetOneDrive);
 SyncTargetRegistry.addClass(SyncTargetNextcloud);
 SyncTargetRegistry.addClass(SyncTargetDropbox);
 
-// const syncTargetId_ = SyncTargetRegistry.nameToId("nextcloud");
-const syncTargetId_ = SyncTargetRegistry.nameToId("memory");
+const syncTargetId_ = SyncTargetRegistry.nameToId("nextcloud");
+// const syncTargetId_ = SyncTargetRegistry.nameToId("memory");
 //const syncTargetId_ = SyncTargetRegistry.nameToId('filesystem');
 // const syncTargetId_ = SyncTargetRegistry.nameToId('dropbox');
 const syncDir = __dirname + '/../tests/sync';

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();
+	});
+
+});

Clipper/joplin-webclipper/.gitignore

@@ -0,0 +1 @@
+dist/

Clipper/joplin-webclipper/background.js

@@ -0,0 +1,40 @@
+let browser_ = null;
+if (typeof browser !== 'undefined') {
+	browser_ = browser;
+	browserSupportsPromises_ = true;
+} else if (typeof chrome !== 'undefined') {
+	browser_ = chrome;
+	browserSupportsPromises_ = false;
+}
+
+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);
+		});
+	});
+}
+
+chrome.runtime.onInstalled.addListener(function() {
+
+});
+
+browser_.runtime.onMessage.addListener((command) => {
+	if (command.name === 'screenshotArea') {
+		browserCaptureVisibleTabs(null, { format: 'jpeg' }).then((imageDataUrl) => {
+			content = Object.assign({}, command.content);
+			content.imageDataUrl = imageDataUrl;
+
+			fetch(command.apiBaseUrl + "/notes", {
+				method: "POST",
+				headers: {
+					'Accept': 'application/json',
+					'Content-Type': 'application/json'
+				},
+				body: JSON.stringify(content)
+			});
+		});
+	}
+});

Clipper/joplin-webclipper/content_scripts/.gitignore

@@ -0,0 +1 @@
+*.bundle.js

Clipper/joplin-webclipper/content_scripts/index.js

@@ -0,0 +1,238 @@
+(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,
+				baseUrl: baseUrl(),
+				url: location.origin + location.pathname,
+			};
+
+		} else if (command.name === "completePageHtml") {
+
+			const cleanDocument = document.body.cloneNode(true);
+			cleanUpElement(cleanDocument);
+
+			return {
+				name: 'clippedContent',
+				html: cleanDocument.innerHTML,
+				title: pageTitle(),
+				baseUrl: baseUrl(),
+				url: location.origin + location.pathname,
+			};
+
+		} else if (command.name === 'screenshot') {
+
+			const overlay = document.createElement('div');
+			overlay.style.opacity = '0.4';
+			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.9'
+			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 = '6px'
+			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);
+
+				if (!selectionArea || !selectionArea.width || !selectionArea.height) return;
+
+				setTimeout(() => {
+					const content = {
+						title: pageTitle(),
+						cropRect: selectionArea,
+						url: location.origin + location.pathname,
+					};
+
+					browser_.runtime.sendMessage({
+						name: 'screenshotArea',
+						content: content,
+						apiBaseUrl: command.apiBaseUrl,
+					});
+				}, 10);
+			}
+
+			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);
+	});
+
+})();

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;

Clipper/joplin-webclipper/manifest.json

@@ -0,0 +1,46 @@
+{
+	"manifest_version": 2,
+	"name": "Joplin Web Clipper",
+	"version": "1.0.1",
+
+	"description": "Gets and saves content 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>"
+	],
+
+	"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}"
+			}
+	 }
+}

Clipper/joplin-webclipper/package-lock.json

@@ -0,0 +1,45 @@
+{
+  "name": "joplin-webclipper",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "fs-extra": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "readability-node": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/readability-node/-/readability-node-0.1.0.tgz",
+      "integrity": "sha1-DUBacMLCFZRKf0qbX3UGzQWpsao="
+    },
+    "universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "dev": true
+    }
+  }
+}

Clipper/joplin-webclipper/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "joplin-webclipper",
+  "version": "1.0.0",
+  "description": "",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "readability-node": "^0.1.0"
+  },
+  "devDependencies": {
+    "fs-extra": "^6.0.1"
+  }
+}

Clipper/joplin-webclipper/popup/.gitignore

@@ -0,0 +1,21 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+
+# testing
+coverage
+
+# production
+build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*