Android release v0.10.92

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

@@ -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

@@ -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",

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": "0.10.61",
   "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": "0.10.61",
   "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",

README.md

@@ -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/v0.10.61/Joplin-Setup-0.10.61.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.61/Joplin-0.10.61.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.61/Joplin-0.10.61-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-v0.10.92/joplin-v0.10.92.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
@@ -200,18 +200,19 @@ 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

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 22
-		versionCode 2097268
-		versionName "0.10.90"
+		versionCode 2097270
+		versionName "0.10.92"
 		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/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,6 +18,10 @@ class FileApiDriverWebDav {
 		return this.api_;
 	}
 
+	requestRepeatCount() {
+		return 3;
+	}
+
 	async stat(path) {
 		try {
 			const result = await this.api().execPropFind(path, 0, [
@@ -48,7 +52,7 @@ class FileApiDriverWebDav {
 
 		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.

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

@@ -74,6 +74,7 @@ async function main() {
 	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));

docs/index.html

@@ -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/v0.10.61/Joplin-Setup-0.10.61.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/v0.10.61/Joplin-0.10.61.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/v0.10.61/Joplin-0.10.61-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-v0.10.92/joplin-v0.10.92.apk">Download APK File</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -375,18 +375,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;&#105;&#x6c;&#116;&#x6f;&#x3a;&#x74;&#114;&#98;&#117;&#104;&#x6f;&#x6d;&#x40;&#110;&#x65;&#x74;&#46;&#x68;&#x72;">&#x74;&#114;&#98;&#117;&#104;&#x6f;&#x6d;&#x40;&#110;&#x65;&#x74;&#46;&#x68;&#x72;</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="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x67;&#x69;&#116;&#64;&#x73;&#116;&#114;&#x6f;&#98;&#x65;&#x6c;&#x74;&#x6f;&#98;&#x69;&#x61;&#x73;&#x2e;&#x64;&#x65;">&#x67;&#x69;&#116;&#64;&#x73;&#116;&#114;&#x6f;&#98;&#x65;&#x6c;&#x74;&#x6f;&#98;&#x69;&#x61;&#x73;&#x2e;&#x64;&#x65;</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 +407,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 +428,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,22 +448,22 @@ $$
 <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;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#97;&#x72;&#x74;&#x79;&#111;&#x6d;&#x2e;&#x6b;&#97;&#114;&#x6c;&#111;&#118;&#64;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#111;&#x6d;">&#97;&#x72;&#x74;&#x79;&#111;&#x6d;&#x2e;&#x6b;&#97;&#114;&#x6c;&#111;&#118;&#64;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#111;&#x6d;</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="&#109;&#97;&#105;&#108;&#116;&#111;&#x3a;&#x52;&#x43;&#x4a;&#x61;&#99;&#72;&#x40;&#111;&#117;&#x74;&#x6c;&#x6f;&#111;&#x6b;&#46;&#x63;&#111;&#109;">&#x52;&#x43;&#x4a;&#x61;&#99;&#72;&#x40;&#111;&#117;&#x74;&#x6c;&#x6f;&#111;&#x6b;&#46;&#x63;&#111;&#109;</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>