CLI v1.0.145

* Trying to implement headless server

* Cli: Cleaned up and completed server command so that it is usable. Added warnings as it is advanced usage only at this point.

* Restored welcome assets

.eslintignore

@@ -33,8 +33,9 @@ node_modules/
 ReactNativeClient/android
 ReactNativeClient/ios
 ReactNativeClient/lib/vendor/
+ReactNativeClient/lib/welcomeAssets.js
 ReactNativeClient/locales
 ReactNativeClient/node_modules
 readme/
 Tools/node_modules
-Tools/PortableAppsLauncher
+Tools/PortableAppsLauncher

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

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

CliClient/app/app-gui.js

@@ -79,7 +79,7 @@ class AppGui {
 			reg.setupRecurrentSync();
 			DecryptionWorker.instance().scheduleStart();
 		} catch (error) {
-			this.fullScreen(false);
+			if (this.term_) { this.fullScreen(false); }
 			console.error(error);
 			process.exit(1);
 		}

CliClient/app/app.js

@@ -384,6 +384,8 @@ class Application extends BaseApplication {
 
 			this.currentFolder_ = await Folder.load(Setting.value('activeFolderId'));
 
+			await this.applySettingsSideEffects();
+
 			try {
 				await this.execCommand(argv);
 			} catch (error) {

CliClient/app/command-server.js

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

CliClient/locales/ar.po

@@ -935,8 +935,8 @@ msgstr ""
 "فيما بعد عبر المزامنة."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "يرجى الرجوع إلى التوثيق للمزيد من المعلومات عن التشفير من الطرف للطرف (E2EE) "
 "و طرق تفعيله."
@@ -1530,6 +1530,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "إظهار أيقونة لوحة النظام"
 
@@ -1770,6 +1773,14 @@ msgstr "الإذن باستخدام الكاميرا"
 msgid "Your permission to use your camera is required."
 msgstr "إذنك باستخدام كاميرا الجوال مطلوب."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "لا يوجد دفتر ملاحظات نشط."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "ينشئ دفتر ملاحظات جديد."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "لا توجد ملاحظات حالياً. أنشئ واحدة بالضغط على زر (+)."
 

CliClient/locales/bg_BG.po

@@ -958,8 +958,8 @@ msgstr ""
 "ще бъдат свалени тепърва чрез синхронизация."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "За повече информация относно криптирането от край до край (E2EE) и за съвети "
 "относно как да го пуснете, вижте документацията:"
@@ -1564,6 +1564,10 @@ msgstr "Пусни синтаксис ++вметка++"
 msgid "Enable multimarkdown table extension"
 msgstr "Пусни разширението за multimarkdown таблици"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Пусни синтаксис ~ниско~"
+
 msgid "Show tray icon"
 msgstr "Покажи иконка до часовника"
 
@@ -1812,6 +1816,14 @@ msgstr "Разрешение за употреба на камерата"
 msgid "Your permission to use your camera is required."
 msgstr "Трябва да разрешените употребата на камерата."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Няма активна тетрадка."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Създава нова тетрадка."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "В момента няма бележки. Натиснете бутон (+) за да създадете бележка."
 

CliClient/locales/ca.po

@@ -1,14 +1,17 @@
 # Catalan Joplin Translation.
-# Copyright (C) 2018 Joan Montané
+# Copyright (C) 2019 Joan Montané, Josep Maria Planell
 # This file is distributed under the same license as the Joplin-CLI package.
-# Joan Montané <jmontane@softcatala.org>, 2018.
+#
+# Translators:
+# Josep Maria Planell <planell.josep@gmail.com>, 2019
+# Joan Montané <jmontane@softcatala.org>, 2019
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: jmontane, 2018\n"
+"Last-Translator: jmontane, 2019\n"
 "Language-Team: jmontane@softcatala.org\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +68,7 @@ msgstr "No es pot canviar l'element xifrat"
 
 #, javascript-format
 msgid "Missing required argument: %s"
-msgstr "Manca un argument requerit: 1%s"
+msgstr "Manca un argument requerit: %s"
 
 #, javascript-format
 msgid "%s: %s"
@@ -287,7 +290,7 @@ msgstr "Creades: %d."
 
 #, javascript-format
 msgid "Updated: %d."
-msgstr "Acualitzades: %d."
+msgstr "Actualitzades: %d."
 
 #, javascript-format
 msgid "Skipped: %d."
@@ -474,8 +477,9 @@ msgid ""
 "`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command>pot ser «add», «remove» o «list» per a assignar o suprimir "
-"[tag] de la [nota], o per a llistar les notes associades amb [tag]. L'ordre "
-"«tag list» es pot usar per a llistar totes les etiquetes."
+"l'[etiqueta] de la [nota], o per a llistar les notes associades amb "
+"l'[etiqueta]. L'ordre «tag list» es pot usar per a llistar totes les "
+"etiquetes."
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
@@ -645,8 +649,9 @@ msgstr ""
 msgid "Create to-do from template"
 msgstr ""
 
+#, fuzzy
 msgid "Insert template"
-msgstr ""
+msgstr "Insereix la data i hora"
 
 #, fuzzy
 msgid "Open template directory"
@@ -716,22 +721,22 @@ msgid "Select all"
 msgstr "Seleccioneu una data"
 
 msgid "Bold"
-msgstr ""
+msgstr "Negreta"
 
 msgid "Italic"
-msgstr ""
+msgstr "Cursiva"
 
 msgid "Link"
 msgstr ""
 
 msgid "Code"
-msgstr ""
+msgstr "Codi"
 
 msgid "Insert Date Time"
-msgstr ""
+msgstr "Insereix la data i hora"
 
 msgid "Edit in external editor"
-msgstr ""
+msgstr "Edita en un editor extern"
 
 msgid "Tags"
 msgstr "Etiquetes"
@@ -890,7 +895,7 @@ msgid "Browse..."
 msgstr ""
 
 msgid "Apply"
-msgstr ""
+msgstr "Aplica"
 
 msgid "Submit"
 msgstr "Tramet"
@@ -971,8 +976,8 @@ msgstr ""
 "sincrontizació."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Per a més informació sobre el xifratge d'extrem a extrem (E2EE) i consells "
 "sobre com activar-lo, llegiu la documentació:"
@@ -1053,9 +1058,8 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#, fuzzy
 msgid "Note History"
-msgstr "Blocs de notes"
+msgstr ""
 
 msgid "Markup"
 msgstr ""
@@ -1086,9 +1090,9 @@ msgstr ""
 msgid "Open..."
 msgstr "Obre..."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "This file could not be opened: %s"
-msgstr "No s'ha pogut desar el bloc de notes: %s"
+msgstr "Aquest fitxer no s'ha pogut obrir: %s"
 
 msgid "Save as..."
 msgstr "Anomena i desa..."
@@ -1097,7 +1101,7 @@ msgid "Copy path to clipboard"
 msgstr "Copia el camí al porta-retalls"
 
 msgid "Copy Link Address"
-msgstr ""
+msgstr "Copia l'adreça de l'enllaç"
 
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
@@ -1118,16 +1122,16 @@ msgid "Only one note can be printed or exported to PDF at a time."
 msgstr ""
 
 msgid "strong text"
-msgstr ""
+msgstr "text en negreta"
 
 msgid "emphasized text"
-msgstr ""
+msgstr "text amb èmfasi"
 
 msgid "List item"
-msgstr ""
+msgstr "Element de llista"
 
 msgid "Insert Hyperlink"
-msgstr ""
+msgstr "insereix un enllaç"
 
 msgid "Attach file"
 msgstr "Adjunta un fitxer"
@@ -1140,29 +1144,28 @@ msgid "In: %s"
 msgstr "A: %s"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Enllaç"
 
 msgid "Numbered List"
-msgstr ""
+msgstr "Llista numerada"
 
 msgid "Bulleted List"
-msgstr ""
+msgstr "Llista de pics"
 
 msgid "Checkbox"
-msgstr ""
+msgstr "Casella de verificació"
 
 msgid "Heading"
-msgstr ""
+msgstr "Capçalera"
 
 msgid "Horizontal Rule"
-msgstr ""
+msgstr "Línia horitzontal"
 
 msgid "Click to stop external editing"
-msgstr ""
+msgstr "Feu-hi clic per a aturar l'edició externa"
 
-#, fuzzy
 msgid "Watching..."
-msgstr "S'està cancel·lant..."
+msgstr "S'està vigilant..."
 
 msgid "to-do"
 msgstr "Tasques pendents"
@@ -1229,13 +1232,12 @@ msgstr ""
 msgid "Add or remove tags"
 msgstr "Afegeix o suprimeix etiquetes"
 
-#, fuzzy
 msgid "Duplicate"
-msgstr "Surt de l'aplicació"
+msgstr "Duplica"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "%s - Copy"
-msgstr "Copia"
+msgstr "%s - Còpia"
 
 msgid "Switch between note and to-do type"
 msgstr "Alterna entre el tipus nota i tasques pendents"
@@ -1570,6 +1572,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostra la icona a la safata"
 
@@ -1628,20 +1633,19 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d hores"
 
-#, fuzzy
 msgid "Text editor command"
-msgstr "Editor de text"
+msgstr "Ordre de l'editor de text"
 
-#, fuzzy
 msgid ""
 "The editor command (may include arguments) that will be used to open a note. "
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
-"L'editor que s'usarà per a obrir una nota. Si no s'indica cap, intentarà "
-"detectar automàticament l'editor predeterminat."
+"L'ordre de l'editor (que pot incloure arguments) que s'usarà per a obrir una "
+"nota. Si no se'n proporciona cap, l'editor predeterminat es detectarà "
+"automàticament."
 
 msgid "Custom TLS certificates"
-msgstr ""
+msgstr "Certificats TLS personalitzats"
 
 msgid ""
 "Comma-separated list of paths to directories to load the certificates from, "
@@ -1649,9 +1653,14 @@ msgid ""
 "pem. Note that if you make changes to the TLS settings, you must save your "
 "changes before clicking on \"Check synchronisation configuration\"."
 msgstr ""
+"Una llista separada per comes de camins a directoris d'on carregar els "
+"certificats, o el camí a fitxers de certificats concrets. Per exemple, "
+"el_meu/dir_cert, /altres/personalitzat.pem. Tingueu en compte que si feu "
+"canvis en la configuració TLS, cal que els deseu abans de fer clic a "
+"«Comprova la configuració de la sincronització»."
 
 msgid "Ignore TLS certificate errors"
-msgstr ""
+msgstr "Ignora els errors de certificat TLS"
 
 #, fuzzy
 msgid "Enable note history"
@@ -1758,11 +1767,11 @@ msgstr ""
 
 #, fuzzy, javascript-format
 msgid "%s (%s) could not be uploaded: %s"
-msgstr "No s'ha pogut desar el bloc de notes: %s"
+msgstr "Aquest fitxer no s'ha pogut obrir: %s"
 
 #, fuzzy, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "No s'ha pogut desar el bloc de notes: %s"
+msgstr "Aquest fitxer no s'ha pogut obrir: %s"
 
 #, fuzzy
 msgid "Items that cannot be decrypted"
@@ -1813,6 +1822,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "No hi ha cap bloc de notes actiu."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Crea un bloc de notes nou."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Ara mateix no hi ha cap nota. Creeu-ne una fent clic en el botó (+)."
 
@@ -1857,17 +1874,17 @@ msgstr "Bloc de notes nou"
 msgid "Configuration"
 msgstr "Configuració"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Decrypting items: %d/%d"
-msgstr "Elements obtinguts: %d/%d"
+msgstr "S'estan desxifrant els elements: %d/%d"
 
 #, fuzzy, javascript-format
 msgid "Fetching resources: %d/%d"
-msgstr "Recursos: %d/%d"
+msgstr "Elements obtinguts: %d/%d."
 
 #, fuzzy
 msgid "All notes"
-msgstr "nota"
+msgstr "Voleu suprimir les notes?"
 
 msgid "Notebooks"
 msgstr "Blocs de notes"
@@ -1900,7 +1917,7 @@ msgstr ""
 
 #, fuzzy, javascript-format
 msgid "Decrypted items: %s / %s"
-msgstr "Elements obtinguts: %d/%d."
+msgstr "S'estan desxifrant els elements: %d/%d"
 
 msgid "New tags:"
 msgstr "Etiquetes noves:"
@@ -1923,7 +1940,6 @@ msgstr "Configuració"
 msgid "Encryption Config"
 msgstr "Configuració del xifratge"
 
-#, fuzzy
 msgid "Tools"
 msgstr "Eines"
 
@@ -2058,7 +2074,7 @@ msgstr "Tipus d'imatge no admesa: %s"
 
 #, fuzzy, javascript-format
 msgid "Updated: %s"
-msgstr "Acualitzades: %d."
+msgstr "Actualitzades: %d."
 
 msgid "View on map"
 msgstr "Mostra-ho al mapa"
@@ -2112,6 +2128,31 @@ msgstr "Inicia sessió amb OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
+#~ msgid "Separate each tag by a comma."
+#~ msgstr "Separeu les etiquetes amb comes."
+
+#~ msgid "Some items cannot be decrypted."
+#~ msgstr "Alguns elements no s'han pogut desxifrar."
+
+#, javascript-format
+#~ msgid "State: %s."
+#~ msgstr "Estat: %s."
+
+#, javascript-format
+#~ msgid "A notebook with this title already exists: \"%s\""
+#~ msgstr "Ja existeix un bloc de notes amb aquest títol: «%s»"
+
+#~ msgid ""
+#~ "The path to synchronise with when file system synchronisation is enabled. "
+#~ "See `sync.target`."
+#~ msgstr ""
+#~ "El camí on sincronitzar en activar la sincronització del sistema. Vegeu "
+#~ "«sync.target»."
+
+#, javascript-format
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
+
 #~ msgid "Cancel synchronisation"
 #~ msgstr "Cancel·la la sincronització"
 
@@ -2138,29 +2179,3 @@ msgstr "Cerca"
 
 #~ msgid "Welcome"
 #~ msgstr "Benvingut"
-
-#~ msgid "Separate each tag by a comma."
-#~ msgstr "Separeu les etiquetes amb comes."
-
-#~ msgid "Some items cannot be decrypted."
-#~ msgstr "Alguns elements no s'han pogut desxifrar."
-
-#~ msgid "%s (%s): %s"
-#~ msgstr "%s (%s): %s"
-
-#~ msgid ""
-#~ "The path to synchronise with when file system synchronisation is enabled. "
-#~ "See `sync.target`."
-#~ msgstr ""
-#~ "El camí on sincronitzar en activar la sincronització del sistema. Vegeu "
-#~ "«sync.target»."
-
-#, fuzzy
-#~ msgid "Joplin v%s"
-#~ msgstr "Lloc web del Joplin"
-
-#~ msgid "State: %s."
-#~ msgstr "Estat: %s"
-
-#~ msgid "A notebook with this title already exists: \"%s\""
-#~ msgstr "Ja existeix un bloc de notes amb aquest títol: «%s»"

CliClient/locales/cs_CZ.po

@@ -950,8 +950,8 @@ msgstr ""
 "staženy při synchronizaci."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Pro více informací o End-To-End šifrování (E2EE) a návod jak je povolit "
 "náhledněte do dokumentace:"
@@ -1547,6 +1547,10 @@ msgstr "Povolit ++insert++ syntaxi"
 msgid "Enable multimarkdown table extension"
 msgstr "Povolit rozšíření multimarkdown tabulky"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Povolit ~sub~ syntaxi"
+
 msgid "Show tray icon"
 msgstr "Zobrazovat ikonu v panelu"
 
@@ -1788,6 +1792,14 @@ msgstr "Oprávnění použít kameru"
 msgid "Your permission to use your camera is required."
 msgstr "Je vyžadováno oprávnění použít vaši kameru."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Není vybrán žádný zápisník."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Vytvoří nový zápisník."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Nemáte žádné poznámky. Vytvořte jednu kliknutím na tlačítko (+)."
 

CliClient/locales/da_DK.po

@@ -950,8 +950,8 @@ msgstr ""
 "(på et eller andet tidspunkt) via synkroniseringen."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Se dokumentationen for nærmere oplysninger om End-To-End-kryptering (E2EE) "
 "og vejledning om hvordan det skal opsættes_"
@@ -1552,6 +1552,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Vis ikon på bundbjælke"
 
@@ -1795,6 +1798,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ingen aktiv notesbog."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Opretter en ny notesbog."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Der er ingen noter. Opret note ved at klikke på (+) knappen."
 

CliClient/locales/de_DE.po

@@ -973,8 +973,8 @@ msgstr ""
 "Die Hauptschlüssel dieser IDs werden für die Verschlüsselung einiger ..."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Weitere Informationen zur Ende-zu-Ende-Verschlüsselung (E2EE) und Hinweise "
 "zur Aktivierung findest du in der Dokumentation (auf Englisch):"
@@ -1585,6 +1585,10 @@ msgstr "Aktiviere ++insert++ Syntax"
 msgid "Enable multimarkdown table extension"
 msgstr "Aktiviere multimarkdown Tabellen Erweiterung"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Aktiviere ~sub~ Syntax"
+
 msgid "Show tray icon"
 msgstr "Zeige Tray-Icon"
 
@@ -1833,6 +1837,14 @@ msgstr "Berechtigung zur Verwendung der Kamera"
 msgid "Your permission to use your camera is required."
 msgstr "Deine Zustimmung zur Verwendung deiner Kamera ist erforderlich."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Die/das momentan ausgewählte Notiz(-buch) löschen."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Erstellt ein neues Notizbuch."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Momentan existieren noch keine Notizen. Erstelle eine, indem du auf den (+) "
@@ -2242,9 +2254,6 @@ msgstr "Suchen"
 #~ msgid "Exit the application."
 #~ msgstr "Das Programm verlassen."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Die/das momentan ausgewählte Notiz(-buch) löschen."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Ein To-Do als abgeschlossen / nicht abgeschlossen markieren"
 

CliClient/locales/en_GB.po

@@ -856,8 +856,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1427,6 +1427,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1650,6 +1653,12 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+msgid "You currently have no notebooks."
+msgstr ""
+
+msgid "Create a notebook"
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 

CliClient/locales/en_US.po

@@ -874,8 +874,8 @@ msgstr ""
 "they will eventually be downloaded via synchronization."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1449,6 +1449,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1675,6 +1678,12 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+msgid "You currently have no notebooks."
+msgstr ""
+
+msgid "Create a notebook"
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 

CliClient/locales/es_ES.po

@@ -961,8 +961,8 @@ msgstr ""
 "través de la sincronización."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Para más información acerca del cifrado extremo a extremo (E2EE) y "
 "advertencias de como habilitarlo por favor revise la documentación:"
@@ -1567,6 +1567,10 @@ msgstr "Activar sintaxis ++insert++"
 msgid "Enable multimarkdown table extension"
 msgstr "Activar extensión de tablas multimarkdown"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Activar sintaxis ~sub~"
+
 msgid "Show tray icon"
 msgstr "Mostrar icono en la bandeja"
 
@@ -1810,6 +1814,14 @@ msgstr "Permiso para usar tu cámara"
 msgid "Your permission to use your camera is required."
 msgstr "El permiso para usar tu cámara es necesario."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Eliminar la nota o libreta seleccionada."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Crea una nueva libreta."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "No hay notas. Cree una pulsando en el botón (+)."
 
@@ -2224,9 +2236,6 @@ msgstr "Buscar"
 #~ msgid "Cancel the current command."
 #~ msgstr "Cancelar el comando actual."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Eliminar la nota o libreta seleccionada."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Marca una tarea como completada/no completada"
 

CliClient/locales/eu.po

@@ -957,8 +957,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1573,6 +1573,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1814,6 +1817,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ezabatu aukeratutako oharra edo koadernoa"
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Koaderno berria sortzen du."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Ez dago oharrik. Sortu bat (+) botoian klik eginaz."
 
@@ -2200,9 +2211,6 @@ msgstr "Bilatu"
 #~ msgid "Cancel the current command."
 #~ msgstr "Utzi uneko komandoa"
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Ezabatu aukeratutako oharra edo koadernoa"
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Zeregina eginda / ez-eginda markatu"
 

CliClient/locales/fa.po

@@ -866,8 +866,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1448,6 +1448,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1672,6 +1675,14 @@ msgstr "اجازه برای استفاده از دوربین"
 msgid "Your permission to use your camera is required."
 msgstr "اجازه ی شما برای استفاده از دوربین شما نیاز است."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "دفترچه‌ی فعالی وجود ندارد."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "ایجاد دفترچه جدید."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 

CliClient/locales/fr_FR.po

@@ -14,8 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.1\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "Pour supprimer une vignette, enlever là des notes associées."
@@ -961,8 +959,8 @@ msgstr ""
 "probable qu'elle vont être prochainement disponible via la synchronisation."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Pour plus d'informations sur le chiffrement de bout en bout, ainsi que des "
 "conseils pour l'activer, veuillez consulter la documentation :"
@@ -1570,6 +1568,9 @@ msgstr "Activer la syntaxe ++insertion++"
 msgid "Enable multimarkdown table extension"
 msgstr "Activer les tables multi-markdown"
 
+msgid "Enable Fountain syntax support"
+msgstr "Activer la syntaxe \"Fountain\""
+
 msgid "Show tray icon"
 msgstr "Afficher l'icône dans la zone de notifications"
 
@@ -1814,6 +1815,12 @@ msgstr "Permission d'utiliser l'appareil photo"
 msgid "Your permission to use your camera is required."
 msgstr "Votre permission est requise pour utiliser l'appareil photo."
 
+msgid "You currently have no notebooks."
+msgstr "Vous n'avez pour l'instant pas de carnets."
+
+msgid "Create a notebook"
+msgstr "Créer un carnet"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Ce carnet ne contient aucune note. Créez-en une en appuyant sur le bouton "
@@ -2233,9 +2240,6 @@ msgstr "Chercher"
 #~ msgid "Exit the application."
 #~ msgstr "Quitter le logiciel."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Supprimer la note ou carnet sélectionné."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Marquer une tâches comme complétée / non-complétée"
 

CliClient/locales/gl_ES.po

@@ -950,8 +950,8 @@ msgstr ""
 "descargados pola sincronización."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1552,6 +1552,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostrar a icona na bandexa"
 
@@ -1795,6 +1798,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ningún caderno activo."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Crea un caderno novo."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Non ten notas actualmente. Cree unha premendo no botón (+)."
 

CliClient/locales/hr_HR.po

@@ -943,8 +943,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1548,6 +1548,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1786,6 +1789,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Obriši odabranu bilješku ili bilježnicu."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Stvara novu bilježnicu."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Trenutno nema bilješki. Stvori novu klikom na (+) gumb."
 
@@ -2175,9 +2186,6 @@ msgstr "Traži"
 #~ msgid "Cancel the current command."
 #~ msgstr "Prekini trenutnu naredbu."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Obriši odabranu bilješku ili bilježnicu."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Postavi zadatak kao završen/nezavršen"
 

CliClient/locales/it_IT.po

@@ -538,6 +538,7 @@ msgstr "Errore fatale:"
 #, javascript-format
 msgid "All potential ports are in use - please report the issue at %s"
 msgstr ""
+"Tutte le potenziali porte sono in uso - prego riportare il problema a %s"
 
 msgid ""
 "The application has been authorised - you may now close this browser tab."
@@ -639,25 +640,23 @@ msgid "Web clipper options"
 msgstr "Opzioni Web Clipper"
 
 msgid "Create note from template"
-msgstr ""
+msgstr "Crea nota da modello"
 
 msgid "Create to-do from template"
-msgstr ""
+msgstr "Nuovo \"Cose-da-fare\" da modello"
 
-#, fuzzy
 msgid "Insert template"
-msgstr "Inserisci data e ora"
+msgstr "Inserisci modello"
 
-#, fuzzy
 msgid "Open template directory"
-msgstr "Cartella di esportazione di Joplin"
+msgstr "Apri cartella modelli"
 
 msgid "Refresh templates"
-msgstr ""
+msgstr "Aggiorna modelli"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Revision: %s (%s)"
-msgstr "%s %s (%s)"
+msgstr "Revisione: %s (%s)"
 
 #, javascript-format
 msgid "%s %s (%s, %s)"
@@ -676,7 +675,7 @@ msgid "Check for updates..."
 msgstr "Controlla aggiornamenti..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Modelli"
 
 msgid "Import"
 msgstr "Importa"
@@ -964,8 +963,8 @@ msgstr ""
 "ad essi. È probabile che verranno scaricati tramite la sincronizzazione."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Per ulteriori informazioni sulla crittografia end-to-end (E2EE) e consigli "
 "su come abilitarlo, consultare la documentazione:"
@@ -997,7 +996,7 @@ msgid "Notebook title:"
 msgstr "Titolo del Taccuino:"
 
 msgid "Add or remove tags:"
-msgstr "Aggiungi or rimuovi etichetta:"
+msgstr "Aggiungi o rimuovi etichetta:"
 
 msgid "Rename notebook:"
 msgstr "Rinomina il Taccuino:"
@@ -1009,7 +1008,7 @@ msgid "Set alarm:"
 msgstr "Imposta allarme:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "File del modello:"
 
 msgid "Layout"
 msgstr "Disposizione"
@@ -1503,10 +1502,10 @@ msgid "Solarised Dark"
 msgstr ""
 
 msgid "Uncompleted to-dos on top"
-msgstr "Cose da fare incomplete in cima alla lista"
+msgstr "\"Cose-da-fare\" incomplete in cima alla lista"
 
 msgid "Show completed to-dos"
-msgstr "Mostra le cose da fare completate"
+msgstr "Mostra le \"Cose-da-fare\" completate"
 
 msgid "Sort notes by"
 msgstr "Ordina le note per"
@@ -1568,6 +1567,10 @@ msgstr "Attiva sintassi ++insert++"
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Attiva sintassi ~sub~"
+
 msgid "Show tray icon"
 msgstr "Visualizza tray icon"
 
@@ -1813,6 +1816,14 @@ msgstr "Permesso di usare la fotocamera"
 msgid "Your permission to use your camera is required."
 msgstr "E’ richiesto il permesso di usare la fotocamera."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Elimina la nota o il taccuino selezionato."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Crea un nuovo Taccuino."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
 
@@ -1841,17 +1852,15 @@ msgstr "Seleziona la data"
 msgid "Confirm"
 msgstr "Conferma"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Taccuini"
+msgstr "Taccuini: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Gli elementi crittografati non possono essere modificati"
+msgstr "I Taccuini crittografati non possono essere rinominati"
 
-#, fuzzy
 msgid "New Notebook"
-msgstr "Nuovo taccuino"
+msgstr "Nuovo Taccuino"
 
 msgid "Configuration"
 msgstr "Configurazione"
@@ -1864,9 +1873,8 @@ msgstr "Decrittografia Elementi: %d/%d"
 msgid "Fetching resources: %d/%d"
 msgstr "Recupero risorse: %d/%d"
 
-#, fuzzy
 msgid "All notes"
-msgstr "Eliminare le note?"
+msgstr "Tutte le note"
 
 msgid "Notebooks"
 msgstr "Taccuini"
@@ -1914,48 +1922,46 @@ msgid "Type new tags or select from list"
 msgstr "Digita nuovi tag o seleziona dalla lista"
 
 msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
 
-#, fuzzy
 msgid "Information"
-msgstr "Maggiori informazioni"
+msgstr "Informazioni"
 
 msgid "Encryption Config"
 msgstr "Configurazione Crittografia"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Strumenti"
+msgstr "Strumenti"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Stato"
+msgstr "Stato sincronizzazione"
 
 msgid "Log"
 msgstr "Log"
 
-#, fuzzy
 msgid "Creating report..."
-msgstr "Creare nuovo %s..."
+msgstr "Creazione report..."
 
 msgid "Export Debug Report"
 msgstr "Esporta il Report di Debug"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Correzione indice di ricerca..."
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Correggi indice di ricerca"
 
 msgid ""
 "Use this to rebuild the search index if there is a problem with search. It "
 "may take a long time depending on the number of notes."
 msgstr ""
+"Usa questo per ricostruire l’indice di ricerca se c’è un problema con la "
+"ricerca. Potrebbe richiedere molto tempo, dipende dal numero di note."
 
 msgid "More information"
 msgstr "Maggiori informazioni"
@@ -2025,9 +2031,8 @@ msgstr "Il Taccuino non può essere salvato: %s"
 msgid "Edit notebook"
 msgstr "Modifica Taccuino"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Titolo del Taccuino:"
+msgstr "Inserisci titolo del Taccuino"
 
 msgid "Show all"
 msgstr "Mostra tutto"
@@ -2061,9 +2066,9 @@ msgstr "Collegamenti con protocollo \"%s\" non sono supportati"
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Aggiornato: %d."
+msgstr "Aggiornato: %s"
 
 msgid "View on map"
 msgstr "Guarda sulla mappa"
@@ -2071,13 +2076,11 @@ msgstr "Guarda sulla mappa"
 msgid "Go to source URL"
 msgstr ""
 
-#, fuzzy
 msgid "Attach..."
-msgstr "Cerca..."
+msgstr "Allega..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Mostra opzioni avanzate"
+msgstr "Scegli un’opzione"
 
 msgid "Take photo"
 msgstr "Scatta foto"
@@ -2097,19 +2100,17 @@ msgstr "Converti in nota"
 msgid "Convert to todo"
 msgstr "Converti in Todo"
 
-#, fuzzy
 msgid "Properties"
-msgstr "Proprietà della nota"
+msgstr "Proprietà"
 
 msgid "Add body"
-msgstr ""
+msgstr "Aggiungi corpo"
 
 msgid "Edit"
 msgstr "Modifica"
 
-#, fuzzy
 msgid "Add title"
-msgstr "titolo"
+msgstr "Aggiungi titolo"
 
 msgid "Login with OneDrive"
 msgstr "Accedi a OneDrive"
@@ -2234,9 +2235,6 @@ msgstr "Cerca"
 #~ msgid "Cancel the current command."
 #~ msgstr "Annulla il comando corrente."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Elimina la nota o il taccuino selezionato."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Imposta un \"Cose-da-fare\" come completato / non completato"
 

CliClient/locales/ja_JP.po

@@ -15,8 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "タグを削除するには、関連するノートからタグを外してください。"
@@ -941,8 +939,8 @@ msgstr ""
 "ロードしてきたのでしょう。"
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "エンドツーエンド暗号化(E2EE)に関する詳細な情報とどのように有効化するのかのア"
 "ドバイスは、次のドキュメントをご覧ください:"
@@ -1545,6 +1543,10 @@ msgstr "++追加++構文を有効にする"
 msgid "Enable multimarkdown table extension"
 msgstr "MultiMarkdownのテーブル拡張を有効にする"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "~下付きテキスト~構文を有効にする"
+
 msgid "Show tray icon"
 msgstr "トレイアイコンの表示"
 
@@ -1786,6 +1788,14 @@ msgstr "カメラ使用の許可"
 msgid "Your permission to use your camera is required."
 msgstr "カメラを使用するには権限が必要です。"
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "選択中のノートまたはノートブックを削除"
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "あたらしいノートブックを作成します。"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "ノートがありません。(+)ボタンを押して新しいノートを作成してください。"
 
@@ -2181,9 +2191,6 @@ msgstr "検索"
 #~ msgid "Exit the application."
 #~ msgstr "アプリケーションを終了する"
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "選択中のノートまたはノートブックを削除"
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "ToDoを完了/未完に設定"
 

CliClient/locales/joplin.pot

@@ -856,8 +856,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1427,6 +1427,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1650,6 +1653,12 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+msgid "You currently have no notebooks."
+msgstr ""
+
+msgid "Create a notebook"
+msgstr ""
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 

CliClient/locales/ko.po

@@ -190,7 +190,7 @@ msgid ""
 "Exports Joplin data to the given path. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
-"조플린의 데이터를 주어진 경로로 내보냅니다. 기본적으로 노트북, 노트, 태그, 기"
+"Joplin의 데이터를 주어진 경로로 내보냅니다. 기본적으로 노트북, 노트, 태그, 기"
 "타 자원을 포함한 완전한 데이터베이스를 내보내게 됩니다."
 
 #, javascript-format
@@ -259,7 +259,7 @@ msgid ""
 msgstr "키보드 단축키 및 설정 옵션을 변경하려면 `help keymap`을 입력해주세요"
 
 msgid "Imports data into Joplin."
-msgstr "데이터를 조플린으로 가져옵니다."
+msgstr "데이터를 Joplin으로 가져옵니다."
 
 #, javascript-format
 msgid "Source format: %s"
@@ -411,7 +411,7 @@ msgstr "인증이 완료되지 않았습니다 (인증 토큰을 받을 수 없
 
 msgid ""
 "To allow Joplin to synchronise with Dropbox, please follow the steps below:"
-msgstr "조플린을 Dropbox와 동기화하려면 다음 절차를 따라주세요:"
+msgstr "Joplin을 Dropbox와 동기화하려면 다음 절차를 따라주세요:"
 
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr "1단계: 브라우저에서 이 URL에 접근하여 애플리케이션을 허가합니다:"
@@ -550,7 +550,7 @@ msgid ""
 "\n"
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
-"조플린에 오신 것을 환영합니다!\n"
+"Joplin에 오신 것을 환영합니다!\n"
 "\n"
 "`:help shortcuts`를 입력하면 키보드 단축키 목록을 확인할 수 있습니다. `:help`"
 "를 입력하시면 사용 방법을 확인하실 수 있습니다.\n"
@@ -638,12 +638,11 @@ msgstr "개정판: %s (%s)"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
-#, fuzzy
 msgid "&File"
 msgstr "파일"
 
 msgid "About Joplin"
-msgstr "조플린에 대해서"
+msgstr "Joplin에 대해서"
 
 msgid "Preferences..."
 msgstr "설정…"
@@ -673,7 +672,6 @@ msgstr "종료"
 msgid "Close Window"
 msgstr "창 닫기"
 
-#, fuzzy
 msgid "&Edit"
 msgstr "편집"
 
@@ -716,7 +714,6 @@ msgstr "모든 노트에서 검색"
 msgid "Search in current note"
 msgstr "현재 노트에서 검색"
 
-#, fuzzy
 msgid "&View"
 msgstr "보기"
 
@@ -729,11 +726,9 @@ msgstr "편집기 배치 형태 전환"
 msgid "Focus"
 msgstr "강조"
 
-#, fuzzy
 msgid "&Tools"
 msgstr "도구"
 
-#, fuzzy
 msgid "&Help"
 msgstr "도움말"
 
@@ -760,7 +755,7 @@ msgid "Cancel"
 msgstr "취소"
 
 msgid "Current version is up-to-date."
-msgstr "현재 최신 버전을 사용하고 있으십니다."
+msgstr "현재 최신 버전을 사용중입니다."
 
 #, javascript-format
 msgid "%s (pre-release)"
@@ -810,7 +805,7 @@ msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
 "to Joplin."
 msgstr ""
-"조플린 웹 수집기는 브라우저에서 웹 페이지 및 스크린샷을 조플린에 저장할 수 있"
+"Joplin 웹 수집기는 브라우저에서 웹 페이지 및 스크린샷을 Joplin에 저장할 수 있"
 "게 해줍니다."
 
 msgid "In order to use the web clipper, you need to do the following:"
@@ -824,8 +819,8 @@ msgid ""
 "enabling it your firewall may ask you to give permission to Joplin to listen "
 "to a particular port."
 msgstr ""
-"이 서비스는 브라우저 확장 기능이 조플린과 연결하게 해줍니다. 활성화시 방화벽"
-"에서 조플린에게 특정 포트 접근을 허가할 것인지 물어볼 수 있습니다."
+"이 서비스는 브라우저 확장 기능이 Joplin과 연결하도록 해줍니다. 서비스를 활성"
+"화시 방화벽에서 Joplin에게 특정 포트 접근을 허가할 것인지 물어볼 수 있습니다."
 
 msgid "Step 2: Install the extension"
 msgstr "2단계: 확장 기능 설치"
@@ -846,7 +841,7 @@ msgid ""
 "This authorisation token is only needed to allow third-party applications to "
 "access Joplin."
 msgstr ""
-"이 인증 토큰은 오직 서드파티 애플리케이션에서 조플린에 접근할 때만 필요합니"
+"이 인증 토큰은 오직 서드파티 애플리케이션에서 Joplin에 접근할 때만 필요합니"
 "다."
 
 #, javascript-format
@@ -939,10 +934,10 @@ msgstr ""
 "될 가능성이 있습니다."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
-"종단간 암호화(E2EE)에 관한 정보, 사용법 및 조언은 다음 문서에서 확인하세요:"
+"종단간 암호화(E2EE)에 관한 정보, 사용법 및 조언은 다음 문서에서 확인해주세요:"
 
 msgid "Status"
 msgstr "상태"
@@ -1226,9 +1221,8 @@ msgstr ""
 "노트 제목을 적으시거나 혹은 건너 뛰세요. 혹은 # 를 적고 태그 이름을 붙이거"
 "나, @뒤에 노트북 이름을 적으세요."
 
-#, fuzzy
 msgid "Goto Anything..."
-msgstr "가고 싶은 곳으로 이동…"
+msgstr "가고자 하는 곳으로 이동…"
 
 #, javascript-format
 msgid "Usage: %s"
@@ -1345,7 +1339,7 @@ msgstr "동기화가 이미 진행되고 있습니다. 상태: %s"
 msgid ""
 "Unknown item type downloaded - please upgrade Joplin to the latest version"
 msgstr ""
-"알려지지 않은 타입을 다운로드 했습니다 - 조플린을 최신 버전으로 업데이트 해주"
+"알려지지 않은 타입을 다운로드 했습니다 - Joplin을 최신 버전으로 업데이트 해주"
 "세요"
 
 msgid "Encrypted"
@@ -1466,11 +1460,9 @@ msgstr "밝음"
 msgid "Dark"
 msgstr "어두움"
 
-#, fuzzy
 msgid "Solarised Light"
 msgstr "Solarized Light"
 
-#, fuzzy
 msgid "Solarised Dark"
 msgstr "Solarized Dark"
 
@@ -1486,7 +1478,6 @@ msgstr "노트를 다음 기준으로 정렬"
 msgid "Reverse sort order"
 msgstr "정렬 순서 반전"
 
-#, fuzzy
 msgid "Sort notebooks by"
 msgstr "노트를 다음 기준으로 정렬"
 
@@ -1541,6 +1532,10 @@ msgstr "++insert++ 확장 허용"
 msgid "Enable multimarkdown table extension"
 msgstr "멀티마크다운 테이블 확장 허용"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "~sub~ 구문 허용"
+
 msgid "Show tray icon"
 msgstr "트레이 아이콘 표시"
 
@@ -1552,11 +1547,11 @@ msgid ""
 "this setting so that your notes are constantly being synchronised, thus "
 "reducing the number of conflicts."
 msgstr ""
-"조플린을 백그라운드에서 구동합니다. 노트가 정기적으로 동기화 되므로, 충돌 횟"
+"Joplin을 백그라운드에서 구동합니다. 노트가 정기적으로 동기화 되므로, 충돌 횟"
 "수가 줄어들게 되므로 이 옵션을 활성화 하시는 것을 추천드립니다."
 
 msgid "Start application minimised in the tray icon"
-msgstr "트레이에 최소화 된 채로 조플린 실행"
+msgstr "트레이에 최소화 된 채로 Joplin 실행"
 
 msgid "Global zoom percentage"
 msgstr "전체 확대 비율"
@@ -1667,13 +1662,13 @@ msgid "The tag \"%s\" already exists. Please choose a different name."
 msgstr "태그 \"%s\"(이)가 이미 존재합니다. 다른 이름을 선택해 주세요."
 
 msgid "Joplin Export File"
-msgstr "조플린 내보내기 파일"
+msgstr "Joplin 내보내기 파일"
 
 msgid "Markdown"
 msgstr "마크다운"
 
 msgid "Joplin Export Directory"
-msgstr "조플린 내보내기 폴더"
+msgstr "Joplin 내보내기 폴더"
 
 msgid "Evernote Export File"
 msgstr "에버노트 내보내기 파일"
@@ -1740,8 +1735,8 @@ msgid ""
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
-"조플린이 여러 항목에 대해서 복호화를 실패했습니다. 아마도 너무 크거나 혹은 손"
-"상되었기 때문일 것입니다. 이 파일들은 기기에 남지만, 조플린은 더이상 이 항목"
+"Joplin이 여러 항목에 대해서 복호화를 실패했습니다. 아마도 너무 크거나 혹은 손"
+"상되었기 때문일 것입니다. 이 파일들은 기기에 남지만, Joplin은 더이상 이 항목"
 "들을 복호화 할 수 없습니다."
 
 msgid "Sync status (synced items / total items)"
@@ -1783,6 +1778,14 @@ msgstr "카메라 사용 허가"
 msgid "Your permission to use your camera is required."
 msgstr "카메라 사용 허가가 필요합니다."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "활성화된 노트북이 없습니다."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "새 노트북을 만듭니다."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "노트가 없습니다. (+) 버튼을 클릭하여 새로 만드세요."
 
@@ -1946,7 +1949,7 @@ msgid "- Location: to allow attaching geo-location information to a note."
 msgstr "- 위치: 지리적 위치 정보를 노트에 첨부하기 위해 필요합니다."
 
 msgid "Joplin website"
-msgstr "조플린 웹사이트"
+msgstr "Joplin 웹사이트"
 
 #, javascript-format
 msgid "Database v%s"
@@ -2010,7 +2013,7 @@ msgstr "ID %s에 해당하는 항목이 없습니다"
 
 #, javascript-format
 msgid "The Joplin mobile app does not currently support this type of link: %s"
-msgstr "조플린 모바일 앱은 현재 해당 형식의 링크를 지원하지 않습니다: %s"
+msgstr "Joplin 모바일 앱에서는 현재 해당 형식의 링크를 지원하지 않습니다: %s"
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"

CliClient/locales/nb_NO.po

@@ -946,8 +946,8 @@ msgstr ""
 "vil siden bli lastet ned via synkronisering."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "For mer informasjon om ende-til-ende-kryptering (E2EE) og råd om hvordan du "
 "aktiverer det kan du sjekke dokumentasjonen:"
@@ -1547,6 +1547,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Vis systemmenyikon"
 
@@ -1789,6 +1792,14 @@ msgstr "Tillatelse til å bruke kamera"
 msgid "Your permission to use your camera is required."
 msgstr "Tillatelse til å bruke kamera er nødvendig."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ingen aktiv notatbok."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Oppretter en ny notatbok."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Det finnes enda ingen notater. Lag en ved å klikke på (+)-knappen."
 

CliClient/locales/nl_BE.po

@@ -959,8 +959,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1574,6 +1574,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1816,6 +1819,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Verwijder de geselecteerde notitie of het geselecteerde notitieboek."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Maakt een nieuw notitieboek aan."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Er zijn momenteel geen notities. Maak een notitie door op (+) te klikken."
@@ -2206,10 +2217,6 @@ msgstr "Zoeken"
 #~ msgid "Cancel the current command."
 #~ msgstr "Annuleer het huidige commando."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr ""
-#~ "Verwijder de geselecteerde notitie of het geselecteerde notitieboek."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Zet een to-do als voltooid / niet voltooid"
 

CliClient/locales/nl_NL.po

@@ -531,7 +531,7 @@ msgstr "Fatale fout:"
 
 #, javascript-format
 msgid "All potential ports are in use - please report the issue at %s"
-msgstr ""
+msgstr "Alle potentiële poorten zijn in gebruik - Meld het probleem op %s"
 
 msgid ""
 "The application has been authorised - you may now close this browser tab."
@@ -632,10 +632,10 @@ msgid "Web clipper options"
 msgstr "Webclipper-opties"
 
 msgid "Create note from template"
-msgstr ""
+msgstr "Notitie maken van sjabloon"
 
 msgid "Create to-do from template"
-msgstr ""
+msgstr "To-do maken van sjabloon"
 
 #, fuzzy
 msgid "Insert template"
@@ -646,7 +646,7 @@ msgid "Open template directory"
 msgstr "Joplin-exportmap"
 
 msgid "Refresh templates"
-msgstr ""
+msgstr "Sjablonen vernieuwen"
 
 #, fuzzy, javascript-format
 msgid "Revision: %s (%s)"
@@ -669,7 +669,7 @@ msgid "Check for updates..."
 msgstr "Controleren op updates..."
 
 msgid "Templates"
-msgstr ""
+msgstr "Sjablonen"
 
 msgid "Import"
 msgstr "Importeren"
@@ -956,8 +956,8 @@ msgstr ""
 "items. Waarschijnlijk worden ze uiteindelijk gedownload via synchronisatie."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Bekijk, voor meer informatie over End-To-End-versleuteling (E2EE) en hulp "
 "bij het inschakelen hiervan, onze documentatie:"
@@ -1003,7 +1003,7 @@ msgid "Set alarm:"
 msgstr "Alarm instellen:"
 
 msgid "Template file:"
-msgstr ""
+msgstr "Sjabloonbestand:"
 
 msgid "Layout"
 msgstr "Indeling"
@@ -1044,7 +1044,7 @@ msgid "Note History"
 msgstr "Notitiegeschiedenis"
 
 msgid "Markup"
-msgstr ""
+msgstr "Opmaak"
 
 msgid "Previous versions of this note"
 msgstr "Vorige versies van deze notitie"
@@ -1496,10 +1496,10 @@ msgid "Dark"
 msgstr "Donker"
 
 msgid "Solarised Light"
-msgstr ""
+msgstr "Solarised Light"
 
 msgid "Solarised Dark"
-msgstr ""
+msgstr "Solarised Dark"
 
 msgid "Uncompleted to-dos on top"
 msgstr "Niet-afgeronde taken bovenaan"
@@ -1567,6 +1567,10 @@ msgstr "Inschakelen ++insert++ syntaxis"
 msgid "Enable multimarkdown table extension"
 msgstr "Inschakelen multimarkdown tabel extensie"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Inschakelen ~sub~ syntaxis"
+
 msgid "Show tray icon"
 msgstr "Systeemvakpictogram tonen"
 
@@ -1814,6 +1818,14 @@ msgstr "Toestemming om de camera te gebruiken"
 msgid "Your permission to use your camera is required."
 msgstr "Je toestemming om de camera te gebruiken is vereist."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Geen actief notitieboek."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Creëert een nieuw notitieboek."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Er zijn momenteel geen notities. Creëer een notitie door te drukken op de "
@@ -1915,12 +1927,14 @@ msgid "Type new tags or select from list"
 msgstr "Typ nieuwe labels of kies ze uit de lijst"
 
 msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
+"Om synchronisatie via het bestandssysteem te gebruiken is je toestemming "
+"nodig om naar externe opslag te schrijven."
 
 #, fuzzy
 msgid "Information"
@@ -1948,15 +1962,17 @@ msgid "Export Debug Report"
 msgstr "Foutopsporingsrapportage exporteren"
 
 msgid "Fixing search index..."
-msgstr ""
+msgstr "Zoekindex repareren…"
 
 msgid "Fix search index"
-msgstr ""
+msgstr "Zoekindex repareren"
 
 msgid ""
 "Use this to rebuild the search index if there is a problem with search. It "
 "may take a long time depending on the number of notes."
 msgstr ""
+"Gebruik dit om de zoekindex opnieuw op te bouwen als er een probleem is met "
+"zoeken: Het kan lang duren afhankelijk van het aantal notities."
 
 msgid "More information"
 msgstr "Meer informatie"
@@ -2099,7 +2115,7 @@ msgid "Properties"
 msgstr "Eigenschappen van notitie"
 
 msgid "Add body"
-msgstr ""
+msgstr "Inhoud toevoegen"
 
 msgid "Edit"
 msgstr "Bewerken"

CliClient/locales/pl_PL.po

@@ -965,8 +965,8 @@ msgstr ""
 "pobrane przy synchonizacji."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Aby uzyskać informacje o szyfrowaniu po stronie klienta (E2EE) i przykłady "
 "ułatwiające jego uruchomienie, proszę sprawdź dokumentację:"
@@ -1575,6 +1575,10 @@ msgstr "Aktywuj składnię ++instert++"
 msgid "Enable multimarkdown table extension"
 msgstr "Aktywuj rozszerzenie dla tabeli multimarkdown"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Aktywuj składnię ~sub~"
+
 msgid "Show tray icon"
 msgstr "Pokaż ikonę w zasobniku systemowym"
 
@@ -1820,6 +1824,14 @@ msgstr "Uprawenie do użytkowania kamery"
 msgid "Your permission to use your camera is required."
 msgstr "Wymagane uprawenienie do użytkowania kamery."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Brak aktywnego notatnika."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Tworzy nowy notatnik."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Brak notatek. Aby utworzyć, naciśnij przycisk (+)."
 

CliClient/locales/pt_BR.po

@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Renato Nunes Bastos <rnbastos@gmail.com>\n"
+"Last-Translator: Rafael Teixeira <rto.tinfo@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -60,7 +60,7 @@ msgid "The command \"%s\" is only available in GUI mode"
 msgstr "O comando \"%s\" está disponível somente em modo gráfico"
 
 msgid "Cannot change encrypted item"
-msgstr "Não pode mudar um item encriptado"
+msgstr "Não é possível mudar um item encriptado"
 
 #, javascript-format
 msgid "Missing required argument: %s"
@@ -593,7 +593,7 @@ msgid "Note list"
 msgstr "Lista de notas"
 
 msgid "Note title"
-msgstr "Título da Nota:"
+msgstr "Título da Nota"
 
 msgid "Note body"
 msgstr "Corpo da Nota"
@@ -755,7 +755,7 @@ msgid "Make a donation"
 msgstr "Fazer uma doação"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Habilitar/Desabilitar ferramentas de desenvolvimento"
 
 #, javascript-format
 msgid "Open %s"
@@ -953,8 +953,8 @@ msgstr ""
 "elas serão baixadas via sincronização."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Para mais informações sobre Encriptação ponto-a-ponto (E2EE) e recomendações "
 "sobre como habilitar, favor verificar a documentação:"
@@ -1175,7 +1175,7 @@ msgid "Encryption Options"
 msgstr "Opções de Encriptação"
 
 msgid "Clipper Options"
-msgstr "Opções do clipper"
+msgstr "Opções do Clipper"
 
 #, javascript-format
 msgid ""
@@ -1206,7 +1206,7 @@ msgstr ""
 "exportado"
 
 msgid "Retry"
-msgstr ""
+msgstr "Tentar novamente"
 
 msgid "Add or remove tags"
 msgstr "Adicionar ou remover tags"
@@ -1452,15 +1452,18 @@ msgid ""
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"No modo \"Manual\", os anexos são baixados apenas quando você clica neles. "
+"Em \"Automático\", eles são baixados quando você abre a nota. Em \"Sempre\", "
+"todos os anexos são baixados independentemente de você abrir a nota ou não."
 
 msgid "Always"
-msgstr ""
+msgstr "Sempre"
 
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 msgid "Auto"
-msgstr ""
+msgstr "Automático"
 
 msgid "Max concurrent connections"
 msgstr ""
@@ -1526,7 +1529,7 @@ msgid "Enable math expressions"
 msgstr "Habilitar expressões matemáticas"
 
 msgid "Enable ==mark== syntax"
-msgstr "Habilitar sintaxe ==marcador== "
+msgstr "Habilitar sintaxe ==marcador=="
 
 msgid "Enable footnotes"
 msgstr "Habilitar notas de rodapé"
@@ -1538,22 +1541,26 @@ msgid "Enable ~sub~ syntax"
 msgstr "Habilitar sintaxe ~sub~"
 
 msgid "Enable ^sup^ syntax"
-msgstr "Habilitar sintaxe ^sup^ "
+msgstr "Habilitar sintaxe ^sup^"
 
 msgid "Enable deflist syntax"
-msgstr "Habilitar sintaxe de deflist "
+msgstr "Habilitar sintaxe de deflist"
 
 msgid "Enable abbreviation syntax"
 msgstr "Habilitar sintaxe de abreviações"
 
 msgid "Enable markdown emoji"
-msgstr "Habilitar emojis em markdown "
+msgstr "Habilitar emojis em markdown"
 
 msgid "Enable ++insert++ syntax"
-msgstr "Habilitar sintaxe ++inserir++ "
+msgstr "Habilitar sintaxe ++inserir++"
 
 msgid "Enable multimarkdown table extension"
-msgstr "Habilitar extensão de tabela de multimarkdown "
+msgstr "Habilitar extensão de tabela de multimarkdown"
+
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Habilitar sintaxe ~sub~"
 
 msgid "Show tray icon"
 msgstr "Exibir tray icon"
@@ -1747,17 +1754,19 @@ msgstr "%s (%s) não pôde ser enviado: %s"
 
 #, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "Item \"%s\" não pôde ser baixado: %s"
+msgstr "O item \"%s\" não pôde ser baixado: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Os itens não podem ser sincronizados"
+msgstr "Os itens não podem ser decriptados"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"O Joplin falhou ao tentar decriptar esses múltiplos items, possivelmente "
+"porque eles estão corruptos ou são grandes demais. Esses itens permanecerão "
+"no dispositivo, porém o Joplin não vai mais tentar decriptá-los."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Status de sincronização (sincronizados / totais)"
@@ -1798,6 +1807,14 @@ msgstr "Permissão para utilizar sua câmera"
 msgid "Your permission to use your camera is required."
 msgstr "É necessária a sua permissão para utilizar sua câmera."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Excluir nota selecionada ou notebook."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Cria um novo caderno."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Atualmente, não há notas. Crie uma, clicando no botão (+)."
 
@@ -1826,15 +1843,13 @@ msgstr "Selecionar data"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Notebook: %s"
-msgstr "Cadernos"
+msgstr "Caderno: %s"
 
-#, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
-msgstr "Itens encriptados não podem ser modificados"
+msgstr "Cadernos encriptados não podem ser renomeados"
 
-#, fuzzy
 msgid "New Notebook"
 msgstr "Novo caderno"
 
@@ -1849,9 +1864,8 @@ msgstr "Decriptando itens: %d/%d"
 msgid "Fetching resources: %d/%d"
 msgstr "Buscando recursos: %d"
 
-#, fuzzy
 msgid "All notes"
-msgstr "Excluir notas?"
+msgstr "Todas as notas"
 
 msgid "Notebooks"
 msgstr "Cadernos"
@@ -1898,27 +1912,24 @@ msgid "Type new tags or select from list"
 msgstr "Digite novsa tags, ou selecione da lista"
 
 msgid "Warning"
-msgstr ""
+msgstr "Atenção"
 
 msgid ""
 "In order to use file system synchronisation your permission to write to "
 "external storage is required."
 msgstr ""
 
-#, fuzzy
 msgid "Information"
-msgstr "Configuração"
+msgstr "Informação"
 
 msgid "Encryption Config"
 msgstr "Configuração de Encriptação"
 
-#, fuzzy
 msgid "Tools"
-msgstr "&Ferramentas"
+msgstr "Ferramentas"
 
-#, fuzzy
 msgid "Sync Status"
-msgstr "Status"
+msgstr "Status de sincronização"
 
 msgid "Log"
 msgstr "Log"
@@ -1941,9 +1952,8 @@ msgid ""
 "may take a long time depending on the number of notes."
 msgstr ""
 
-#, fuzzy
 msgid "More information"
-msgstr "Configuração"
+msgstr "Mais informações"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -2009,9 +2019,8 @@ msgstr "O caderno não pôde ser salvo: %s"
 msgid "Edit notebook"
 msgstr "Editar caderno"
 
-#, fuzzy
 msgid "Enter notebook title"
-msgstr "Título do caderno:"
+msgstr "Entre o título do caderno"
 
 msgid "Show all"
 msgstr "Exibir tudo"
@@ -2038,15 +2047,15 @@ msgstr "O app mobile do Joplin não suporta, atualmente, esse tipo de link: %s"
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "Links com o protocolo \"%s\" não são suportados"
 
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagem não suportada: %s"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Updated: %s"
-msgstr "Atualizado: %d."
+msgstr "Atualizado: %s"
 
 msgid "View on map"
 msgstr "Ver no mapa"
@@ -2058,9 +2067,8 @@ msgstr "Ir para a URL de origem"
 msgid "Attach..."
 msgstr "Pesquisar..."
 
-#, fuzzy
 msgid "Choose an option"
-msgstr "Mostrar opções avançadas"
+msgstr "Escolha uma opção"
 
 msgid "Take photo"
 msgstr "Tirar foto"
@@ -2090,9 +2098,8 @@ msgstr ""
 msgid "Edit"
 msgstr "Editar"
 
-#, fuzzy
 msgid "Add title"
-msgstr "título"
+msgstr "Adicionar título"
 
 msgid "Login with OneDrive"
 msgstr "Login com OneDrive"
@@ -2205,9 +2212,6 @@ msgstr "Procurar"
 #~ msgid "Exit the application."
 #~ msgstr "Sair da aplicação."
 
-#~ msgid "Delete the currently selected note or notebook."
-#~ msgstr "Excluir nota selecionada ou notebook."
-
 #~ msgid "Set a to-do as completed / not completed"
 #~ msgstr "Marcar uma tarefa como completada / não completada"
 

CliClient/locales/ro.po

@@ -879,8 +879,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1458,6 +1458,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Afișați iconița coșul de gunoi"
 
@@ -1688,6 +1691,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Niciun caiet de notițe activ."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Creați caiet de notițe."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 

CliClient/locales/ru_RU.po

@@ -960,8 +960,8 @@ msgstr ""
 "загрузятся при синхронизации."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Для получения дополнительной информации о сквозном шифровании (E2EE) и "
 "советах о том, как его включить, пожалуйста, обратитесь к документации:"
@@ -1558,6 +1558,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Показывать иконку в трее"
 
@@ -1804,6 +1807,14 @@ msgstr "Разрешение на использование камеры"
 msgid "Your permission to use your camera is required."
 msgstr "Необходимо ваше разрешение на использование камеры."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Нет активного блокнота."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Создает новый блокнот."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Сейчас здесь нет заметок. Создайте новую, нажав кнопку (+)."
 

CliClient/locales/sl_SI.po

@@ -958,8 +958,8 @@ msgstr ""
 "da bodo sčasoma preneseni s sinhronizacijo."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 
 msgid "Status"
@@ -1567,6 +1567,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Pokaži ikono v območju za obvestila(opravilna vrstica)"
 
@@ -1810,6 +1813,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ni aktivnih beležnic."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Ustvari novo beležnico."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Trenutno ni zabeležk. Ustvarite jo s klikom na (+) gumb."
 

CliClient/locales/sr_RS.po

@@ -959,8 +959,8 @@ msgstr ""
 "преузети путем синхронизације."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "За више информација о End-To-End Шифровању (Е2ЕЕ) и саветима о томе како да "
 "га омогућите, молимо вас да проверите документацију:"
@@ -1564,6 +1564,10 @@ msgstr "Омогући ++insert++ синтаксу"
 msgid "Enable multimarkdown table extension"
 msgstr "Омогући проширење мултимаркдаун табеле"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "Омогућу ~sub~ синтаксу"
+
 msgid "Show tray icon"
 msgstr "Прикажи иконицу апликације на траци"
 
@@ -1808,6 +1812,14 @@ msgstr "Дозвола за употребу камере"
 msgid "Your permission to use your camera is required."
 msgstr "Ваша дозвола за употребу камере је неопходна."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Нема активне бележнице."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Креира нову бележницу."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Тренутно нема белешки. Направите једну тако што ће те кликнути на (+) дугме."

CliClient/locales/sv.po

@@ -965,8 +965,8 @@ msgstr ""
 "småningom kommer att hämtas via synkronisering."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "För mer information om End-to-End Encryption (E2EE) och råd om hur du "
 "aktiverar det finns i dokumentationen:"
@@ -1568,6 +1568,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Visa fältikon"
 
@@ -1813,6 +1816,14 @@ msgstr "Tillåtelse att använda kameran"
 msgid "Your permission to use your camera is required."
 msgstr "Du måste ge tillåtelse att använda kameran."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Ingen aktiv anteckningsbok."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Skapar en ny anteckningsbok."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
 "Det finns för närvarande inga anteckningar. Skapa en genom att klicka på (+)-"

CliClient/locales/tr_TR.po

@@ -934,8 +934,8 @@ msgstr ""
 "senkronizasyon yoluyla indirilmeleri sağlanacaktır."
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr ""
 "Uçtan Uca Şifreleme (E2EE) hakkında bilgi ve nasıl aktif edilebileceğine "
 "dair ipuçları için lütfen belgeleri inceleyin:"
@@ -1536,6 +1536,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Tepsi simgesini göster"
 
@@ -1779,6 +1782,14 @@ msgstr "Kamera kullanımı için izin"
 msgid "Your permission to use your camera is required."
 msgstr "Kamera kullanımı için izniniz gerekmektedir."
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "Aktif not defteri yok."
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "Yeni bir not defteri oluşturur."
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "Şu anda not yok. (+) butonuna tıklayarak bir tane oluşturun."
 

CliClient/locales/zh_CN.po

@@ -908,8 +908,8 @@ msgstr ""
 "能通过同步下载。"
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr "有关端到端加密（E2EE）的更多信息，以及如何启用它的建议，请查看文档："
 
 msgid "Status"
@@ -1496,6 +1496,10 @@ msgstr "启用 ++insert++ 句法"
 msgid "Enable multimarkdown table extension"
 msgstr "启用 multimarkdown 表格扩展"
 
+#, fuzzy
+msgid "Enable Fountain syntax support"
+msgstr "启用 ~sub~ 句法"
+
 msgid "Show tray icon"
 msgstr "显示托盘图标"
 
@@ -1732,6 +1736,14 @@ msgstr "使用摄像头的权限"
 msgid "Your permission to use your camera is required."
 msgstr "您须要授予相机权限。"
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "无活动笔记本。"
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "新建笔记本。"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "当前没有任何笔记。点击 (+) 按钮创建。"
 

CliClient/locales/zh_TW.po

@@ -921,8 +921,8 @@ msgstr ""
 "可能最終會通過同步下載。"
 
 msgid ""
-"For more information about End-To-End Encryption (E2EE) and advices on how "
-"to enable it please check the documentation:"
+"For more information about End-To-End Encryption (E2EE) and advice on how to "
+"enable it please check the documentation:"
 msgstr "有關端到端加密 (E2EE) 的詳細資訊以及該如何啟用它，請參考線上文檔:"
 
 msgid "Status"
@@ -1507,6 +1507,9 @@ msgstr ""
 msgid "Enable multimarkdown table extension"
 msgstr ""
 
+msgid "Enable Fountain syntax support"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "顯示系統匣圖示"
 
@@ -1747,6 +1750,14 @@ msgstr ""
 msgid "Your permission to use your camera is required."
 msgstr ""
 
+#, fuzzy
+msgid "You currently have no notebooks."
+msgstr "無使用中的記事本。"
+
+#, fuzzy
+msgid "Create a notebook"
+msgstr "新增記事本。"
+
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "您當前沒有任何筆記。通過按一下 (+) 鍵去新增一則筆記。"
 

CliClient/package-lock.json

@@ -1,9 +1,22 @@
 {
   "name": "joplin",
-  "version": "1.0.141",
+  "version": "1.0.145",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@cronvel/get-pixels": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.3.1.tgz",
+      "integrity": "sha512-jgDb8vGPkpjRDbiYyHTI2Bna4HJysjPNSiERzBnRJjCR/YqC3u0idTae0tmNECsaZLOpAWmlK9wiIwnLGIT9Bg==",
+      "requires": {
+        "jpeg-js": "^0.1.1",
+        "ndarray": "^1.0.13",
+        "ndarray-pack": "^1.1.1",
+        "node-bitmap": "0.0.1",
+        "omggif": "^1.0.5",
+        "pngjs": "^2.0.0"
+      }
+    },
     "abab": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
@@ -127,22 +140,6 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
-    "async-kit": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/async-kit/-/async-kit-2.2.3.tgz",
-      "integrity": "sha1-JkdRonndxfWbQZY4uAWuLEmFj7c=",
-      "requires": {
-        "nextgen-events": "^0.9.0",
-        "tree-kit": "^0.5.26"
-      },
-      "dependencies": {
-        "nextgen-events": {
-          "version": "0.9.9",
-          "resolved": "https://registry.npmjs.org/nextgen-events/-/nextgen-events-0.9.9.tgz",
-          "integrity": "sha1-OaivxKK4RTiMV+LGu5cWcRmGo6A="
-        }
-      }
-    },
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
@@ -169,9 +166,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -230,14 +227,6 @@
         }
       }
     },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "requires": {
-        "hoek": "4.x.x"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -310,6 +299,11 @@
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
       "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
     },
+    "chroma-js": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.0.6.tgz",
+      "integrity": "sha512-IiiClbBRkRwuXNl6impq5ssEhUGpmWvc5zzImZbDUWLWcFbj6ZbtsdZEx6sIXMKes7azgYaUpnmsY1T8BL6PqQ=="
+    },
     "clean-css": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
@@ -433,24 +427,6 @@
       "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
       "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
     },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.x.x"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-          "requires": {
-            "hoek": "4.x.x"
-          }
-        }
-      }
-    },
     "css": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
@@ -498,11 +474,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "data-uri-to-buffer": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz",
-      "integrity": "sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo="
-    },
     "data-urls": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
@@ -559,6 +530,11 @@
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -748,6 +724,14 @@
         "format": "^0.2.2"
       }
     },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
     "file-type": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
@@ -891,24 +875,6 @@
         }
       }
     },
-    "get-pixels": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/get-pixels/-/get-pixels-3.3.0.tgz",
-      "integrity": "sha1-jZeVvq4YhQuED3SVgbrcBdPjbkE=",
-      "requires": {
-        "data-uri-to-buffer": "0.0.3",
-        "jpeg-js": "^0.1.1",
-        "mime-types": "^2.0.1",
-        "ndarray": "^1.0.13",
-        "ndarray-pack": "^1.1.1",
-        "node-bitmap": "0.0.1",
-        "omggif": "^1.0.5",
-        "parse-data-uri": "^0.2.0",
-        "pngjs": "^2.0.0",
-        "request": "^2.44.0",
-        "through": "^2.3.4"
-      }
-    },
     "get-prototype-chain": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-prototype-chain/-/get-prototype-chain-1.0.1.tgz",
@@ -956,12 +922,35 @@
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "requires": {
-        "ajv": "^5.1.0",
+        "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
       }
     },
     "has-ansi": {
@@ -989,17 +978,6 @@
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-      "requires": {
-        "boom": "4.x.x",
-        "cryptiles": "3.x.x",
-        "hoek": "4.x.x",
-        "sntp": "2.x.x"
-      }
-    },
     "he": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -1010,11 +988,6 @@
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
       "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
     },
-    "hoek": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
-    },
     "html-encoding-sniffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
@@ -1042,6 +1015,25 @@
         "uglify-js": "3.3.x"
       }
     },
+    "http-errors": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        }
+      }
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -1710,6 +1702,11 @@
         "graceful-fs": "^4.1.9"
       }
     },
+    "lazyness": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/lazyness/-/lazyness-1.1.1.tgz",
+      "integrity": "sha512-rYHC6l6LeRlJSt5jxpqN8z/49gZ0CqLi89HAGzJjHahCFlqEjFGFN9O15hmzSzUGFl7zN/vOWduv/+0af3r/kQ=="
+    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
@@ -1901,6 +1898,24 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "multiparty": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.1.tgz",
+      "integrity": "sha512-AvESCnNoQlZiOfP9R4mxN8M9csy2L16EIbWIkt3l4FuGti9kXBS8QVzlfyg4HEnarJhrzZilgNFlZtqmoiAIIA==",
+      "requires": {
+        "fd-slicer": "1.1.0",
+        "http-errors": "~1.7.0",
+        "safe-buffer": "5.1.2",
+        "uid-safe": "2.1.5"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
+      }
+    },
     "nan": {
       "version": "2.13.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
@@ -1955,9 +1970,9 @@
       }
     },
     "nextgen-events": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/nextgen-events/-/nextgen-events-0.11.3.tgz",
-      "integrity": "sha512-dC4v/dOF6m8/M05eU712KXjRJ0e/187rx5CMS/fTnulv2QGPps1U/c/J1D3wtegEhK+EE7LuJc3jly3pyfV46g=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.0.tgz",
+      "integrity": "sha512-eBz5mrO4Hw2eenPVm0AVPHuAzg/RZetAWMI547RH8O9+a0UYhCysiZ3KoNWslnWNlHetb9kzowEshsKsmFo2YQ=="
     },
     "no-case": {
       "version": "2.3.2",
@@ -2074,9 +2089,9 @@
       "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
     },
     "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -2120,9 +2135,9 @@
       }
     },
     "omggif": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz",
-      "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz",
+      "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="
     },
     "once": {
       "version": "1.4.0",
@@ -2200,14 +2215,6 @@
         "no-case": "^2.2.0"
       }
     },
-    "parse-data-uri": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz",
-      "integrity": "sha1-vwTYUd1ch7CrI45dAazklLYEtMk=",
-      "requires": {
-        "data-uri-to-buffer": "0.0.3"
-      }
-    },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -2218,6 +2225,11 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -2353,6 +2365,11 @@
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
       "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
     },
+    "random-bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs="
+    },
     "rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -2416,32 +2433,82 @@
       "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
     },
     "request": {
-      "version": "2.85.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
-      "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "requires": {
         "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
+        "aws4": "^1.8.0",
         "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
-        "hawk": "~6.0.2",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
         "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "stringstream": "~0.0.5",
-        "tough-cookie": "~2.3.3",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        },
+        "uuid": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+          "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+        }
       }
     },
     "request-promise-core": {
@@ -2522,6 +2589,24 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "seventh": {
+      "version": "0.7.28",
+      "resolved": "https://registry.npmjs.org/seventh/-/seventh-0.7.28.tgz",
+      "integrity": "sha512-WitJqSwsjLWbCP9cciaozByx4csddLQyNoaPBqOpYFMNE6iD6FK/pM8J2yqtpauSxJUUo7Wfv5KF5w1jbVov7A==",
+      "requires": {
+        "setimmediate": "^1.0.5"
+      }
+    },
     "sharp": {
       "version": "0.22.1",
       "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.22.1.tgz",
@@ -2623,14 +2708,6 @@
         "is-fullwidth-code-point": "^2.0.0"
       }
     },
-    "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-      "requires": {
-        "hoek": "4.x.x"
-      }
-    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -2812,6 +2889,11 @@
         "tweetnacl": "~0.14.0"
       }
     },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -2823,12 +2905,9 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
     "string-kit": {
-      "version": "0.6.14",
-      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.14.tgz",
-      "integrity": "sha512-Sz9Q98Q4JKLaOaXUYLSO8ScWhO9z/itJ53GJOLl+w/wR9XXFt82MzN4Q5pwXN9QZCN1/aCnZhOe67ANK8Vs6Vw==",
-      "requires": {
-        "xregexp": "^3.2.0"
-      }
+      "version": "0.9.10",
+      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.9.10.tgz",
+      "integrity": "sha512-hcJem/u3/ddt3lSY2Xlx953XCHe3C8BX2XEWbPrByjyJ0CSR36X7kzsGFsI5lLaG94dLCQYpt8ffVwRjKpRT6g=="
     },
     "string-padding": {
       "version": "1.0.2",
@@ -2883,11 +2962,6 @@
         }
       }
     },
-    "stringstream": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="
-    },
     "strip-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -3035,23 +3109,20 @@
       }
     },
     "terminal-kit": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.15.1.tgz",
-      "integrity": "sha512-nk0+wDRfcvjnBXW6b2X2SFBzCMbT5ZJX56rRvmq/CFaimMYfWHU1eooy33RmzWByXWkkI71zx17q3vlp71OUNA==",
+      "version": "1.31.2",
+      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.31.2.tgz",
+      "integrity": "sha512-qbzHgHONdyJ5SQsjMWvoV5Jivw2VGbV8uw6U8WMgEgkbjX5AZ6Irhs183z459+b6u++36+6WIFeYddIDoXKNeQ==",
       "requires": {
-        "async-kit": "^2.2.3",
-        "get-pixels": "^3.3.0",
+        "@cronvel/get-pixels": "^3.3.1",
+        "chroma-js": "^2.0.4",
+        "lazyness": "^1.1.1",
         "ndarray": "^1.0.18",
-        "nextgen-events": "^0.11.2",
-        "string-kit": "^0.6.9",
-        "tree-kit": "^0.5.26"
+        "nextgen-events": "^1.1.1",
+        "seventh": "^0.7.28",
+        "string-kit": "^0.9.10",
+        "tree-kit": "^0.6.1"
       }
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
     "tkwidgets": {
       "version": "0.5.26",
       "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.26.tgz",
@@ -3080,6 +3151,11 @@
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
     "tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
@@ -3104,9 +3180,9 @@
       }
     },
     "tree-kit": {
-      "version": "0.5.26",
-      "resolved": "https://registry.npmjs.org/tree-kit/-/tree-kit-0.5.26.tgz",
-      "integrity": "sha1-hXHIb6JNHbdU5bDLOn4J9B50qN8="
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/tree-kit/-/tree-kit-0.6.1.tgz",
+      "integrity": "sha512-7mV4KbsLMuA6ths3J1wpVUj2PLmLdoNEGnP9fm3kxef4UXYC/A0rL5gKsqtkUaCMuRYUMORyioy8IpBWUBQ1Ig=="
     },
     "tunnel-agent": {
       "version": "0.6.0",
@@ -3156,6 +3232,14 @@
         }
       }
     },
+    "uid-safe": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+      "requires": {
+        "random-bytes": "~1.0.0"
+      }
+    },
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -3346,11 +3430,6 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
       "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
     },
-    "xregexp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz",
-      "integrity": "sha1-yzYBmHv+JpW1hAAMGPHEqMMih44="
-    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",

CliClient/package.json

@@ -20,7 +20,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.141",
+  "version": "1.0.145",
   "bin": {
     "joplin": "./main.js"
   },
@@ -51,6 +51,7 @@
     "md5": "^2.2.1",
     "mime": "^2.0.3",
     "moment": "^2.24.0",
+    "multiparty": "^4.2.1",
     "node-emoji": "^1.8.1",
     "node-fetch": "^1.7.1",
     "node-persist": "^2.1.0",
@@ -59,6 +60,7 @@
     "query-string": "4.3.4",
     "read-chunk": "^2.1.0",
     "redux": "^3.7.2",
+    "request": "^2.88.0",
     "sax": "^1.2.2",
     "server-destroy": "^1.0.1",
     "sharp": "^0.22.1",
@@ -70,6 +72,7 @@
     "syswide-cas": "^5.2.0",
     "tar": "^4.4.10",
     "tcp-port-used": "^0.1.2",
+    "terminal-kit": "^1.30.0",
     "tkwidgets": "^0.5.26",
     "url-parse": "^1.4.7",
     "uuid": "^3.0.1",

CliClient/tests/HtmlToMd.js

@@ -39,7 +39,7 @@ describe('HtmlToMd', function() {
 			const htmlPath = basePath + '/' + htmlFilename;
 			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
 
-			// if (htmlFilename !== 'mathjax_block.html') continue;
+			// if (htmlFilename !== 'table_with_pipe.html') continue;
 
 			const htmlToMdOptions = {};
 

CliClient/tests/html_to_md/table_with_pipe.html

@@ -0,0 +1,4 @@
+<table>
+	<tr><td>Line with | pipe</td><td>No pipe</td></tr>
+	<tr><td>One</td><td>Two</td></tr>
+</table>

CliClient/tests/html_to_md/table_with_pipe.md

@@ -0,0 +1,4 @@
+|     |     |
+| --- | --- |
+| Line with \| pipe | No pipe |
+| One | Two |

Clipper/joplin-webclipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",

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

@@ -1,4 +1,4 @@
-const randomClipperPort = require('./randomClipperPort');
+const { randomClipperPort } = require('./randomClipperPort');
 
 class Bridge {
 

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

@@ -17,4 +17,4 @@ function randomClipperPort(state, env) {
 	return state;
 }
 
-module.exports = randomClipperPort;
+module.exports = { randomClipperPort };

ElectronClient/app/gui/EncryptionConfigScreen.jsx

@@ -205,7 +205,7 @@ class EncryptionConfigScreenComponent extends React.Component {
 					{
 						<div style={{ backgroundColor: theme.warningBackgroundColor, paddingLeft: 10, paddingRight: 10, paddingTop: 2, paddingBottom: 2 }}>
 							<p style={theme.textStyle}>
-								<span>{_('For more information about End-To-End Encryption (E2EE) and advices on how to enable it please check the documentation:')}</span>{' '}
+								<span>{_('For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:')}</span>{' '}
 								<a
 									onClick={() => {
 										bridge().openExternal('https://joplinapp.org/e2ee/');

ElectronClient/app/gui/MainScreen.jsx

@@ -134,7 +134,9 @@ class MainScreenComponent extends React.Component {
 					return { value: a.id, label: a.title };
 				})
 				.sort((a, b) => {
-					return a.label.localeCompare(b.label);
+					// sensitivity accent will treat accented characters as differemt
+					// but treats caps as equal
+					return a.label.localeCompare(b.label, undefined, {sensitivity: 'accent'});
 				});
 			const allTags = await Tag.allWithNotes();
 			const tagSuggestions = allTags.map(a => {

ElectronClient/app/gui/NoteText.jsx

@@ -270,6 +270,7 @@ class NoteTextComponent extends React.Component {
 				localSearch: {
 					query: query,
 					selectedIndex: 0,
+					timestamp: Date.now(),
 				},
 			});
 		};
@@ -277,6 +278,7 @@ class NoteTextComponent extends React.Component {
 		const noteSearchBarNextPrevious = inc => {
 			const ls = Object.assign({}, this.state.localSearch);
 			ls.selectedIndex += inc;
+			ls.timestamp = Date.now();
 			if (ls.selectedIndex < 0) ls.selectedIndex = ls.resultCount - 1;
 			if (ls.selectedIndex >= ls.resultCount) ls.selectedIndex = 0;
 
@@ -1934,6 +1936,7 @@ class NoteTextComponent extends React.Component {
 				];
 				markerOptions.selectedIndex = this.state.localSearch.selectedIndex;
 				markerOptions.separateWordSearch = false;
+				markerOptions.searchTimestamp = this.state.localSearch.timestamp;
 			} else {
 				const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
 				if (search) {

ElectronClient/app/gui/PromptDialog.jsx

@@ -104,6 +104,7 @@ class PromptDialog extends React.Component {
 				Object.assign(provided, {
 					minWidth: width * 0.2,
 					maxWidth: width * 0.5,
+					fontFamily: theme.fontFamily,
 				}),
 			input: provided =>
 				Object.assign(provided, {

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

@@ -227,7 +227,11 @@
 
 			ipcProxySendToHost('setMarkerCount', elementIndex);
 
-			if (selectedElement) selectedElement.scrollIntoView();
+			// We only scroll the element into view if the search just happened. So when the user type the search
+			// or select the next/previous result, we scroll into view. However for other actions that trigger a
+			// re-render, we don't scroll as this is normally not wanted.
+			// This is to go around this issue: https://github.com/laurent22/joplin/issues/1833
+			if (selectedElement && Date.now() - options.searchTimestamp <= 1000) selectedElement.scrollIntoView();
 		}
 
 		let markLoaded_ = false;

ElectronClient/app/locales/index.js

@@ -30,34 +30,34 @@ locales['sv'] = require('./sv.json');
 locales['tr_TR'] = require('./tr_TR.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":85};
+stats['ar'] = {"percentDone":84};
 stats['eu'] = {"percentDone":47};
-stats['bg_BG'] = {"percentDone":94};
-stats['ca'] = {"percentDone":69};
+stats['bg_BG'] = {"percentDone":93};
+stats['ca'] = {"percentDone":73};
 stats['hr_HR'] = {"percentDone":38};
 stats['cs_CZ'] = {"percentDone":85};
-stats['da_DK'] = {"percentDone":62};
+stats['da_DK'] = {"percentDone":61};
 stats['de_DE'] = {"percentDone":99};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":92};
-stats['fr_FR'] = {"percentDone":99};
-stats['gl_ES'] = {"percentDone":61};
-stats['it_IT'] = {"percentDone":92};
-stats['nl_BE'] = {"percentDone":48};
-stats['nl_NL'] = {"percentDone":94};
-stats['nb_NO'] = {"percentDone":86};
+stats['es_ES'] = {"percentDone":91};
+stats['fr_FR'] = {"percentDone":100};
+stats['gl_ES'] = {"percentDone":60};
+stats['it_IT'] = {"percentDone":96};
+stats['nl_BE'] = {"percentDone":47};
+stats['nl_NL'] = {"percentDone":96};
+stats['nb_NO'] = {"percentDone":85};
 stats['fa'] = {"percentDone":46};
 stats['pl_PL'] = {"percentDone":92};
-stats['pt_BR'] = {"percentDone":91};
-stats['ro'] = {"percentDone":48};
+stats['pt_BR'] = {"percentDone":95};
+stats['ro'] = {"percentDone":47};
 stats['sl_SI'] = {"percentDone":60};
 stats['sv'] = {"percentDone":82};
 stats['tr_TR'] = {"percentDone":80};
 stats['ru_RU'] = {"percentDone":85};
-stats['sr_RS'] = {"percentDone":92};
+stats['sr_RS'] = {"percentDone":91};
 stats['zh_CN'] = {"percentDone":93};
-stats['zh_TW'] = {"percentDone":74};
-stats['ja_JP'] = {"percentDone":80};
-stats['ko'] = {"percentDone":98};
+stats['zh_TW'] = {"percentDone":73};
+stats['ja_JP'] = {"percentDone":98};
+stats['ko'] = {"percentDone":99};
 module.exports = { locales: locales, stats: stats };

ElectronClient/app/package-lock.json

@@ -4013,9 +4013,9 @@
       }
     },
     "joplin-turndown-plugin-gfm": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz",
-      "integrity": "sha512-uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.9.tgz",
+      "integrity": "sha512-SOa/Uiy3nyoBGtHqFe+TBg10UTIOzzcUUzNhx2MyR4Z0vbKL3enGggGypig1t7G5uHwv5j+NhooRuM619Zk0bw=="
     },
     "js-tokens": {
       "version": "3.0.2",

ElectronClient/app/package.json

@@ -103,7 +103,7 @@
     "html-minifier": "^4.0.0",
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.17",
-    "joplin-turndown-plugin-gfm": "^1.0.8",
+    "joplin-turndown-plugin-gfm": "^1.0.9",
     "jssha": "^2.3.1",
     "katex": "^0.10.0",
     "levenshtein": "^1.0.5",

Joplin_install_and_update.sh

@@ -71,7 +71,7 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; t
 
     # Create icon for Gnome
     echo 'Create Desktop icon.'
-    if [[ $desktop =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*X-Cinnamon.* ]]
+    if [[ $desktop =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.* ]]
     then
        : "${TMPDIR:=/tmp}"
        # This command extracts to squashfs-root by default and can't be changed...

README.md

@@ -20,15 +20,15 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download | Alternative
 -----------------|--------|-------------------
-Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.160/Joplin-Setup-1.0.160.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.160/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.160/Joplin-1.0.160.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.160/Joplin-1.0.160-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/Joplin-Setup-1.0.165.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/Joplin-1.0.165.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.165/Joplin-1.0.165-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
 
 ## Mobile applications
 
 Operating System | Download | Alt. Download
 -----------------|----------|----------------
-Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.299/joplin-v1.0.299.apk)
+Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.303/joplin-v1.0.303.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplinapp.org/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -346,12 +346,12 @@ Joplin implements the SQLite Full Text Search (FTS4) extension. It means the con
 Search type | Description | Example
 ------------|-------------|---------
 Single word | Returns all the notes that contain this term. | For example, searching for `cat` will return all the notes that contain this exact word. Note: it will not return the notes that contain the substring - thus, for "cat", notes that contain "cataclysmic" or "prevaricate" will **not** be returned.
-Multiples words | Returns all the notes that contain **all** these words, but not necessarily next to each other. | `dog cat` - will return any notes that contain the words "dog" and "cat" anywhere in the note, no necessarily in that order nor next to each others. It will **not** return results that contain "dog" or "cat" only.
-Phrase query | Add double quotes to return the notes that contain exactly this phrase. | `"shopping list"` - will return the notes that contain these **exact terms** next to each others and in this order. It will **not** return for example a note that contain "going shopping with my list".
-Prefix | Add a wildmark to return all the notes that contain a term with a specified prefix. | `swim*` - will return all the notes that contain eg. "swim", but also "swimming", "swimsuit", etc. IMPORTANT: The wildcard **can only be at the end** - it will be ignored at the beginning of a word (eg. `*swim`) and will be treated as a literal asterisk in the middle of a word (eg. `ast*rix`)
+Multiples words | Returns all the notes that contain **all** these words, but not necessarily next to each other. | `dog cat` - will return any notes that contain the words "dog" and "cat" anywhere in the note, no necessarily in that order nor next to each other. It will **not** return results that contain "dog" or "cat" only.
+Phrase query | Add double quotes to return the notes that contain exactly this phrase. | `"shopping list"` - will return the notes that contain these **exact terms** next to each other and in this order. It will **not** return for example a note that contains "going shopping with my list".
+Prefix | Add a wildcard to return all the notes that contain a term with a specified prefix. | `swim*` - will return all the notes that contain eg. "swim", but also "swimming", "swimsuit", etc. IMPORTANT: The wildcard **can only be at the end** - it will be ignored at the beginning of a word (eg. `*swim`) and will be treated as a literal asterisk in the middle of a word (eg. `ast*rix`)
 Field restricted | Add either `title:` or `body:` before a note to restrict your search to just the title, or just the body. | `title:shopping`, `body:egg`
 
-Notes are sorted by "relevance". Currently it means the notes that contain the requested terms the most times are on top. For queries with multiple terms, it also matter how close to each others are the terms. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as much details as possible to replicate the issue.
+Notes are sorted by "relevance". Currently it means the notes that contain the requested terms the most times are on top. For queries with multiple terms, it also matters how close to each other the terms are. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as many details as possible to replicate the issue.
 
 # Goto Anything
 
@@ -370,6 +370,7 @@ Please see the [donation page](https://joplinapp.org/donate/) for information on
 - For bug reports and feature requests, go to the [GitHub Issue Tracker](https://github.com/laurent22/joplin/issues).
 - The latest news are posted [on the Patreon page](https://www.patreon.com/joplin).
 - You can also follow us on <a rel="me" href="https://mastodon.social/@joplinapp">the Mastodon feed</a> or [the Twitter feed](https://twitter.com/joplinapp).
+- You can join the live community on [the JoplinApp discord server](https://discordapp.com/invite/d2HMPwE) to get help with Joplin or to discuss anything Joplin related.
 
 # Contributing
 
@@ -393,36 +394,36 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po)  |  عبد الناصر سعيد (as@althobaity.com)  |  85%
+![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po)  |  عبد الناصر سعيد (as@althobaity.com)  |  84%
 ![](https://joplinapp.org/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  47%
-![](https://joplinapp.org/images/flags/country-4x3/bg.png)  |  Bulgarian  |  [bg_BG](https://github.com/laurent22/joplin/blob/master/CliClient/locales/bg_BG.po)  |    |  94%
-![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  69%
+![](https://joplinapp.org/images/flags/country-4x3/bg.png)  |  Bulgarian  |  [bg_BG](https://github.com/laurent22/joplin/blob/master/CliClient/locales/bg_BG.po)  |    |  93%
+![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2019  |  73%
 ![](https://joplinapp.org/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić (trbuhom@net.hr)  |  38%
 ![](https://joplinapp.org/images/flags/country-4x3/cz.png)  |  Czech  |  [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po)  |  Lukas Helebrandt (lukas@aiya.cz)  |  85%
-![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |  Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.  |  62%
+![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |  Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.  |  61%
 ![](https://joplinapp.org/images/flags/country-4x3/de.png)  |  Deutsch  |  [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po)  |  Michael Sonntag (ms@editorei.de)  |  99%
 ![](https://joplinapp.org/images/flags/country-4x3/gb.png)  |  English (UK)  |  [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po)  |    |  100%
 ![](https://joplinapp.org/images/flags/country-4x3/us.png)  |  English (US)  |  [en_US](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_US.po)  |    |  100%
-![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Andros Fenollosa (andros@fenollosa.email)  |  92%
-![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français  |  [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po)  |  Laurent Cozic  |  99%
-![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans (marcoslansgarza@gmail.com)  |  61%
-![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  92%
-![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  48%
-![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands  |  [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po)  |  Heimen Stoffels (vistausss@outlook.com)  |  94%
-![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian  |  [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po)  |  Mats Estensen (code@mxe.no)  |  86%
+![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Andros Fenollosa (andros@fenollosa.email)  |  91%
+![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français  |  [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po)  |  Laurent Cozic  |  100%
+![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans (marcoslansgarza@gmail.com)  |  60%
+![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  96%
+![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  47%
+![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands  |  [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po)  |  Heimen Stoffels (vistausss@outlook.com)  |  96%
+![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian  |  [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po)  |  Mats Estensen (code@mxe.no)  |  85%
 ![](https://joplinapp.org/images/flags/country-4x3/ir.png)  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fa.po)  |  Mehrad Mahmoudian (mehrad@mahmoudian.me)  |  46%
 ![](https://joplinapp.org/images/flags/country-4x3/pl.png)  |  Polski  |  [pl_PL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pl_PL.po)  |    |  92%
-![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos (rnbastos@gmail.com)  |  91%
-![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  48%
+![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Rafael Teixeira (rto.tinfo@gmail.com)  |  95%
+![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  47%
 ![](https://joplinapp.org/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  60%
 ![](https://joplinapp.org/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po)  |  Jonatan Nyberg (jonatan@autistici.org)  |  82%
 ![](https://joplinapp.org/images/flags/country-4x3/tr.png)  |  Türkçe  |  [tr_TR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/tr_TR.po)  |  Zorbey Doğangüneş (zorbeyd@gmail.com)  |  80%
 ![](https://joplinapp.org/images/flags/country-4x3/ru.png)  |  Русский  |  [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po)  |  Artyom Karlov (artyom.karlov@gmail.com)  |  85%
-![](https://joplinapp.org/images/flags/country-4x3/rs.png)  |  српски језик  |  [sr_RS](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sr_RS.po)  |    |  92%
+![](https://joplinapp.org/images/flags/country-4x3/rs.png)  |  српски језик  |  [sr_RS](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sr_RS.po)  |    |  91%
 ![](https://joplinapp.org/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  93%
-![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  74%
-![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |  AWASHIRO Ikuya (ikunya@gmail.com)  |  80%
-![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  98%
+![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  73%
+![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |  AWASHIRO Ikuya (ikunya@gmail.com)  |  98%
+![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  99%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Contributors

ReactNativeClient/android/app/build.gradle

@@ -94,8 +94,8 @@ android {
 		applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097535
-		versionName "1.0.299"
+		versionCode 2097539
+		versionName "1.0.303"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}

ReactNativeClient/android/app/src/main/java/net/cozic/joplin/MainApplication.java

@@ -28,6 +28,7 @@ import cx.evermeet.versioninfo.RNVersionInfoPackage;
 
 import java.util.Arrays;
 import java.util.List;
+import android.database.CursorWindow;
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -68,6 +69,20 @@ public class MainApplication extends Application implements ReactApplication {
 	@Override
 	public void onCreate() {
 		super.onCreate();
+
+		// To try to fix the error "Row too big to fit into CursorWindow"
+		// https://github.com/andpor/react-native-sqlite-storage/issues/364#issuecomment-526423153
+		// https://github.com/laurent22/joplin/issues/1767#issuecomment-515617991
+		try {
+			// Field field = CursorWindow.class.getDeclaredField("sCursorWindowSize");
+			CursorWindow.class.getDeclaredField("sCursorWindowSize").setAccessible(true);
+			CursorWindow.class.getDeclaredField("sCursorWindowSize").set(null, 50 * 1024 * 1024); // 50 MB
+		} catch (Exception e) {
+			// if (DEBUG_MODE) {
+			// 	e.printStackTrace();
+			// }
+		}
+
 		SoLoader.init(this, /* native exopackage */ false);
 	}
 }

ReactNativeClient/lib/BaseApplication.js

@@ -325,6 +325,60 @@ class BaseApplication {
 		return middleware;
 	}
 
+	async applySettingsSideEffects(action = null) {
+		const sideEffects = {
+			'dateFormat': async () => {
+				time.setLocale(Setting.value('locale'));
+				time.setDateFormat(Setting.value('dateFormat'));
+				time.setTimeFormat(Setting.value('timeFormat'));
+			},
+			'net.ignoreTlsErrors': async () => {
+				process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = Setting.value('net.ignoreTlsErrors') ? '0' : '1';
+			},
+			'net.customCertificates': async () => {
+				const caPaths = Setting.value('net.customCertificates').split(',');
+				for (let i = 0; i < caPaths.length; i++) {
+					const f = caPaths[i].trim();
+					if (!f) continue;
+					syswidecas.addCAs(f);
+				}
+			},
+			'encryption.enabled': async () => {
+				if (this.hasGui()) {
+					await EncryptionService.instance().loadMasterKeysFromSettings();
+					DecryptionWorker.instance().scheduleStart();
+					const loadedMasterKeyIds = EncryptionService.instance().loadedMasterKeyIds();
+
+					this.dispatch({
+						type: 'MASTERKEY_REMOVE_NOT_LOADED',
+						ids: loadedMasterKeyIds,
+					});
+
+					// Schedule a sync operation so that items that need to be encrypted
+					// are sent to sync target.
+					reg.scheduleSync();
+				}
+			},
+			'sync.interval': async () => {
+				if (this.hasGui()) reg.setupRecurrentSync();
+			},
+		};
+
+		sideEffects['timeFormat'] = sideEffects['dateFormat'];
+		sideEffects['locale'] = sideEffects['dateFormat'];
+		sideEffects['encryption.activeMasterKeyId'] = sideEffects['encryption.enabled'];
+		sideEffects['encryption.passwordCache'] = sideEffects['encryption.enabled'];
+
+		if (action) {
+			const effect = sideEffects[action.key];
+			if (effect) await effect();
+		} else {
+			for (const key in sideEffects) {
+				await sideEffects[key]();
+			}
+		}
+	}
+
 	async generalMiddleware(store, next, action) {
 		// this.logger().debug('Reducer action', this.reducerActionToString(action));
 
@@ -376,57 +430,10 @@ class BaseApplication {
 			refreshNotes = true;
 		}
 
-		// if (action.type == 'NOTE_DELETE') {
-		// 	refreshTags = true;
-		// }
-
 		if (refreshNotes) {
 			await this.refreshNotes(newState, refreshNotesUseSelectedNoteId);
 		}
 
-		// if (refreshTags) {
-		// 	this.dispatch({
-		// 		type: 'TAG_UPDATE_ALL',
-		// 		items: await Tag.allWithNotes(),
-		// 	});
-		// }
-
-		if ((action.type == 'SETTING_UPDATE_ONE' && (action.key == 'dateFormat' || action.key == 'timeFormat')) || action.type == 'SETTING_UPDATE_ALL') {
-			time.setDateFormat(Setting.value('dateFormat'));
-			time.setTimeFormat(Setting.value('timeFormat'));
-		}
-
-		if ((action.type == 'SETTING_UPDATE_ONE' && action.key == 'net.ignoreTlsErrors') || action.type == 'SETTING_UPDATE_ALL') {
-			// https://stackoverflow.com/questions/20082893/unable-to-verify-leaf-signature
-			process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = Setting.value('net.ignoreTlsErrors') ? '0' : '1';
-		}
-
-		if ((action.type == 'SETTING_UPDATE_ONE' && action.key == 'net.customCertificates') || action.type == 'SETTING_UPDATE_ALL') {
-			const caPaths = Setting.value('net.customCertificates').split(',');
-			for (let i = 0; i < caPaths.length; i++) {
-				const f = caPaths[i].trim();
-				if (!f) continue;
-				syswidecas.addCAs(f);
-			}
-		}
-
-		if ((action.type == 'SETTING_UPDATE_ONE' && action.key.indexOf('encryption.') === 0) || action.type == 'SETTING_UPDATE_ALL') {
-			if (this.hasGui()) {
-				await EncryptionService.instance().loadMasterKeysFromSettings();
-				DecryptionWorker.instance().scheduleStart();
-				const loadedMasterKeyIds = EncryptionService.instance().loadedMasterKeyIds();
-
-				this.dispatch({
-					type: 'MASTERKEY_REMOVE_NOT_LOADED',
-					ids: loadedMasterKeyIds,
-				});
-
-				// Schedule a sync operation so that items that need to be encrypted
-				// are sent to sync target.
-				reg.scheduleSync();
-			}
-		}
-
 		if (action.type === 'NOTE_UPDATE_ONE') {
 			refreshFolders = true;
 		}
@@ -435,10 +442,6 @@ class BaseApplication {
 			refreshFolders = 'now';
 		}
 
-		if ((this.hasGui() && action.type == 'SETTING_UPDATE_ONE' && action.key == 'sync.interval') || action.type == 'SETTING_UPDATE_ALL') {
-			reg.setupRecurrentSync();
-		}
-
 		if (this.hasGui() && action.type === 'SYNC_GOT_ENCRYPTED_ITEM') {
 			DecryptionWorker.instance().scheduleStart();
 		}
@@ -447,6 +450,12 @@ class BaseApplication {
 			ResourceFetcher.instance().autoAddResources();
 		}
 
+		if (action.type == 'SETTING_UPDATE_ONE') {
+			await this.applySettingsSideEffects(action);
+		} else if (action.type == 'SETTING_UPDATE_ALL') {
+			await this.applySettingsSideEffects();
+		}
+
 		if (refreshFolders) {
 			if (refreshFolders === 'now') {
 				await FoldersScreenUtils.refreshFolders();

ReactNativeClient/lib/ClipperServer.js

@@ -1,7 +1,7 @@
 const urlParser = require('url');
 const Setting = require('lib/models/Setting');
 const { Logger } = require('lib/logger.js');
-const randomClipperPort = require('lib/randomClipperPort');
+const { randomClipperPort, startPort } = require('lib/randomClipperPort');
 const enableServerDestroy = require('server-destroy');
 const Api = require('lib/services/rest/Api');
 const ApiResponse = require('lib/services/rest/ApiResponse');
@@ -73,13 +73,22 @@ class ClipperServer {
 		throw new Error('All potential ports are in use or not available.');
 	}
 
+	async isRunning() {
+		const tcpPortUsed = require('tcp-port-used');
+		const port = Setting.value('api.port') ? Setting.value('api.port') : startPort(Setting.value('env'));
+		const inUse = await tcpPortUsed.check(port);
+		return inUse ? port : 0;
+	}
+
 	async start() {
 		this.setPort(null);
 
 		this.setStartState('starting');
 
+		const settingPort = Setting.value('api.port');
+
 		try {
-			const p = await this.findAvailablePort();
+			const p = settingPort ? settingPort : await this.findAvailablePort();
 			this.setPort(p);
 		} catch (error) {
 			this.setStartState('idle');
@@ -200,6 +209,10 @@ class ClipperServer {
 		this.server_.listen(this.port_, '127.0.0.1');
 
 		this.setStartState('started');
+
+		// We return an empty promise that never resolves so that it's possible to `await` the server indefinitely.
+		// This is used only in command-server.js
+		return new Promise(() => {});
 	}
 
 	async stop() {

ReactNativeClient/lib/TemplateUtils.js

@@ -4,18 +4,6 @@ const Mustache = require('mustache');
 
 const TemplateUtils = {};
 
-// new template variables can be added here
-// If there are too many, this should be moved to a new file
-const view = {
-	date: time.formatMsToLocal(new Date().getTime(), time.dateFormat()),
-	time: time.formatMsToLocal(new Date().getTime(), time.timeFormat()),
-	datetime: time.formatMsToLocal(new Date().getTime()),
-	custom_datetime: () => {
-		return (text, render) => {
-			return render(time.formatMsToLocal(new Date().getTime(), text));
-		};
-	},
-};
 
 // Mustache escapes strings (including /) with the html code by default
 // This isn't useful for markdown so it's disabled
@@ -24,6 +12,20 @@ Mustache.escape = text => {
 };
 
 TemplateUtils.render = function(input) {
+	// new template variables can be added here
+	// If there are too many, this should be moved to a new file
+	// view needs to be set in this function so that the formats reflect settings
+	const view = {
+		date: time.formatMsToLocal(new Date().getTime(), time.dateFormat()),
+		time: time.formatMsToLocal(new Date().getTime(), time.timeFormat()),
+		datetime: time.formatMsToLocal(new Date().getTime()),
+		custom_datetime: () => {
+			return (text, render) => {
+				return render(time.formatMsToLocal(new Date().getTime(), text));
+			};
+		},
+	};
+
 	return Mustache.render(input, view);
 };
 
@@ -41,6 +43,10 @@ TemplateUtils.loadTemplates = async function(filePath) {
 			throw error;
 		}
 
+		// Make sure templates are always in the same order
+		// sensitivity ensures that the sort will ignore case
+		files.sort((a, b) => { return a.path.localeCompare(b.path, undefined, {sensitivity: 'accent'}); });
+
 		files.forEach(async file => {
 			if (file.path.endsWith('.md')) {
 				try {

ReactNativeClient/lib/components/screens/encryption-config.js

@@ -243,7 +243,7 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent {
 				<ScrollView style={this.styles().container}>
 					{
 						<View style={{ backgroundColor: theme.warningBackgroundColor, paddingTop: 5, paddingBottom: 5, paddingLeft: 10, paddingRight: 10 }}>
-							<Text>{_('For more information about End-To-End Encryption (E2EE) and advices on how to enable it please check the documentation:')}</Text>
+							<Text>{_('For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:')}</Text>
 							<TouchableOpacity
 								onPress={() => {
 									Linking.openURL('https://joplinapp.org/e2ee/');

ReactNativeClient/lib/logger.js

@@ -120,7 +120,8 @@ class Logger {
 				if (level == Logger.LEVEL_ERROR) fn = 'error';
 				if (level == Logger.LEVEL_WARN) fn = 'warn';
 				if (level == Logger.LEVEL_INFO) fn = 'info';
-				console[fn](line + this.objectsToString(...object));
+				const consoleObj = target.console ? target.console : console;
+				consoleObj[fn](line + this.objectsToString(...object));
 			} else if (target.type == 'file') {
 				let serializedObject = this.objectsToString(...object);
 				Logger.fsDriver().appendFileSync(target.path, line + serializedObject + '\n');

ReactNativeClient/lib/models/Setting.js

@@ -390,6 +390,7 @@ class Setting extends BaseModel {
 			},
 
 			'api.token': { value: null, type: Setting.TYPE_STRING, public: false },
+			'api.port': { value: null, type: Setting.TYPE_INT, public: true, appTypes: ['cli'], description: () => _('Specify the port that should be used by the API server. If not set, a default will be used.') },
 
 			'resourceService.lastProcessedChangeId': { value: 0, type: Setting.TYPE_INT, public: false },
 			'searchEngine.lastProcessedChangeId': { value: 0, type: Setting.TYPE_INT, public: false },

ReactNativeClient/lib/randomClipperPort.js

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

ReactNativeClient/lib/renderers/MdToHtml/rules/checkbox.js

@@ -83,7 +83,8 @@ function installRule(markdownIt, mdOptions, ruleOptions, context) {
 				continue;
 			}
 
-			if (currentListItem && !processedFirstInline && token.type === 'inline') {
+			// Note that we only support list items that start with "-" (not with "*")
+			if (currentListItem && currentListItem.markup === '-' && !processedFirstInline && token.type === 'inline') {
 				processedFirstInline = true;
 				const firstChild = token.children && token.children.length ? token.children[0] : null;
 				if (!firstChild) continue;

ReactNativeClient/lib/renderers/noteStyle.js

@@ -237,7 +237,11 @@ module.exports = function(style, options) {
 			align-items: center;
 		}
 
-		.checkbox-label-checked {
+		.md-checkbox input[type=checkbox]:checked {
+			opacity: 0.7;
+		}
+
+		.md-checkbox .checkbox-label-checked {
 			opacity: 0.5;
 		}
 
@@ -253,6 +257,14 @@ module.exports = function(style, options) {
 			.code, .inline-code {
 				border: 1px solid #CBCBCB;
 			}
+
+			#content {
+				/* The height of the content is set dynamically by JavaScript (in updateBodyHeight) to go
+				   around various issues related to scrolling. However when printing we don't want this
+				   fixed size as that would crop the content. So we set it to auto here. "important" is
+				   needed to override the style set by JavaScript at the element-level. */
+				height: auto !important;
+			}
 		}
 	`;
 

ReactNativeClient/lib/services/rest/Api.js

@@ -652,9 +652,20 @@ class Api {
 				const urlInfo = urls[imageUrl];
 				if (!urlInfo || !urlInfo.resource) return before + imageUrl + after;
 				if (!(urlInfo.originalUrl in imageSizesIndexes)) imageSizesIndexes[urlInfo.originalUrl] = 0;
-				const imageSize = imageSizes[urlInfo.originalUrl][imageSizesIndexes[urlInfo.originalUrl]];
-				imageSizesIndexes[urlInfo.originalUrl]++;
+
 				const resourceUrl = Resource.internalUrl(urlInfo.resource);
+				const imageSizesCollection = imageSizes[urlInfo.originalUrl];
+
+				if (!imageSizesCollection) {
+					// In some cases, we won't find the image size information for that particular URL. Normally
+					// it will only happen when using the "Clip simplified page" feature, which can modify the
+					// image URLs (for example it will select a smaller size resolution). In that case, it's
+					// fine to return the image as-is because it has already good dimensions.
+					return before + resourceUrl + after;
+				}
+
+				const imageSize = imageSizesCollection[imageSizesIndexes[urlInfo.originalUrl]];
+				imageSizesIndexes[urlInfo.originalUrl]++;
 
 				if (imageSize && (imageSize.naturalWidth !== imageSize.width || imageSize.naturalHeight !== imageSize.height)) {
 					return '<img width="' + imageSize.width + '" height="' + imageSize.height + '" src="' + resourceUrl + '"/>';

ReactNativeClient/lib/time-utils.js

@@ -4,6 +4,16 @@ class Time {
 	constructor() {
 		this.dateFormat_ = 'DD/MM/YYYY';
 		this.timeFormat_ = 'HH:mm';
+		this.locale_ = 'en-us';
+	}
+
+	locale() {
+		return this.locale_;
+	}
+
+	setLocale(v) {
+		moment.locale(v);
+		this.locale_ = v;
 	}
 
 	dateFormat() {