Android release v1.0.97

CliClient/locales/de_DE.po

@@ -707,7 +707,14 @@ msgstr "Abbrechen"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Notizen löschen?"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -717,19 +724,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Synchronisation abbrechen"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -884,6 +884,13 @@ msgstr ""
 "Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf den "
 "(+) Knopf drückst."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Änderungen speichern"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nicht unterstützter Link oder Nachricht: %s"
@@ -891,9 +898,24 @@ msgstr "Nicht unterstützter Link oder Nachricht: %s"
 msgid "Attach file"
 msgstr "Datei anhängen"
 
+msgid "Tags"
+msgstr "Markierungen"
+
 msgid "Set alarm"
 msgstr "Alarm erstellen"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Neues To-Do"
+
+#, fuzzy
+msgid "note"
+msgstr "Neue Notiz"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Importiere Notizen..."
+
 msgid "Refresh"
 msgstr "Aktualisieren"
 
@@ -930,9 +952,6 @@ msgstr "Synchronisieren"
 msgid "Notebooks"
 msgstr "Notizbücher"
 
-msgid "Tags"
-msgstr "Markierungen"
-
 msgid "Searches"
 msgstr "Suchen"
 

CliClient/locales/en_GB.po

@@ -615,7 +615,14 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -624,18 +631,10 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
+msgid "Check synchronisation configuration"
 msgstr ""
 
 #, javascript-format
@@ -772,6 +771,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Open..."
+msgstr ""
+
+msgid "Save as..."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -779,9 +784,22 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Set alarm"
 msgstr ""
 
+msgid "to-do"
+msgstr ""
+
+msgid "note"
+msgstr ""
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr ""
+
 msgid "Refresh"
 msgstr ""
 
@@ -818,9 +836,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Searches"
 msgstr ""
 

CliClient/locales/es_CR.po

@@ -673,7 +673,14 @@ msgstr "Cancelar"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Eliminar notas?"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -683,19 +690,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Sincronizacion cancelada"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -840,6 +840,13 @@ msgid ""
 msgstr ""
 "Actualmente no hay notas. Crea una nueva nota dando client en el boton (+)."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Guardar cambios"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Enlace o mensaje sin soporte: %s"
@@ -847,9 +854,24 @@ msgstr "Enlace o mensaje sin soporte: %s"
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
+msgid "Tags"
+msgstr "Etiquetas"
+
 msgid "Set alarm"
 msgstr "Ajustar alarma"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Nueva lista de tareas"
+
+#, fuzzy
+msgid "note"
+msgstr "Nueva nota"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Importando notas..."
+
 msgid "Refresh"
 msgstr "Refrescar"
 
@@ -887,9 +909,6 @@ msgstr "Sincronizar"
 msgid "Notebooks"
 msgstr "Libretas"
 
-msgid "Tags"
-msgstr "Etiquetas"
-
 msgid "Searches"
 msgstr "Busquedas"
 

CliClient/locales/es_ES.po

@@ -687,7 +687,14 @@ msgstr "Cancelar"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "¿Desea eliminar notas?"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -697,19 +704,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Cancelar sincronización"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -846,6 +846,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "No hay ninguna libreta. Cree una pulsando en «Libreta nueva»."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Guardar cambios"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Enlace o mensaje no soportado: %s"
@@ -853,9 +860,24 @@ msgstr "Enlace o mensaje no soportado: %s"
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
+msgid "Tags"
+msgstr "Etiquetas"
+
 msgid "Set alarm"
 msgstr "Fijar alarma"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Lista de tareas nueva"
+
+#, fuzzy
+msgid "note"
+msgstr "Nota nueva"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Importando notas..."
+
 msgid "Refresh"
 msgstr "Refrescar"
 
@@ -892,9 +914,6 @@ msgstr "Sincronizar"
 msgid "Notebooks"
 msgstr "Libretas"
 
-msgid "Tags"
-msgstr "Etiquetas"
-
 msgid "Searches"
 msgstr "Búsquedas"
 

CliClient/locales/fr_FR.po

@@ -14,8 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.3\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 msgid "Give focus to next pane"
 msgstr "Activer le volet suivant"
@@ -692,7 +690,17 @@ msgstr "Annuler"
 msgid "Error"
 msgstr "Erreur"
 
-msgid "An update is available, do you want to update now?"
+#, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr ""
+"Notes de version :\n"
+"\n"
+"%s"
+
+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 ?"
 
@@ -702,21 +710,11 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr "Impossible de télécharger la mise à jour : %s"
-
 msgid "Current version is up-to-date."
 msgstr "La version actuelle est à jour."
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-"La nouvelle version a été téléchargée - le programme va se fermer et se "
-"mettre à jour..."
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr "Impossible d'installer la mise à jour : %s"
+msgid "Check synchronisation configuration"
+msgstr "Vérifier config synchronisation"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -872,6 +870,12 @@ msgstr ""
 "Il n'y a pour l'instant aucun carnet. Créez-en un en cliquant sur \"Nouveau "
 "carnet\"."
 
+msgid "Open..."
+msgstr "Ouvrir..."
+
+msgid "Save as..."
+msgstr "Enregistrer sous..."
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Lien ou message non géré : %s"
@@ -879,9 +883,22 @@ msgstr "Lien ou message non géré : %s"
 msgid "Attach file"
 msgstr "Attacher un fichier"
 
+msgid "Tags"
+msgstr "Étiquettes"
+
 msgid "Set alarm"
 msgstr "Régler alarme"
 
+msgid "to-do"
+msgstr "tâche"
+
+msgid "note"
+msgstr "note"
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr "Création de %s..."
+
 msgid "Refresh"
 msgstr "Rafraîchir"
 
@@ -918,9 +935,6 @@ msgstr "Synchroniser"
 msgid "Notebooks"
 msgstr "Carnets"
 
-msgid "Tags"
-msgstr "Étiquettes"
-
 msgid "Searches"
 msgstr "Recherches"
 
@@ -1348,6 +1362,17 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
+#~ msgid "Could not download the update: %s"
+#~ msgstr "Impossible de télécharger la mise à jour : %s"
+
+#~ msgid "New version downloaded - application will quit now and update..."
+#~ msgstr ""
+#~ "La nouvelle version a été téléchargée - le programme va se fermer et se "
+#~ "mettre à jour..."
+
+#~ msgid "Could not install the update: %s"
+#~ msgstr "Impossible d'installer la mise à jour : %s"
+
 #~ msgid ""
 #~ "The target to synchonise to. If synchronising with the file system, set "
 #~ "`sync.2.path` to specify the target directory."

CliClient/locales/hr_HR.po

@@ -695,7 +695,14 @@ msgstr "Odustani"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Obriši bilješke?"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -705,19 +712,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Prekini sinkronizaciju"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -856,6 +856,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Ovdje nema bilježnica. Stvori novu pritiskom na \"Nova bilježnica\"."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Spremi promjene"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana poveznica ili poruka: %s"
@@ -863,9 +870,24 @@ msgstr "Nepodržana poveznica ili poruka: %s"
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
+msgid "Tags"
+msgstr "Oznake"
+
 msgid "Set alarm"
 msgstr "Postavi upozorenje"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Novi zadatak"
+
+#, fuzzy
+msgid "note"
+msgstr "Nova bilješka"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Uvozim bilješke..."
+
 msgid "Refresh"
 msgstr "Osvježi"
 
@@ -902,9 +924,6 @@ msgstr "Sinkroniziraj"
 msgid "Notebooks"
 msgstr "Bilježnice"
 
-msgid "Tags"
-msgstr "Oznake"
-
 msgid "Searches"
 msgstr "Pretraživanja"
 

CliClient/locales/it_IT.po

@@ -673,7 +673,14 @@ msgstr "Cancella"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Eliminare le note?"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -683,19 +690,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Cancella la sincronizzazione"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -835,6 +835,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Salva i cambiamenti"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Collegamento o messaggio non supportato: %s"
@@ -842,9 +849,24 @@ msgstr "Collegamento o messaggio non supportato: %s"
 msgid "Attach file"
 msgstr "Allega file"
 
+msgid "Tags"
+msgstr "Etichette"
+
 msgid "Set alarm"
 msgstr "Imposta allarme"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Nuova attività"
+
+#, fuzzy
+msgid "note"
+msgstr "Nuova nota"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Importazione delle note..."
+
 msgid "Refresh"
 msgstr "Aggiorna"
 
@@ -881,9 +903,6 @@ msgstr "Sincronizza"
 msgid "Notebooks"
 msgstr "Blocchi note"
 
-msgid "Tags"
-msgstr "Etichette"
-
 msgid "Searches"
 msgstr "Ricerche"
 

CliClient/locales/ja_JP.po

@@ -672,7 +672,14 @@ msgstr "キャンセル"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "ノートを削除しますか？"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -681,19 +688,12 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "同期の中止"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -836,6 +836,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "ノートブックがありません。新しいノートブックを作成してください。"
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "変更を保存"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -843,9 +850,24 @@ msgstr ""
 msgid "Attach file"
 msgstr "ファイルを添付"
 
+msgid "Tags"
+msgstr "タグ"
+
 msgid "Set alarm"
 msgstr "アラームをセット"
 
+#, fuzzy
+msgid "to-do"
+msgstr "新しいToDo"
+
+#, fuzzy
+msgid "note"
+msgstr "新しいノート"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "ノートのインポート…"
+
 msgid "Refresh"
 msgstr "更新"
 
@@ -882,9 +904,6 @@ msgstr "同期"
 msgid "Notebooks"
 msgstr "ノートブック"
 
-msgid "Tags"
-msgstr "タグ"
-
 msgid "Searches"
 msgstr "検索"
 

CliClient/locales/joplin.pot

@@ -615,7 +615,14 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -624,18 +631,10 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
+msgid "Check synchronisation configuration"
 msgstr ""
 
 #, javascript-format
@@ -772,6 +771,12 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Open..."
+msgstr ""
+
+msgid "Save as..."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -779,9 +784,22 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Set alarm"
 msgstr ""
 
+msgid "to-do"
+msgstr ""
+
+msgid "note"
+msgstr ""
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr ""
+
 msgid "Refresh"
 msgstr ""
 
@@ -818,9 +836,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Searches"
 msgstr ""
 

CliClient/locales/nl_BE.po

@@ -690,7 +690,14 @@ msgstr "Annuleer"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Notities verwijderen?"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -700,19 +707,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Annuleer synchronisatie"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -864,6 +864,13 @@ msgstr ""
 "U heeft momenteel geen notitieboek. Maak een notitieboek door op \"Nieuw "
 "notitieboek\" te klikken."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Sla wijzigingen op"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Link of bericht \"%s\" wordt niet ondersteund"
@@ -871,9 +878,24 @@ msgstr "Link of bericht \"%s\" wordt niet ondersteund"
 msgid "Attach file"
 msgstr "Voeg bestand toe"
 
+msgid "Tags"
+msgstr "Tags"
+
 msgid "Set alarm"
 msgstr "Zet melding"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Nieuwe to-do"
+
+#, fuzzy
+msgid "note"
+msgstr "Nieuwe notitie"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Notities importeren..."
+
 msgid "Refresh"
 msgstr "Vernieuwen"
 
@@ -910,9 +932,6 @@ msgstr "Synchroniseer"
 msgid "Notebooks"
 msgstr "Notitieboeken"
 
-msgid "Tags"
-msgstr "Tags"
-
 msgid "Searches"
 msgstr "Zoekopdrachten"
 

CliClient/locales/pt_BR.po

@@ -668,7 +668,14 @@ msgstr "Cancelar"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Excluir notas?"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -678,19 +685,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Cancelar sincronização"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -832,6 +832,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Atualmente, não há notas. Crie uma, clicando no botão (+)."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Gravar alterações"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Link ou mensagem não suportada: %s"
@@ -839,9 +846,24 @@ msgstr "Link ou mensagem não suportada: %s"
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
+msgid "Tags"
+msgstr "Tags"
+
 msgid "Set alarm"
 msgstr "Definir alarme"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Nova tarefa"
+
+#, fuzzy
+msgid "note"
+msgstr "Nova nota"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Importando notas ..."
+
 msgid "Refresh"
 msgstr "Atualizar"
 
@@ -879,9 +901,6 @@ msgstr "Sincronizar"
 msgid "Notebooks"
 msgstr "Cadernos"
 
-msgid "Tags"
-msgstr "Tags"
-
 msgid "Searches"
 msgstr "Pesquisas"
 

CliClient/locales/ru_RU.po

@@ -689,7 +689,15 @@ msgstr "Отмена"
 msgid "Error"
 msgstr "Ошибка"
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Удалить заметки?"
+
+#, fuzzy
+msgid "An update is available, do you want to download it now?"
 msgstr "Доступно обновление. Обновить сейчас?"
 
 msgid "Yes"
@@ -699,20 +707,12 @@ msgstr ""
 msgid "No"
 msgstr "N"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr "Не удалось загрузить обновление: %s"
-
 msgid "Current version is up-to-date."
 msgstr "Вы используете самую свежую версию."
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-"Новая версия загружена — приложение сейчас будет закрыто и обновлено..."
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr "Не удалось установить обновление: %s"
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Отменить синхронизацию"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -861,6 +861,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "Сейчас здесь нет блокнотов. Создайте новый нажав «Новый блокнот»."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Сохранить изменения"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Неподдерживаемая ссыка или сообщение: %s"
@@ -868,9 +875,24 @@ msgstr "Неподдерживаемая ссыка или сообщение: %
 msgid "Attach file"
 msgstr "Прикрепить файл"
 
+msgid "Tags"
+msgstr "Теги"
+
 msgid "Set alarm"
 msgstr "Установить напоминание"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Новая задача"
+
+#, fuzzy
+msgid "note"
+msgstr "Новая заметка"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Импорт заметок..."
+
 msgid "Refresh"
 msgstr "Обновить"
 
@@ -907,9 +929,6 @@ msgstr "Синхронизировать"
 msgid "Notebooks"
 msgstr "Блокноты"
 
-msgid "Tags"
-msgstr "Теги"
-
 msgid "Searches"
 msgstr "Запросы"
 
@@ -1335,6 +1354,16 @@ msgstr "У вас сейчас нет блокнота. Создайте его
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
+#~ msgid "Could not download the update: %s"
+#~ msgstr "Не удалось загрузить обновление: %s"
+
+#~ msgid "New version downloaded - application will quit now and update..."
+#~ msgstr ""
+#~ "Новая версия загружена — приложение сейчас будет закрыто и обновлено..."
+
+#~ msgid "Could not install the update: %s"
+#~ msgstr "Не удалось установить обновление: %s"
+
 #~ msgid ""
 #~ "The target to synchonise to. If synchronising with the file system, set "
 #~ "`sync.2.path` to specify the target directory."

CliClient/locales/zh_CN.po

@@ -639,7 +639,14 @@ msgstr "取消"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "是否删除笔记？"
+
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
 msgid "Yes"
@@ -649,19 +656,12 @@ msgstr ""
 msgid "No"
 msgstr "否"
 
-#, javascript-format
-msgid "Could not download the update: %s"
-msgstr ""
-
 msgid "Current version is up-to-date."
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
-
-#, javascript-format
-msgid "Could not install the update: %s"
-msgstr ""
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "取消同步"
 
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
@@ -801,6 +801,13 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr "当前无笔记。点击(+)创建新笔记。"
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "保存更改"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "不支持的链接或信息：%s"
@@ -808,9 +815,24 @@ msgstr "不支持的链接或信息：%s"
 msgid "Attach file"
 msgstr "附加文件"
 
+msgid "Tags"
+msgstr "标签"
+
 msgid "Set alarm"
 msgstr "设置提醒"
 
+#, fuzzy
+msgid "to-do"
+msgstr "新待办事项"
+
+#, fuzzy
+msgid "note"
+msgstr "新笔记"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "正在导入笔记..."
+
 msgid "Refresh"
 msgstr "刷新"
 
@@ -847,9 +869,6 @@ msgstr "同步"
 msgid "Notebooks"
 msgstr "笔记本"
 
-msgid "Tags"
-msgstr "标签"
-
 msgid "Searches"
 msgstr "搜索历史"
 

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "0.10.93",
+  "version": "1.0.95",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -64,6 +64,11 @@
         }
       }
     },
+    "async-mutex": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.3.tgz",
+      "integrity": "sha1-Cq0hEjaXlas/F+M3RFVtLs9UdWY="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",

CliClient/package.json

@@ -19,7 +19,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "0.10.93",
+  "version": "1.0.95",
   "bin": {
     "joplin": "./main.js"
   },
@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "app-module-path": "^2.2.0",
+    "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
     "compare-version": "^0.1.2",
     "follow-redirects": "^1.2.4",

CliClient/tests/synchronizer.js

@@ -60,6 +60,7 @@ async function allSyncTargetItemsEncrypted() {
 }
 
 async function localItemsSameAsRemote(locals, expect) {
+	let error = null;
 	try {
 		let files = await fileApi().list();
 		files = files.items;
@@ -81,12 +82,15 @@ async function localItemsSameAsRemote(locals, expect) {
 			// }
 
 			let remoteContent = await fileApi().get(path);
+
 			remoteContent = dbItem.type_ == BaseModel.TYPE_NOTE ? await Note.unserialize(remoteContent) : await Folder.unserialize(remoteContent);
 			expect(remoteContent.title).toBe(dbItem.title);
 		}
-	} catch (error) {
-		console.error(error);
+	} catch (e) {
+		error = e;
 	}
+
+	expect(error).toBe(null);
 }
 
 let insideBeforeEach = false;
@@ -985,4 +989,15 @@ describe('Synchronizer', function() {
 		expect(resource1.encryption_blob_encrypted).toBe(0);
 	}));
 
+	it('should create remote items with UTF-8 content', asyncTest(async () => {
+		let folder = await Folder.save({ title: "Fahrräder" });
+		await Note.save({ title: "Fahrräder", body: "Fahrräder", parent_id: folder.id });
+
+		let all = await allItems();
+
+		await synchronizer().start();
+
+		await localItemsSameAsRemote(all, expect);
+	}));
+
 });

ElectronClient/app/gui/ConfigScreen.jsx

@@ -15,10 +15,6 @@ class ConfigScreenComponent extends React.Component {
 	constructor() {
 		super();
 
-		this.state = {
-			settings: {},
-		};
-
 		shared.init(this);
 
 		this.checkSyncConfig_ = async () => {
@@ -68,9 +64,7 @@ class ConfigScreenComponent extends React.Component {
 		};
 
 		const updateSettingValue = (key, value) => {
-			const settings = Object.assign({}, this.state.settings);
-			settings[key] = Setting.formatValue(key, value);
-			this.setState({ settings: settings });
+			return shared.updateSettingValue(this, key, value);
 		}
 
 		// Component key needs to be key+value otherwise it doesn't update when the settings change.
@@ -142,10 +136,7 @@ class ConfigScreenComponent extends React.Component {
 	}
 
 	onSaveClick() {
-		for (let n in this.state.settings) {
-			if (!this.state.settings.hasOwnProperty(n)) continue;
-			Setting.setValue(n, this.state.settings[n]);
-		}
+		shared.saveSettings(this);
 		this.props.dispatch({ type: 'NAV_BACK' });
 	}
 
@@ -167,24 +158,11 @@ class ConfigScreenComponent extends React.Component {
 		};
 
 		const buttonStyle = {
-			display: this.state.settings === this.props.settings ? 'none' : 'inline-block',
+			display: this.state.changedSettingKeys.length ? 'inline-block' : 'none',
 			marginRight: 10,
 		}
 
-		let settingComps = [];
-		let keys = Setting.keys(true, 'desktop');
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			if (!(key in settings)) {
-				console.warn('Missing setting: ' + key);
-				continue;
-			}
-			const md = Setting.settingMetadata(key);
-			if (md.show && !md.show(settings)) continue;
-			const comp = this.settingToComponent(key, settings[key]);
-			if (!comp) continue;
-			settingComps.push(comp);
-		}
+		const settingComps = shared.settingsToComponents(this, 'desktop', settings);
 
 		const syncTargetMd = SyncTargetRegistry.idToMetadata(settings['sync.target']);
 

ElectronClient/app/gui/EncryptionConfigScreen.jsx

@@ -182,7 +182,7 @@ class EncryptionConfigScreenComponent extends React.Component {
 			<div>
 				<Header style={headerStyle} />
 				<div style={containerStyle}>
-					<div style={{backgroundColor: theme.warningBackgroundColor, paddingLeft: 10, paddingRight: 10, paddingTop: 2, paddingBottom: 2 }}>
+					{/*<div style={{backgroundColor: theme.warningBackgroundColor, paddingLeft: 10, paddingRight: 10, paddingTop: 2, paddingBottom: 2 }}>
 						<p style={theme.textStyle}>
 							Important: This is a <b>beta</b> feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain.
 						</p>
@@ -192,7 +192,7 @@ class EncryptionConfigScreenComponent extends React.Component {
 						<p style={theme.textStyle}>
 							For more information about End-To-End Encryption (E2EE) and how it is going to work, please check the documentation: <a onClick={() => {bridge().openExternal('http://joplin.cozic.net/help/e2ee.html')}} href="#">http://joplin.cozic.net/help/e2ee.html</a>
 						</p>
-					</div>
+					</div>*/}
 					<h1 style={theme.h1Style}>{_('Status')}</h1>
 					<p style={theme.textStyle}>{_('Encryption is:')} <strong>{this.props.encryptionEnabled ? _('Enabled') : _('Disabled')}</strong></p>
 					{decryptedItemsInfo}

ElectronClient/app/gui/ImportScreen.jsx

@@ -25,9 +25,7 @@ class ImportScreenComponent extends React.Component {
 				doImport: true,
 				filePath: newProps.filePath,
 				messages: [],
-			});
-
-			this.doImport();
+			}, () => { this.doImport() });
 		}
 	}
 

ElectronClient/app/gui/NoteText.jsx

@@ -16,6 +16,7 @@ const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
 const { shim } = require('lib/shim.js');
 const eventManager = require('../eventManager');
+const fs = require('fs-extra');
 
 require('brace/mode/markdown');
 // https://ace.c9.io/build/kitchen-sink.html
@@ -264,7 +265,7 @@ class NoteTextComponent extends React.Component {
 		shared.showMetadata_onPress(this);
 	}
 
-	webview_ipcMessage(event) {
+	async webview_ipcMessage(event) {
 		const msg = event.channel ? event.channel : '';
 		const args = event.args;
 		const arg0 = args && args.length >= 1 ? args[0] : null;
@@ -286,6 +287,32 @@ class NoteTextComponent extends React.Component {
 		} else if (msg === 'percentScroll') {
 			this.ignoreNextEditorScroll_ = true;
 			this.setEditorPercentScroll(arg0);
+		} else if (msg === 'contextMenu') {
+			const itemType = arg0 && arg0.type;
+
+			const menu = new Menu()
+
+			if (itemType === 'image') {
+				const resource = await Resource.load(arg0.resourceId);
+				const resourcePath = Resource.fullPath(resource);
+
+				menu.append(new MenuItem({label: _('Open...'), click: async () => {
+					bridge().openExternal(resourcePath);
+				}}));
+
+				menu.append(new MenuItem({label: _('Save as...'), click: async () => {
+					const filePath = bridge().showSaveDialog({
+						defaultPath: resource.filename ? resource.filename : resource.title,
+					});
+					if (!filePath) return;
+					await fs.copy(resourcePath, filePath);
+				}}));
+			} else {
+				reg.logger().error('Unhandled item type: ' + itemType);
+				return;
+			}
+
+			menu.popup(bridge().window());
 		} else if (msg.indexOf('joplin://') === 0) {
 			const resourceId = msg.substr('joplin://'.length);
 			Resource.load(resourceId).then((resource) => {
@@ -438,6 +465,16 @@ class NoteTextComponent extends React.Component {
 		});
 	}
 
+	async commandSetTags() {
+		await this.saveIfNeeded(true);
+
+		this.props.dispatch({
+			type: 'WINDOW_COMMAND',
+			name: 'setTags',
+			noteId: this.state.note.id,
+		});
+	}
+
 	itemContextMenu(event) {
 		const note = this.state.note;
 		if (!note) return;
@@ -448,6 +485,10 @@ class NoteTextComponent extends React.Component {
 			return this.commandAttachFile();
 		}}));
 
+		menu.append(new MenuItem({label: _('Tags'), click: async () => {
+			return this.commandSetTags();
+		}}));
+
 		if (!!note.is_todo) {
 			menu.append(new MenuItem({label: _('Set alarm'), click: async () => {
 				return this.commandSetAlarm();
@@ -571,6 +612,12 @@ class NoteTextComponent extends React.Component {
 			onClick: () => { return this.commandAttachFile(); },
 		});
 
+		toolbarItems.push({
+			title: _('Tags'),
+			iconName: 'fa-tags',
+			onClick: () => { return this.commandSetTags(); },
+		});
+
 		if (note.is_todo) {
 			toolbarItems.push({
 				title: Note.needAlarm(note) ? time.formatMsToLocal(note.todo_due) : _('Set alarm'),

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

@@ -180,6 +180,16 @@
 		ipcRenderer.sendToHost('percentScroll', percent);
 	});
 
+	document.addEventListener('contextmenu', function(event) {
+		const element = event.target;
+		if (element && element.getAttribute('data-resource-id')) {
+			ipcRenderer.sendToHost('contextMenu', {
+				type: element.getAttribute('src') ? 'image' : 'link',
+				resourceId: element.getAttribute('data-resource-id'),
+			});
+		}
+	});
+
 	// Disable drag and drop otherwise it's possible to drop a URL
 	// on it and it will open in the view as a website.
 	document.addEventListener('drop', function(e) {

ElectronClient/app/locales/index.js

@@ -3,6 +3,7 @@ locales['en_GB'] = require('./en_GB.json');
 locales['de_DE'] = require('./de_DE.json');
 locales['es_CR'] = require('./es_CR.json');
 locales['es_ES'] = require('./es_ES.json');
+locales['eu'] = require('./eu.json');
 locales['fr_FR'] = require('./fr_FR.json');
 locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');

ElectronClient/app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "0.10.60",
+  "version": "1.0.63",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -237,6 +237,11 @@
       "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
       "dev": true
     },
+    "async-mutex": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.3.tgz",
+      "integrity": "sha1-Cq0hEjaXlas/F+M3RFVtLs9UdWY="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",

ElectronClient/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "0.10.60",
+  "version": "1.0.63",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {
@@ -55,6 +55,7 @@
   },
   "dependencies": {
     "app-module-path": "^2.2.0",
+    "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
     "electron-context-menu": "^0.9.1",
     "electron-log": "^2.2.11",

ElectronClient/app/update-readme-download.js

@@ -79,6 +79,10 @@ async function main(argv) {
 	const macOsUrl = downloadUrl(release, 'macos');
 	const linuxUrl = downloadUrl(release, 'linux');
 
+	console.info('Windows: ', winUrl);
+	console.info('macOS: ', macOsUrl);
+	console.info('Linux: ', linuxUrl);
+
 	let content = readmeContent();
 
 	if (winUrl) content = content.replace(/(https:\/\/github.com\/laurent22\/joplin\/releases\/download\/.*?\.exe)/, winUrl);

README.md

@@ -6,7 +6,7 @@ Notes exported from Evernote via .enex files [can be imported](#importing-notes-
 
 The notes can be [synchronised](#synchronisation) with various targets including [Nextcloud](https://nextcloud.com/), the file system (for example with a network directory) or with Microsoft OneDrive. When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.
 
-Joplin is still under development but is out of Beta and should be suitable for every day use. The UI of the terminal client is built on top of the great [terminal-kit](https://github.com/cronvel/terminal-kit) library, the desktop client using [Electron](https://electronjs.org/), and the Android client front end is done using [React Native](https://facebook.github.io/react-native/).
+The UI of the terminal client is built on top of the great [terminal-kit](https://github.com/cronvel/terminal-kit) library, the desktop client using [Electron](https://electronjs.org/), and the Android client front end is done using [React Native](https://facebook.github.io/react-native/).
 
 <div class="top-screenshot"><img src="https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/AllClients.jpg" style="max-width: 100%; max-height: 35em;"></div>
 
@@ -18,15 +18,15 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download
 -----------------|--------
-Windows          | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.59/Joplin-Setup-0.10.59.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a>
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.59/Joplin-0.10.59.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a>
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v0.10.59/Joplin-0.10.59-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a>
+Windows          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.62/Joplin-Setup-1.0.62.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a>
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.62/Joplin-1.0.62.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a>
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.62/Joplin-1.0.62-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a>
 
 ## Mobile applications
 
 Operating System | Download | Alt. Download
 -----------------|----------|----------------
-Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin/releases/download/android-v0.10.88/joplin-v0.10.88.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://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.97/joplin-v1.0.97.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -51,13 +51,15 @@ For usage information, please refer to the full [Joplin Terminal Application Doc
 # Features 
 
 - Desktop, mobile and terminal applications.
+- Import Enex files (Evernote export format)
 - Support notes, to-dos, tags and notebooks.
+- Support for alarms (notifications) in mobile and desktop applications.
 - Offline first, so the entire data is always available on the device even without an internet connection.
-- Ability to synchronise with multiple targets, including NextCloud, the file system and OneDrive (Dropbox is planned).
+- Synchronisation with various services, including NextCloud, WebDAV and OneDrive. Dropbox is planned.
+- End To End Encryption (E2EE)
 - Synchronises to a plain text format, which can be easily manipulated, backed up, or exported to a different format.
-- Markdown notes, which are rendered with images and formatting in the desktop and mobile applications.
-- Tag support
-- File attachment support (images are displayed, and other files are linked and can be opened in the relevant application).
+- Markdown notes, which are rendered with images and formatting in the desktop and mobile applications. Support for extra features such as math notation and checkboxes.
+- File attachment support - images are displayed, and other files are linked and can be opened in the relevant application.
 - Search functionality.
 - Geo-location support.
 - Supports multiple languages
@@ -91,8 +93,6 @@ Currently, synchronisation is possible with Nextcloud and OneDrive (by default)
 
 ## Nextcloud synchronisation
 
-**Important: This is a beta feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain. If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup the profile directory of the desktop or terminal application.**
-
 On the **desktop application** or **mobile application**, go to the config screen and select Nextcloud as the synchronisation target. Then input [the WebDAV URL](https://docs.nextcloud.com/server/9/user_manual/files/access_webdav.html), this is normally `https://example.com/nextcloud/remote.php/dav/files/USERNAME/Joplin` (make sure to create the "Joplin" directory in Nextcloud and to replace USERNAME by your Nextcloud username), and set the username and password.
 
 On the **terminal application**, you will need to set the `sync.target` config variable and all the `sync.5.path`, `sync.5.username` and `sync.5.password` config variables to, respectively the Nextcloud WebDAV URL, your username and your password. This can be done from the command line mode using:
@@ -106,10 +106,14 @@ If synchronisation does not work, please consult the logs in the app profile dir
 
 ## WebDAV synchronisation
 
-**Important: This is a beta feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain. If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup the profile directory of the desktop or terminal application.**
-
 Select the "WebDAV" synchronisation target and follow the same instructions as for Nextcloud above.
 
+Known compatible services that use WebDAV:
+
+- [Box.com](https://www.box.com/)
+- [DriveHQ](https://www.drivehq.com)
+- [Zimbra](https://www.zimbra.com/)
+
 ## OneDrive synchronisation
 
 When syncing with OneDrive, Joplin creates a sub-directory in OneDrive, in /Apps/Joplin and read/write the notes and notebooks from it. The application does not have access to anything outside this directory.
@@ -200,28 +204,21 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Code  |  Last translator  |  Percent done
 ---|---|---|---|---
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/es/basque_country.png)  |  Basque  |  eu  |  juan.abasolo@ehu.eus  |  89%
 ![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/hr.png)  |  Croatian  |  hr_HR  |  Hrvoje Mandić <trbuhom@net.hr>  |  72%
-![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png)  |  Deutsch  |  de_DE  |  Tobias Strobel <git@strobeltobias.de>  |  92%
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png)  |  Deutsch  |  de_DE  |  Tobias Strobel <git@strobeltobias.de>  |  91%
 ![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/gb.png)  |  English  |  en_GB  |    |  100%
-![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/es.png)  |  Español  |  es_ES  |  Lucas Vieites  |  80%
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/es.png)  |  Español  |  es_ES  |  Lucas Vieites  |  79%
 ![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cr.png)  |  Español (Costa Rica)  |  es_CR  |    |  68%
 ![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/fr.png)  |  Français  |  fr_FR  |  Laurent Cozic  |  100%
-![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/it.png)  |  Italiano  |  it_IT  |    |  76%
-![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/be.png)  |  Nederlands  |  nl_BE  |    |  90%
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/it.png)  |  Italiano  |  it_IT  |    |  75%
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/be.png)  |  Nederlands  |  nl_BE  |    |  89%
 ![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/br.png)  |  Português (Brasil)  |  pt_BR  |    |  74%
-![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png)  |  Русский  |  ru_RU  |  Artyom Karlov <artyom.karlov@gmail.com>  |  96%
-![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png)  |  中文 (简体)  |  zh_CN  |  RCJacH <RCJacH@outlook.com>  |  76%
-![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/jp.png)  |  日本語  |  ja_JP  |    |  74%
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png)  |  Русский  |  ru_RU  |  Artyom Karlov <artyom.karlov@gmail.com>  |  94%
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png)  |  中文 (简体)  |  zh_CN  |  RCJacH <RCJacH@outlook.com>  |  75%
+![](https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/jp.png)  |  日本語  |  ja_JP  |    |  73%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
-# Coming features
-
-- Mobile: manage tags
-- Windows: Tray icon
-- Desktop apps: Tag auto-complete
-- Desktop apps: Dark theme
-- Linux: Enable auto-update for desktop app
-
 # Known bugs
 
 - Non-alphabetical characters such as Chinese or Arabic might create glitches in the terminal on Windows. This is a limitation of the current Windows console.

README_terminal.md

@@ -244,7 +244,7 @@ The following commands are available in [command-line mode](#command-line-mode):
 	                           Possible values: HH:mm (20:30), h:mm A (8:30 PM).
 	                           Default: "HH:mm"
 	                           
-	    uncompletedTodosOnTop  Show uncompleted todos on top of the lists.
+	    uncompletedTodosOnTop  Show uncompleted to-dos on top of the lists.
 	                           Type: bool.
 	                           Default: true
 	                           

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 22
-		versionCode 2097266
-		versionName "0.10.88"
+		versionCode 2097275
+		versionName "1.0.97"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}

ReactNativeClient/lib/BaseModel.js

@@ -2,6 +2,7 @@ const { Log } = require('lib/log.js');
 const { Database } = require('lib/database.js');
 const { uuid } = require('lib/uuid.js');
 const { time } = require('lib/time-utils.js');
+const Mutex = require('async-mutex').Mutex;
 
 class BaseModel {
 
@@ -247,6 +248,40 @@ class BaseModel {
 		return !Object.getOwnPropertyNames(diff).length;
 	}
 
+	static saveMutex(modelOrId) {
+		const noLockMutex = {
+			acquire: function() { return null; }
+		};
+
+		if (!modelOrId) return noLockMutex;
+
+		let modelId = typeof modelOrId === 'string' ? modelOrId : modelOrId.id;
+
+		if (!modelId) return noLockMutex;
+
+		let mutex = BaseModel.saveMutexes_[modelId];
+		if (mutex) return mutex;
+
+		mutex = new Mutex();
+		BaseModel.saveMutexes_[modelId] = mutex;
+		return mutex;
+	}
+
+	static releaseSaveMutex(modelOrId, release) {
+		if (!release) return;
+		if (!modelOrId) return release();
+
+		let modelId = typeof modelOrId === 'string' ? modelOrId : modelOrId.id;
+
+		if (!modelId) return release();
+
+		let mutex = BaseModel.saveMutexes_[modelId];
+		if (!mutex) return release();
+
+		delete BaseModel.saveMutexes_[modelId];
+		release();
+	}
+
 	static saveQuery(o, options) {
 		let temp = {}
 		let fieldNames = this.fieldNames();
@@ -320,7 +355,16 @@ class BaseModel {
 		return query;
 	}
 
-	static save(o, options = null) {
+	static async save(o, options = null) {
+		// When saving, there's a mutex per model ID. This is because the model returned from this function
+		// is basically its input `o` (instead of being read from the database, for performance reasons).
+		// This works well in general except if that model is saved simultaneously in two places. In that
+		// case, the output won't be up-to-date and would cause for example display issues with out-dated
+		// notes being displayed. This was an issue when notes were being synchronised while being decrypted
+		// at the same time.
+
+		const mutexRelease = await this.saveMutex(o).acquire();
+
 		options = this.modOptions(options);
 		options.isNew = this.isNew(o, options);
 
@@ -348,7 +392,11 @@ class BaseModel {
 			queries = queries.concat(options.nextQueries);
 		}
 
-		return this.db().transactionExecBatch(queries).then(() => {
+		let output = null;
+
+		try {
+			await this.db().transactionExecBatch(queries);
+
 			o = Object.assign({}, o);
 			if (modelId) o.id = modelId;
 			if ('updated_time' in saveQuery.modObject) o.updated_time = saveQuery.modObject.updated_time;
@@ -365,10 +413,14 @@ class BaseModel {
 				}
 			}
 
-			return this.filter(o);
-		}).catch((error) => {
+			output = this.filter(o);
+		} catch (error) {
 			Log.error('Cannot save model', error);
-		});
+		}
+
+		this.releaseSaveMutex(o, mutexRelease);
+
+		return output;
 	}
 
 	static isNew(object, options) {
@@ -447,5 +499,6 @@ BaseModel.TYPE_MASTER_KEY = 9;
 
 BaseModel.db_ = null;
 BaseModel.dispatch = function(o) {};
+BaseModel.saveMutexes_ = {};
 
 module.exports = BaseModel;

ReactNativeClient/lib/MdToHtml.js

@@ -117,7 +117,7 @@ class MdToHtml {
 		if (mime == 'image/png' || mime == 'image/jpg' || mime == 'image/jpeg' || mime == 'image/gif') {
 			let src = './' + Resource.filename(resource);
 			if (this.resourceBaseUrl_ !== null) src = this.resourceBaseUrl_ + src;
-			let output = '<img title="' + htmlentities(title) + '" src="' + src + '"/>';
+			let output = '<img data-resource-id="' + resource.id + '" title="' + htmlentities(title) + '" src="' + src + '"/>';
 			return output;
 		}
 		

ReactNativeClient/lib/SyncTargetNextcloud.js

@@ -25,7 +25,7 @@ class SyncTargetNextcloud extends BaseSyncTarget {
 	}
 
 	static label() {
-		return _('Nextcloud (Beta)');
+		return _('Nextcloud');
 	}
 
 	isAuthenticated() {

ReactNativeClient/lib/SyncTargetWebDAV.js

@@ -21,7 +21,7 @@ class SyncTargetWebDAV extends BaseSyncTarget {
 	}
 
 	static label() {
-		return _('WebDAV (Beta)');
+		return _('WebDAV');
 	}
 
 	isAuthenticated() {

ReactNativeClient/lib/WebDavApi.js

@@ -133,6 +133,42 @@ class WebDavApi {
 		return this.valueFromJson(json, keys, 'array');
 	}
 
+	resourcePropByName(resource, outputType, propName) {
+		const propStats = resource['d:propstat'];
+		let output = null;
+		if (!Array.isArray(propStats)) throw new Error('Missing d:propstat property');
+		for (let i = 0; i < propStats.length; i++) {
+			const props = propStats[i]['d:prop'];
+			if (!Array.isArray(props) || !props.length) continue;
+			const prop = props[0];
+			if (Array.isArray(prop[propName])) {
+				output = prop[propName];
+				break;
+			}
+		}
+
+		if (outputType === 'string') {
+			// If the XML has not attribute the value is directly a string
+			// If the XML node has attributes, the value is under "_".
+			// Eg for this XML, the string will be under {"_":"Thu, 01 Feb 2018 17:24:05 GMT"}:
+			// <a:getlastmodified b:dt="dateTime.rfc1123">Thu, 01 Feb 2018 17:24:05 GMT</a:getlastmodified>
+			// For this XML, the value will be "Thu, 01 Feb 2018 17:24:05 GMT"
+			// <a:getlastmodified>Thu, 01 Feb 2018 17:24:05 GMT</a:getlastmodified>
+
+			output = output[0];
+
+			if (typeof output === 'object' && '_' in output) output = output['_'];
+			if (typeof output !== 'string') return null;
+			return output;
+		}
+
+		if (outputType === 'array') {
+			return output;
+		}
+
+		throw new Error('Invalid output type: ' + outputType);
+	}
+
 	async execPropFind(path, depth, fields = null, options = null) {
 		if (fields === null) fields = ['d:getlastmodified'];
 
@@ -158,6 +194,22 @@ class WebDavApi {
 		return this.exec('PROPFIND', path, body, { 'Depth': depth }, options);
 	}
 
+	requestToCurl_(url, options) {
+		let output = [];
+		output.push('curl');
+		if (options.method) output.push('-X ' + options.method);
+		if (options.headers) {
+			for (let n in options.headers) {
+				if (!options.headers.hasOwnProperty(n)) continue;
+				output.push('-H ' + '"' + n + ': ' + options.headers[n] + '"');
+			}
+		}
+		if (options.body) output.push('--data ' + "'" + options.body + "'");
+		output.push(url);
+
+		return output.join(' ');		
+	}	
+
 	// curl -u admin:123456 'http://nextcloud.local/remote.php/dav/files/admin/' -X PROPFIND --data '<?xml version="1.0" encoding="UTF-8"?>
 	//  <d:propfind xmlns:d="DAV:">
 	//    <d:prop xmlns:oc="http://owncloud.org/ns">
@@ -175,7 +227,10 @@ class WebDavApi {
 
 		if (authToken) headers['Authorization'] = 'Basic ' + authToken;
 
-		if (typeof body === 'string') headers['Content-Length'] = body.length;
+		// /!\ Doesn't work with UTF-8 strings as it results in truncated content. Content-Length
+		// /!\ should not be needed anyway, but was required by one service. If re-implementing this
+		// /!\ test with various content, including binary blobs.
+		// if (typeof body === 'string') headers['Content-Length'] = body.length;
 
 		const fetchOptions = {};
 		fetchOptions.headers = headers;
@@ -188,6 +243,7 @@ class WebDavApi {
 		let response = null;
 
 		// console.info('WebDAV Call', method + ' ' + url, headers, options);
+		// console.info(this.requestToCurl_(url, fetchOptions));
 
 		if (options.source == 'file' && (method == 'POST' || method == 'PUT')) {
 			response = await shim.uploadBlob(url, fetchOptions);

ReactNativeClient/lib/components/screens/config.js

@@ -20,11 +20,6 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		super();
 		this.styles_ = {};
 
-		this.state = {
-			settings: {},
-			settingsChanged: false,
-		};
-
 		shared.init(this);
 
 		this.checkSyncConfig_ = async () => {
@@ -32,11 +27,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		}
 
 		this.saveButton_press = () => {
-			for (let n in this.state.settings) {
-				if (!this.state.settings.hasOwnProperty(n)) continue;
-				Setting.setValue(n, this.state.settings[n]);
-			}
-			this.setState({settingsChanged:false});
+			return shared.saveSettings(this);
 		};
 	}
 
@@ -74,6 +65,11 @@ class ConfigScreenComponent extends BaseScreenComponent {
 				fontSize: theme.fontSize,
 				flex: 1,
 			},
+			descriptionText: {
+				color: theme.color,
+				fontSize: theme.fontSize,
+				flex: 1,
+			},
 			settingControl: {
 				color: theme.color,
 				flex: 1,
@@ -113,12 +109,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		let output = null;
 
 		const updateSettingValue = (key, value) => {
-			const settings = Object.assign({}, this.state.settings);
-			settings[key] = value;
-			this.setState({
-				settings: settings,
-				settingsChanged: true,
-			});
+			return shared.updateSettingValue(this, key, value);
 		}
 
 		const md = Setting.settingMetadata(key);
@@ -187,20 +178,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 	render() {
 		const settings = this.state.settings;
 
-		const keys = Setting.keys(true, 'mobile');
-		let settingComps = [];
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			//if (key == 'sync.target' && !settings.showAdvancedOptions) continue;
-			if (!Setting.isPublic(key)) continue;
-
-			const md = Setting.settingMetadata(key);
-			if (md.show && !md.show(settings)) continue;
-
-			const comp = this.settingToComponent(key, settings[key]);
-			if (!comp) continue;
-			settingComps.push(comp);
-		}
+		const settingComps = shared.settingsToComponents(this, 'mobile', settings);
 
 		const syncTargetMd = SyncTargetRegistry.idToMetadata(settings['sync.target']);
 
@@ -208,8 +186,8 @@ class ConfigScreenComponent extends BaseScreenComponent {
 			const messages = shared.checkSyncConfigMessages(this);
 			const statusComp = !messages.length ? null : (
 				<View style={{flex:1, marginTop: 10}}>
-					<Text>{messages[0]}</Text>
-					{messages.length >= 1 ? (<Text style={{marginTop:10}}>{messages[1]}</Text>) : null}
+					<Text style={this.styles().descriptionText}>{messages[0]}</Text>
+					{messages.length >= 1 ? (<View style={{marginTop:10}}><Text style={this.styles().descriptionText}>{messages[1]}</Text></View>) : null}
 				</View>);
 
 			settingComps.push(
@@ -244,7 +222,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 				<ScreenHeader
 					title={_('Configuration')}
 					showSaveButton={true}
-					saveButtonDisabled={!this.state.settingsChanged}
+					saveButtonDisabled={!this.state.changedSettingKeys.length}
 					onSaveButtonPress={this.saveButton_press}
 				/>
 				<ScrollView >

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

@@ -215,12 +215,12 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent {
 				<ScreenHeader title={_('Encryption Config')}/>
 				<ScrollView style={this.styles().container}>
 
-					<View style={{backgroundColor: theme.warningBackgroundColor, padding: 5}}>
+					{/*<View style={{backgroundColor: theme.warningBackgroundColor, padding: 5}}>
 						<Text>Important: This is a *beta* feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain.</Text>
 						<Text>If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup your notes from the desktop or terminal application.</Text>
 						<Text>For more information about End-To-End Encryption (E2EE) and how it is going to work, please check the documentation:</Text>
 						<TouchableOpacity onPress={() => { Linking.openURL('http://joplin.cozic.net/help/e2ee.html') }}><Text>http://joplin.cozic.net/help/e2ee.html</Text></TouchableOpacity>
-					</View>
+					</View>*/}
 
 					<Text style={this.styles().titleText}>{_('Status')}</Text>
 					<Text style={this.styles().normalText}>{_('Encryption is: %s', this.props.encryptionEnabled ? _('Enabled') : _('Disabled'))}</Text>

ReactNativeClient/lib/components/shared/config-shared.js

@@ -7,6 +7,8 @@ const shared = {}
 shared.init = function(comp) {
 	if (!comp.state) comp.state = {};
 	comp.state.checkSyncConfigResult = null;
+	comp.state.settings = {};
+	comp.state.changedSettingKeys = [];
 }
 
 shared.checkSyncConfig = async function(comp, settings) {
@@ -15,7 +17,6 @@ shared.checkSyncConfig = async function(comp, settings) {
 	const options = Setting.subValues('sync.' + syncTargetId, settings);
 	comp.setState({ checkSyncConfigResult: 'checking' });
 	const result = await SyncTargetClass.checkConfig(options);
-	console.info(result);
 	comp.setState({ checkSyncConfigResult: result });
 }
 
@@ -35,4 +36,46 @@ shared.checkSyncConfigMessages = function(comp) {
 	return output;
 }
 
+shared.updateSettingValue = function(comp, key, value) {
+	const settings = Object.assign({}, comp.state.settings);
+	const changedSettingKeys = comp.state.changedSettingKeys.slice();
+	settings[key] = Setting.formatValue(key, value);
+	if (changedSettingKeys.indexOf(key) < 0) changedSettingKeys.push(key);
+
+	comp.setState({
+		settings: settings,
+		changedSettingKeys: changedSettingKeys,
+	});
+}
+
+shared.saveSettings = function(comp) {
+	for (let key in comp.state.settings) {
+		if (!comp.state.settings.hasOwnProperty(key)) continue;
+		if (comp.state.changedSettingKeys.indexOf(key) < 0) continue;
+		console.info("Saving", key, comp.state.settings[key]);
+		Setting.setValue(key, comp.state.settings[key]);
+	}
+
+	comp.setState({ changedSettingKeys: [] });
+}
+
+shared.settingsToComponents = function(comp, device, settings) {
+	const keys = Setting.keys(true, device);
+	const settingComps = [];
+
+	for (let i = 0; i < keys.length; i++) {
+		const key = keys[i];
+		if (!Setting.isPublic(key)) continue;
+
+		const md = Setting.settingMetadata(key);
+		if (md.show && !md.show(settings)) continue;
+
+		const settingComp = comp.settingToComponent(key, settings[key]);
+		if (!settingComp) continue;
+		settingComps.push(settingComp);
+	}
+
+	return settingComps
+}
+
 module.exports = shared;

ReactNativeClient/lib/components/shared/note-screen-shared.js

@@ -30,7 +30,6 @@ shared.saveNoteButton_press = async function(comp) {
 		options.fields = BaseModel.diffObjectsFields(comp.state.lastSavedNote, note);
 	}
 
-
 	const hasAutoTitle = comp.state.newAndNoTitleChangeNoteId || (isNew && !note.title);
 	if (hasAutoTitle) {
 		note.title = Note.defaultTitle(note);

ReactNativeClient/lib/file-api-driver-local.js

@@ -42,7 +42,7 @@ class FileApiDriverLocal {
 	metadataFromStat_(stat) {
 		return {
 			path: stat.path,
-			created_time: stat.birthtime.getTime(),
+			// created_time: stat.birthtime.getTime(),
 			updated_time: stat.mtime.getTime(),
 			isDir: stat.isDirectory(),
 		};

ReactNativeClient/lib/file-api-driver-memory.js

@@ -39,7 +39,7 @@ class FileApiDriverMemory {
 			path: path,
 			isDir: isDir,
 			updated_time: now, // In milliseconds!!
-			created_time: now, // In milliseconds!!
+			// created_time: now, // In milliseconds!!
 			content: '',
 		};
 	}

ReactNativeClient/lib/file-api-driver-onedrive.js

@@ -41,7 +41,7 @@ class FileApiDriverOneDrive {
 		if ('deleted' in odItem) {
 			output.isDeleted = true;
 		} else {
-			output.created_time = moment(odItem.fileSystemInfo.createdDateTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ').format('x');
+			// output.created_time = moment(odItem.fileSystemInfo.createdDateTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ').format('x');
 			output.updated_time = moment(odItem.fileSystemInfo.lastModifiedDateTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ').format('x');
 		}
 

ReactNativeClient/lib/file-api-driver-webdav.js

@@ -18,12 +18,16 @@ class FileApiDriverWebDav {
 		return this.api_;
 	}
 
+	requestRepeatCount() {
+		return 3;
+	}
+
 	async stat(path) {
 		try {
 			const result = await this.api().execPropFind(path, 0, [
 				'd:getlastmodified',
 				'd:resourcetype',
-				'd:getcontentlength', // Remove this once PUT call issue is sorted out
+				// 'd:getcontentlength', // Remove this once PUT call issue is sorted out
 			]);
 
 			const resource = this.api().objectFromJson(result, ['d:multistatus', 'd:response', 0]);
@@ -35,23 +39,41 @@ class FileApiDriverWebDav {
 	}
 
 	statFromResource_(resource, path) {
-		const isCollection = this.api().stringFromJson(resource, ['d:propstat', 0, 'd:prop', 0, 'd:resourcetype', 0, 'd:collection', 0]);
-		const lastModifiedString = this.api().stringFromJson(resource, ['d:propstat', 0, 'd:prop', 0, 'd:getlastmodified', 0]);
+		// WebDAV implementations are always slighly different from one server to another but, at the minimum,
+		// a resource should have a propstat key - if not it's probably an error.
+		const propStat = this.api().arrayFromJson(resource, ['d:propstat']);
+		if (!Array.isArray(propStat)) throw new Error('Invalid WebDAV resource format: ' + JSON.stringify(resource));
 
-		const sizeDONOTUSE = Number(this.api().stringFromJson(resource, ['d:propstat', 0, 'd:prop', 0, 'd:getcontentlength', 0]));
-		if (isNaN(sizeDONOTUSE)) throw new Error('Cannot get content size: ' + JSON.stringify(resource));
+		const resourceTypes = this.api().resourcePropByName(resource, 'array', 'd:resourcetype');
+		let isDir = false;
+		if (Array.isArray(resourceTypes)) {
+			for (let i = 0; i < resourceTypes.length; i++) {
+				const t = resourceTypes[i];
+				if (typeof t === 'object' && 'd:collection' in t) {
+					isDir = true;
+					break;
+				}
+			}
+		}
 
-		if (!lastModifiedString) throw new Error('Could not get lastModified date: ' + JSON.stringify(resource));
+		const lastModifiedString = this.api().resourcePropByName(resource, 'string', 'd:getlastmodified');	
 
-		const lastModifiedDate = new Date(lastModifiedString);
+		// const sizeDONOTUSE = Number(this.api().stringFromJson(resource, ['d:propstat', 0, 'd:prop', 0, 'd:getcontentlength', 0]));
+		// if (isNaN(sizeDONOTUSE)) throw new Error('Cannot get content size: ' + JSON.stringify(resource));
+
+
+		// Note: Not all WebDAV servers return a getlastmodified date (eg. Seafile, which doesn't return the
+		// property for folders) so we can only throw an error if it's a file.
+		if (!lastModifiedString && !isDir) throw new Error('Could not get lastModified date for resource: ' + JSON.stringify(resource));
+		const lastModifiedDate = lastModifiedString ? new Date(lastModifiedString) : new Date();
 		if (isNaN(lastModifiedDate.getTime())) throw new Error('Invalid date: ' + lastModifiedString);
 
 		return {
 			path: path,
-			created_time: lastModifiedDate.getTime(),
+			// created_time: lastModifiedDate.getTime(),
 			updated_time: lastModifiedDate.getTime(),
-			isDir: isCollection === '',
-			sizeDONOTUSE: sizeDONOTUSE, // This property is used only for the WebDAV PUT hack (see below) so mark it as such so that it can be removed with the hack later on.
+			isDir: isDir,
+			// sizeDONOTUSE: sizeDONOTUSE, // This property is used only for the WebDAV PUT hack (see below) so mark it as such so that it can be removed with the hack later on.
 		};
 	}
 
@@ -256,7 +278,7 @@ class FileApiDriverWebDav {
 		]);
 
 		const resources = this.api().arrayFromJson(result, ['d:multistatus', 'd:response']);
-		const stats = this.statsFromResources_(resources)
+		const stats = this.statsFromResources_(resources);
 
 		return {
 			items: stats,
@@ -300,32 +322,7 @@ class FileApiDriverWebDav {
 	}
 
 	async put(path, content, options = null) {
-		// In theory, if a client doesn't complete an upload, the file will not appear in the Nextcloud app. Likewise if
-		// the server interrupts the upload midway, the client should receive some kind of error and try uploading the
-		// file again next time. At the very least the file should not appear half-uploaded on the server. In practice
-		// however it seems some files might end up half uploaded on the server (at least on ocloud.de) so, for now,
-		// instead of doing a simple PUT, we do it to a temp file on Nextcloud, then check the file size and, if it
-		// matches, move it its actual place (hoping the server won't mess up and only copy half of the file).
-		// This is innefficient so once the bug is better understood it should hopefully be possible to go back to
-		// using a single PUT call.
-
-		let contentSize = 0;
-		if (content) contentSize = content.length;
-		if (options && options.path) {
-			const stat = await shim.fsDriver().stat(options.path);
-			contentSize = stat.size;
-		}
-
-		const tempPath = this.fileApi_.tempDirName() + '/' + basename(path) + '_' + Date.now();
-		await this.api().exec('PUT', tempPath, content, null, options);
-
-		const stat = await this.stat(tempPath);
-		if (stat.sizeDONOTUSE != contentSize) {
-			// await this.delete(tempPath);
-			throw new Error('WebDAV PUT - Size check failed for ' + tempPath + ' Expected: ' + contentSize + '. Found: ' + stat.sizeDONOTUSE);
-		}
-
-		await this.move(tempPath, path);
+		return await this.api().exec('PUT', path, content, null, options);
 	}
 
 	async delete(path) {

ReactNativeClient/lib/file-api.js

@@ -4,6 +4,31 @@ const { shim } = require('lib/shim');
 const BaseItem = require('lib/models/BaseItem.js');
 const JoplinError = require('lib/JoplinError');
 const ArrayUtils = require('lib/ArrayUtils');
+const { time } = require('lib/time-utils.js');
+
+function requestCanBeRepeated(error) {
+	const errorCode = typeof error === 'object' && error.code ? error.code : null;
+
+	if (errorCode === 'rejectedByTarget') return false;
+
+	return true;
+}
+
+async function tryAndRepeat(fn, count) {
+	let retryCount = 0;
+
+	while (true) {
+		try {
+			const result = await fn();
+			return result;
+		} catch (error) {
+			if (retryCount >= count) throw error;
+			if (!requestCanBeRepeated(error)) throw error;
+			retryCount++;
+			await time.sleep(1 + retryCount * 3);
+		}
+	}
+}
 
 class FileApi {
 
@@ -16,6 +41,14 @@ class FileApi {
 		this.driver_.fileApi_ = this;
 	}
 
+	// Ideally all requests repeating should be done at the FileApi level to remove duplicate code in the drivers, but
+	// historically some drivers (eg. OneDrive) are already handling request repeating, so this is optional, per driver,
+	// and it defaults to no repeating.
+	requestRepeatCount() {
+		if (this.driver_.requestRepeatCount) return this.driver_.requestRepeatCount();
+		return 0;
+	}
+
 	tempDirName() {
 		if (this.tempDirName_ === null) throw Error('Temp dir not set!');
 		return this.tempDirName_;
@@ -59,50 +92,70 @@ class FileApi {
 	}
 
 	// DRIVER MUST RETURN PATHS RELATIVE TO `path`
-	list(path = '', options = null) {
+	async list(path = '', options = null) {
 		if (!options) options = {};
 		if (!('includeHidden' in options)) options.includeHidden = false;
 		if (!('context' in options)) options.context = null;
 
 		this.logger().debug('list ' + this.baseDir_);
 
-		return this.driver_.list(this.baseDir_, options).then((result) => {
-			if (!options.includeHidden) {
-				let temp = [];
-				for (let i = 0; i < result.items.length; i++) {
-					if (!isHidden(result.items[i].path)) temp.push(result.items[i]);
-				}
-				result.items = temp;
+		const result = await tryAndRepeat(() => this.driver_.list(this.baseDir_, options), this.requestRepeatCount());
+
+		if (!options.includeHidden) {
+			let temp = [];
+			for (let i = 0; i < result.items.length; i++) {
+				if (!isHidden(result.items[i].path)) temp.push(result.items[i]);
 			}
-			return result;
-		});
+			result.items = temp;
+		}
+
+		return result;
+	
+		// return this.driver_.list(this.baseDir_, options).then((result) => {
+		// 	if (!options.includeHidden) {
+		// 		let temp = [];
+		// 		for (let i = 0; i < result.items.length; i++) {
+		// 			if (!isHidden(result.items[i].path)) temp.push(result.items[i]);
+		// 		}
+		// 		result.items = temp;
+		// 	}
+		// 	return result;
+		// });
 	}
 
 	// Deprectated
 	setTimestamp(path, timestampMs) {
 		this.logger().debug('setTimestamp ' + this.fullPath_(path));
-		return this.driver_.setTimestamp(this.fullPath_(path), timestampMs);
+		return tryAndRepeat(() => this.driver_.setTimestamp(this.fullPath_(path), timestampMs), this.requestRepeatCount());
+		//return this.driver_.setTimestamp(this.fullPath_(path), timestampMs);
 	}
 
 	mkdir(path) {
 		this.logger().debug('mkdir ' + this.fullPath_(path));
-		return this.driver_.mkdir(this.fullPath_(path));
+		return tryAndRepeat(() => this.driver_.mkdir(this.fullPath_(path)), this.requestRepeatCount());
 	}
 
-	stat(path) {
+	async stat(path) {
 		this.logger().debug('stat ' + this.fullPath_(path));
-		return this.driver_.stat(this.fullPath_(path)).then((output) => {
-			if (!output) return output;
-			output.path = path;
-			return output;
-		});
+
+		const output = await tryAndRepeat(() => this.driver_.stat(this.fullPath_(path)), this.requestRepeatCount());
+
+		if (!output) return output;
+		output.path = path;
+		return output;
+
+		// return this.driver_.stat(this.fullPath_(path)).then((output) => {
+		// 	if (!output) return output;
+		// 	output.path = path;
+		// 	return output;
+		// });
 	}
 
 	get(path, options = null) {
 		if (!options) options = {};
 		if (!options.encoding) options.encoding = 'utf8';
 		this.logger().debug('get ' + this.fullPath_(path));
-		return this.driver_.get(this.fullPath_(path), options);
+		return tryAndRepeat(() => this.driver_.get(this.fullPath_(path), options), this.requestRepeatCount());
 	}
 
 	async put(path, content, options = null) {
@@ -112,32 +165,32 @@ class FileApi {
 			if (!await this.fsDriver().exists(options.path)) throw new JoplinError('File not found: ' + options.path, 'fileNotFound');
 		}
 
-		return this.driver_.put(this.fullPath_(path), content, options);
+		return tryAndRepeat(() => this.driver_.put(this.fullPath_(path), content, options), this.requestRepeatCount());
 	}
 
 	delete(path) {
 		this.logger().debug('delete ' + this.fullPath_(path));
-		return this.driver_.delete(this.fullPath_(path));
+		return tryAndRepeat(() => this.driver_.delete(this.fullPath_(path)), this.requestRepeatCount());
 	}
 
 	// Deprectated
 	move(oldPath, newPath) {
 		this.logger().debug('move ' + this.fullPath_(oldPath) + ' => ' + this.fullPath_(newPath));
-		return this.driver_.move(this.fullPath_(oldPath), this.fullPath_(newPath));
+		return tryAndRepeat(() => this.driver_.move(this.fullPath_(oldPath), this.fullPath_(newPath)), this.requestRepeatCount());
 	}
 
 	// Deprectated
 	format() {
-		return this.driver_.format();
+		return tryAndRepeat(() => this.driver_.format(), this.requestRepeatCount());
 	}
 
 	clearRoot() {
-		return this.driver_.clearRoot(this.baseDir_);
+		return tryAndRepeat(() => this.driver_.clearRoot(this.baseDir_), this.requestRepeatCount());
 	}
 
 	delta(path, options = null) {
 		this.logger().debug('delta ' + this.fullPath_(path));
-		return this.driver_.delta(this.fullPath_(path), options);
+		return tryAndRepeat(() => this.driver_.delta(this.fullPath_(path), options), this.requestRepeatCount());
 	}
 
 }

ReactNativeClient/lib/locale.js

@@ -256,7 +256,7 @@ function countryDisplayName(canonicalName) {
 
 	let extraString;
 
-	if (countryCode != "") {
+	if (countryCode) {
 		if (languageCode == "zh" && countryCode == "CN") {
 			extraString = "简体"; // "Simplified" in "Simplified Chinese"
 		} else {
@@ -266,7 +266,7 @@ function countryDisplayName(canonicalName) {
 
 	if (languageCode == "zh" && (countryCode == "" || countryCode == "TW")) extraString = "繁體"; // "Traditional" in "Traditional Chinese"
 
-	if (extraString != "") output += " (" + extraString + ")";
+	if (extraString) output += " (" + extraString + ")";
 
 	return output;
 }
@@ -294,7 +294,11 @@ function _(s, ...args) {
 	let strings = localeStrings(currentLocale_);
 	let result = strings[s];
 	if (result === '' || result === undefined) result = s;
-	return sprintf(result, ...args);
+	try {
+		return sprintf(result, ...args);
+	} catch (error) {
+		return result + ' ' + args.join(', ') + ' (Translation error: ' + error.message + ')';
+	}
 }
 
 module.exports = { _, supportedLocales, countryDisplayName, localeStrings, setLocale, supportedLocalesToLanguages, defaultLocale, closestSupportedLocale, languageCode, countryCodeOnly };

ReactNativeClient/lib/models/Note.js

@@ -381,26 +381,26 @@ class Note extends BaseItem {
 		return this.save(newNote);
 	}
 
-	static save(o, options = null) {
+	static async save(o, options = null) {
 		let isNew = this.isNew(o, options);
 		if (isNew && !o.source) o.source = Setting.value('appName');
 		if (isNew && !o.source_application) o.source_application = Setting.value('appId');
 
-		return super.save(o, options).then((note) => {
-			this.dispatch({
-				type: 'NOTE_UPDATE_ONE',
-				note: note,
-			});
+		const note = await super.save(o, options);
 
-			if ('todo_due' in o || 'todo_completed' in o || 'is_todo' in o || 'is_conflict' in o) {
-				this.dispatch({
-					type: 'EVENT_NOTE_ALARM_FIELD_CHANGE',
-					id: note.id,
-				});
-			}
-			
-			return note;
+		this.dispatch({
+			type: 'NOTE_UPDATE_ONE',
+			note: note,
 		});
+
+		if ('todo_due' in o || 'todo_completed' in o || 'is_todo' in o || 'is_conflict' in o) {
+			this.dispatch({
+				type: 'EVENT_NOTE_ALARM_FIELD_CHANGE',
+				id: note.id,
+			});
+		}
+		
+		return note;
 	}
 
 	static async delete(id, options = null) {

ReactNativeClient/lib/models/Setting.js

@@ -58,7 +58,7 @@ class Setting extends BaseModel {
 			// 	recent: _('Non-completed and recently completed ones'),
 			// 	nonCompleted: _('Non-completed ones only'),
 			// })},
-			'uncompletedTodosOnTop': { value: true, type: Setting.TYPE_BOOL, public: true, label: () => _('Show uncompleted todos on top of the lists') },
+			'uncompletedTodosOnTop': { value: true, type: Setting.TYPE_BOOL, public: true, label: () => _('Show uncompleted to-dos on top of the lists') },
 			'trackLocation': { value: true, type: Setting.TYPE_BOOL, public: true, label: () => _('Save geo-location with notes') },
 			'newTodoFocus': { value: 'title', type: Setting.TYPE_STRING, isEnum: true, public: true, appTypes: ['desktop'], label: () => _('When creating a new to-do:'), options: () => {
 				return {

ReactNativeClient/locales/index.js

@@ -3,6 +3,7 @@ locales['en_GB'] = require('./en_GB.json');
 locales['de_DE'] = require('./de_DE.json');
 locales['es_CR'] = require('./es_CR.json');
 locales['es_ES'] = require('./es_ES.json');
+locales['eu'] = require('./eu.json');
 locales['fr_FR'] = require('./fr_FR.json');
 locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');

ReactNativeClient/package-lock.json

@@ -228,6 +228,11 @@
         "lodash": "4.17.4"
       }
     },
+    "async-mutex": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.3.tgz",
+      "integrity": "sha1-Cq0hEjaXlas/F+M3RFVtLs9UdWY="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",

ReactNativeClient/package.json

@@ -10,6 +10,7 @@
     "postinstall": "node ../Tools/copycss.js"
   },
   "dependencies": {
+    "async-mutex": "^0.1.3",
     "base-64": "^0.1.0",
     "buffer": "^5.0.8",
     "events": "^1.1.1",

ReactNativeClient/root.js

@@ -1,5 +1,5 @@
 const React = require('react'); const Component = React.Component;
-const { Keyboard, NativeModules, BackHandler } = require('react-native');
+const { AppState, Keyboard, NativeModules, BackHandler } = require('react-native');
 const { SafeAreaView } = require('react-navigation');
 const { connect, Provider } = require('react-redux');
 const { BackButtonService } = require('lib/services/back-button.js');
@@ -469,6 +469,10 @@ class AppComponent extends React.Component {
 		this.backButtonHandler_ = () => {
 			return this.backButtonHandler();
 		}
+
+		this.onAppStateChange_ = () => {
+			PoorManIntervals.update();
+		}
 	}
 
 	async componentDidMount() {
@@ -493,6 +497,12 @@ class AppComponent extends React.Component {
 			const notification = await Alarm.makeNotification(alarm);
 			this.dropdownAlert_.alertWithType('info', notification.title, notification.body ? notification.body : '');
 		});
+
+		AppState.addEventListener('change', this.onAppStateChange_);
+	}
+
+	componentWillUnmount() {
+		AppState.removeEventListener('change', this.onAppStateChange_);
 	}
 
 	async backButtonHandler() {

Tools/build-translation.js

@@ -108,6 +108,23 @@ function availableLocales(defaultLocale) {
 	return output;
 }
 
+function extractTranslator(regex, poContent) {
+	const translatorMatch = poContent.match(regex);
+	let translatorName = '';
+	
+	if (translatorMatch && translatorMatch.length >= 1) {
+		translatorName = translatorMatch[1];
+		translatorName = translatorName.replace(/["\s]+$/, '');
+		translatorName = translatorName.replace(/\\n$/, '');
+		translatorName = translatorName.replace(/^\s*/, '');
+	}
+
+	if (translatorName.indexOf('FULL NAME') >= 0) return '';
+	if (translatorName.indexOf('LL@li.org') >= 0) return '';
+
+	return translatorName;
+}
+
 async function translationStatus(isDefault, poFile) {
 	// "apt install translate-toolkit" to have pocount
 	const command = 'pocount "' + poFile + '"';
@@ -120,17 +137,26 @@ async function translationStatus(isDefault, poFile) {
 
 	let translatorName = '';
 	const content = await fs.readFile(poFile, 'utf-8');
-	// "Last-Translator: Hrvoje Mandić <trbuhom@net.hr>\n"
-	const translatorMatch = content.match(/Last-Translator:\s*?(.*)/);
-	
-	if (translatorMatch.length >= 1) {
-		translatorName = translatorMatch[1];
-		translatorName = translatorName.replace(/["\s]+$/, '');
-		translatorName = translatorName.replace(/\\n$/, '');
-		translatorName = translatorName.replace(/^\s*/, '');
+
+	translatorName = extractTranslator(/Last-Translator:\s*?(.*)/, content);
+	if (!translatorName) {
+		translatorName = extractTranslator(/Language-Team:\s*?(.*)/, content);
 	}
 
-	if (translatorName.indexOf('FULL NAME') >= 0) translatorName = '';
+	// "Last-Translator: Hrvoje Mandić <trbuhom@net.hr>\n"
+	// let translatorMatch = content.match(/Last-Translator:\s*?(.*)/);
+	// if (translatorMatch.length < 1) {
+	// 	translatorMatch = content.match(/Last-Team:\s*?(.*)/);
+	// }
+	
+	// if (translatorMatch.length >= 1) {
+	// 	translatorName = translatorMatch[1];
+	// 	translatorName = translatorName.replace(/["\s]+$/, '');
+	// 	translatorName = translatorName.replace(/\\n$/, '');
+	// 	translatorName = translatorName.replace(/^\s*/, '');
+	// }
+
+	// if (translatorName.indexOf('FULL NAME') >= 0) translatorName = '';
 
 	return {
 		percentDone: isDefault ? 100 : percentDone,
@@ -138,13 +164,21 @@ async function translationStatus(isDefault, poFile) {
 	};
 }
 
+function flagImageUrl(locale) {
+	if (locale === 'eu') {
+		return 'https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/es/basque_country.png';
+	} else {
+		return 'https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/' + countryCodeOnly(locale).toLowerCase() + '.png'
+	}
+}
+
 function translationStatusToMdTable(status) {
 	let output = [];
 	output.push(['&nbsp;', 'Language', 'Code', 'Last translator', 'Percent done'].join('  |  '));
 	output.push(['---', '---', '---', '---', '---'].join('|'));
 	for (let i = 0; i < status.length; i++) {
 		const stat = status[i];
-		const flagUrl = 'https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/' + countryCodeOnly(stat.locale).toLowerCase() + '.png';
+		const flagUrl = flagImageUrl(stat.locale); //'https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/' + countryCodeOnly(stat.locale).toLowerCase() + '.png';
 		output.push(['![](' + flagUrl + ')', stat.languageName, stat.locale, stat.translatorName, stat.percentDone + '%'].join('  |  '));
 	}
 	return output.join('\n');

Tools/release-android.js

@@ -47,12 +47,13 @@ function gradleVersionName(content) {
 }
 
 async function main() {
+	const projectName = 'joplin-android';
 	const newContent = updateGradleConfig();
 	const version = gradleVersionName(newContent);
 	const tagName = 'android-v' + version;
 	const apkFilename = 'joplin-v' + version + '.apk';
 	const apkFilePath = releaseDir + '/' + apkFilename;
-	const downloadUrl = 'https://github.com/laurent22/joplin/releases/download/' + tagName + '/' + apkFilename;
+	const downloadUrl = 'https://github.com/laurent22/' + projectName + '/releases/download/' + tagName + '/' + apkFilename;
 
 	process.chdir(rootDir);
 
@@ -70,9 +71,10 @@ async function main() {
 	console.info('Updating Readme URL...');
 
 	let readmeContent = await fs.readFile('README.md', 'utf8');
-	readmeContent = readmeContent.replace(/(https:\/\/github.com\/laurent22\/joplin\/releases\/download\/.*?\.apk)/, downloadUrl);
+	readmeContent = readmeContent.replace(/(https:\/\/github.com\/laurent22\/joplin-android\/releases\/download\/.*?\.apk)/, downloadUrl);
 	await fs.writeFile('README.md', readmeContent);
 
+	console.info(await execCommand('git pull'));
 	console.info(await execCommand('git add -A'));
 	console.info(await execCommand('git commit -m "Android release v' + version + '"'));
 	console.info(await execCommand('git tag ' + tagName));
@@ -81,7 +83,7 @@ async function main() {
 
 	console.info('Creating GitHub release ' + tagName + '...');
 
-	const release = await githubRelease('joplin-android', tagName, false);
+	const release = await githubRelease(projectName, tagName, false);
 	const uploadUrlTemplate = uriTemplate.parse(release.upload_url);
 	const uploadUrl = uploadUrlTemplate.expand({ name: apkFilename });
 

docs/index.html

@@ -202,7 +202,7 @@
 <p>Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in <a href="https://daringfireball.net/projects/markdown/basics">Markdown format</a>.</p>
 <p>Notes exported from Evernote via .enex files <a href="#importing-notes-from-evernote">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.).</p>
 <p>The notes can be <a href="#synchronisation">synchronised</a> with various targets including <a href="https://nextcloud.com/">Nextcloud</a>, the file system (for example with a network directory) or with Microsoft OneDrive. When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.</p>
-<p>Joplin is still under development but is out of Beta and should be suitable for every day use. The UI of the terminal client is built on top of the great <a href="https://github.com/cronvel/terminal-kit">terminal-kit</a> library, the desktop client using <a href="https://electronjs.org/">Electron</a>, and the Android client front end is done using <a href="https://facebook.github.io/react-native/">React Native</a>.</p>
+<p>The UI of the terminal client is built on top of the great <a href="https://github.com/cronvel/terminal-kit">terminal-kit</a> library, the desktop client using <a href="https://electronjs.org/">Electron</a>, and the Android client front end is done using <a href="https://facebook.github.io/react-native/">React Native</a>.</p>
 <div class="top-screenshot"><img src="https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/AllClients.jpg" style="max-width: 100%; max-height: 35em;"></div>
 
 <h1 id="installation">Installation</h1>
@@ -218,15 +218,15 @@
 <tbody>
 <tr>
 <td>Windows</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.59/Joplin-Setup-0.10.59.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.62/Joplin-Setup-1.0.62.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a></td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.59/Joplin-0.10.59.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.62/Joplin-1.0.62.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v0.10.59/Joplin-0.10.59-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.62/Joplin-1.0.62-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a></td>
 </tr>
 </tbody>
 </table>
@@ -243,7 +243,7 @@
 <tr>
 <td>Android</td>
 <td><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://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a></td>
-<td>or <a href="https://github.com/laurent22/joplin/releases/download/android-v0.10.88/joplin-v0.10.88.apk">Download APK File</a></td>
+<td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.97/joplin-v1.0.97.apk">Download APK File</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -265,13 +265,15 @@ sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
 <h1 id="features">Features</h1>
 <ul>
 <li>Desktop, mobile and terminal applications.</li>
+<li>Import Enex files (Evernote export format)</li>
 <li>Support notes, to-dos, tags and notebooks.</li>
+<li>Support for alarms (notifications) in mobile and desktop applications.</li>
 <li>Offline first, so the entire data is always available on the device even without an internet connection.</li>
-<li>Ability to synchronise with multiple targets, including NextCloud, the file system and OneDrive (Dropbox is planned).</li>
+<li>Synchronisation with various services, including NextCloud, WebDAV and OneDrive. Dropbox is planned.</li>
+<li>End To End Encryption (E2EE)</li>
 <li>Synchronises to a plain text format, which can be easily manipulated, backed up, or exported to a different format.</li>
-<li>Markdown notes, which are rendered with images and formatting in the desktop and mobile applications.</li>
-<li>Tag support</li>
-<li>File attachment support (images are displayed, and other files are linked and can be opened in the relevant application).</li>
+<li>Markdown notes, which are rendered with images and formatting in the desktop and mobile applications. Support for extra features such as math notation and checkboxes.</li>
+<li>File attachment support - images are displayed, and other files are linked and can be opened in the relevant application.</li>
 <li>Search functionality.</li>
 <li>Geo-location support.</li>
 <li>Supports multiple languages</li>
@@ -297,7 +299,6 @@ sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
 <p>One of the goals of Joplin was to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. Most of the synchronisation process is done at an abstract level and access to external services, such as Nextcloud or OneDrive, is done via lightweight drivers. It is easy to support new services by creating simple drivers that provide a filesystem-like interface, i.e. the ability to read, write, delete and list items. It is also simple to switch from one service to another or to even sync to multiple services at once. Each note, notebook, tags, as well as the relation between items is transmitted as plain text files during synchronisation, which means the data can also be moved to a different application, can be easily backed up, inspected, etc.</p>
 <p>Currently, synchronisation is possible with Nextcloud and OneDrive (by default) or the local filesystem. A Dropbox one will also be available once <a href="https://github.com/facebook/react-native/issues/14445">this React Native bug</a> is fixed. To setup synchronisation please follow the instructions below. After that, the application will synchronise in the background whenever it is running, or you can click on &quot;Synchronise&quot; to start a synchronisation manually.</p>
 <h2 id="nextcloud-synchronisation">Nextcloud synchronisation</h2>
-<p><strong>Important: This is a beta feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain. If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup the profile directory of the desktop or terminal application.</strong></p>
 <p>On the <strong>desktop application</strong> or <strong>mobile application</strong>, go to the config screen and select Nextcloud as the synchronisation target. Then input <a href="https://docs.nextcloud.com/server/9/user_manual/files/access_webdav.html">the WebDAV URL</a>, this is normally <code>https://example.com/nextcloud/remote.php/dav/files/USERNAME/Joplin</code> (make sure to create the &quot;Joplin&quot; directory in Nextcloud and to replace USERNAME by your Nextcloud username), and set the username and password.</p>
 <p>On the <strong>terminal application</strong>, you will need to set the <code>sync.target</code> config variable and all the <code>sync.5.path</code>, <code>sync.5.username</code> and <code>sync.5.password</code> config variables to, respectively the Nextcloud WebDAV URL, your username and your password. This can be done from the command line mode using:</p>
 <pre><code>:config sync.5.path https://example.com/nextcloud/remote.php/dav/files/USERNAME/Joplin
@@ -306,8 +307,13 @@ sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
 :config sync.target 5
 </code></pre><p>If synchronisation does not work, please consult the logs in the app profile directory - it is often due to a misconfigured URL or password. The log should indicate what the exact issue is.</p>
 <h2 id="webdav-synchronisation">WebDAV synchronisation</h2>
-<p><strong>Important: This is a beta feature. It has been extensively tested and is already in use by some users, but it is possible that some bugs remain. If you wish to you use it, it is recommended that you keep a backup of your data. The simplest way is to regularly backup the profile directory of the desktop or terminal application.</strong></p>
 <p>Select the &quot;WebDAV&quot; synchronisation target and follow the same instructions as for Nextcloud above.</p>
+<p>Known compatible services that use WebDAV:</p>
+<ul>
+<li><a href="https://www.box.com/">Box.com</a></li>
+<li><a href="https://www.drivehq.com">DriveHQ</a></li>
+<li><a href="https://www.zimbra.com/">Zimbra</a></li>
+</ul>
 <h2 id="onedrive-synchronisation">OneDrive synchronisation</h2>
 <p>When syncing with OneDrive, Joplin creates a sub-directory in OneDrive, in /Apps/Joplin and read/write the notes and notebooks from it. The application does not have access to anything outside this directory.</p>
 <p>On the <strong>desktop application</strong> or <strong>mobile application</strong>, select &quot;OneDrive&quot; as the synchronisation target in the config screen (it is selected by default). Then, to initiate the synchronisation process, click on the &quot;Synchronise&quot; button in the sidebar. You will be asked to login to OneDrive to authorise the application (simply input your Microsoft credentials - you do not need to register with OneDrive).</p>
@@ -375,18 +381,25 @@ $$
 </thead>
 <tbody>
 <tr>
+<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/es/basque_country.png" alt=""></td>
+<td>Basque</td>
+<td>eu</td>
+<td>juan.abasolo@ehu.eus</td>
+<td>89%</td>
+</tr>
+<tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/hr.png" alt=""></td>
 <td>Croatian</td>
 <td>hr_HR</td>
-<td>Hrvoje Mandić <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#116;&#114;&#98;&#x75;&#x68;&#x6f;&#x6d;&#x40;&#110;&#x65;&#116;&#46;&#x68;&#114;">&#116;&#114;&#98;&#x75;&#x68;&#x6f;&#x6d;&#x40;&#110;&#x65;&#116;&#46;&#x68;&#114;</a></td>
+<td>Hrvoje Mandić <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x74;&#114;&#98;&#117;&#104;&#111;&#x6d;&#64;&#110;&#101;&#x74;&#x2e;&#104;&#114;">&#x74;&#114;&#98;&#117;&#104;&#111;&#x6d;&#64;&#110;&#101;&#x74;&#x2e;&#104;&#114;</a></td>
 <td>72%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png" alt=""></td>
 <td>Deutsch</td>
 <td>de_DE</td>
-<td>Tobias Strobel <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#103;&#x69;&#116;&#x40;&#115;&#x74;&#x72;&#x6f;&#98;&#101;&#x6c;&#x74;&#111;&#x62;&#x69;&#x61;&#115;&#46;&#100;&#x65;">&#103;&#x69;&#116;&#x40;&#115;&#x74;&#x72;&#x6f;&#98;&#101;&#x6c;&#x74;&#111;&#x62;&#x69;&#x61;&#115;&#46;&#100;&#x65;</a></td>
-<td>92%</td>
+<td>Tobias Strobel <a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#x3a;&#103;&#105;&#x74;&#64;&#115;&#x74;&#114;&#111;&#98;&#x65;&#108;&#x74;&#x6f;&#98;&#105;&#x61;&#115;&#x2e;&#x64;&#101;">&#103;&#105;&#x74;&#64;&#115;&#x74;&#114;&#111;&#98;&#x65;&#108;&#x74;&#x6f;&#98;&#105;&#x61;&#115;&#x2e;&#x64;&#101;</a></td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/gb.png" alt=""></td>
@@ -400,7 +413,7 @@ $$
 <td>Español</td>
 <td>es_ES</td>
 <td>Lucas Vieites</td>
-<td>80%</td>
+<td>79%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cr.png" alt=""></td>
@@ -421,14 +434,14 @@ $$
 <td>Italiano</td>
 <td>it_IT</td>
 <td></td>
-<td>76%</td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/be.png" alt=""></td>
 <td>Nederlands</td>
 <td>nl_BE</td>
 <td></td>
-<td>90%</td>
+<td>89%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/br.png" alt=""></td>
@@ -441,34 +454,26 @@ $$
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png" alt=""></td>
 <td>Русский</td>
 <td>ru_RU</td>
-<td>Artyom Karlov <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#97;&#114;&#116;&#x79;&#x6f;&#x6d;&#46;&#x6b;&#x61;&#114;&#108;&#x6f;&#118;&#64;&#x67;&#x6d;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;">&#97;&#114;&#116;&#x79;&#x6f;&#x6d;&#46;&#x6b;&#x61;&#114;&#108;&#x6f;&#118;&#64;&#x67;&#x6d;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;</a></td>
-<td>96%</td>
+<td>Artyom Karlov <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#x6f;&#x3a;&#x61;&#x72;&#x74;&#x79;&#x6f;&#x6d;&#x2e;&#107;&#x61;&#114;&#108;&#x6f;&#118;&#64;&#103;&#x6d;&#97;&#x69;&#x6c;&#x2e;&#99;&#111;&#109;">&#x61;&#x72;&#x74;&#x79;&#x6f;&#x6d;&#x2e;&#107;&#x61;&#114;&#108;&#x6f;&#118;&#64;&#103;&#x6d;&#97;&#x69;&#x6c;&#x2e;&#99;&#111;&#109;</a></td>
+<td>94%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png" alt=""></td>
 <td>中文 (简体)</td>
 <td>zh_CN</td>
-<td>RCJacH <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#58;&#82;&#x43;&#74;&#97;&#99;&#x48;&#64;&#111;&#x75;&#116;&#108;&#111;&#x6f;&#x6b;&#46;&#99;&#111;&#109;">&#82;&#x43;&#74;&#97;&#99;&#x48;&#64;&#111;&#x75;&#116;&#108;&#111;&#x6f;&#x6b;&#46;&#99;&#111;&#109;</a></td>
-<td>76%</td>
+<td>RCJacH <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#x52;&#67;&#x4a;&#x61;&#x63;&#x48;&#64;&#111;&#117;&#116;&#108;&#111;&#x6f;&#x6b;&#x2e;&#99;&#x6f;&#x6d;">&#x52;&#67;&#x4a;&#x61;&#x63;&#x48;&#64;&#111;&#117;&#116;&#108;&#111;&#x6f;&#x6b;&#x2e;&#99;&#x6f;&#x6d;</a></td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/jp.png" alt=""></td>
 <td>日本語</td>
 <td>ja_JP</td>
 <td></td>
-<td>74%</td>
+<td>73%</td>
 </tr>
 </tbody>
 </table>
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
-<h1 id="coming-features">Coming features</h1>
-<ul>
-<li>Mobile: manage tags</li>
-<li>Windows: Tray icon</li>
-<li>Desktop apps: Tag auto-complete</li>
-<li>Desktop apps: Dark theme</li>
-<li>Linux: Enable auto-update for desktop app</li>
-</ul>
 <h1 id="known-bugs">Known bugs</h1>
 <ul>
 <li>Non-alphabetical characters such as Chinese or Arabic might create glitches in the terminal on Windows. This is a limitation of the current Windows console.</li>

docs/terminal/index.html

@@ -395,7 +395,7 @@ Possible keys/values:
                            Possible values: HH:mm (20:30), h:mm A (8:30 PM).
                            Default: "HH:mm"
 
-    uncompletedTodosOnTop  Show uncompleted todos on top of the lists.
+    uncompletedTodosOnTop  Show uncompleted to-dos on top of the lists.
                            Type: bool.
                            Default: true
 

joplin.sublime-project

@@ -18,6 +18,8 @@
 				"*.min.js",
 				"ElectronClient/app/gui/note-viewer/highlight/*.pack.js",
 				"ElectronClient/app/css/font-awesome.min.css",
+				"docs/*.html",
+				"docs/*.svg",
 			],
 			"folder_exclude_patterns":
 			[
@@ -50,6 +52,7 @@
 				"tests/logs",
 				"ReactNativeClient/ios/build",
 				"ElectronClient/app/dist",
+				"_releases"
 			],
 			"path": "."
 		},