Android release v1.0.235

* Electron: enable ESC key press to dismiss NotePropertyDialog, when no editedKey.

* Desktop: handle ESC key press to cancel the NotePropertiesDialog

.gitignore

@@ -40,4 +40,5 @@ Tools/github_oauth_token.txt
 _releases
 ReactNativeClient/lib/csstojs/
 ElectronClient/app/gui/note-viewer/fonts/
+ElectronClient/app/gui/note-viewer/lib.js
 Tools/commit_hook.txt

CONTRIBUTING.md

@@ -1,3 +1,7 @@
+**IMPORTANT:** At the moment pull requests for new features are no longer being accepted. More info there: https://github.com/laurent22/joplin/issues/1112
+
+* * *
+
 # User support
 
 For general discussion about Joplin, user support, software development questions, and to discuss new features, please go to the [Joplin Forum](https://discourse.joplin.cozic.net/). It is possible to login with your GitHub account.

CliClient/app/command-search.js

@@ -49,35 +49,6 @@ class Command extends BaseCommand {
 			type: 'SEARCH_SELECT',
 			id: searchId,
 		});
-
-		// let fields = Note.previewFields();
-		// fields.push('body');
-		// const notes = await Note.previews(folder ? folder.id : null, {
-		// 	fields: fields,
-		// 	anywherePattern: '*' + pattern + '*',
-		// });
-
-		// const fragmentLength = 50;
-
-		// let parents = {};
-
-		// for (let i = 0; i < notes.length; i++) {
-		// 	const note = notes[i];
-		// 	const parent = parents[note.parent_id] ? parents[note.parent_id] : await Folder.load(note.parent_id);
-		// 	parents[note.parent_id] = parent;
-
-		// 	const idx = note.body.indexOf(pattern);
-		// 	let line = '';
-		// 	if (idx >= 0) {
-		// 		let fragment = note.body.substr(Math.max(0, idx - fragmentLength / 2), fragmentLength);
-		// 		fragment = fragment.replace(/\n/g, ' ');
-		// 		line = sprintf('%s: %s / %s: %s', BaseModel.shortId(note.id), parent.title, note.title, fragment);
-		// 	} else {
-		// 		line = sprintf('%s: %s / %s', BaseModel.shortId(note.id), parent.title, note.title);
-		// 	}
-
-		// 	this.stdout(line);
-		// }
 	}
 
 }

CliClient/app/command-sync.js

@@ -117,7 +117,6 @@ class Command extends BaseCommand {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
-		// TODO: use SQLite database to do lock?
 		const lockFilePath = require('os').tmpdir() + '/synclock_' + md5(escape(Setting.value('profileDir'))); // https://github.com/pvorb/node-md5/issues/41
 		if (!await fs.pathExists(lockFilePath)) await fs.writeFile(lockFilePath, 'synclock');
 

CliClient/app/gui/FolderListWidget.js

@@ -139,7 +139,8 @@ class FolderListWidget extends ListWidget {
 			const orderFolders = (parentId) => {
 				for (let i = 0; i < this.folders.length; i++) {
 					const f = this.folders[i];
-					if (f.parent_id === parentId) {
+					const folderParentId = f.parent_id ? f.parent_id : '';
+					if (folderParentId === parentId) {
 						newItems.push(f);
 						if (this.folderHasChildren_(this.folders, f.id)) orderFolders(f.id);
 					}

CliClient/locales/ca.po

@@ -655,6 +655,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Cerca a totes les notes"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Cerca a totes les notes"
+
 msgid "View"
 msgstr "Visualització"
 
@@ -714,9 +718,21 @@ msgstr "Cancel·la"
 msgid "Current version is up-to-date."
 msgstr "La versió actual està actualitzada"
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Hi ha disponible una actualització. Voleu baixar-la ara?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Sí"
 
@@ -1021,6 +1037,9 @@ msgstr ""
 "Aquesta nota no té contingut. Feu clic a «%s» per a anar a l'editor i "
 "modificar-la."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1345,6 +1364,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Percentatge de zoom global"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Tipus de lletra de l'editor"
+
 msgid "Editor font family"
 msgstr "Tipus de lletra de l'editor"
 
@@ -1359,6 +1382,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Actualitza automàticament l'aplicació"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Interval de sincronització"
 
@@ -1657,9 +1687,24 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Lloc web del Joplin"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Lloc web del Joplin"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Per suprimir: %d"
+
 msgid "Login with Dropbox"
 msgstr "Inicia sessió amb Dropbox"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Clau mestra %s"
@@ -1712,6 +1757,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipus d'imatge no admesa: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Adjunta una imatge"
+
 msgid "Attach photo"
 msgstr "Adjunta una imatge"
 

CliClient/locales/cs_CZ.po

@@ -637,6 +637,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Hledat ve všech poznámkách"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Hledat ve všech poznámkách"
+
 msgid "View"
 msgstr "Zobrazit"
 
@@ -696,9 +700,21 @@ msgstr "Zrušit"
 msgid "Current version is up-to-date."
 msgstr "Současná verze je aktuální."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Je k dispozici update, chcete jej stáhnout?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Ano"
 
@@ -990,6 +1006,9 @@ msgid ""
 "note."
 msgstr "Tato poznámka je prázdný. Klikněte na  \"%s\" pro otevření editoru."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1320,6 +1339,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Globální zoom"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Rodina písma v editoru"
+
 msgid "Editor font family"
 msgstr "Rodina písma v editoru"
 
@@ -1334,6 +1357,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automaticky updatovat aplikaci"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Interval synchronizace"
 
@@ -1626,10 +1656,25 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Web Joplinu"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Web Joplinu"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "K smazání: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Přihlásit se pomocí OneDrive"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Master heslo %s"
@@ -1681,6 +1726,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodporovaný formát obrázku: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Přiložit obrázek"
+
 msgid "Attach photo"
 msgstr "Přiložit obrázek"
 

CliClient/locales/da_DK.po

@@ -642,6 +642,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Søg i alle noter"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Søg i alle noter"
+
 msgid "View"
 msgstr "Vis"
 
@@ -701,9 +705,21 @@ msgstr "Fortryd"
 msgid "Current version is up-to-date."
 msgstr "Aktuel version er nyeste."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Opdatering er til rådighed, vil du hente den nu?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Ja"
 
@@ -999,6 +1015,9 @@ msgid ""
 "note."
 msgstr "Denne note er tom. Klik på \"%s\" for at starte editor og rette noten."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1329,6 +1348,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Global zoom procent"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Rediger skrifttype"
+
 msgid "Editor font family"
 msgstr "Rediger skrifttype"
 
@@ -1343,6 +1366,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automatisk app update"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Synkroniserings interval"
 
@@ -1635,10 +1665,25 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Joplin hjemmeside"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin hjemmeside"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Til sletning: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Log på med OneDrive"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Hoved nøgle %s"
@@ -1690,6 +1735,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Ulovlig billedtype: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Vedhæft foto"
+
 msgid "Attach photo"
 msgstr "Vedhæft foto"
 

CliClient/locales/de_DE.po

@@ -472,10 +472,10 @@ msgid "Starting synchronisation..."
 msgstr "Starte Synchronisation..."
 
 msgid "Downloading resources..."
-msgstr ""
+msgstr "Lade Anhänge herunter..."
 
 msgid "Cancelling... Please wait."
-msgstr "Abbrechen… Bitte warten."
+msgstr "Abbrechen... Bitte warten."
 
 msgid ""
 "<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
@@ -600,7 +600,7 @@ msgstr "Exportiere „%s“ ins „%s“ Format. Bitte warten..."
 
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importiere „%s“ ins „%s“ Format. Bitte warten…"
+msgstr "Importiere „%s“ ins „%s“ Format. Bitte warten..."
 
 msgid "PDF File"
 msgstr "PDF-Datei"
@@ -663,11 +663,14 @@ msgstr "Im externen Editor bearbeiten"
 msgid "Search in all the notes"
 msgstr "Alle Notizen durchsuchen"
 
+msgid "Search in current note"
+msgstr "Aktuelle Notiz durchsuchen"
+
 msgid "View"
 msgstr "Ansicht"
 
 msgid "Toggle sidebar"
-msgstr "Seitenleiste ein/aus"
+msgstr "Seitenleiste umschalten"
 
 msgid "Toggle editor layout"
 msgstr "Editor-Layout umschalten"
@@ -697,7 +700,7 @@ msgid "Make a donation"
 msgstr "Spenden"
 
 msgid "Check for updates..."
-msgstr "Überprüfe auf Updates…"
+msgstr "Überprüfe auf Aktualisierungen..."
 
 msgid "About Joplin"
 msgstr "Über Joplin"
@@ -720,10 +723,23 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 msgid "Current version is up-to-date."
-msgstr "Die aktuelle Version ist up-to-date."
+msgstr "Die aktuelle Version ist auf dem neuesten Stand."
+
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
 
 msgid "An update is available, do you want to download it now?"
-msgstr "Es ist ein Update verfügbar. Soll es jetzt heruntergeladen werden?"
+msgstr ""
+"Es ist eine Aktualisierung verfügbar. Soll sie jetzt heruntergeladen werden?"
+
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
 
 msgid "Yes"
 msgstr "Ja"
@@ -879,7 +895,7 @@ msgstr ""
 "Notizbücher ursprünglich verschlüsselt wurden."
 
 msgid "Missing Master Keys"
-msgstr "Fehlender Hauptschlüssel"
+msgstr "Fehlende Hauptschlüssel"
 
 msgid ""
 "The master keys with these IDs are used to encrypt some of your items, "
@@ -961,7 +977,7 @@ msgstr "Duplizieren"
 
 #, javascript-format
 msgid "%s - Copy"
-msgstr "%s kopieren"
+msgstr "%s - Kopieren"
 
 msgid "Switch between note and to-do type"
 msgstr "Zwischen Notiz und To-Do Typ wechseln"
@@ -1019,6 +1035,7 @@ msgstr "Link-Adresse kopieren"
 
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
+"Dieser Anhang wurde nicht heruntergeladen oder noch nicht entschlüsselt."
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -1032,6 +1049,9 @@ msgstr ""
 "Diese Notiz hat keinen Inhalt. Klicke auf „%s“ um den Editor zu aktivieren "
 "und die Notiz zu bearbeiten."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "Fetter Text"
 
@@ -1137,9 +1157,9 @@ msgstr "Notizbücher"
 msgid "Decrypting items: %d/%d"
 msgstr "Entschlüsselte Objekte: %d/%d"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Fetching resources: %d"
-msgstr "Anhänge: %d."
+msgstr "Ressourcen abrufen: %d"
 
 msgid "Please select where the sync status should be exported to"
 msgstr ""
@@ -1350,6 +1370,9 @@ msgid ""
 "this setting so that your notes are constantly being synchronised, thus "
 "reducing the number of conflicts."
 msgstr ""
+"Dadurch kann Joplin im Hintergrund laufen. Es wird empfohlen,diese "
+"Einstellung zu aktivieren, damit deine Notizen ständig synchronisiertwerden "
+"und somit die Anzahl der Konflikte reduziert wird."
 
 msgid "Start application minimised in the tray icon"
 msgstr "Starte die Anwendung minimiert im Tray"
@@ -1357,8 +1380,11 @@ msgstr "Starte die Anwendung minimiert im Tray"
 msgid "Global zoom percentage"
 msgstr "Zoomstufe der Benutzeroberfläche"
 
+msgid "Editor font size"
+msgstr "Schriftgröße im Editor"
+
 msgid "Editor font family"
-msgstr "Editor Schriftenfamilie"
+msgstr "Schriftfamilie im Editor"
 
 msgid ""
 "This must be *monospace* font or it will not work properly. If the font is "
@@ -1371,6 +1397,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Die Applikation automatisch aktualisieren"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Synchronisationsinterval"
 
@@ -1487,9 +1520,8 @@ msgstr "Joplin Export Verzeichnis"
 msgid "Evernote Export File"
 msgstr "Evernote Export Datei"
 
-#, fuzzy
 msgid "Json Export Directory"
-msgstr "Joplin Export Verzeichnis"
+msgstr "Json Export Verzeichnis"
 
 msgid "Directory"
 msgstr "Verzeichnis"
@@ -1567,10 +1599,10 @@ msgid "On %s: %s"
 msgstr "Auf %s: %s"
 
 msgid "Permission to use camera"
-msgstr ""
+msgstr "Berechtigung zur Verwendung der Kamera"
 
 msgid "Your permission to use your camera is required."
-msgstr ""
+msgstr "Deine Zustimmung zur Verwendung deiner Kamera ist erforderlich."
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr ""
@@ -1683,9 +1715,25 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Website von Joplin"
 
+#, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin v%s"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr "Datenbank v%s"
+
+#, javascript-format
+msgid "FTS enabled: %d"
+msgstr "FTS aktiviert: %d"
+
 msgid "Login with Dropbox"
 msgstr "Mit Dropbox anmelden"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "Hier Code eingeben"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Hauptschlüssel %s"
@@ -1738,6 +1786,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nicht unterstütztes Fotoformat: %s"
 
+msgid "Take photo"
+msgstr "Foto aufnehmen"
+
 msgid "Attach photo"
 msgstr "Foto anhängen"
 
@@ -1763,7 +1814,7 @@ msgid "View on map"
 msgstr "Auf der Karte anzeigen"
 
 msgid "Go to source URL"
-msgstr ""
+msgstr "Zur Quell-URL gehen"
 
 msgid "Delete notebook"
 msgstr "Notizbuch löschen"
@@ -1833,9 +1884,6 @@ msgstr "Willkommen"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Das vorherige Fenster fokussieren"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Zum Terminal-Modus wechseln"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Den Terminal-Modus verlassen"
 

CliClient/locales/en_GB.po

@@ -573,6 +573,9 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "Search in current note"
+msgstr ""
+
 msgid "View"
 msgstr ""
 
@@ -632,9 +635,21 @@ msgstr ""
 msgid "Current version is up-to-date."
 msgstr ""
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr ""
 
@@ -909,6 +924,9 @@ msgid ""
 "note."
 msgstr ""
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1224,6 +1242,9 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr ""
 
+msgid "Editor font size"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1235,6 +1256,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr ""
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -1508,9 +1536,24 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
+#, javascript-format
+msgid "Joplin v%s"
+msgstr ""
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, javascript-format
+msgid "FTS enabled: %d"
+msgstr ""
+
 msgid "Login with Dropbox"
 msgstr ""
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1562,6 +1605,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr ""
 
+msgid "Take photo"
+msgstr ""
+
 msgid "Attach photo"
 msgstr ""
 

CliClient/locales/es_ES.po

@@ -651,6 +651,10 @@ msgstr "Editar con un editor externo"
 msgid "Search in all the notes"
 msgstr "Buscar en todas las notas"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Buscar en todas las notas"
+
 msgid "View"
 msgstr "Ver"
 
@@ -710,9 +714,21 @@ msgstr "Cancelar"
 msgid "Current version is up-to-date."
 msgstr "La versión actual está actualizada."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Hay disponible una actualización. ¿Quiere descargarla ahora?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Sí"
 
@@ -1014,6 +1030,9 @@ msgstr ""
 "Esta nota no tiene contenido. Pulse en \"%s\" para cambiar al editor y "
 "editar la nota."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "texto destacado"
 
@@ -1338,6 +1357,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Establecer el porcentaje de aumento de la aplicación"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Fuente del editor"
+
 msgid "Editor font family"
 msgstr "Fuente del editor"
 
@@ -1352,6 +1375,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Actualizar la aplicación automáticamente"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Intervalo de sincronización"
 
@@ -1655,9 +1685,25 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Sitio web de Joplin"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Sitio web de Joplin"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Borrar: %d"
+
 msgid "Login with Dropbox"
 msgstr "Acceder con Dropbox"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "Entrar en modo línea de comandos"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Clave maestra %s"
@@ -1710,6 +1756,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagen no soportado: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Adjuntar foto"
+
 msgid "Attach photo"
 msgstr "Adjuntar foto"
 
@@ -1810,9 +1860,6 @@ msgstr "Bienvenido"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Enfocar el panel anterior"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Entrar en modo línea de comandos"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Salir del modo línea de comandos"
 

CliClient/locales/eu.po

@@ -650,6 +650,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Bilatu ohar guztietan"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Bilatu ohar guztietan"
+
 msgid "View"
 msgstr ""
 
@@ -710,9 +714,21 @@ msgstr "Utzi"
 msgid "Current version is up-to-date."
 msgstr ""
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr ""
 
@@ -1009,6 +1025,9 @@ msgid ""
 "note."
 msgstr ""
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1350,6 +1369,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Ezarri aplikazioaren zoomaren ehunekoa"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Oharra editatu."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1361,6 +1384,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automatikoki eguneratu aplikazioa"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Sinkronizazio tartea"
 
@@ -1656,10 +1686,26 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
+#, javascript-format
+msgid "Joplin v%s"
+msgstr ""
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Ezabatzeko: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Login with OneDrive"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "Sartu komando-lerro moduan "
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Pasahitz Nagusia %s"
@@ -1711,6 +1757,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Irudi formatua ez onartua: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Argazkia erantsi"
+
 msgid "Attach photo"
 msgstr "Argazkia erantsi"
 
@@ -1802,9 +1852,6 @@ msgstr "Ongi etorri!"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Eraman fokua aurreko panelera"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Sartu komando-lerro moduan "
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Irten komando-lerro modutik"
 

CliClient/locales/fr_FR.po

@@ -648,6 +648,9 @@ msgstr "Ouvrir dans un éditeur externe"
 msgid "Search in all the notes"
 msgstr "Chercher dans toutes les notes"
 
+msgid "Search in current note"
+msgstr "Chercher dans la note en cours"
+
 msgid "View"
 msgstr "Affichage"
 
@@ -707,10 +710,22 @@ msgstr "Annuler"
 msgid "Current version is up-to-date."
 msgstr "La version actuelle est à jour."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr "%s (pré-release)"
+
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 "Une mise à jour est disponible, souhaitez vous la télécharger maintenant ?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr "Votre version : v%s"
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr "Nouvelle version : v%s"
+
 msgid "Yes"
 msgstr "Oui"
 
@@ -1018,6 +1033,11 @@ msgstr ""
 "Cette note n'a pas de contenu. Cliquer sur \"%s\" pour basculer vers "
 "l'éditeur et éditer cette note."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+"Les notes ne peuvent être imprimées ou exportées en PDF qu'une seule à la "
+"fois."
+
 msgid "strong text"
 msgstr "texte en gras"
 
@@ -1345,6 +1365,9 @@ msgstr "Démarrer minimisé dans la zone de notification"
 msgid "Global zoom percentage"
 msgstr "Niveau de zoom"
 
+msgid "Editor font size"
+msgstr "Taille police éditeur"
+
 msgid "Editor font family"
 msgstr "Police de l'éditeur"
 
@@ -1359,6 +1382,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Mettre à jour le logiciel automatiquement"
 
+msgid "Get pre-releases when checking for updates"
+msgstr "Recevoir les pré-release lors de la vérification des mises à jour"
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr "Voir la page des pré-release pour plus de détails : %s"
+
 msgid "Synchronisation interval"
 msgstr "Intervalle de synchronisation"
 
@@ -1667,9 +1697,24 @@ msgstr "- Position : Pour attacher à une note les coordonnées GPS."
 msgid "Joplin website"
 msgstr "Site web de Joplin"
 
+#, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin v%s"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr "Base de données v%s"
+
+#, javascript-format
+msgid "FTS enabled: %d"
+msgstr "FTS activé : %d"
+
 msgid "Login with Dropbox"
 msgstr "Se connecter à Dropbox"
 
+msgid "Enter code here"
+msgstr "Entrez le code ici"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Clef maître %s"
@@ -1722,6 +1767,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Type d'image non géré : %s"
 
+msgid "Take photo"
+msgstr "Prendre une photo"
+
 msgid "Attach photo"
 msgstr "Attacher une photo"
 
@@ -1823,9 +1871,6 @@ msgstr "Bienvenue"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Activer le volet précédent"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Démarrer le mode de ligne de commande"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Sortir du mode de ligne de commande"
 

CliClient/locales/gl_ES.po

@@ -642,6 +642,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Buscar en todas as notas"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Buscar en todas as notas"
+
 msgid "View"
 msgstr "Vista"
 
@@ -701,9 +705,21 @@ msgstr "Cancelar"
 msgid "Current version is up-to-date."
 msgstr "A versión actual está actualizada."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Hai unha actualización dispoñíbel, desexa descargala agora?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Si"
 
@@ -998,6 +1014,9 @@ msgstr ""
 "Esta nota non ten contido. Prema en «%s» para ir ao editor e modificar a "
 "nota."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1328,6 +1347,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Porcentaxe de ampliación"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Familia de tipos de letra do editor"
+
 msgid "Editor font family"
 msgstr "Familia de tipos de letra do editor"
 
@@ -1342,6 +1365,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Actualizar automaticamente o aplicativo"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Intervalo de sincronización"
 
@@ -1634,10 +1664,25 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Sitio web de Joplin"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Sitio web de Joplin"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Borrar: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Acceder con OneDrive"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Chave mestra %s"
@@ -1689,6 +1734,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imaxe incompatíbel: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Anexar foto"
+
 msgid "Attach photo"
 msgstr "Anexar foto"
 

CliClient/locales/hr_HR.po

@@ -647,6 +647,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Pretraži u svim bilješkama"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Pretraži u svim bilješkama"
+
 msgid "View"
 msgstr ""
 
@@ -708,9 +712,21 @@ msgstr "Odustani"
 msgid "Current version is up-to-date."
 msgstr ""
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr ""
 
@@ -996,6 +1012,9 @@ msgid ""
 "note."
 msgstr ""
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1332,6 +1351,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr ""
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Uredi bilješku."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1343,6 +1366,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Automatsko instaliranje nove verzije"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Interval sinkronizacije"
 
@@ -1631,10 +1661,26 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
+#, javascript-format
+msgid "Joplin v%s"
+msgstr ""
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Za brisanje: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Prijavi se u OneDrive"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "Otvori naredbeni redak"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1687,6 +1733,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodržana vrsta slike: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Priloži sliku"
+
 msgid "Attach photo"
 msgstr "Priloži sliku"
 
@@ -1777,9 +1827,6 @@ msgstr "Dobro došli"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Fokusiraj prethodno okno"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Otvori naredbeni redak"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Napusti naredbeni redak"
 

CliClient/locales/it_IT.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -462,7 +462,7 @@ msgid "Starting synchronisation..."
 msgstr "Inizio sincronizzazione..."
 
 msgid "Downloading resources..."
-msgstr ""
+msgstr "Scaricamento risorse…"
 
 msgid "Cancelling... Please wait."
 msgstr "Cancellazione... Attendere per favore."
@@ -566,6 +566,13 @@ msgid ""
 "\n"
 "For example, to create a notebook press `mb`; to create a note press `mn`."
 msgstr ""
+"Benvenuto in Joplin!\n"
+"\n"
+"Digita `:help shortcuts` per la lista delle scorciatoie da tastiera, oppure "
+"solo `:help` per le informazioni di utilizzo.\n"
+"\n"
+"Per esempio, per creare un taccuino digita `mb`; per creare una nota digita "
+"`mn`."
 
 msgid ""
 "One or more items are currently encrypted and you may need to supply a "
@@ -629,9 +636,8 @@ msgstr "Taglia"
 msgid "Paste"
 msgstr "Incolla"
 
-#, fuzzy
 msgid "Select all"
-msgstr "Seleziona la data"
+msgstr "Seleziona tutto"
 
 msgid "Bold"
 msgstr "Grasseto"
@@ -648,6 +654,9 @@ msgstr "Modifica in un editor esterno"
 msgid "Search in all the notes"
 msgstr "Cerca in tutte le note"
 
+msgid "Search in current note"
+msgstr "Cerca nella nota corrente"
+
 msgid "View"
 msgstr "Vista"
 
@@ -707,9 +716,21 @@ msgstr "Cancella"
 msgid "Current version is up-to-date."
 msgstr "La versione attuale è aggiornata."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "È disponibile un aggiornamento, vuoi scaricarlo ora?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Sì"
 
@@ -948,13 +969,11 @@ msgstr "%s - Copia"
 msgid "Switch between note and to-do type"
 msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
 
-#, fuzzy
 msgid "Switch to note type"
-msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
+msgstr "Converti in nota"
 
-#, fuzzy
 msgid "Switch to to-do type"
-msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
+msgstr "Converti in \"Cose-da-fare\""
 
 msgid "Copy Markdown link"
 msgstr "Copia il link Markdown"
@@ -1000,7 +1019,7 @@ msgid "Copy Link Address"
 msgstr "Copia l'indirizzo del link"
 
 msgid "This attachment is not downloaded or not decrypted yet."
-msgstr ""
+msgstr "Questo allegato non è ancora stato scaricato o decriptato."
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -1014,6 +1033,9 @@ msgstr ""
 "Questa nota non ha contenuto. Fai clic su \"%s\" per attivare l'editor e "
 "modificare la nota."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "Testo grasseto"
 
@@ -1312,10 +1334,10 @@ msgid "When creating a new to-do:"
 msgstr "Quando crei un nuovo \"Cose-da-fare\":"
 
 msgid "Focus title"
-msgstr ""
+msgstr "Focus sul titolo"
 
 msgid "Focus body"
-msgstr ""
+msgstr "Focus sul testo"
 
 msgid "When creating a new note:"
 msgstr "Quando si crea una nuova nota:"
@@ -1331,6 +1353,9 @@ msgid ""
 "this setting so that your notes are constantly being synchronised, thus "
 "reducing the number of conflicts."
 msgstr ""
+"Questo consentirà Joplin di essere in esecuzione in background. E’ "
+"raccomandata l’attivazione di questa impostazione per sincronizzare "
+"costantemente le tue note e quindi ridurre il numero di conflitti."
 
 msgid "Start application minimised in the tray icon"
 msgstr ""
@@ -1338,8 +1363,11 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Percentuale di zoom globale"
 
+msgid "Editor font size"
+msgstr "Editor dimensione caratteri"
+
 msgid "Editor font family"
-msgstr "Editor Famiglia Caratteri"
+msgstr "Editor famiglia caratteri"
 
 msgid ""
 "This must be *monospace* font or it will not work properly. If the font is "
@@ -1352,6 +1380,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Aggiorna automaticamente l'applicazione"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Intervallo di sincronizzazione"
 
@@ -1446,14 +1481,14 @@ msgstr "Ignora gli errori del certificato TLS"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
-msgstr "Oprione non valida: \"%s\". I valori possibili sono: %s."
+msgstr "Opzione non valida: \"%s\". I valori possibili sono: %s."
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr ""
+msgstr "Il tag \"%s\" esiste già. Scegliere un nome differente."
 
 msgid "Joplin Export File"
-msgstr "Esposta files di Joplin"
+msgstr "Esporta file di Joplin"
 
 msgid "Markdown"
 msgstr "Markdown"
@@ -1464,9 +1499,8 @@ msgstr "Cartella di esportazione di Joplin"
 msgid "Evernote Export File"
 msgstr "Esporta files di Evernote"
 
-#, fuzzy
 msgid "Json Export Directory"
-msgstr "Cartella di esportazione di Joplin"
+msgstr "Cartella di esportazione JSON"
 
 msgid "Directory"
 msgstr "Cartella"
@@ -1543,7 +1577,7 @@ msgid "On %s: %s"
 msgstr "Su %s: %s"
 
 msgid "Permission to use camera"
-msgstr ""
+msgstr "Permesso di usare la fotocamera"
 
 msgid "Your permission to use your camera is required."
 msgstr ""
@@ -1653,11 +1687,26 @@ msgstr ""
 "geografica ad una nota."
 
 msgid "Joplin website"
-msgstr "Siro web Joplin"
+msgstr "Sito web Joplin"
+
+#, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin v%s"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr "Database v%s"
+
+#, javascript-format
+msgid "FTS enabled: %d"
+msgstr "FTS attivato: %d"
 
 msgid "Login with Dropbox"
 msgstr "Login Dropbox"
 
+msgid "Enter code here"
+msgstr "Inserisci qui il codice"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Chiave Master %s"
@@ -1710,6 +1759,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"
 
+msgid "Take photo"
+msgstr "Scatta foto"
+
 msgid "Attach photo"
 msgstr "Allega foto"
 
@@ -1817,9 +1869,6 @@ msgstr "Benvenuto"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Pannello precedente"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Accedi alla modalità linea di comando"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Esci dalla modalità linea di comando"
 

CliClient/locales/ja_JP.po

@@ -236,7 +236,7 @@ msgstr ""
 "ムを参照できます。"
 
 msgid "To move from one pane to another, press Tab or Shift+Tab."
-msgstr "ペイン間を移動するには、TabかShift+Tabをおしてください。"
+msgstr "ペイン間を移動するには、TabかShift+Tabを押してください。"
 
 msgid ""
 "Use the arrows and page up/down to scroll the lists and text areas "
@@ -446,7 +446,7 @@ msgid "Starting synchronisation..."
 msgstr "同期を開始中..."
 
 msgid "Downloading resources..."
-msgstr ""
+msgstr "リソースをダウンロード中..."
 
 msgid "Cancelling... Please wait."
 msgstr "中止中...お待ちください。"
@@ -618,9 +618,8 @@ msgstr "切り取り"
 msgid "Paste"
 msgstr "貼り付け"
 
-#, fuzzy
 msgid "Select all"
-msgstr "日付の選択"
+msgstr "すべて選択"
 
 msgid "Bold"
 msgstr "太字"
@@ -637,6 +636,9 @@ msgstr "外部エディターで編集"
 msgid "Search in all the notes"
 msgstr "すべてのノートを検索"
 
+msgid "Search in current note"
+msgstr "現在のノートを検索"
+
 msgid "View"
 msgstr "表示"
 
@@ -696,9 +698,21 @@ msgstr "キャンセル"
 msgid "Current version is up-to-date."
 msgstr "現在のバージョンは最新版です。"
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "アップデートがあります。すぐにダウンロードしますか？"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Yes"
 
@@ -706,7 +720,7 @@ msgid "No"
 msgstr "No"
 
 msgid "Token has been copied to the clipboard!"
-msgstr ""
+msgstr "トークンをクリップボードにコピーしました！"
 
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "Webクリッパーサービスは有効で、自動起動します。"
@@ -756,20 +770,21 @@ msgstr "ステップ2: 拡張機能のインストール"
 msgid "Download and install the relevant extension for your browser:"
 msgstr "関連する拡張機能をブラウザーにインストールします:"
 
-#, fuzzy
 msgid "Advanced options"
-msgstr "詳細な設定の表示"
+msgstr "詳細な設定"
 
 msgid "Authorisation token:"
-msgstr ""
+msgstr "認証するトークン:"
 
 msgid "Copy token"
-msgstr ""
+msgstr "トークンのコピー"
 
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
 "access Joplin."
 msgstr ""
+"この認証トークンはサードパーティアプリケーションがJoplinにアクセスするためだ"
+"けに必要です。"
 
 msgid "Check synchronisation configuration"
 msgstr "同期の設定を確認する"
@@ -934,13 +949,11 @@ msgstr "%s - コピー"
 msgid "Switch between note and to-do type"
 msgstr "ノートとToDoを切り替え"
 
-#, fuzzy
 msgid "Switch to note type"
-msgstr "ノートとToDoを切り替え"
+msgstr "ノートに切り替え"
 
-#, fuzzy
 msgid "Switch to to-do type"
-msgstr "ノートとToDoを切り替え"
+msgstr "ToDoに切り替え"
 
 msgid "Copy Markdown link"
 msgstr "Markdownのリンクをコピー"
@@ -959,13 +972,13 @@ msgid ""
 msgstr "ノートブックがありません。新しいノートブックを作成してください。"
 
 msgid "Location"
-msgstr ""
+msgstr "場所"
 
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 msgid "Note properties"
-msgstr ""
+msgstr "ノートのプロパティ"
 
 msgid "Open..."
 msgstr "開く..."
@@ -984,7 +997,7 @@ msgid "Copy Link Address"
 msgstr "リンクアドレスをコピー"
 
 msgid "This attachment is not downloaded or not decrypted yet."
-msgstr ""
+msgstr "この添付ファイルはダウンロードできないか、まだ復号できません。"
 
 #, javascript-format
 msgid "Unsupported link or message: %s"
@@ -998,6 +1011,9 @@ msgstr ""
 "このノートには中身がありません。 \"%s\" をクリックしてエディターを表示し、"
 "ノートを編集してください。"
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "文字を太字に"
 
@@ -1011,7 +1027,7 @@ msgid "Insert Hyperlink"
 msgstr "ハイパーリンクの挿入"
 
 msgid "Attach file"
-msgstr "ファイルを添付"
+msgstr "ファイルを添付する"
 
 msgid "Tags"
 msgstr "タグ"
@@ -1103,9 +1119,9 @@ msgstr "ノートブック"
 msgid "Decrypting items: %d/%d"
 msgstr "復号中のアイテム: %d/%d"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Fetching resources: %d"
-msgstr "リソース: %d."
+msgstr "取得中のリソース: %d"
 
 msgid "Please select where the sync status should be exported to"
 msgstr "同期状況の出力先を選択してください"
@@ -1316,6 +1332,8 @@ 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 "アプリケーションをトレイアンコンで最小化して起動"
@@ -1323,6 +1341,9 @@ msgstr "アプリケーションをトレイアンコンで最小化して起動
 msgid "Global zoom percentage"
 msgstr "全体ズームの割合"
 
+msgid "Editor font size"
+msgstr "エディターのフォントサイズ"
+
 msgid "Editor font family"
 msgstr "エディターのフォントファミリー"
 
@@ -1334,7 +1355,14 @@ msgstr ""
 "誤っているか空の場合は、一般的な等幅フォントが指定されるでしょう。"
 
 msgid "Automatically update the application"
-msgstr "アプリケーションの自動更新"
+msgstr "アプリケーションを自動的にアップデート"
+
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
 
 msgid "Synchronisation interval"
 msgstr "同期間隔"
@@ -1449,9 +1477,8 @@ msgstr "Joplin エクスポートディレクトリ"
 msgid "Evernote Export File"
 msgstr "Evernote エクスポートファイル"
 
-#, fuzzy
 msgid "Json Export Directory"
-msgstr "Joplin エクスポートディレクトリ"
+msgstr "Json エクスポートディレクトリ"
 
 msgid "Directory"
 msgstr "ディレクトリ"
@@ -1528,10 +1555,10 @@ msgid "On %s: %s"
 msgstr "日時 %s: %s"
 
 msgid "Permission to use camera"
-msgstr ""
+msgstr "カメラ使用の許可"
 
 msgid "Your permission to use your camera is required."
-msgstr ""
+msgstr "カメラを使用するには権限が必要です。"
 
 msgid "There are currently no notes. Create one by clicking on the (+) button."
 msgstr "ノートがありません。(+)ボタンを押して新しいノートを作成してください。"
@@ -1561,9 +1588,8 @@ msgstr "%d個のノートを\"%s\"に移動しますか？"
 msgid "Press to set the decryption password."
 msgstr "復号するパスワードを入力してください。"
 
-#, fuzzy
 msgid "Clear alarm"
-msgstr "アラームをセット"
+msgstr "アラームをクリア"
 
 msgid "Save alarm"
 msgstr "アラームの保存"
@@ -1577,22 +1603,21 @@ msgstr "確認"
 msgid "Cancel synchronisation"
 msgstr "同期の中止"
 
-#, fuzzy
 msgid "Checking... Please wait."
-msgstr "中止中...お待ちください。"
+msgstr "確認中...お待ちください。"
 
-#, fuzzy
 msgid "Success! Synchronisation configuration appears to be correct."
-msgstr "同期の設定を確認する"
+msgstr "成功です！ 同期の設定は正しいようです。"
 
 msgid ""
 "Error. Please check that URL, username, password, etc. are correct and that "
 "the sync target is accessible. The reported error was:"
 msgstr ""
+"エラーです。URL、ユーザー名、パスワードなどを修正し、同期するターゲットにアク"
+"セスできるかを確認してください。次が報告されたエラーです:"
 
-#, fuzzy
 msgid "The application has been authorised!"
-msgstr "アプリケーションは問題なく認証されました。"
+msgstr "アプリケーションは問題なく認証されました！"
 
 #, javascript-format
 msgid ""
@@ -1602,10 +1627,15 @@ msgid ""
 "\n"
 "Please try again."
 msgstr ""
+"アプリケーションが認証できません:\n"
+"\n"
+"%s\n"
+"\n"
+"やり直してください。"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Decrypted items: %s / %s"
-msgstr "復号中のアイテム: %d/%d"
+msgstr "復号中のアイテム: %s/%s"
 
 msgid "New tags:"
 msgstr "新しいタグ:"
@@ -1636,9 +1666,25 @@ msgstr "- 位置情報: ノートに位置情報を添付するのに必要で
 msgid "Joplin website"
 msgstr "JoplinのWebサイト"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "JoplinのWebサイト"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "削除予定: %d"
+
 msgid "Login with Dropbox"
 msgstr "Dropboxでログイン"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "コマンドラインモードに入る"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "マスターキー %s"
@@ -1690,6 +1736,9 @@ msgstr "Joplinモバイルアプリは次のタイプのリンクをまだサポ
 msgid "Unsupported image type: %s"
 msgstr "サポートされていない画像の形式: %s"
 
+msgid "Take photo"
+msgstr "写真を撮影する"
+
 msgid "Attach photo"
 msgstr "写真を添付"
 
@@ -1715,7 +1764,7 @@ msgid "View on map"
 msgstr "地図上に表示"
 
 msgid "Go to source URL"
-msgstr ""
+msgstr "ソースURLに行く"
 
 msgid "Delete notebook"
 msgstr "ノートブックを削除"
@@ -1781,9 +1830,6 @@ msgstr "ようこそ"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "前のペインへ"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "コマンドラインモードに入る"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "コマンドラインモードの終了"
 

CliClient/locales/joplin.pot

@@ -573,6 +573,9 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
+msgid "Search in current note"
+msgstr ""
+
 msgid "View"
 msgstr ""
 
@@ -632,9 +635,21 @@ msgstr ""
 msgid "Current version is up-to-date."
 msgstr ""
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr ""
 
@@ -909,6 +924,9 @@ msgid ""
 "note."
 msgstr ""
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1224,6 +1242,9 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr ""
 
+msgid "Editor font size"
+msgstr ""
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1235,6 +1256,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr ""
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr ""
 
@@ -1508,9 +1536,24 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
+#, javascript-format
+msgid "Joplin v%s"
+msgstr ""
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, javascript-format
+msgid "FTS enabled: %d"
+msgstr ""
+
 msgid "Login with Dropbox"
 msgstr ""
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1562,6 +1605,9 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr ""
 
+msgid "Take photo"
+msgstr ""
+
 msgid "Attach photo"
 msgstr ""
 

CliClient/locales/ko.po

@@ -634,6 +634,10 @@ msgstr "외부 편집기에서 편집하기"
 msgid "Search in all the notes"
 msgstr "모든 노트에서 검색"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "모든 노트에서 검색"
+
 msgid "View"
 msgstr "보기"
 
@@ -693,9 +697,21 @@ msgstr "취소"
 msgid "Current version is up-to-date."
 msgstr "현재 버전은 최신입니다."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "업데이트가 있습니다. 지금 다운로드할까요?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "예"
 
@@ -992,6 +1008,9 @@ msgstr ""
 "비어있는 노트입니다. \"%s\" 항목을 선택해서 편집기를 전환하고 노트를 편집하세"
 "요."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "중요 텍스트"
 
@@ -1315,6 +1334,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "전체적 확대 비율"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "편집기 글꼴 집합"
+
 msgid "Editor font family"
 msgstr "편집기 글꼴 집합"
 
@@ -1329,6 +1352,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "애플리케이션을 자동으로 업데이트"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "동기화 간격"
 
@@ -1626,9 +1656,24 @@ msgstr "- 위치: 지리적 위치 정보를 노트에 첨부하기 위해서
 msgid "Joplin website"
 msgstr "조플린 웹사이트"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "조플린 웹사이트"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "삭제: %d"
+
 msgid "Login with Dropbox"
 msgstr "Dropbox로 로그인"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "관리자 키 %s"
@@ -1680,6 +1725,10 @@ msgstr "조플린 모바일 앱은 현재 해당 형식의 링크를 지원하
 msgid "Unsupported image type: %s"
 msgstr "지원하지 않는 이미지 형식: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "사진 첨부"
+
 msgid "Attach photo"
 msgstr "사진 첨부"
 

CliClient/locales/nl_BE.po

@@ -652,6 +652,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Zoek in alle notities"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Zoek in alle notities"
+
 msgid "View"
 msgstr ""
 
@@ -712,9 +716,21 @@ msgstr "Annuleer"
 msgid "Current version is up-to-date."
 msgstr ""
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr ""
 
@@ -1013,6 +1029,9 @@ msgid ""
 "note."
 msgstr ""
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1352,6 +1371,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr ""
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Bewerk notitie."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1363,6 +1386,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Update de applicatie automatisch"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Synchronisatie interval"
 
@@ -1658,10 +1688,26 @@ msgstr ""
 msgid "Joplin website"
 msgstr ""
 
+#, javascript-format
+msgid "Joplin v%s"
+msgstr ""
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Verwijderen: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Log in met OneDrive"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "Ga naar command line modus"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Hoofdsleutel: %s"
@@ -1713,6 +1759,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Afbeeldingstype %s wordt niet ondersteund"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Voeg foto toe"
+
 msgid "Attach photo"
 msgstr "Voeg foto toe"
 
@@ -1806,9 +1856,6 @@ msgstr "Welkom"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Focus op het vorige paneel"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Ga naar command line modus"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Ga uit command line modus"
 

CliClient/locales/nl_NL.po

@@ -651,6 +651,10 @@ msgstr "Bewerken in externe bewerker"
 msgid "Search in all the notes"
 msgstr "Alle notities doorzoeken"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Alle notities doorzoeken"
+
 msgid "View"
 msgstr "Beeld"
 
@@ -710,9 +714,21 @@ msgstr "Annuleren"
 msgid "Current version is up-to-date."
 msgstr "De huidige versie is up-to-date."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Er is een update beschikbaar. Wil je deze nu downloaden?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Ja"
 
@@ -1020,6 +1036,9 @@ msgstr ""
 "Deze notitie bevat geen inhoud. Klik op \"%s\" om de bewerker te openen en "
 "de notitie te bewerken."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "vetgedrukte tekst"
 
@@ -1343,6 +1362,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Globaal zoompercentage"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Lettertype van bewerker"
+
 msgid "Editor font family"
 msgstr "Lettertype van bewerker"
 
@@ -1357,6 +1380,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Applicatie automatisch bijwerken"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Synchronisatietussenpoos"
 
@@ -1662,9 +1692,24 @@ msgstr "- Locatie: zodat je locatie-informatie kunt toevoegen aan een notitie."
 msgid "Joplin website"
 msgstr "Joplin-website"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin-website"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Te verwijderen: %d"
+
 msgid "Login with Dropbox"
 msgstr "Inloggen met Dropbox"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Hoofdsleutel %s"
@@ -1716,6 +1761,10 @@ msgstr "De mobiele Joplin-app ondersteunt momenteel niet dit soort links: %s"
 msgid "Unsupported image type: %s"
 msgstr "Niet-ondersteunde afbeeldingssoort: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Foto bijvoegen"
+
 msgid "Attach photo"
 msgstr "Foto bijvoegen"
 

CliClient/locales/pt_BR.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Poedit 2.0.7\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -647,6 +647,9 @@ msgstr "Editar com editor externo"
 msgid "Search in all the notes"
 msgstr "Pesquisar em todas as notas"
 
+msgid "Search in current note"
+msgstr "Pesquisar na nota atual"
+
 msgid "View"
 msgstr "Visualizar"
 
@@ -706,9 +709,21 @@ msgstr "Cancelar"
 msgid "Current version is up-to-date."
 msgstr "A versão atual está atualizada."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Uma atualização está disponível, você quer baixar agora?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Sim"
 
@@ -1009,6 +1024,9 @@ msgstr ""
 "Esta nota não possui conteúdo. Clique em \"%s\" para alternar para o editor, "
 "e edite a nota."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "texto forte"
 
@@ -1256,7 +1274,7 @@ msgid "title"
 msgstr "título"
 
 msgid "updated date"
-msgstr "data de ataualização"
+msgstr "data de atualização"
 
 msgid "created date"
 msgstr "data de criação"
@@ -1338,6 +1356,9 @@ msgstr "Iniciar aplicativo minimizado na barra de tarefas"
 msgid "Global zoom percentage"
 msgstr "Porcentagem global do zoom"
 
+msgid "Editor font size"
+msgstr "Tamanho da fonte no Editor"
+
 msgid "Editor font family"
 msgstr "Família de fontes do editor"
 
@@ -1351,6 +1372,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Atualizar automaticamente o aplicativo"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Intervalo de sincronização"
 
@@ -1660,9 +1688,25 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Site do Joplin"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Site do Joplin"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Para excluir: %d"
+
 msgid "Login with Dropbox"
 msgstr "Login com Dropbox"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "Entrar no modo de linha de comando"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Chave Master %s"
@@ -1714,6 +1758,9 @@ msgstr "O app mobile do Joplin não suporta, atualmente, esse tipo de link: %s"
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagem não suportada: %s"
 
+msgid "Take photo"
+msgstr "Tirar foto"
+
 msgid "Attach photo"
 msgstr "Anexar foto"
 
@@ -1806,9 +1853,6 @@ msgstr "Bem-vindo"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Dar o foco para o painel anterior"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Entrar no modo de linha de comando"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Sair do modo de linha de comando"
 

CliClient/locales/ro.po

@@ -587,6 +587,10 @@ msgstr "Editați într-un editor extern"
 msgid "Search in all the notes"
 msgstr "Căutați în toate notițele"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Căutați în toate notițele"
+
 msgid "View"
 msgstr "Vizualizați"
 
@@ -646,9 +650,21 @@ msgstr "Anulați"
 msgid "Current version is up-to-date."
 msgstr "Versiunea curentă este actualizată."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr ""
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Da"
 
@@ -926,6 +942,9 @@ msgid ""
 "note."
 msgstr ""
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1241,6 +1260,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr ""
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Editează notiță."
+
 msgid "Editor font family"
 msgstr ""
 
@@ -1252,6 +1275,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Actualizați automat aplicația"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Intervalul de sincronizare"
 
@@ -1527,9 +1557,24 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Website Joplin"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Website Joplin"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "De șters: %d"
+
 msgid "Login with Dropbox"
 msgstr "Autentificați-vă cu Dropbox"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr ""
@@ -1581,6 +1626,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr ""
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Atașează imagine"
+
 msgid "Attach photo"
 msgstr "Atașează imagine"
 

CliClient/locales/ru_RU.po

@@ -649,11 +649,15 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Поиск во всех заметках"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Поиск во всех заметках"
+
 msgid "View"
 msgstr "Вид"
 
 msgid "Toggle sidebar"
-msgstr ""
+msgstr "Переключить панель"
 
 msgid "Toggle editor layout"
 msgstr "Переключить вид редактора"
@@ -665,7 +669,7 @@ msgid "Synchronisation status"
 msgstr "Статус синхронизации"
 
 msgid "Web clipper options"
-msgstr ""
+msgstr "Настройки веб-клиппера"
 
 msgid "Encryption options"
 msgstr "Настройки шифрования"
@@ -708,9 +712,21 @@ msgstr "Отмена"
 msgid "Current version is up-to-date."
 msgstr "Вы используете самую свежую версию."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Доступно обновление. Желаете скачать его сейчас?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Да"
 
@@ -721,7 +737,7 @@ msgid "Token has been copied to the clipboard!"
 msgstr ""
 
 msgid "The web clipper service is enabled and set to auto-start."
-msgstr ""
+msgstr "Веб-клиппер включен"
 
 #, javascript-format
 msgid "Status: Started on port %d"
@@ -732,13 +748,13 @@ msgid "Status: %s"
 msgstr "Статус: «%s»."
 
 msgid "Disable Web Clipper Service"
-msgstr ""
+msgstr "Выключить веб-клиппер"
 
 msgid "The web clipper service is not enabled."
-msgstr ""
+msgstr "Веб-клиппер остановлен"
 
 msgid "Enable Web Clipper Service"
-msgstr ""
+msgstr "Включить веб-клиппер"
 
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -749,7 +765,7 @@ msgid "In order to use the web clipper, you need to do the following:"
 msgstr ""
 
 msgid "Step 1: Enable the clipper service"
-msgstr ""
+msgstr "Шаг 1: включить веб-клиппер"
 
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -758,20 +774,20 @@ msgid ""
 msgstr ""
 
 msgid "Step 2: Install the extension"
-msgstr ""
+msgstr "Шаг 2: установить расширение"
 
 msgid "Download and install the relevant extension for your browser:"
-msgstr ""
+msgstr "Скачайте и установите расширение для вашего браузера"
 
 #, fuzzy
 msgid "Advanced options"
 msgstr "Показывать расширенные настройки"
 
 msgid "Authorisation token:"
-msgstr ""
+msgstr "Токен авторизации"
 
 msgid "Copy token"
-msgstr ""
+msgstr "Скопировать токен"
 
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -786,10 +802,10 @@ msgid "Notes and settings are stored in: %s"
 msgstr "Заметки и настройки сохранены в: %s"
 
 msgid "Apply"
-msgstr ""
+msgstr "Применить"
 
 msgid "Submit"
-msgstr ""
+msgstr "Отправить"
 
 msgid "Save"
 msgstr "Сохранить"
@@ -1008,6 +1024,9 @@ msgstr ""
 "Заметка пуста. Нажмите на «%s», чтобы переключиться в редактор и "
 "отредактировать её."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1338,6 +1357,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Глобальный масштаб в процентах"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Семейство шрифтов редактора"
+
 msgid "Editor font family"
 msgstr "Семейство шрифтов редактора"
 
@@ -1352,6 +1375,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Автоматически обновлять приложение"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Интервал синхронизации"
 
@@ -1645,10 +1675,26 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Сайт Joplin"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Сайт Joplin"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "К удалению: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Войти в OneDrive"
 
+#, fuzzy
+msgid "Enter code here"
+msgstr "Войти в режим командной строки"
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Мастер-ключ %s"
@@ -1700,6 +1746,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Неподдерживаемый формат изображения: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Прикрепить фото"
+
 msgid "Attach photo"
 msgstr "Прикрепить фото"
 
@@ -1790,9 +1840,6 @@ msgstr "Добро пожаловать"
 #~ msgid "Give focus to previous pane"
 #~ msgstr "Переключиться на предыдущую панель"
 
-#~ msgid "Enter command line mode"
-#~ msgstr "Войти в режим командной строки"
-
 #~ msgid "Exit command line mode"
 #~ msgstr "Выйти из режима командной строки"
 

CliClient/locales/sl_SI.po

@@ -648,6 +648,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr "Išči znotraj vseh zabeležk"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Išči znotraj vseh zabeležk"
+
 msgid "View"
 msgstr "Pogled"
 
@@ -707,9 +711,21 @@ msgstr "Prekliči"
 msgid "Current version is up-to-date."
 msgstr "Sedanja verzija je najnovejša."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "Posodobitev je na voljo, jo želite prenesti sedaj?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Da"
 
@@ -1012,6 +1028,9 @@ msgstr ""
 "Ta zabeležka nima vsebine. Kliknite na \"%s\" da menjate med urejevalnikom "
 "in urejanje zabeležke."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr ""
 
@@ -1342,6 +1361,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Celokupen procent povečave"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Družina urejevalnika besedilnega stila"
+
 msgid "Editor font family"
 msgstr "Družina urejevalnika besedilnega stila"
 
@@ -1356,6 +1379,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Samodejno posodobi aplikacijo"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Časovni interval sinhronizacije"
 
@@ -1648,10 +1678,25 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Joplin spletna stran"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin spletna stran"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "Za izbris: %d"
+
 #, fuzzy
 msgid "Login with Dropbox"
 msgstr "Prijavi se z OneDrive"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Glavno geslo %s"
@@ -1703,6 +1748,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodprt tip slike: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Pripni fotografijo"
+
 msgid "Attach photo"
 msgstr "Pripni fotografijo"
 

CliClient/locales/sv.po

@@ -655,6 +655,10 @@ msgstr "Redigera i extern redigerare"
 msgid "Search in all the notes"
 msgstr "Sök i alla anteckningarna"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "Sök i alla anteckningarna"
+
 msgid "View"
 msgstr "Visa"
 
@@ -714,9 +718,21 @@ msgstr "Avbryt"
 msgid "Current version is up-to-date."
 msgstr "Nuvarande version är uppdaterad."
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "En uppdatering är tillgänglig, vill du hämta den nu?"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "Ja"
 
@@ -1021,6 +1037,9 @@ msgstr ""
 "Den här anteckningen har inget innehåll. Klicka på \"%s\" för att växla "
 "redigeraren och redigera anteckningen."
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "stark text"
 
@@ -1345,6 +1364,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "Global zoomprocent"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "Redigerarens typsnittsfamilj"
+
 msgid "Editor font family"
 msgstr "Redigerarens typsnittsfamilj"
 
@@ -1359,6 +1382,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "Uppdatera programmet automatiskt"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "Synkroniseringsintervall"
 
@@ -1664,9 +1694,24 @@ msgstr ""
 msgid "Joplin website"
 msgstr "Joplin-webbplats"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin-webbplats"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "För att ta bort: %d"
+
 msgid "Login with Dropbox"
 msgstr "Logga in med Dropbox"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "Huvudnyckel %s"
@@ -1719,6 +1764,10 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Bildstorlek som inte stöds: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "Bifoga foto"
+
 msgid "Attach photo"
 msgstr "Bifoga foto"
 

CliClient/locales/zh_CN.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Laurent Cozic
 # This file is distributed under the same license as the Joplin-CLI package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Yukio Usuzumi <anohigisavay@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgid "To delete a tag, untag the associated notes."
 msgstr "移除相关笔记的标签后才可删除此标签。"
 
 msgid "Please select the note or notebook to be deleted first."
-msgstr "请选择最先删除的笔记或笔记本。"
+msgstr "请先选择需要删除的笔记或笔记本。"
 
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr "按 Ctrl+D 或输入 \"exit\" 退出程序"
@@ -32,7 +32,7 @@ msgid "No notebook selected."
 msgstr "未选择笔记本。"
 
 msgid "No notebook has been specified."
-msgstr "无指定笔记本。"
+msgstr "未指定笔记本。"
 
 msgid "Y"
 msgstr "是"
@@ -47,7 +47,7 @@ msgid "y"
 msgstr "是"
 
 msgid "Cancelling background synchronisation... Please wait."
-msgstr "正在取消后台同步... 请稍后。"
+msgstr "正在取消后台同步... 请稍候。"
 
 #, javascript-format
 msgid "No such command: %s"
@@ -614,6 +614,10 @@ msgstr "在外部编辑器中打开"
 msgid "Search in all the notes"
 msgstr "在所有笔记内搜索"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "在所有笔记内搜索"
+
 msgid "View"
 msgstr "显示"
 
@@ -673,9 +677,21 @@ msgstr "取消"
 msgid "Current version is up-to-date."
 msgstr "当前版本为最新版。"
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "软件有更新，是否下载最新版？"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "是"
 
@@ -964,6 +980,9 @@ msgid ""
 "note."
 msgstr "此笔记没有任何内容。点击 \"%s\" 切换至编辑器并编辑笔记。"
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "加粗文本"
 
@@ -1271,7 +1290,7 @@ msgid "Show tray icon"
 msgstr "显示托盘图标"
 
 msgid "Note: Does not work in all desktop environments."
-msgstr "注意：在所有的桌面环境中都不能工作。"
+msgstr "注意：在某些桌面环境下可能无法正常工作。"
 
 msgid ""
 "This will allow Joplin to run in the background. It is recommended to enable "
@@ -1287,6 +1306,10 @@ msgstr "启动应用程序时在托盘中最小化"
 msgid "Global zoom percentage"
 msgstr "全局缩放比例"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "编辑器字体"
+
 msgid "Editor font family"
 msgstr "编辑器字体"
 
@@ -1300,6 +1323,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "自动更新此程序"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "同步间隔"
 
@@ -1598,9 +1628,24 @@ msgstr "- 定位：允许将地理位置信息附加到一条笔记中。"
 msgid "Joplin website"
 msgstr "Joplin 官网"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin 官网"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "将删除：%d条"
+
 msgid "Login with Dropbox"
 msgstr "通过 Dropbox 登录"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "主密码 %s"
@@ -1652,6 +1697,10 @@ msgstr "Joplin 手机应用目前不支持这种类型的链接：%s"
 msgid "Unsupported image type: %s"
 msgstr "不支持的图片格式：%s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "附加照片"
+
 msgid "Attach photo"
 msgstr "附加照片"
 

CliClient/locales/zh_TW.po

@@ -614,6 +614,10 @@ msgstr "使用外部編輯器編輯"
 msgid "Search in all the notes"
 msgstr "在所有記事中搜尋"
 
+#, fuzzy
+msgid "Search in current note"
+msgstr "在所有記事中搜尋"
+
 msgid "View"
 msgstr "檢視"
 
@@ -673,9 +677,21 @@ msgstr "取消"
 msgid "Current version is up-to-date."
 msgstr "此版本是最新的。"
 
+#, javascript-format
+msgid "%s (pre-release)"
+msgstr ""
+
 msgid "An update is available, do you want to download it now?"
 msgstr "有可用的更新，您需要立即下載嗎？"
 
+#, javascript-format
+msgid "Your version: v%s"
+msgstr ""
+
+#, javascript-format
+msgid "New version: v%s"
+msgstr ""
+
 msgid "Yes"
 msgstr "是"
 
@@ -964,6 +980,9 @@ msgid ""
 "note."
 msgstr "此筆記沒有內容。按一下 \"%s\" 切換到編輯模式並編輯筆記。"
 
+msgid "Only one note can be printed or exported to PDF at a time."
+msgstr ""
+
 msgid "strong text"
 msgstr "重要文字 <strong>"
 
@@ -1284,6 +1303,10 @@ msgstr ""
 msgid "Global zoom percentage"
 msgstr "整體縮放比例 (%)"
 
+#, fuzzy
+msgid "Editor font size"
+msgstr "編輯器字型系列"
+
 msgid "Editor font family"
 msgstr "編輯器字型系列"
 
@@ -1297,6 +1320,13 @@ msgstr ""
 msgid "Automatically update the application"
 msgstr "自動更新應用程式"
 
+msgid "Get pre-releases when checking for updates"
+msgstr ""
+
+#, javascript-format
+msgid "See the pre-release page for more details: %s"
+msgstr ""
+
 msgid "Synchronisation interval"
 msgstr "同步時間間隔"
 
@@ -1586,9 +1616,24 @@ msgstr "- 位置: 允許將地理位置資訊附加到筆記。"
 msgid "Joplin website"
 msgstr "Joplin 官方網站"
 
+#, fuzzy, javascript-format
+msgid "Joplin v%s"
+msgstr "Joplin 官方網站"
+
+#, javascript-format
+msgid "Database v%s"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "FTS enabled: %d"
+msgstr "標示刪除: %d"
+
 msgid "Login with Dropbox"
 msgstr "以 Dropbox 登錄"
 
+msgid "Enter code here"
+msgstr ""
+
 #, javascript-format
 msgid "Master Key %s"
 msgstr "主密碼 %s"
@@ -1640,6 +1685,10 @@ msgstr "Joplin 移動應用程式暫時不支援此類型的連結: %s"
 msgid "Unsupported image type: %s"
 msgstr "不支援的圖像類型: %s"
 
+#, fuzzy
+msgid "Take photo"
+msgstr "附加相片"
+
 msgid "Attach photo"
 msgstr "附加相片"
 

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.0.118",
+  "version": "1.0.120",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -555,6 +555,11 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
     },
+    "diacritics": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",
+      "integrity": "sha1-PvqHMj67hj5mls67AILUj/PW96E="
+    },
     "domexception": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",

CliClient/package.json

@@ -15,11 +15,12 @@
     "years": [
       2016,
       2017,
-      2018
+      2018,
+      2019
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.118",
+  "version": "1.0.120",
   "bin": {
     "joplin": "./main.js"
   },
@@ -31,6 +32,7 @@
     "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
     "compare-version": "^0.1.2",
+    "diacritics": "^1.3.0",
     "es6-promise-pool": "^2.5.0",
     "follow-redirects": "^1.2.4",
     "form-data": "^2.1.4",

CliClient/run_test.sh

@@ -29,8 +29,10 @@ npm test tests-build/models_BaseItem.js
 npm test tests-build/models_Folder.js
 npm test tests-build/models_Note.js
 npm test tests-build/models_Tag.js
+npm test tests-build/models_ItemChange.js
 npm test tests-build/models_Setting.js
 npm test tests-build/pathUtils.js
+npm test tests-build/StringUtils.js
 npm test tests-build/services_InteropService.js
 npm test tests-build/services_ResourceService.js
 npm test tests-build/urlUtils.js

CliClient/tests/StringUtils.js

@@ -0,0 +1,45 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const StringUtils = require('lib/string-utils');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('StringUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should surround keywords with strings', async (done) => {
+		const testCases = [
+			[[], 'test', 'a', 'b', 'test'],
+			[['test'], 'test', 'a', 'b', 'atestb'],
+			[['test'], 'Test', 'a', 'b', 'aTestb'],
+			[['te[]st'], 'Te[]st', 'a', 'b', 'aTe[]stb'],
+			[['test1', 'test2'], 'bla test1 blabla test1 bla test2 not this one - test22', 'a', 'b', 'bla atest1b blabla atest1b bla atest2b not this one - test22'],
+			[['test1', 'test2'], 'bla test1 test1 bla test2', '<span class="highlighted-keyword">', '</span>', 'bla <span class="highlighted-keyword">test1</span> <span class="highlighted-keyword">test1</span> bla <span class="highlighted-keyword">test2</span>'],
+			[[{ type:'regex', value:'test.*?'}], 'bla test1 test1 bla test2 test tttest', 'a', 'b', 'bla atest1b atest1b bla atest2b atestb tttest'],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const t = testCases[i];
+
+			const keywords = t[0];
+			const input = t[1];
+			const prefix = t[2];
+			const suffix = t[3];
+			const expected = t[4];
+
+			const actual = StringUtils.surroundKeywords(keywords, input, prefix, suffix);
+
+			expect(actual).toBe(expected);
+		}
+
+		done();
+	});
+
+});

CliClient/tests/models_ItemChange.js

@@ -0,0 +1,53 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const SearchEngine = require('lib/services/SearchEngine');
+const ResourceService = require('lib/services/ResourceService');
+const ItemChangeUtils = require('lib/services/ItemChangeUtils');
+const Note = require('lib/models/Note');
+const Setting = require('lib/models/Setting');
+const ItemChange = require('lib/models/ItemChange');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+let searchEngine = null;
+
+describe('models_ItemChange', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		searchEngine = new SearchEngine();
+		searchEngine.setDb(db());
+		done();
+	});
+
+	it('should delete old changes that have been processed', asyncTest(async () => {
+		const n1 = await Note.save({ title: "abcd efgh" }); // 3
+
+		await ItemChange.waitForAllSaved();
+
+		expect(await ItemChange.lastChangeId()).toBe(1);
+
+		const resourceService = new ResourceService();
+
+		await searchEngine.syncTables();
+
+		// If we run this now, it should not delete any change because
+		// the resource service has not yet processed the change
+		await ItemChangeUtils.deleteProcessedChanges();
+
+		expect(await ItemChange.lastChangeId()).toBe(1);
+
+		await resourceService.indexNoteResources();
+
+		// Now that the resource service has processed the change,
+		// the change can be deleted.
+		await ItemChangeUtils.deleteProcessedChanges();
+
+		expect(await ItemChange.lastChangeId()).toBe(0);
+	}));
+
+});

CliClient/tests/services_ResourceService.js

@@ -8,6 +8,7 @@ const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
 const NoteTag = require('lib/models/NoteTag.js');
 const Resource = require('lib/models/Resource.js');
+const ItemChange = require('lib/models/ItemChange.js');
 const NoteResource = require('lib/models/NoteResource.js');
 const ResourceService = require('lib/services/ResourceService.js');
 const fs = require('fs-extra');
@@ -124,4 +125,25 @@ describe('services_ResourceService', function() {
 		expect(!!(await Resource.load(resource1.id))).toBe(true);
 	}));
 
+	it('should not process twice the same change', asyncTest(async () => {
+		const service = new ResourceService();
+
+		let folder1 = await Folder.save({ title: "folder1" });
+		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
+		note1 = await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		let resource1 = (await Resource.all())[0];
+
+		await service.indexNoteResources();
+
+		const before = (await NoteResource.all())[0];
+
+		await time.sleep(0.1);
+
+		await service.indexNoteResources();
+
+		const after = (await NoteResource.all())[0];
+
+		expect(before.last_seen_time).toBe(after.last_seen_time);
+	}));
+
 });

CliClient/tests/services_SearchEngine.js

@@ -0,0 +1,257 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const SearchEngine = require('lib/services/SearchEngine');
+const Note = require('lib/models/Note');
+const ItemChange = require('lib/models/ItemChange');
+const Setting = require('lib/models/Setting');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+let engine = null;
+
+describe('services_SearchEngine', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+
+		engine = new SearchEngine();
+		engine.setDb(db());
+		
+		done();
+	});
+
+	it('should keep the content and FTS table in sync', asyncTest(async () => {
+		let rows, n1, n2, n3;
+
+		n1 = await Note.save({ title: "a" });
+		n2 = await Note.save({ title: "b" });
+		await engine.syncTables();
+		rows = await engine.search('a');
+		expect(rows.length).toBe(1);
+		expect(rows[0].title).toBe('a');
+
+		await Note.delete(n1.id);
+		await engine.syncTables();
+		rows = await engine.search('a');
+		expect(rows.length).toBe(0);
+		rows = await engine.search('b');
+		expect(rows[0].title).toBe('b');
+
+		await Note.save({ id: n2.id, title: 'c' });
+		await engine.syncTables();
+		rows = await engine.search('b');
+		expect(rows.length).toBe(0);
+		rows = await engine.search('c');
+		expect(rows[0].title).toBe('c');
+
+		await Note.save({ id: n2.id, encryption_applied: 1 });
+		await engine.syncTables();
+		rows = await engine.search('c');
+		expect(rows.length).toBe(0);
+
+		await Note.save({ id: n2.id, encryption_applied: 0 });
+		await engine.syncTables();
+		rows = await engine.search('c');
+		expect(rows.length).toBe(1);
+	}));
+
+	it('should, after initial indexing, save the last change ID', asyncTest(async () => {
+		const n1 = await Note.save({ title: "abcd efgh" }); // 3
+		const n2 = await Note.save({ title: "abcd aaaaa abcd abcd" }); // 1
+
+		expect(Setting.value('searchEngine.initialIndexingDone')).toBe(false);
+
+		await ItemChange.waitForAllSaved();
+		const lastChangeId = await ItemChange.lastChangeId();
+
+		await engine.syncTables();
+
+		expect(Setting.value('searchEngine.lastProcessedChangeId')).toBe(lastChangeId);
+		expect(Setting.value('searchEngine.initialIndexingDone')).toBe(true);
+	}));
+
+
+	it('should order search results by relevance (1)', asyncTest(async () => {
+		const n1 = await Note.save({ title: "abcd efgh" }); // 3
+		const n2 = await Note.save({ title: "abcd aaaaa abcd abcd" }); // 1
+		const n3 = await Note.save({ title: "abcd aaaaa bbbb eeee abcd" }); // 2
+
+		await engine.syncTables();
+		const rows = await engine.search('abcd');
+
+		expect(rows[0].id).toBe(n2.id);
+		expect(rows[1].id).toBe(n3.id);
+		expect(rows[2].id).toBe(n1.id);
+	}));
+
+	it('should order search results by relevance (2)', asyncTest(async () => {
+		// 1
+		const n1 = await Note.save({ title: "abcd efgh", body: "XX abcd XX efgh" });
+		// 4
+		const n2 = await Note.save({ title: "abcd aaaaa bbbb eeee efgh" });
+		// 3
+		const n3 = await Note.save({ title: "abcd aaaaa efgh" });
+		// 2
+		const n4 = await Note.save({ title: "blablablabla blabla bla abcd X efgh" });
+		// 5
+		const n5 = await Note.save({ title: "occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh occurence many times but very abcd spread appart spread appart spread appart spread appart spread appart efgh" });
+
+		await engine.syncTables();
+		const rows = await engine.search('abcd efgh');
+
+		expect(rows[0].id).toBe(n1.id);
+		expect(rows[1].id).toBe(n4.id);
+		expect(rows[2].id).toBe(n3.id);
+		expect(rows[3].id).toBe(n2.id);
+		expect(rows[4].id).toBe(n5.id);
+	}));
+
+	it('should supports various query types', asyncTest(async () => {
+		let rows;
+
+		const n1 = await Note.save({ title: "abcd efgh ijkl", body: "aaaa bbbb" });
+		const n2 = await Note.save({ title: "iiii efgh bbbb", body: "aaaa bbbb" });
+		const n3 = await Note.save({ title: "Агентство Рейтер" });
+		const n4 = await Note.save({ title: "Dog" });
+		const n5 = await Note.save({ title: "СООБЩИЛО" });
+
+		await engine.syncTables();
+
+		rows = await engine.search('abcd ijkl');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('"abcd ijkl"');
+		expect(rows.length).toBe(0);
+
+		rows = await engine.search('"abcd efgh"');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('title:abcd');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('title:efgh');
+		expect(rows.length).toBe(2);
+
+		rows = await engine.search('body:abcd');
+		expect(rows.length).toBe(0);
+
+		rows = await engine.search('body:bbbb');
+		expect(rows.length).toBe(2);
+
+		rows = await engine.search('body:bbbb iiii');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('Рейтер');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('рейтер');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('Dog');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('dog');
+		expect(rows.length).toBe(1);
+
+		rows = await engine.search('сообщило');
+		expect(rows.length).toBe(1);
+	}));
+
+	it('should support queries with or without accents', asyncTest(async () => {
+		let rows;
+		const n1 = await Note.save({ title: "père noël" });
+
+		await engine.syncTables();
+
+		expect((await engine.search('père')).length).toBe(1);
+		expect((await engine.search('pere')).length).toBe(1);
+		expect((await engine.search('noe*')).length).toBe(1);
+		expect((await engine.search('noë*')).length).toBe(1);
+	}));
+
+	it('should support queries with Chinese characters', asyncTest(async () => {
+		let rows;
+		const n1 = await Note.save({ title: "我是法国人" });
+
+		await engine.syncTables();
+
+		expect((await engine.search('我')).length).toBe(1);
+		expect((await engine.search('法国人')).length).toBe(1);
+	}));
+
+	it('should support queries with Japanese characters', asyncTest(async () => {
+		let rows;
+		const n1 = await Note.save({ title: "私は日本語を話すことができません" });
+
+		await engine.syncTables();
+
+		expect((await engine.search('日本')).length).toBe(1);
+		expect((await engine.search('できません')).length).toBe(1);
+	}));
+
+	it('should support queries with Korean characters', asyncTest(async () => {
+		let rows;
+		const n1 = await Note.save({ title: "이것은 한국말이다" });
+
+		await engine.syncTables();
+
+		expect((await engine.search('이것은')).length).toBe(1);
+		expect((await engine.search('말')).length).toBe(1);
+	}));
+
+	it('should parse normal query strings', asyncTest(async () => {
+		let rows;
+
+		const testCases = [
+			['abcd efgh', { _: ['abcd', 'efgh'] }],
+			['abcd   efgh', { _: ['abcd', 'efgh'] }],
+			['title:abcd efgh', { _: ['efgh'], title: ['abcd'] }],
+			['title:abcd', { title: ['abcd'] }],
+			['"abcd efgh"', { _: ['abcd efgh'] }],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const t = testCases[i];
+			const input = t[0];
+			const expected = t[1];
+			const actual = engine.parseQuery(input);
+
+			expect(JSON.stringify(actual.terms._)).toBe(JSON.stringify(expected._));
+			expect(JSON.stringify(actual.terms.title)).toBe(JSON.stringify(expected.title));
+			expect(JSON.stringify(actual.terms.body)).toBe(JSON.stringify(expected.body));
+		}
+	}));
+
+	it('should parse query strings with wildcards', asyncTest(async () => {
+		let rows;
+
+		const testCases = [
+			['do*', ['do', 'dog', 'domino'], [] ],
+			// "*" is a wildcard only when used at the end (to searhc for documents with the specified prefix)
+			// If it's at the beginning, it's ignored, if it's in the middle, it's treated as a litteral "*".
+			['*an*', ['an', 'anneau'], ['piano', 'plan'] ],
+			['no*no', ['no*no'], ['nonono'] ],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const t = testCases[i];
+			const input = t[0];
+			const shouldMatch = t[1];
+			const shouldNotMatch = t[2];
+			const regex = new RegExp(engine.parseQuery(input).terms._[0].value, 'gmi');
+
+			for (let j = 0; j < shouldMatch.length; j++) {
+				const r = shouldMatch[j].match(regex);
+				expect(!!r).toBe(true, '"' + input + '" should match "' + shouldMatch[j] + '"');
+			}
+		}
+
+		expect(engine.parseQuery('*').termCount).toBe(0);
+	}));
+
+});

CliClient/tests/test-utils.js

@@ -4,6 +4,7 @@ const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const BaseModel = require('lib/BaseModel.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
+const ItemChange = require('lib/models/ItemChange.js');
 const Resource = require('lib/models/Resource.js');
 const Tag = require('lib/models/Tag.js');
 const NoteTag = require('lib/models/NoteTag.js');
@@ -122,6 +123,8 @@ async function switchClient(id) {
 async function clearDatabase(id = null) {
 	if (id === null) id = currentClient_;
 
+	await ItemChange.waitForAllSaved();
+
 	let queries = [
 		'DELETE FROM notes',
 		'DELETE FROM folders',
@@ -134,6 +137,7 @@ async function clearDatabase(id = null) {
 		'DELETE FROM settings',		
 		'DELETE FROM deleted_items',
 		'DELETE FROM sync_items',
+		'DELETE FROM notes_normalized',
 	];
 
 	await databases_[id].transactionExecBatch(queries);

CliClientDemo/.gitignore

@@ -1 +0,0 @@
-node_modules

CliClientDemo/index.js

@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const spawn = require('child_process').spawn;
-const os = require('os');
-const fs = require('fs-extra');
-
-const joplinPath = __dirname + '/node_modules/.bin/joplin';
-const profileDir = os.homedir() + '/.config/demo-joplin';
-const dbFilename = 'database.sqlite';
-
-fs.ensureDirSync(profileDir);
-if (!fs.pathExistsSync(profileDir + '/' + dbFilename)) {
-	fs.copySync(__dirname + '/' + dbFilename, profileDir + '/' + dbFilename);
-}
-
-const opt = {
-	cwd: __dirname,
-	env: (function() {
-		process.env.NODE_PATH = '.';
-		return process.env;
-	}()),
-	stdio: [process.stdin, process.stdout, process.stderr]
-};
-
-const app = spawn(joplinPath, ['--is-demo', '--profile', profileDir], opt);
-
-app.on('close', (code) => {
-	process.exit(code);
-});

CliClientDemo/package.json

@@ -1,33 +0,0 @@
-{
-  "name": "demo-joplin",
-  "version": "1.0.8",
-  "description": "Demo for Joplin CLI",
-  "bin": {
-    "demo-joplin": "./index.js"
-  },
-  "bugs": {
-    "url": "https://github.com/laurent22/joplin/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/laurent22/joplin"
-  },
-  "engines": {
-    "node": ">=8.7.0"
-  },
-  "copyright": {
-    "title": "Demo for Joplin CLI",
-    "years": [
-      2016,
-      2017,
-      2018
-    ],
-    "owner": "Laurent Cozic"
-  },
-  "dependencies": {
-    "fs-extra": "^4.0.2",
-    "joplin": "^0.10.69"
-  },
-  "author": "Laurent Cozic",
-  "license": "MIT"
-}

CliClientDemo/publish.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-npm version patch
-npm publish

Clipper/joplin-webclipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplin.cozic.net",
     "icons": {

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

@@ -18,7 +18,10 @@ class AppComponent extends Component {
 		});
 
 		this.confirm_click = () => {
-			bridge().sendContentToJoplin(this.props.clippedContent);
+			const content = Object.assign({}, this.props.clippedContent);
+			content.tags = this.state.selectedTags.join(',');
+			content.parent_id = this.props.selectedFolderId;
+			bridge().sendContentToJoplin(content);
 		}
 
 		this.contentTitle_change = (event) => {
@@ -31,24 +34,18 @@ class AppComponent extends Component {
 		this.clipSimplified_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'simplifiedPageHtml',
-				parent_id: this.props.selectedFolderId,
-				tags: this.state.selectedTags.join(','),
 			});
 		}
 
 		this.clipComplete_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'completePageHtml',
-				parent_id: this.props.selectedFolderId,
-				tags: this.state.selectedTags.join(','),
 			});
 		}
 
 		this.clipSelection_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'selectedHtml',
-				parent_id: this.props.selectedFolderId,
-				tags: this.state.selectedTags.join(','),
 			});
 		}
 

ElectronClient/app/ElectronAppWrapper.js

@@ -58,7 +58,7 @@ class ElectronAppWrapper {
 
 		// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098
 		// Fix: https://github.com/electron-userland/electron-builder/issues/2269
-		if (shim.isLinux()) windowOptions.icon = __dirname + '/build/icons/128x128.png';
+		if (shim.isLinux()) windowOptions.icon = path.join(__dirname, '..', 'build/icons/128x128.png');
 
 		require('electron-context-menu')({
 			shouldShowMenu: (event, params) => {
@@ -231,4 +231,4 @@ class ElectronAppWrapper {
 
 }
 
-module.exports = { ElectronAppWrapper };
+module.exports = { ElectronAppWrapper };

ElectronClient/app/app.js

@@ -197,10 +197,6 @@ class Application extends BaseApplication {
 			this.updateEditorFont();
 		}
 
-		if (["NOTE_UPDATE_ONE", "NOTE_DELETE", "FOLDER_UPDATE_ONE", "FOLDER_DELETE"].indexOf(action.type) >= 0) {
-			if (!await reg.syncTarget().syncStarted()) reg.scheduleSync(30 * 1000, { syncSteps: ["update_remote", "delete_remote"] });
-		}
-
 		if (['EVENT_NOTE_ALARM_FIELD_CHANGE', 'NOTE_DELETE'].indexOf(action.type) >= 0) {
 			await AlarmService.updateNoteNotification(action.id, action.type === 'NOTE_DELETE');
 		}
@@ -459,14 +455,27 @@ class Application extends BaseApplication {
 							name: 'commandStartExternalEditing',
 						});
 					},
+				}, {
+					type: 'separator',
+					screens: ['Main'],
 				}, {
 					label: _('Search in all the notes'),
 					screens: ['Main'],
+					accelerator: 'F6',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'focus_search',
+						});
+					},
+				}, {
+					label: _('Search in current note'),
+					screens: ['Main'],
 					accelerator: 'CommandOrControl+F',
 					click: () => {
 						this.dispatch({
 							type: 'WINDOW_COMMAND',
-							name: 'focus_search',
+							name: 'showLocalSearch',
 						});
 					},
 				}],
@@ -575,7 +584,7 @@ class Application extends BaseApplication {
 				}, {
 					label: _('Check for updates...'),
 					click: () => {
-						bridge().checkForUpdates(false, bridge().window(), this.checkForUpdateLoggerPath());
+						bridge().checkForUpdates(false, bridge().window(), this.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
 					}
 				}, {
 					type: 'separator',
@@ -587,7 +596,7 @@ class Application extends BaseApplication {
 						let message = [
 							p.description,
 							'',
-							'Copyright © 2016-2018 Laurent Cozic',
+							'Copyright © 2016-2019 Laurent Cozic',
 							_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
 						];
 						bridge().showInfoMessageBox(message.join('\n'), {
@@ -758,7 +767,7 @@ class Application extends BaseApplication {
 		if (shim.isWindows() || shim.isMac()) {
 			const runAutoUpdateCheck = () => {
 				if (Setting.value('autoUpdateEnabled')) {
-					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath());
+					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
 				}
 			}
 

ElectronClient/app/bridge.js

@@ -116,9 +116,9 @@ class Bridge {
 		return require('electron').shell.openItem(fullPath)
 	}
 
-	checkForUpdates(inBackground, window, logFilePath) {
+	checkForUpdates(inBackground, window, logFilePath, options) {
 		const { checkForUpdates } = require('./checkForUpdates.js');
-		checkForUpdates(inBackground, window, logFilePath);
+		checkForUpdates(inBackground, window, logFilePath, options);
 	}
 	
 }

ElectronClient/app/checkForUpdates.js

@@ -29,15 +29,35 @@ function onCheckEnded() {
 	isCheckingForUpdate_ = false;
 }
 
-async function fetchLatestRelease() {
-	const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases/latest');
+async function fetchLatestRelease(options) {
+	options = Object.assign({}, { includePreReleases: false }, options);
 
-	if (!response.ok) {
-		const responseText = await response.text();
-		throw new Error('Cannot get latest release info: ' + responseText.substr(0,500));
+	let json = null;
+
+	if (options.includePreReleases) {
+		// This end-point will include all releases, including pre-releases (but not draft), so we take
+		// whatever is the latest release. It might be the same as releases/latest, or it might be
+		// a pre-release.
+		const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases');
+
+		if (!response.ok) {
+			const responseText = await response.text();
+			throw new Error('Cannot get latest release info: ' + responseText.substr(0,500));
+		}
+
+		json = await response.json();
+		if (!json.length) throw new Error('Cannot get latest release info: ' + responseText.substr(0,500));
+		json = json[0];
+	} else {
+		const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases/latest');
+
+		if (!response.ok) {
+			const responseText = await response.text();
+			throw new Error('Cannot get latest release info: ' + responseText.substr(0,500));
+		}
+
+		json = await response.json();
 	}
-
-	const json = await response.json();
 	
 	const version = json.tag_name.substr(1);
 	let downloadUrl = null;
@@ -69,10 +89,11 @@ async function fetchLatestRelease() {
 		downloadUrl: downloadUrl,
 		notes: json.body,
 		pageUrl: json.html_url,
+		prerelease: json.prerelease,
 	};
 }
 
-function checkForUpdates(inBackground, window, logFilePath) {
+function checkForUpdates(inBackground, window, logFilePath, options) {
 	if (isCheckingForUpdate_) {
 		autoUpdateLogger_.info('checkForUpdates: Skipping check because it is already running');
 		return;
@@ -91,18 +112,22 @@ function checkForUpdates(inBackground, window, logFilePath) {
 
 	checkInBackground_ = inBackground;
 
-	fetchLatestRelease().then(release => {
+	autoUpdateLogger_.info('checkForUpdates: Checking with options ' + JSON.stringify(options));
+
+	fetchLatestRelease(options).then(release => {
 		autoUpdateLogger_.info('Current version: ' + packageInfo.version);
 		autoUpdateLogger_.info('Latest version: ' + release.version);
+		autoUpdateLogger_.info('Is Pre-release:', release.prerelease);
 
 		if (compareVersions(release.version, packageInfo.version) <= 0) {
 			if (!checkInBackground_) dialog.showMessageBox({ message: _('Current version is up-to-date.') })
 		} else {
 			const releaseNotes = release.notes.trim() ? "\n\n" + release.notes.trim() : '';
+			const newVersionString = release.prerelease ? _('%s (pre-release)', release.version) : release.version;
 
 			const buttonIndex = dialog.showMessageBox(parentWindow_, {
 				type: 'info',
-				message: _('An update is available, do you want to download it now?' + releaseNotes),
+				message: _('An update is available, do you want to download it now?') + '\n\n' + _('Your version: v%s', packageInfo.version) + '\n' + _('New version: v%s', newVersionString) + releaseNotes,
 				buttons: [_('Yes'), _('No')]
 			});
 

ElectronClient/app/compile.js

@@ -2,6 +2,7 @@ const fs = require('fs-extra');
 const spawnSync	= require('child_process').spawnSync;
 
 const babelPath = __dirname + '/node_modules/.bin/babel' + (process.platform === 'win32' ? '.cmd' : '');
+const basePath = __dirname + '/../..';
 const guiPath = __dirname + '/gui';
 
 function fileIsNewerThan(path1, path2) {
@@ -27,7 +28,7 @@ fs.readdirSync(guiPath).forEach((filename) => {
 
 	if (fileIsNewerThan(jsxPath, jsPath)) {
 		console.info('Compiling ' + jsxPath + '...');
-		const result = spawnSync(babelPath, ['--presets', 'react', '--out-file',jsPath, jsxPath]);
+		const result = spawnSync(babelPath, ['--presets', 'react', '--out-file', jsPath, jsxPath]);
 		if (result.status !== 0) {
 			const msg = [];
 			if (result.stdout) msg.push(result.stdout.toString());
@@ -38,3 +39,10 @@ fs.readdirSync(guiPath).forEach((filename) => {
 		}
 	}
 });
+
+const libContent = [
+	fs.readFileSync(basePath + '/ReactNativeClient/lib/string-utils-common.js', 'utf8'),
+	fs.readFileSync(basePath + '/ReactNativeClient/lib/markJsUtils.js', 'utf8'),
+];
+
+fs.writeFileSync(__dirname + '/gui/note-viewer/lib.js', libContent.join('\n'), 'utf8');

ElectronClient/app/gui/NoteList.jsx

@@ -4,6 +4,7 @@ const { connect } = require('react-redux');
 const { time } = require('lib/time-utils.js');
 const { themeStyle } = require('../theme.js');
 const BaseModel = require('lib/BaseModel');
+const markJsUtils = require('lib/markJsUtils');
 const { _ } = require('lib/locale.js');
 const { bridge } = require('electron').remote.require('./bridge');
 const Menu = bridge().Menu;
@@ -13,6 +14,8 @@ const InteropService = require('lib/services/InteropService');
 const InteropServiceHelper = require('../InteropServiceHelper.js');
 const Search = require('lib/models/Search');
 const Mark = require('mark.js/dist/mark.min.js');
+const SearchEngine = require('lib/services/SearchEngine');
+const { replaceRegexDiacritics, pregQuote } = require('lib/string-utils');
 
 class NoteListComponent extends React.Component {
 
@@ -154,12 +157,14 @@ class NoteListComponent extends React.Component {
 				}}));
 			}
 
-			exportMenu.append(new MenuItem({ label: 'PDF - ' + _('PDF File') , click: () => {
-				this.props.dispatch({
-					type: 'WINDOW_COMMAND',
-					name: 'exportPdf',
-				});
-			}}));
+			if (noteIds.length === 1) {
+				exportMenu.append(new MenuItem({ label: 'PDF - ' + _('PDF File') , click: () => {
+					this.props.dispatch({
+						type: 'WINDOW_COMMAND',
+						name: 'exportPdf',
+					});
+				}}));
+			}
 
 			const exportMenuItem = new MenuItem({label: _('Export'), submenu: exportMenu});
 
@@ -234,8 +239,11 @@ class NoteListComponent extends React.Component {
 
 		let highlightedWords = [];
 		if (this.props.notesParentType === 'Search') {
-			const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
-			highlightedWords = search ? Search.keywords(search.query_pattern) : [];
+			const query = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
+			if (query) {
+				const parsedQuery = SearchEngine.instance().parseQuery(query.query_pattern);
+				highlightedWords = SearchEngine.instance().allParsedQueryTerms(parsedQuery);
+			}
 		}
 
 		let style = Object.assign({ width: width }, this.style().listItem);
@@ -266,7 +274,17 @@ class NoteListComponent extends React.Component {
 				exclude: ['img'],
 				acrossElements: true,
 			});
-			mark.mark(highlightedWords);
+
+			mark.unmark();
+
+			for (let i = 0; i < highlightedWords.length; i++) {
+				const w = highlightedWords[i];
+
+				markJsUtils.markKeyword(mark, w, {
+					pregQuote: pregQuote,
+					replaceRegexDiacritics: replaceRegexDiacritics,
+				});
+			}
 
 			// Note: in this case it is safe to use dangerouslySetInnerHTML because titleElement
 			// is a span tag that we created and that contains data that's been inserted as plain text

ElectronClient/app/gui/NotePropertiesDialog.jsx

@@ -16,6 +16,8 @@ class NotePropertiesDialog extends React.Component {
 
 		this.okButton_click = this.okButton_click.bind(this);
 		this.cancelButton_click = this.cancelButton_click.bind(this);
+		this.onKeyDown = this.onKeyDown.bind(this);
+		this.okButton = React.createRef();
 
 		this.state = {
 			formNote: null,
@@ -43,6 +45,12 @@ class NotePropertiesDialog extends React.Component {
 		}
 	}
 
+	componentDidUpdate() {
+		if (this.state.editedKey == null) {
+			this.okButton.current.focus();
+		}
+	}
+
 	async loadNote(noteId) {
 		if (!noteId) {
 			this.setState({ formNote: null });
@@ -184,6 +192,14 @@ class NotePropertiesDialog extends React.Component {
 		this.closeDialog(false);
 	}
 
+	onKeyDown(event) {
+		if (event.keyCode === 13) {
+			this.closeDialog(true);
+		} else if (event.keyCode === 27) {
+			this.closeDialog(false);
+		}
+	}
+
 	editPropertyButtonClick(key, initialValue) {
 		this.setState({
 			editedKey: key,
@@ -222,6 +238,7 @@ class NotePropertiesDialog extends React.Component {
 
 	async cancelProperty() {
 		return new Promise((resolve, reject) => {
+			this.okButton.current.focus();
 			this.setState({
 				editedKey: null,
 				editedValue: null
@@ -347,7 +364,17 @@ class NotePropertiesDialog extends React.Component {
 		const formNote = this.state.formNote;
 
 		const buttonComps = [];
-		buttonComps.push(<button key="ok" style={styles.button} onClick={this.okButton_click}>{_('Apply')}</button>);
+		buttonComps.push(
+			<button
+				key="ok"
+				style={styles.button}
+				onClick={this.okButton_click}
+				ref={this.okButton}
+				onKeyDown={this.onKeyDown}
+			>
+				{_('Apply')}
+			</button>
+		);
 		buttonComps.push(<button key="cancel" style={styles.button} onClick={this.cancelButton_click}>{_('Cancel')}</button>);
 
 		const noteComps = [];

ElectronClient/app/gui/NoteSearchBar.jsx

@@ -0,0 +1,122 @@
+const React = require('react');
+const { connect } = require('react-redux');
+const { themeStyle } = require('../theme.js');
+const { _ } = require('lib/locale.js');
+
+class NoteSearchBarComponent extends React.Component {
+
+	constructor() {
+		super();
+
+		this.state = {
+			query: '',
+		};
+
+		this.searchInput_change = this.searchInput_change.bind(this);
+		this.previousButton_click = this.previousButton_click.bind(this);
+		this.nextButton_click = this.nextButton_click.bind(this);
+		this.closeButton_click = this.closeButton_click.bind(this);
+	}
+
+	style() {
+		const theme = themeStyle(this.props.theme);
+
+		let style = {
+			root: Object.assign({}, theme.textStyle, {
+				backgroundColor: theme.backgroundColor,
+				color: theme.colorFaded,
+			}),
+		};
+
+		return style;
+	}
+
+	componentDidMount() {
+		this.refs.searchInput.focus();
+	}
+
+	buttonIconComponent(iconName, clickHandler) {
+		const theme = themeStyle(this.props.theme);
+
+		const searchButton = {
+			paddingLeft: 4,
+			paddingRight: 4,
+			paddingTop: 2,
+			paddingBottom: 2,
+			textDecoration: 'none',
+			marginRight: 5,
+		};
+
+		const iconStyle = {
+			display: 'flex',
+			fontSize: Math.round(theme.fontSize) * 1.2,
+			color: theme.color,
+		};
+
+		const icon = <i style={iconStyle} className={"fa " + iconName}></i>
+
+		return (
+			<a
+				href="#"
+				style={searchButton}
+				onClick={clickHandler}
+			>{icon}</a>
+		);
+	}
+
+	searchInput_change(event) {
+		const query = event.currentTarget.value;
+		this.setState({ query: query });
+		this.triggerOnChange(query);
+	}
+
+	previousButton_click(event) {
+		if (this.props.onPrevious) this.props.onPrevious();
+	}
+
+	nextButton_click(event) {
+		if (this.props.onNext) this.props.onNext();
+	}
+
+	closeButton_click(event) {
+		if (this.props.onClose) this.props.onClose();
+	}
+
+	triggerOnChange(query) {
+		if (this.props.onChange) this.props.onChange(query);
+	}
+
+	focus() {
+		this.refs.searchInput.focus();
+	}
+
+	render() {
+		const theme = themeStyle(this.props.theme);
+
+		const closeButton = this.buttonIconComponent('fa-times', this.closeButton_click);
+		const previousButton = this.buttonIconComponent('fa-chevron-up', this.previousButton_click);
+		const nextButton = this.buttonIconComponent('fa-chevron-down', this.nextButton_click);
+
+		return (
+			<div style={this.props.style}>
+				<div style={{display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
+					{ closeButton }
+					<input placeholder={_('Search...')} value={this.state.query} onChange={this.searchInput_change} ref="searchInput" type="text" style={{width: 200, marginRight: 5}}></input>
+					{ nextButton }
+					{ previousButton }
+				</div>
+			</div>
+		);
+	}
+
+}
+
+const mapStateToProps = (state) => {
+	return {
+		theme: state.settings.theme,
+	};
+};
+
+const NoteSearchBar = connect(mapStateToProps, null, null, { withRef: true })(NoteSearchBarComponent);
+
+module.exports = NoteSearchBar;

ElectronClient/app/gui/NoteText.jsx

@@ -6,7 +6,7 @@ const Search = require('lib/models/Search.js');
 const { time } = require('lib/time-utils.js');
 const Setting = require('lib/models/Setting.js');
 const { IconButton } = require('./IconButton.min.js');
-const { urlDecode, escapeHtml } = require('lib/string-utils');
+const { urlDecode, escapeHtml, pregQuote, scriptType } = require('lib/string-utils');
 const Toolbar = require('./Toolbar.min.js');
 const TagList = require('./TagList.min.js');
 const { connect } = require('react-redux');
@@ -25,13 +25,16 @@ const fs = require('fs-extra');
 const md5 = require('md5');
 const mimeUtils = require('lib/mime-utils.js').mime;
 const ArrayUtils = require('lib/ArrayUtils');
+const ObjectUtils = require('lib/ObjectUtils');
 const urlUtils = require('lib/urlUtils');
 const dialogs = require('./dialogs');
+const NoteSearchBar = require('./NoteSearchBar.min.js');
 const markdownUtils = require('lib/markdownUtils');
 const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
 const ResourceFetcher = require('lib/services/ResourceFetcher');
 const { toSystemSlashes, safeFilename } = require('lib/path-utils');
 const { clipboard } = require('electron');
+const SearchEngine = require('lib/services/SearchEngine');
 
 require('brace/mode/markdown');
 // https://ace.c9.io/build/kitchen-sink.html
@@ -46,6 +49,12 @@ class NoteTextComponent extends React.Component {
 	constructor() {
 		super();
 
+		this.localSearchDefaultState = {
+			query: '',
+			selectedIndex: 0,
+			resultCount: 0,
+		};
+
 		this.state = {
 			note: null,
 			noteMetadata: '',
@@ -65,6 +74,8 @@ class NoteTextComponent extends React.Component {
 			newAndNoTitleChangeNoteId: null,
 			bodyHtml: '',
 			lastKeys: [],
+			showLocalSearch: false,
+			localSearch: Object.assign({}, this.localSearchDefaultState), 
 		};
 
 		this.lastLoadedNoteId_ = null;
@@ -74,8 +85,10 @@ class NoteTextComponent extends React.Component {
 		this.scheduleSaveTimeout_ = null;
 		this.restoreScrollTop_ = null;
 		this.lastSetHtml_ = '';
-		this.lastSetMarkers_ = [];
+		this.lastSetMarkers_ = '';
+		this.lastSetMarkersOptions_ = {};
 		this.selectionRange_ = null;
+		this.noteSearchBar_ = React.createRef();
 
 		// Complicated but reliable method to get editor content height
 		// https://github.com/ajaxorg/ace/issues/2046
@@ -214,6 +227,36 @@ class NoteTextComponent extends React.Component {
 				this.updateHtml(this.state.note.body);
 			}
 		}
+
+		this.noteSearchBar_change = (query) => {
+			this.setState({ localSearch: {
+				query: query,
+				selectedIndex: 0,
+			}});
+		}
+
+		const noteSearchBarNextPrevious = (inc) => {
+			const ls = Object.assign({}, this.state.localSearch);
+			ls.selectedIndex += inc;
+			if (ls.selectedIndex < 0) ls.selectedIndex = ls.resultCount - 1;
+			if (ls.selectedIndex >= ls.resultCount) ls.selectedIndex = 0;
+
+			this.setState({ localSearch: ls });
+		}
+
+		this.noteSearchBar_next = () => {
+			noteSearchBarNextPrevious(+1);
+		}
+
+		this.noteSearchBar_previous = () => {
+			noteSearchBarNextPrevious(-1);
+		}
+
+		this.noteSearchBar_close = () => {
+			this.setState({
+				showLocalSearch: false,
+			});
+		}
 	}
 
 	// Note:
@@ -441,8 +484,7 @@ class NoteTextComponent extends React.Component {
 			}
 		}
 
-		if (note)
-		{
+		if (note) {
 			parentFolder = Folder.byId(props.folders, note.parent_id);
 		}
 
@@ -461,8 +503,14 @@ class NoteTextComponent extends React.Component {
 			newState.newAndNoTitleChangeNoteId = null;
 		}
 
+		if (!note || loadingNewNote) {
+			newState.showLocalSearch = false;
+			newState.localSearch = Object.assign({}, this.localSearchDefaultState);
+		}
+
 		this.lastSetHtml_ = '';
-		this.lastSetMarkers_ = [];
+		this.lastSetMarkers_ = '';
+		this.lastSetMarkersOptions_ = {};
 
 		this.setState(newState);
 
@@ -565,6 +613,10 @@ class NoteTextComponent extends React.Component {
 
 			const newBody = this.mdToHtml_.handleCheckboxClick(msg, this.state.note.body);
 			this.saveOneProperty('body', newBody);
+		} else if (msg === 'setMarkerCount') {
+			const ls = Object.assign({}, this.state.localSearch);
+			ls.resultCount = arg0;
+			this.setState({ localSearch: ls });
 		} else if (msg === 'percentScroll') {
 			this.ignoreNextEditorScroll_ = true;
 			this.setEditorPercentScroll(arg0);
@@ -682,7 +734,7 @@ class NoteTextComponent extends React.Component {
 			webviewReady: true,
 		});
 
-		// if (Setting.value('env') === 'dev') this.webview_.openDevTools();
+		if (Setting.value('env') === 'dev') this.webview_.openDevTools();
 	}
 
 	webview_ref(element) {
@@ -857,32 +909,54 @@ class NoteTextComponent extends React.Component {
 	}
 
 	async doCommand(command) {
-		if (!command || !this.state.note) return;
+		if (!command) return;
 
-		let commandProcessed = true;
+		let fn = null;
 
-		if (command.name === 'exportPdf' && this.webview_) {
-			this.commandSavePdf();
-		} else if (command.name === 'print' && this.webview_) {
-			this.webview_.print();
-		} else if (command.name === 'textBold') {
-			this.commandTextBold();
-		} else if (command.name === 'textItalic') {
-			this.commandTextItalic();
-		} else if (command.name === 'insertDateTime' ) {
-			this.commandDateTime();
-		} else if (command.name === 'commandStartExternalEditing') {
-			this.commandStartExternalEditing();
+		if (command.name === 'exportPdf') {
+			fn = this.commandSavePdf;
+		} else if (command.name === 'print') {
+			fn = this.commandPrint;
+		}
+
+		if (this.state.note) {
+			if (command.name === 'textBold') {
+				fn = this.commandTextBold;
+			} else if (command.name === 'textItalic') {
+				fn = this.commandTextItalic;
+			} else if (command.name === 'insertDateTime' ) {
+				fn = this.commandDateTime;
+			} else if (command.name === 'commandStartExternalEditing') {
+				fn = this.commandStartExternalEditing;
+			} else if (command.name === 'showLocalSearch') {
+				fn = this.commandShowLocalSearch;
+			}
+		}
+
+		if (!fn) return;
+
+		this.props.dispatch({
+			type: 'WINDOW_COMMAND',
+			name: null,
+		});
+
+		requestAnimationFrame(() => {
+			fn = fn.bind(this);
+			fn();
+		});
+	}
+
+	commandShowLocalSearch() {
+		if (this.state.showLocalSearch) {
+			this.noteSearchBar_.current.wrappedInstance.focus();
 		} else {
-			commandProcessed = false;
+			this.setState({ showLocalSearch: true });
 		}
 
-		if (commandProcessed) {
-			this.props.dispatch({
-				type: 'WINDOW_COMMAND',
-				name: null,
-			});
-		}
+		this.props.dispatch({
+			type: 'NOTE_VISIBLE_PANES_SET',
+			panes: ['editor', 'viewer'],
+		});
 	}
 
 	async commandAttachFile(filePaths = null) {
@@ -927,42 +1001,68 @@ class NoteTextComponent extends React.Component {
 		});
 	}
 
-	commandSavePdf() {
-		const path = bridge().showSaveDialog({
-			filters: [{ name: _('PDF File'), extensions: ['pdf']}],
-			defaultPath: safeFilename(this.state.note.title),
-		});
+	printTo_(target, options) {
+		if (this.props.selectedNoteIds.length !== 1 || !this.webview_) {
+			throw new Error(_('Only one note can be printed or exported to PDF at a time.'));
+		}
 
-		if (path) {
-			// Temporarily add a <h2> title in the webview
-			const newHtml = this.insertHtmlHeading_(this.lastSetHtml_, this.state.note.title);
-			this.webview_.send('setHtml', newHtml);
+		const previousBody = this.state.note.body;
+		const tempBody = "# " + this.state.note.title + "\n\n" + previousBody;
 
-			setTimeout(() => {
+		const previousTheme = Setting.value('theme');
+		Setting.setValue('theme', Setting.THEME_LIGHT);
+		this.lastSetHtml_ = '';
+		this.updateHtml(tempBody);
+		this.forceUpdate();
+
+		const restoreSettings = () => {
+			Setting.setValue('theme', previousTheme);
+			this.lastSetHtml_ = '';
+			this.updateHtml(previousBody);
+			this.forceUpdate();
+		}
+
+		setTimeout(() => {
+			if (target === 'pdf') {
 				this.webview_.printToPDF({}, (error, data) => {
+					restoreSettings();
+
 					if (error) {
 						bridge().showErrorMessageBox(error.message);
 					} else {
-						shim.fsDriver().writeFile(path, data, 'buffer');
+						shim.fsDriver().writeFile(options.path, data, 'buffer');
 					}
-
-					// Refresh the webview, restoring the previous content
-					this.lastSetHtml_ = '';
-					this.forceUpdate();
 				});
-			}, 100);
+			} else if (target === 'printer') {
+				this.webview_.print();
+				restoreSettings();
+			}
+		}, 100);		
+	}
+
+	commandSavePdf() {
+		try {
+			if (!this.state.note) throw new Error(_('Only one note can be printed or exported to PDF at a time.'));
+
+			const path = bridge().showSaveDialog({
+				filters: [{ name: _('PDF File'), extensions: ['pdf']}],
+				defaultPath: safeFilename(this.state.note.title),
+			});
+
+			if (!path) return;
+
+			this.printTo_('pdf', { path: path });
+		} catch (error) {
+			bridge().showErrorMessageBox(error.message);
 		}
 	}
 
-	insertHtmlHeading_(s, heading) {
-		const tag = 'h2';
-		const marker = '<!-- START_OF_DOCUMENT -->'
-		let splitStyle = s.split(marker);
-		const index = splitStyle.length > 1 ? 1 : 0;
-		let toInsert = escapeHtml(heading);
-		toInsert = '<' + tag + '>' + toInsert + '</' + tag + '>';
-		splitStyle[index] = toInsert + splitStyle[index];
-		return splitStyle.join(marker);
+	commandPrint() {
+		try {
+			this.printTo_('printer');
+		} catch (error) {
+			bridge().showErrorMessageBox(error.message);
+		}		
 	}
 
 	async commandStartExternalEditing() {
@@ -1414,6 +1514,8 @@ class NoteTextComponent extends React.Component {
 			height: 30
 		};
 
+		const searchBarHeight = this.state.showLocalSearch ? 35 : 0;
+
 		let bottomRowHeight = 0;
 		if (NOTE_TAG_BAR_FEATURE_ENABLED) {
 			bottomRowHeight = rootStyle.height - titleBarStyle.height - titleBarStyle.marginBottom - titleBarStyle.marginTop - theme.toolbarHeight - tagStyle.height - tagStyle.marginBottom;
@@ -1421,8 +1523,9 @@ class NoteTextComponent extends React.Component {
 			toolbarStyle.marginBottom = 10;
 			bottomRowHeight = rootStyle.height - titleBarStyle.height - titleBarStyle.marginBottom - titleBarStyle.marginTop - theme.toolbarHeight - toolbarStyle.marginBottom;
 		}
-		
 
+		bottomRowHeight -= searchBarHeight;
+		
 		const viewerStyle = {
 			width: Math.floor(innerWidth / 2),
 			height: bottomRowHeight,
@@ -1442,7 +1545,7 @@ class NoteTextComponent extends React.Component {
 			verticalAlign: 'top',
 			paddingTop: paddingTop + 'px',
 			lineHeight: theme.textAreaLineHeight + 'px',
-			fontSize: theme.fontSize + 'px',
+			fontSize: theme.editorFontSize + 'px',
 			color: theme.color,
 			backgroundColor: theme.backgroundColor,
 			editorTheme: theme.editorTheme,
@@ -1481,12 +1584,29 @@ class NoteTextComponent extends React.Component {
 				this.lastSetHtml_ = html;
 			}
 
-			const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
-			const keywords = search ? Search.keywords(search.query_pattern) : [];
+			let keywords = [];
+			const markerOptions = {};
 
-			if (htmlHasChanged || !ArrayUtils.contentEquals(this.lastSetMarkers_, keywords)) {
-				this.lastSetMarkers_ = [];
-				this.webview_.send('setMarkers', keywords);
+			if (this.state.showLocalSearch) {
+				keywords = [{
+					type: 'text',
+					value: this.state.localSearch.query,
+					accuracy: 'partially',
+				}]
+				markerOptions.selectedIndex = this.state.localSearch.selectedIndex;
+			} else {
+				const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
+				if (search) {
+					const parsedQuery = SearchEngine.instance().parseQuery(search.query_pattern);
+					keywords = SearchEngine.instance().allParsedQueryTerms(parsedQuery);
+				}
+			}
+
+			const keywordHash = JSON.stringify(keywords);
+			if (htmlHasChanged || keywordHash !== this.lastSetMarkers_ || !ObjectUtils.fieldsEqual(this.lastSetMarkersOptions_, markerOptions)) {
+				this.lastSetMarkers_ = keywordHash;
+				this.lastSetMarkersOptions_ = Object.assign({}, markerOptions);
+				this.webview_.send('setMarkers', keywords, markerOptions);
 			}
 		}
 
@@ -1574,6 +1694,17 @@ class NoteTextComponent extends React.Component {
 			highlightActiveLine={false}
 		/>
 
+		const noteSearchBarComp = !this.state.showLocalSearch ? null : (
+			<NoteSearchBar
+				ref={this.noteSearchBar_}
+				style={{display: 'flex', height:searchBarHeight,width:innerWidth, borderTop: '1px solid ' + theme.dividerColor}}
+				onChange={this.noteSearchBar_change}
+				onNext={this.noteSearchBar_next}
+				onPrevious={this.noteSearchBar_previous}
+				onClose={this.noteSearchBar_close}
+			/>
+		);
+
 		return (
 			<div style={rootStyle} onDrop={this.onDrop_}>
 				<div style={titleBarStyle}>
@@ -1585,6 +1716,8 @@ class NoteTextComponent extends React.Component {
 				{ tagList }
 				{ editor }
 				{ viewer }
+				<div style={{clear:'both'}}/>
+				{ noteSearchBarComp }
 			</div>
 		);
 	}
@@ -1594,6 +1727,7 @@ class NoteTextComponent extends React.Component {
 const mapStateToProps = (state) => {
 	return {
 		noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null,
+		selectedNoteIds: state.selectedNoteIds,
 		noteTags: state.selectedNoteTags,
 		folderId: state.selectedFolderId,
 		itemType: state.selectedItemType,

ElectronClient/app/gui/SideBar.jsx

@@ -3,6 +3,7 @@ const { connect } = require("react-redux");
 const shared = require("lib/components/shared/side-menu-shared.js");
 const { Synchronizer } = require("lib/synchronizer.js");
 const BaseModel = require("lib/BaseModel.js");
+const Setting = require('lib/models/Setting.js');
 const Folder = require("lib/models/Folder.js");
 const Note = require("lib/models/Note.js");
 const Tag = require("lib/models/Tag.js");
@@ -23,7 +24,7 @@ class SideBarComponent extends React.Component {
 		this.onFolderDragStart_ = (event) => {
 			const folderId = event.currentTarget.getAttribute('folderid');
 			if (!folderId) return;
-			
+
 			event.dataTransfer.setDragImage(new Image(), 1, 1);
 			event.dataTransfer.clearData();
 			event.dataTransfer.setData('text/x-jop-folder-ids', JSON.stringify([folderId]));
@@ -79,6 +80,11 @@ class SideBarComponent extends React.Component {
 				id: folderId,
 			});
 		};
+
+		this.state = {
+			tagHeaderIsExpanded: Setting.value('tagHeaderIsExpanded'),
+			folderHeaderIsExpanded: Setting.value('folderHeaderIsExpanded')
+		};
 	}
 
 	style() {
@@ -190,7 +196,7 @@ class SideBarComponent extends React.Component {
 		if (shim.isLinux()) {
 			// For some reason, the UI seems to sleep in some Linux distro during
 			// sync. Cannot find the reason for it and cannot replicate, so here
-			// as a test force the update at regular intervals. 
+			// as a test force the update at regular intervals.
 			// https://github.com/laurent22/joplin/issues/312#issuecomment-429472193
 			if (!prevProps.syncStarted && this.props.syncStarted) {
 				this.clearForceUpdateDuringSync();
@@ -201,7 +207,7 @@ class SideBarComponent extends React.Component {
 			}
 
 			if (prevProps.syncStarted && !this.props.syncStarted) this.clearForceUpdateDuringSync();
-		}	
+		}
 	}
 
 	componentWillUnmount() {
@@ -303,7 +309,7 @@ class SideBarComponent extends React.Component {
 			);
 		}
 
-		if (itemType === BaseModel.TYPE_TAG) { 
+		if (itemType === BaseModel.TYPE_TAG) {
 			menu.append(
 				new MenuItem({
 					label: _('Rename'),
@@ -440,14 +446,48 @@ class SideBarComponent extends React.Component {
 	makeHeader(key, label, iconName, extraProps = {}) {
 		const style = this.style().header;
 		const icon = <i style={{ fontSize: style.fontSize * 1.2, marginRight: 5 }} className={"fa " + iconName} />;
+
+		if (extraProps.toggleblock || extraProps.onClick) {
+			style.cursor = "pointer";
+		}
+
+		let headerClick = extraProps.onClick || null;
+		delete extraProps.onClick;
+
+		// check if toggling option is set.
+		let toggleIcon = null;
+		const toggleKey = `${key}IsExpanded`;
+		if (extraProps.toggleblock) {
+			let isExpanded = this.state[toggleKey];
+			toggleIcon = <i className={`fa ${isExpanded ? 'fa-chevron-down' : 'fa-chevron-left'}`} style={{ fontSize: style.fontSize * 0.75,
+				marginRight: 12, marginLeft: 5, marginTop: style.fontSize * 0.125}}></i>;
+		}
 		return (
-			<div style={style} key={key} {...extraProps}>
+			<div style={style} key={key} {...extraProps} onClick={(event) => { 
+					// if a custom click event is attached, trigger that. 				
+					if (headerClick) {
+						headerClick(key, event); 				
+					}
+					this.onHeaderClick_(key, event); 
+				}}>
 				{icon}
-				{label}
+				<span style={{flex: 1 }}>{label}</span>
+				{toggleIcon}
 			</div>
 		);
 	}
 
+	onHeaderClick_(key, event) {	
+		const currentHeader = event.currentTarget;
+		const toggleBlock = +currentHeader.getAttribute('toggleblock');
+		if (toggleBlock) {
+			const toggleKey = `${key}IsExpanded`;				
+			const isExpanded = this.state[toggleKey]; 					
+			this.setState({ [toggleKey]: !isExpanded }); 					
+			Setting.setValue(toggleKey, !isExpanded); 				
+		}
+	}
+
 	synchronizeButton(type) {
 		const style = this.style().button;
 		const iconName = type === "sync" ? "fa-refresh" : "fa-times";
@@ -477,24 +517,27 @@ class SideBarComponent extends React.Component {
 		});
 
 		let items = [];
-
 		items.push(this.makeHeader("folderHeader", _("Notebooks"), "fa-folder-o", {
 			onDrop: this.onFolderDrop_,
 			folderid: '',
+			toggleblock: 1
 		}));
 
 		if (this.props.folders.length) {
 			const folderItems = shared.renderFolders(this.props, this.folderItem.bind(this));
-			items = items.concat(folderItems);
+			items.push(<div className="folders" key="folder_items" style={{display: this.state.folderHeaderIsExpanded ? 'block': 'none'}}>
+				{folderItems}</div>);
 		}
 
-		items.push(this.makeHeader("tagHeader", _("Tags"), "fa-tags"));
+		items.push(this.makeHeader("tagHeader", _("Tags"), "fa-tags", {
+			toggleblock: 1
+		}));
 
 		if (this.props.tags.length) {
 			const tagItems = shared.renderTags(this.props, this.tagItem.bind(this));
 
 			items.push(
-				<div className="tags" key="tag_items">
+				<div className="tags" key="tag_items" style={{display: this.state.tagHeaderIsExpanded ? 'block': 'none'}}>
 					{tagItems}
 				</div>
 			);

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

@@ -16,6 +16,11 @@
 		}
 
 		mark {
+			background: #F3B717;
+			color: black;
+		}
+
+		.mark-selected {
 			background: #CF3F00;
 			color: white;
 		}
@@ -32,6 +37,7 @@
 	<div id="hlScriptContainer"></div>
 	<div id="markScriptContainer"></div>
 	<div id="content" ondragstart="return false;" ondrop="return false;"></div>
+	<script src="./lib.js"></script>
 
 	<script>
 	const contentElement = document.getElementById('content');
@@ -138,6 +144,8 @@
 	ipc.setHtml = (event) => {
 		const html = event.html;
 
+		markJsHackMarkerInserted_ = false;
+
 		updateBodyHeight();
 
 		contentElement.innerHTML = html;
@@ -191,8 +199,36 @@
 		setPercentScroll(percent);
 	}
 
+	// HACK for Mark.js bug - https://github.com/julmot/mark.js/issues/127
+	let markJsHackMarkerInserted_ = false;
+	function addMarkJsSpaceHack(document) {
+		if (markJsHackMarkerInserted_) return;
+		
+		const prepareElementsForMarkJs = (elements, type) => {
+			// const markJsHackMarker_ = '&#8203; &#8203;'
+			const markJsHackMarker_ = ' ';
+			for (let i = 0; i < elements.length; i++) {
+				if (!type) {
+					elements[i].innerHTML = elements[i].innerHTML + markJsHackMarker_;
+				} else if (type === 'insertBefore') {
+					elements[i].insertAdjacentHTML('beforeBegin', markJsHackMarker_);
+				}
+			}
+		}
+
+		prepareElementsForMarkJs(document.getElementsByTagName('p'));
+		prepareElementsForMarkJs(document.getElementsByTagName('div'));
+		prepareElementsForMarkJs(document.getElementsByTagName('br'), 'insertBefore');
+		markJsHackMarkerInserted_ = true;
+	}
+
 	let mark_ = null;
-	function setMarkers(keywords) {
+	let markSelectedElement_ = null;
+	function setMarkers(keywords, options = null) {
+		if (!options) options = {};
+
+		// TODO: Add support for scriptType on mobile and CLI
+
 		if (!mark_) {
 			mark_ = new Mark(document.getElementById('content'), {
 				exclude: ['img'],
@@ -200,26 +236,61 @@
 			});
 		}
 
-		mark_.mark(keywords);
+		addMarkJsSpaceHack(document);
+
+		mark_.unmark()
+
+		if (markSelectedElement_) markSelectedElement_.classList.remove('mark-selected');
+
+		let selectedElement = null;
+		let elementIndex = 0;
+
+		const onEachElement = (element) => {
+			if (!('selectedIndex' in options)) return;
+
+			if (('selectedIndex' in options) && elementIndex === options.selectedIndex) {
+				markSelectedElement_ = element;
+				element.classList.add('mark-selected');
+				selectedElement = element;
+			}
+			
+			elementIndex++;
+		}
+
+		for (let i = 0; i < keywords.length; i++) {
+			let keyword = keywords[i];
+
+			markJsUtils.markKeyword(mark_, keyword, {
+				pregQuote: pregQuote,
+				replaceRegexDiacritics: replaceRegexDiacritics,
+			}, {
+				each: onEachElement,				
+			});
+		}
+
+		ipcProxySendToHost('setMarkerCount', elementIndex);
+
+		if (selectedElement) selectedElement.scrollIntoView();
 	}
 
 	let markLoaded_ = false;
 	ipc.setMarkers = (event) => {
 		const keywords = event.keywords;
+		const options = event.options;
 
 		if (!keywords.length && !markLoaded_) return;
 
 		if (!markLoaded_) {
 			const script = document.createElement('script');
 			script.onload = function() {
-				setMarkers(keywords);
+				setMarkers(keywords, options);
 			};
 
 			script.src = '../../node_modules/mark.js/dist/mark.min.js';
 			document.getElementById('markScriptContainer').appendChild(script);
 			markLoaded_ = true;
 		} else {
-			setMarkers(keywords);
+			setMarkers(keywords, options);
 		}
 	}
 
@@ -286,22 +357,38 @@
 		return false;
 	}
 
+	function getParentAnchorElement(element) {
+		let counter = 0;
+		while (true) {
+
+			if (counter++ >= 10000) {
+				console.warn('been looping for too long - exiting')
+				return null;
+			}
+
+			if (!element) return null;
+			if (element.nodeName === 'A') return element;
+			element = element.parentElement;
+		}
+	}
+
 	document.addEventListener('click', function(event) {
-		const t = event.target;
+		const anchor = getParentAnchorElement(event.target);
+		if (!anchor) return;
 
 		// Prevent URLs added via <a> tags from being opened within the application itself
 		// otherwise it would open the whole website within the WebView.
-		if (t && t.nodeName === 'A' && !t.hasAttribute('data-from-md')) {
-			if (handleInternalLink(event, t)) return;
+		if (!anchor.hasAttribute('data-from-md')) {
+			if (handleInternalLink(event, anchor)) return;
 
 			event.preventDefault();
-			ipcProxySendToHost(t.getAttribute('href'));
+			ipcProxySendToHost(anchor.getAttribute('href'));
 			return;
 		}
 
 		// If this is an internal link, jump to the anchor directly
-		if (t && t.nodeName === 'A' && t.hasAttribute('data-from-md')) {
-			if (handleInternalLink(event, t)) return;
+		if (anchor.hasAttribute('data-from-md')) {
+			if (handleInternalLink(event, anchor)) return;
 		}
 	});
 

ElectronClient/app/gui/note-viewer/preload.js

@@ -13,8 +13,8 @@ ipcRenderer.on('setPercentScroll', (event, percent) => {
 	window.postMessage({ target: 'webview', name: 'setPercentScroll', data: { percent: percent } }, '*');
 });
 
-ipcRenderer.on('setMarkers', (event, keywords) => {
-	window.postMessage({ target: 'webview', name: 'setMarkers', data: { keywords: keywords } }, '*');
+ipcRenderer.on('setMarkers', (event, keywords, options) => {
+	window.postMessage({ target: 'webview', name: 'setMarkers', data: { keywords: keywords, options: options } }, '*');
 });
 
 window.addEventListener('message', (event) => {

ElectronClient/app/locales/index.js

@@ -12,9 +12,9 @@ locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');
 locales['ja_JP'] = require('./ja_JP.json');
 locales['ko'] = require('./ko.json');
+locales['nb_NO'] = require('./nb_NO.json');
 locales['nl_BE'] = require('./nl_BE.json');
 locales['nl_NL'] = require('./nl_NL.json');
-locales['no'] = require('./no.json');
 locales['pt_BR'] = require('./pt_BR.json');
 locales['ro'] = require('./ro.json');
 locales['ru_RU'] = require('./ru_RU.json');

ElectronClient/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.117",
+  "version": "1.0.124",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {
@@ -8,8 +8,8 @@
     "pack": "node_modules/.bin/electron-builder --dir",
     "dist": "node_modules/.bin/electron-builder",
     "publish": "build -p always",
-    "postinstall": "node compile-jsx.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts",
-    "compile": "node compile-jsx.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts"
+    "postinstall": "node compile.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts && install-app-deps",
+    "compile": "node compile.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts"
   },
   "repository": {
     "type": "git",
@@ -58,6 +58,9 @@
     "linux": {
       "asar": false,
       "category": "Office",
+      "desktop": {
+        "Icon": "joplin"
+      },
       "target": "AppImage"
     }
   },
@@ -71,8 +74,8 @@
     "electron-builder": "20.14.7"
   },
   "optionalDependencies": {
-    "7zip-bin-mac": "^1.0.1",
     "7zip-bin-linux": "^1.0.1",
+    "7zip-bin-mac": "^1.0.1",
     "7zip-bin-win": "^2.1.1"
   },
   "dependencies": {
@@ -81,6 +84,7 @@
     "base-64": "^0.1.0",
     "chokidar": "^2.0.3",
     "compare-versions": "^3.2.1",
+    "diacritics": "^1.3.0",
     "electron-context-menu": "^0.9.1",
     "electron-is-dev": "^0.3.0",
     "electron-window-state": "^4.1.1",
@@ -121,7 +125,7 @@
     "server-destroy": "^1.0.1",
     "smalltalk": "^2.5.1",
     "sprintf-js": "^1.1.1",
-    "sqlite3": "^3.1.13",
+    "sqlite3": "^4.0.4",
     "string-padding": "^1.0.2",
     "string-to-stream": "^1.1.1",
     "syswide-cas": "^5.1.0",

ElectronClient/app/theme.js

@@ -1,11 +1,9 @@
 const Setting = require('lib/models/Setting.js');
 
-const zoomRatio = Setting.value('style.zoom') / 100;
-
 // globalStyle should be used for properties that do not change across themes
 // i.e. should not be used for colors
 const globalStyle = {
-	fontSize: Math.round(12 * zoomRatio),
+	fontSize: 12,
 	fontFamily: 'sans-serif',
 	margin: 15, // No text and no interactive component should be within this margin
 	itemMarginTop: 10,
@@ -14,6 +12,7 @@ const globalStyle = {
 	disabledOpacity: 0.3,
 	buttonMinWidth: 50,
 	buttonMinHeight: 30,
+	editorFontSize: 12,
 	textAreaLineHeight: 17,
 
 	headerHeight: 35,
@@ -23,10 +22,6 @@ const globalStyle = {
 	tagItemPadding: 3,
 };
 
-// For WebView - must correspond to the properties above
-globalStyle.htmlFontSize = globalStyle.fontSize + 'px';
-globalStyle.htmlLineHeight = Math.round(20 * zoomRatio) + 'px';
-
 globalStyle.marginRight = globalStyle.margin;
 globalStyle.marginLeft = globalStyle.margin;
 globalStyle.marginTop = globalStyle.margin;
@@ -41,39 +36,6 @@ globalStyle.lineInput = {
 	fontFamily: globalStyle.fontFamily,
 };
 
-globalStyle.textStyle = {
-	fontFamily: globalStyle.fontFamily,
-	fontSize: globalStyle.fontSize,
-	lineHeight: '1.6em',
-};
-
-globalStyle.textStyle2 = Object.assign({}, globalStyle.textStyle, {});
-
-globalStyle.urlStyle = Object.assign({}, globalStyle.textStyle, { textDecoration: 'underline' });
-
-globalStyle.h1Style = Object.assign({}, globalStyle.textStyle);
-globalStyle.h1Style.fontSize *= 1.5;
-globalStyle.h1Style.fontWeight = 'bold';
-
-globalStyle.h2Style = Object.assign({}, globalStyle.textStyle);
-globalStyle.h2Style.fontSize *= 1.3;
-globalStyle.h2Style.fontWeight = 'bold';
-
-globalStyle.toolbarStyle = {
-	height: globalStyle.toolbarHeight,
-	minWidth: globalStyle.toolbarHeight,
-	display: 'flex',
-	alignItems: 'center',
-	paddingLeft: globalStyle.headerButtonHPadding,
-	paddingRight: globalStyle.headerButtonHPadding,
-	textDecoration: 'none',
-	fontFamily: globalStyle.fontFamily,
-	fontSize: globalStyle.fontSize,
-	boxSizing: 'border-box',
-	cursor: 'default',
-	justifyContent: 'center',
-};
-
 globalStyle.headerStyle = {};
 
 globalStyle.inputStyle = {
@@ -178,6 +140,59 @@ function addExtraStyles(style) {
 		color: style.raisedColor,
 	};
 
+	style.toolbarStyle = {
+		height: style.toolbarHeight,
+		minWidth: style.toolbarHeight,
+		display: 'flex',
+		alignItems: 'center',
+		paddingLeft: style.headerButtonHPadding,
+		paddingRight: style.headerButtonHPadding,
+		textDecoration: 'none',
+		fontFamily: style.fontFamily,
+		fontSize: style.fontSize,
+		boxSizing: 'border-box',
+		cursor: 'default',
+		justifyContent: 'center',
+		color: style.color,
+	};
+
+	style.textStyle = {
+		fontFamily: globalStyle.fontFamily,
+		fontSize: style.fontSize,
+		lineHeight: '1.6em',
+		color: style.color
+	};
+
+	style.textStyle2 = Object.assign({}, style.textStyle,
+		{ color: style.color2, }
+	);
+
+	style.urlStyle = Object.assign({}, style.textStyle,
+		{
+			textDecoration: 'underline',
+			color: style.urlColor
+		}
+	);
+
+	style.h1Style = Object.assign({},
+		style.textStyle,
+		{
+			color: style.color,
+			fontSize: style.textStyle.fontSize * 1.5,
+			fontWeight: 'bold'
+		}
+	);
+
+	style.h2Style = Object.assign({},
+		style.textStyle,
+		{
+			color: style.color,
+			fontSize: style.textStyle.fontSize * 1.3,
+			fontWeight: 'bold'
+		}
+	);
+
+
 	return style;
 }
 
@@ -185,26 +200,38 @@ let themeCache_ = {};
 
 function themeStyle(theme) {
 	if (!theme) throw new Error('Theme must be specified');
-	if (themeCache_[theme]) return themeCache_[theme];
+
+	var zoomRatio = Setting.value('style.zoom') / 100;
+	var editorFontSize = Setting.value('style.editor.fontSize');
+
+	const cacheKey = [theme, zoomRatio, editorFontSize].join('-');
+	if (themeCache_[cacheKey]) return themeCache_[cacheKey];
+
+	let fontSizes = {
+		fontSize: Math.round(12 * zoomRatio),
+		editorFontSize: editorFontSize,
+		textAreaLineHeight: Math.round(17 * editorFontSize / 12),
+
+		// For WebView - must correspond to the properties above
+		htmlFontSize: Math.round(12 * zoomRatio) + 'px',
+		htmlLineHeight: Math.round(20 * zoomRatio) + 'px'
+	}
 
 	let output = {};
+	output.zoomRatio = zoomRatio;
+	output.editorFontSize = editorFontSize;
 	if (theme == Setting.THEME_LIGHT) {
-		output = Object.assign({}, globalStyle, lightStyle);
+		output = Object.assign({}, globalStyle, fontSizes, lightStyle);
 	}
 	else if (theme == Setting.THEME_DARK) {
-		output = Object.assign({}, globalStyle, darkStyle);
+		output = Object.assign({}, globalStyle, fontSizes, darkStyle);
 	}
 
-	// TODO: All the theme specific things should go in addExtraStyles
+	// Note: All the theme specific things should go in addExtraStyles
 	// so that their definition is not split between here and the
 	// beginning of the file. At least new styles should go in
 	// addExtraStyles.
 
-	output.textStyle = Object.assign({},
-		output.textStyle,
-		{ color: output.color }
-	);
-
 	output.icon = Object.assign({},
 		output.icon,
 		{ color: output.color }
@@ -218,31 +245,6 @@ function themeStyle(theme) {
 		}
 	);
 
-	output.textStyle2 = Object.assign({},
-		output.textStyle2,
-		{ color: output.color2, }
-	);
-
-	output.urlStyle = Object.assign({},
-		output.urlStyle,
-		{ color: output.urlColor }
-	);
-
-	output.h1Style = Object.assign({},
-		output.h1Style,
-		{ color: output.color }
-	);
-
-	output.h2Style = Object.assign({},
-		output.h2Style,
-		{ color: output.color }
-	);
-
-	output.toolbarStyle = Object.assign({},
-		output.toolbarStyle,
-		{ color: output.color }
-	);
-
 	output.headerStyle = Object.assign({},
 		output.headerStyle,
 		{
@@ -279,8 +281,8 @@ function themeStyle(theme) {
 
 	output = addExtraStyles(output);
 
-	themeCache_[theme] = output;
-	return themeCache_[theme];
+	themeCache_[cacheKey] = output;
+	return themeCache_[cacheKey];
 }
 
 module.exports = { themeStyle };

ElectronClient/package-lock.json

@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "diacritics": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",
+      "integrity": "sha1-PvqHMj67hj5mls67AILUj/PW96E="
+    }
+  }
+}

Joplin_install_and_update.sh

@@ -58,9 +58,9 @@ if [[ $(< ~/.joplin/VERSION) != "$version" ]]; then
     desktop=${desktop,,}  # convert to lower case
 
     # Create icon for Gnome
-    if [[ $desktop =~ .*gnome.* ]] 
+    if [[ $desktop =~ .*gnome.* ]] || [[ $desktop =~ .*kde.* ]] 
     then
-       echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nExec=/home/$USER/.joplin/Joplin-$version-x86_64.AppImage\nIcon=/home/$USER/.joplin/Icon512.png\nType=Application\nCategories=Application;" >> ~/.local/share/applications/joplin.desktop
+       echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=/home/$USER/.joplin/Icon512.png\nType=Application\nCategories=Application;" >> ~/.local/share/applications/joplin.desktop
     fi
     
     #-----------------------------------------------------

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2018 Laurent Cozic
+Copyright (c) 2016-2019 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -14,15 +14,15 @@ The application is available for Windows, Linux, macOS, Android and iOS. A [Web
 
 # Installation
 
-Three types of applications are available: for the **desktop** (Windows, macOS and Linux), for **mobile** (Android and iOS) and for **terminal** (Windows, macOS and Linux). All applications have similar user interfaces and can synchronise with each others.
+Three types of applications are available: for the **desktop** (Windows, macOS and Linux), for **mobile** (Android and iOS) and for **terminal** (Windows, macOS and Linux). All applications have similar user interfaces and can synchronise with each other.
 
 ## Desktop applications
 
 Operating System | Download | Alternative
 -----------------|--------|-------------------
-Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.116/Joplin-Setup-1.0.116.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.116/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.116/Joplin-1.0.116.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> | 
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.116/Joplin-1.0.116-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.120/Joplin-Setup-1.0.120.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.120/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.120/Joplin-1.0.120.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> |
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.120/Joplin-1.0.120-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
 
 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.
 
@@ -36,7 +36,7 @@ wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_insta
 
 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://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.176/joplin-v1.0.176.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://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.235/joplin-v1.0.235.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplin.cozic.net/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -81,7 +81,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [Donate](https://github.com/laurent22/joplin/blob/master/readme/donate.md)
 <!-- TOC -->
 
-# Features 
+# Features
 
 - Desktop, mobile and terminal applications.
 - [Web Clipper](https://github.com/laurent22/joplin/blob/master/readme/clipper.md) for Firefox and Chrome.
@@ -98,10 +98,11 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 - Search functionality.
 - Geo-location support.
 - Supports multiple languages
+- External editor support - open notes in your favorite external editor with one click in Joplin.
 
 # Importing
 
-## Importing from Evernote 
+## Importing from Evernote
 
 Joplin was designed as a replacement for Evernote and so can import complete Evernote notebooks, as well as notes, tags, resources (attached files) and note metadata (such as author, geo-location, etc.) via ENEX files. In terms of data, the only two things that might slightly differ are:
 
@@ -173,6 +174,7 @@ Select the "WebDAV" synchronisation target and follow the same instructions as f
 
 WebDAV-compatible services that are known to work with Joplin:
 
+- [Apache WebDAV Module](https://httpd.apache.org/docs/current/mod/mod_dav.html)
 - [Box.com](https://www.box.com/)
 - [DriveHQ](https://www.drivehq.com)
 - [Fastmail](https://www.fastmail.com/)
@@ -284,6 +286,20 @@ It is generally recommended to enter the notes as Markdown as it makes the notes
 
 Rendered markdown can be customized by placing a userstyle file in the profile directory `~/.config/joplin-desktop/userstyle.css` (This path might be different on your device - check at the top of the Config screen for the exact path). This file supports standard CSS syntax.
 
+# Searching
+
+Joplin implements the SQLite Full Text Search (FTS4) extension. It means the content of all the notes is indexed in real time and search queries return results very fast. Both [Simple FTS Queries](https://www.sqlite.org/fts3.html#simple_fts_queries) and [Full-Text Index Queries](https://www.sqlite.org/fts3.html#full_text_index_queries) are supported. See below for the list of supported queries:
+
+Search type | Description | Example
+------------|-------------|---------
+Single word | Returns all the notes that contain this term. | `dog`, `cat`
+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`)
+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.
+
 # Donations
 
 Donations to Joplin support the development of the project. Developing quality applications mostly takes time, but there are also some expenses, such as digital certificates to sign the applications, app store fees, hosting, etc. Most of all, your donation will make it possible to keep up the current development standard.
@@ -319,29 +335,29 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-![](https://joplin.cozic.net/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  61%
-![](https://joplin.cozic.net/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  87%
-![](https://joplin.cozic.net/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)  |  49%
-![](https://joplin.cozic.net/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)  |  77%
-![](https://joplin.cozic.net/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.  |  78%
+![](https://joplin.cozic.net/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  59%
+![](https://joplin.cozic.net/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  84%
+![](https://joplin.cozic.net/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)  |  48%
+![](https://joplin.cozic.net/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)  |  75%
+![](https://joplin.cozic.net/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.  |  76%
 ![](https://joplin.cozic.net/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)  |  98%
 ![](https://joplin.cozic.net/images/flags/country-4x3/gb.png)  |  English  |  [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po)  |    |  100%
-![](https://joplin.cozic.net/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Fernando Martín (f@mrtn.es)  |  93%
+![](https://joplin.cozic.net/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Fernando Martín (f@mrtn.es)  |  90%
 ![](https://joplin.cozic.net/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://joplin.cozic.net/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)  |  77%
-![](https://joplin.cozic.net/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  92%
-![](https://joplin.cozic.net/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)  |  93%
-![](https://joplin.cozic.net/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  61%
-![](https://joplin.cozic.net/images/flags/country-4x3/no.png)  |  Norwegian  |  [no](https://github.com/laurent22/joplin/blob/master/CliClient/locales/no.po)  |    |  83%
-![](https://joplin.cozic.net/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)  |  100%
-![](https://joplin.cozic.net/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  61%
-![](https://joplin.cozic.net/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  76%
-![](https://joplin.cozic.net/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po)  |  Jonatan Nyberg (jonatan@autistici.org)  |  92%
-![](https://joplin.cozic.net/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)  |  76%
-![](https://joplin.cozic.net/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  96%
-![](https://joplin.cozic.net/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  93%
-![](https://joplin.cozic.net/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)  |  94%
-![](https://joplin.cozic.net/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  93%
+![](https://joplin.cozic.net/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)  |  75%
+![](https://joplin.cozic.net/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  93%
+![](https://joplin.cozic.net/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  60%
+![](https://joplin.cozic.net/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)  |  90%
+![](https://joplin.cozic.net/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)  |  97%
+![](https://joplin.cozic.net/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)  |  97%
+![](https://joplin.cozic.net/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  59%
+![](https://joplin.cozic.net/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  74%
+![](https://joplin.cozic.net/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po)  |  Jonatan Nyberg (jonatan@autistici.org)  |  89%
+![](https://joplin.cozic.net/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)  |  77%
+![](https://joplin.cozic.net/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  93%
+![](https://joplin.cozic.net/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  90%
+![](https://joplin.cozic.net/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)  |  97%
+![](https://joplin.cozic.net/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  90%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Known bugs
@@ -354,7 +370,7 @@ Current translations:
 
 MIT License
 
-Copyright (c) 2016-2018 Laurent Cozic
+Copyright (c) 2016-2019 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097412
-		versionName "1.0.176"
+		versionCode 2097471
+		versionName "1.0.235"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}
@@ -137,24 +137,37 @@ android {
 }
 
 dependencies {
-    compile project(':react-native-camera')
-	compile project(':react-native-file-viewer')
-	compile project(':react-native-securerandom')
-	compile project(':react-native-push-notification')
-	compile project(':react-native-fs')
-	compile project(':react-native-image-picker')
-	compile project(':react-native-vector-icons')
-	compile project(':react-native-fs')
+    compile project(':react-native-push-notification')
+    implementation (project(':react-native-camera')) {
+    	// This is required because com.google.firebase requires v16.0.x of com.google.android.gms
+    	// while react-native-camera requires v15.x, which results in broken dependencies with
+    	// this error message:
+    	// 
+    	// The library com.google.android.gms:play-services-base is being requested by various other libraries at [[15.0.1,15.0.1]], but resolves to 16.0.1
+    	//
+    	// For the record: found solution by removing all Firebase stuff here and running "gradlew.bat :app:dependencies"
+    	// That shows that react-native-camera was the one requiring v15.0.1.
+        exclude group: "com.google.android.gms"
+    }
+	implementation project(':react-native-file-viewer')
+	implementation project(':react-native-securerandom')
+	implementation project(':react-native-fs')
+	implementation project(':react-native-image-picker')
+	implementation project(':react-native-vector-icons')
+	implementation project(':react-native-fs')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
-	compile project(':react-native-sqlite-storage')
-	compile project(':rn-fetch-blob')
-	compile project(':react-native-document-picker')
-	compile project(':react-native-image-resizer')
-	compile project(':react-native-share-extension')
-	compile project(':react-native-version-info')
-	compile "com.facebook.react:react-native:+"
+	implementation project(':react-native-sqlite-storage')
+	implementation project(':rn-fetch-blob')
+	implementation project(':react-native-document-picker')
+	implementation project(':react-native-image-resizer')
+	implementation project(':react-native-share-extension')
+	implementation project(':react-native-version-info')
+	implementation "com.facebook.react:react-native:+"
+
+	implementation "com.google.android.gms:play-services-base:16.0.1" // For Firebase
+	implementation 'me.leolin:ShortcutBadger:1.1.21@aar' // For Firebase - this line if you wish to use badge on Android
 
 	// To fix the error below, which happened after adding react-native-camera.
 	// Doesn't make any sense since rn-camera neither defines v26 nor 27 but
@@ -182,4 +195,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
 	into 'libs'
 }
 
-apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
+apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

ReactNativeClient/android/app/src/main/AndroidManifest.xml

@@ -11,25 +11,23 @@
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
 
+	<!-- ============================= -->
+	<!-- START RN-push-notitication    -->
+	<!-- ============================= -->
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
+    <permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+	<!-- ============================= -->
+	<!-- END RN-push-notitication      -->
+	<!-- ============================= -->
+
 	<!-- Make these features optional to enable Chromebooks -->
 	<!-- https://github.com/laurent22/joplin/issues/37 -->
 	<uses-feature android:name="android.hardware.camera" android:required="false" />
 	<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
-	<!-- ==================================== -->
-	<!-- START react-native-push-notification -->
-	<!-- ==================================== -->
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<permission
-		android:name="${applicationId}.permission.C2D_MESSAGE"
-		android:protectionLevel="signature" />
-	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-	<!-- ================================== -->
-	<!-- END react-native-push-notification -->
-	<!-- ================================== -->
-
 	<uses-sdk
 		android:minSdkVersion="16"
 		android:targetSdkVersion="26" />
@@ -41,27 +39,50 @@
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/AppTheme">
 
-		<!-- ==================================== -->
-		<!-- START react-native-push-notification -->
-		<!-- ==================================== -->
+		<!-- ============================= -->
+		<!-- START RN-push-notitication    -->
+		<!-- ============================= -->
+		<meta-data android:name="com.dieam.reactnativepushnotification.notification_channel_name" android:value="@string/default_notification_channel_id"/>
+        <meta-data android:name="com.dieam.reactnativepushnotification.notification_channel_description" android:value="Allow displaying a notification for Joplin's alarms"/>
+        <meta-data android:name="com.dieam.reactnativepushnotification.notification_color" android:resource="@android:color/white"/>
+
+		<receiver
+		    android:name="com.google.android.gms.gcm.GcmReceiver"
+		    android:exported="true"
+		    android:permission="com.google.android.c2dm.permission.SEND" >
+		    <intent-filter>
+		        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+		        <category android:name="${applicationId}" />
+		    </intent-filter>
+		</receiver>
 
 		<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
-		<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
-			<intent-filter>
-				<action android:name="android.intent.action.BOOT_COMPLETED" />
-			</intent-filter>
-		</receiver>
-		<service android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationRegistrationService"/>
-		<!-- ================================== -->
-		<!-- END react-native-push-notification -->
-		<!-- ================================== -->
+        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        <service android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationRegistrationService"/>
 
+        <service
+            android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerServiceGcm"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+            </intent-filter>
+        </service>
+		<!-- ============================= -->
+		<!-- END RN-push-notitication      -->
+		<!-- ============================= -->
+		
+		<!-- 2018-12-16: Changed android:launchMode from "singleInstance" to "singleTop" for Firebase notification -->
+		<!--             Previously singleInstance was necessary to prevent multiple instance of the RN app from running at the same time, but maybe no longer needed. -->
 		<activity
 			android:name=".MainActivity"
 			android:label="@string/app_name"
 			android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
 			android:windowSoftInputMode="adjustResize"
-			android:launchMode="singleInstance">
+			android:launchMode="singleTop">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />

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

@@ -3,10 +3,10 @@ package net.cozic.joplin;
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
 import org.reactnative.camera.RNCameraPackage;
 import com.vinzscam.reactnativefileviewer.RNFileViewerPackage;
 import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
-import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
 import com.imagepicker.ImagePickerPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
@@ -38,12 +38,12 @@ public class MainApplication extends Application implements ReactApplication {
 		@Override
 		protected List<ReactPackage> getPackages() {
 			return Arrays.<ReactPackage>asList(
-				new ImageResizerPackage(),
 				new MainReactPackage(),
-            new RNCameraPackage(),
-            new RNFileViewerPackage(),
-            new RNSecureRandomPackage(),
             new ReactNativePushNotificationPackage(),
+				new ImageResizerPackage(),
+				new RNCameraPackage(),
+				new RNFileViewerPackage(),
+				new RNSecureRandomPackage(),
 				new ImagePickerPackage(),
 				new ReactNativeDocumentPicker(),
 				new RNFetchBlobPackage(),

ReactNativeClient/android/app/src/main/res/values/colors.xml

@@ -0,0 +1,3 @@
+<resources>
+    <color name="white">#FFF</color>
+</resources>

ReactNativeClient/android/app/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Joplin</string>
+    <string name="default_notification_channel_id">net.cozic.joplin.notification</string>
 </resources>

ReactNativeClient/android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0' // Upgraded from 3.1.4 to 3.2.0 for Firebase
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -23,6 +23,8 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
+        google()
+        jcenter() // Was added by me - still needed?
         maven {
             url "https://maven.google.com"
         }
@@ -30,8 +32,6 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
-        jcenter() // Was added by me - still needed?
-        google()
     }
 }