CLI v1.0.137

CliClient/locales/ar.po

@@ -643,6 +643,9 @@ msgstr "أخف %s"
 msgid "Quit"
 msgstr "إغلاق"
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr "ت&حرير"
 
@@ -809,12 +812,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "الملاحظات و الإعدادات مخزّنة في: %s"
 
-msgid "Browse..."
-msgstr "استعراض..."
-
 msgid "Check synchronisation configuration"
 msgstr "فحص ضبط المزامنة"
 
+msgid "Browse..."
+msgstr "استعراض..."
+
 msgid "Apply"
 msgstr "تطبيق"
 
@@ -974,9 +977,33 @@ msgstr "المكان"
 msgid "URL"
 msgstr "عنوان URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "قائمة ملاحظات"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "خصائص الملاحظة"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "جرى تعديل هذه الملاحظة:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "فتح..."
 
@@ -1283,6 +1310,10 @@ msgstr "قيد التقدم"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "المزامنة قيد التقدم بالفعل. الحال: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "مشفّر"
 
@@ -1533,6 +1564,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "تجاهل أخطاء شهادات TLS"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "تفعيل التشفير"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "قيمة خيار غير صحيحة: \"%s\". القيم الممكنة هي: %s."
@@ -1602,12 +1647,19 @@ msgstr "لا يوجد بيانات للتصدير."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "فضلاً حدّد دفتر الملاحظات الذي ترغب استيراد الملاحظات إليه."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "العناصر التي لا يمكن مزامنتها"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "لم نتمكن من فتح هذا الملف: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "لم نتمكن من فتح هذا الملف: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1880,9 +1932,8 @@ msgstr "ليس لديك دفاتر ملاحظات حالياً. أنشئ واح
 msgid "Welcome"
 msgstr "مرحباً"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "جرى تعديل هذه الملاحظة:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/ca.po

@@ -668,6 +668,9 @@ msgstr "Amaga %s"
 msgid "Quit"
 msgstr "Surt"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Edita"
@@ -844,12 +847,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes i la configuració es desen a: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Comprova la configuració de la sincronització"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -1013,9 +1016,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Blocs de notes"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Aquesta nota s'ha modificat:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Obre..."
 
@@ -1326,6 +1353,10 @@ msgstr "En progés"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronització ja és en procés. Estat: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Xifrat"
 
@@ -1572,6 +1603,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Activa el xifratge"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "El valor de l'opció no és vàlid: «%s». Els valors possibles són: %s."
@@ -1646,12 +1691,19 @@ msgstr "No hi ha dades per exportar."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Indiqueu el bloc de notes on s'haurien d'importar les notes."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Elements que no s'han pogut sincronitzar"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "No s'ha pogut desar el bloc de notes: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "No s'ha pogut desar el bloc de notes: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1930,9 +1982,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvingut"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Aquesta nota s'ha modificat:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/cs_CZ.po

@@ -15,8 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "Pro smazání tagu jej odeberte od přiřazených poznámek."
@@ -653,6 +651,9 @@ msgstr "Schovat %s"
 msgid "Quit"
 msgstr "Ukončit"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Upravit"
@@ -827,12 +828,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Poznámky a nastavení uloženo v: %s"
 
-msgid "Browse..."
-msgstr "Procházet..."
-
 msgid "Check synchronisation configuration"
 msgstr "Zkontrolujte nastavení synchronizace"
 
+msgid "Browse..."
+msgstr "Procházet..."
+
 msgid "Apply"
 msgstr "Použít"
 
@@ -990,9 +991,33 @@ msgstr "Lokace"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Seznam položek"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Nastavení poznámek"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Poznámka byla upravena:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Otevřít..."
 
@@ -1303,6 +1328,10 @@ msgstr "Probíhá"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronizace již probíhá. Stav: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Zašifrováno"
 
@@ -1553,6 +1582,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorovat chyby TLS certifikátu"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Povolit poznámky pod čarou"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Neplatná hodnota: \"%s\". Přípustné hodnoty jsou: %s."
@@ -1622,12 +1665,19 @@ msgstr "Nic k exportování."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Prosím specifikujte sešit, do kterého mají být poznámky importovány."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Položky jež nelze synchronizovat"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Soubor se nepodařilo otevřít: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Soubor se nepodařilo otevřít: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1905,9 +1955,8 @@ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+
 msgid "Welcome"
 msgstr "Vítejte"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Poznámka byla upravena:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/da_DK.po

@@ -655,6 +655,9 @@ msgstr "Skjul %s"
 msgid "Quit"
 msgstr "Afslut"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Ret"
@@ -824,12 +827,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Noter og indstillinger er gemt i: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Check synkroniserings Indstillinger"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -992,9 +995,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Notesbøger"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Denne note er ændret:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Åben..."
 
@@ -1303,6 +1330,10 @@ msgstr "I gang"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering er allerede i gang: Tilstand: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Krypteret"
 
@@ -1554,6 +1585,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Start kryptering"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ulovlig værdi: \"%s\".  Mulige valg er: %s."
@@ -1628,12 +1673,19 @@ msgstr "Der er ingen data at eksportere."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Angiv hvilken notesbog, noter skal importeres til."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Emner kan ikke synkroniseres"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Notesbogen kan ikke gemmes: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Notesbogen kan ikke gemmes: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1905,9 +1957,8 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
 msgid "Welcome"
 msgstr "Velkommen"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Denne note er ændret:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/de_DE.po

@@ -674,6 +674,9 @@ msgstr "%s ausblenden"
 msgid "Quit"
 msgstr "Verlassen"
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
@@ -846,12 +849,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Notizen und Einstellungen werden gespeichert in: %s"
 
-msgid "Browse..."
-msgstr "Durchsuche..."
-
 msgid "Check synchronisation configuration"
 msgstr "Überprüfen der Synchronisationseinstellungen"
 
+msgid "Browse..."
+msgstr "Durchsuche..."
+
 msgid "Apply"
 msgstr "Anwenden"
 
@@ -1018,9 +1021,33 @@ msgstr "Standort"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Notizen-Liste"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Notiz-Eigenschaften"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Diese Notiz wurde verändert:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Öffne..."
 
@@ -1332,6 +1359,10 @@ msgstr "In Bearbeitung"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronisation ist bereits im Gange. Status: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
@@ -1586,6 +1617,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoriere TLS-Zertifikatfehler"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Aktiviere Fußnoten"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ungültiger Optionswert: \"%s\". Mögliche Werte sind: %s."
@@ -1658,12 +1703,19 @@ msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 "Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Objekte können nicht synchronisiert werden"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Dieses Notizbuch konnte nicht geöffnet werden: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Dieses Notizbuch konnte nicht geöffnet werden: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1948,9 +2000,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Willkommen"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Diese Notiz wurde verändert:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid "Table of contents"
 #~ msgstr "Inhaltsverzeichnis"

CliClient/locales/en_GB.po

@@ -583,6 +583,9 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr ""
 
@@ -744,10 +747,10 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Browse..."
+msgid "Check synchronisation configuration"
 msgstr ""
 
-msgid "Check synchronisation configuration"
+msgid "Browse..."
 msgstr ""
 
 msgid "Apply"
@@ -894,9 +897,31 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+msgid "Note History"
+msgstr ""
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+msgid "This note has no history"
+msgstr ""
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -1191,6 +1216,10 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr ""
 
@@ -1425,6 +1454,19 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid "Enable note history"
+msgstr ""
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
@@ -1492,11 +1534,18 @@ msgstr ""
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr ""
 
 #, javascript-format
-msgid "%s (%s): %s"
+msgid "%s (%s) could not be uploaded: %s"
+msgstr ""
+
+#, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
 msgstr ""
 
 msgid ""

CliClient/locales/en_US.po

@@ -589,6 +589,9 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr ""
 
@@ -752,12 +755,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Check synchronization configuration"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -912,9 +915,31 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+msgid "Note History"
+msgstr ""
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+msgid "This note has no history"
+msgstr ""
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -1211,6 +1236,10 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronization is already in progress. State: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr ""
 
@@ -1450,6 +1479,19 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid "Enable note history"
+msgstr ""
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
@@ -1517,11 +1559,18 @@ msgstr ""
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Items that cannot be synchronized"
 
 #, javascript-format
-msgid "%s (%s): %s"
+msgid "%s (%s) could not be uploaded: %s"
+msgstr ""
+
+#, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
 msgstr ""
 
 msgid ""

CliClient/locales/es_ES.po

@@ -662,6 +662,9 @@ msgstr "Oculta %s"
 msgid "Quit"
 msgstr "Salir"
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr "&Editar"
 
@@ -830,12 +833,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Las notas y los ajustes se guardan en: %s"
 
-msgid "Browse..."
-msgstr "Explorar..."
-
 msgid "Check synchronisation configuration"
 msgstr "Comprobar sincronización"
 
+msgid "Browse..."
+msgstr "Explorar..."
+
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -995,9 +998,33 @@ msgstr "Localización"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Lista de notas"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Propiedades de nota"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Esta nota ha sido modificada:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Abrir..."
 
@@ -1305,6 +1332,10 @@ msgstr "En progreso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronización ya está en progreso. Estado: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1562,6 +1593,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorar errores en certificados TLS"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Habilitar cifrado"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Opción inválida: «%s». Los valores posibles son: %s."
@@ -1631,12 +1676,19 @@ msgstr "No hay datos para exportar."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Por favor especifique la libreta donde las notas deben ser importadas."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Elementos que no se pueden sincronizar"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "No se ha podido abrir este archivo: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "No se ha podido abrir este archivo: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1917,9 +1969,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Esta nota ha sido modificada:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/eu.po

@@ -663,6 +663,9 @@ msgstr ""
 msgid "Quit"
 msgstr "Irten"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Editatu"
@@ -832,13 +835,13 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Oharrak eta ezarpenak hemen daude gordeta: %s"
 
-msgid "Browse..."
-msgstr ""
-
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Sinkronizazioa utzi"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -1000,9 +1003,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Koadernoak"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Ohar hau mugitua izan da:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -1316,6 +1343,10 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizazioa hasita dago. Egoera: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Zifratuta"
 
@@ -1574,6 +1605,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Zifratua gaitu"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Balio aukera baliogabea: \"%s\". Litezkeen balioak: %s."
@@ -1649,12 +1694,19 @@ msgstr ""
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Itemok ezin sinkronizatu"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Koadernoa ezin gorde daiteke: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Koadernoa ezin gorde daiteke: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1926,9 +1978,8 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
 msgid "Welcome"
 msgstr "Ongi etorri!"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Ohar hau mugitua izan da:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/fr_FR.po

@@ -659,6 +659,9 @@ msgstr "Cacher %s"
 msgid "Quit"
 msgstr "Quitter"
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr "&Édition"
 
@@ -830,12 +833,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Les notes et paramètres se trouve dans : %s"
 
-msgid "Browse..."
-msgstr "Parcourir…"
-
 msgid "Check synchronisation configuration"
 msgstr "Vérifier config synchronisation"
 
+msgid "Browse..."
+msgstr "Parcourir…"
+
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -1002,9 +1005,33 @@ msgstr "Lieu"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Liste de notes"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Propriétés de la note"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Cette note a été modifiée :"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Ouvrir..."
 
@@ -1317,6 +1344,10 @@ msgstr "En cours"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La synchronisation est déjà en cours. État : %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Chiffré"
 
@@ -1570,6 +1601,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorer les erreurs de certificats TLS"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Activer les notes de bas de page"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Option invalide: \"%s\". Les valeurs possibles sont : %s."
@@ -1639,12 +1684,19 @@ msgstr "Il n'y a pas de données à exporter."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Veuillez sélectionner le carnet où les notes doivent être importées."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Objets qui ne peuvent pas être synchronisés"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s) : %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Ce fichier n'a pas pu être ouvert : %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Ce fichier n'a pas pu être ouvert : %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1927,9 +1979,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Cette note a été modifiée :"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s) : %s"
 
 #~ msgid "Table of contents"
 #~ msgstr "Table des matières"

CliClient/locales/gl_ES.po

@@ -655,6 +655,9 @@ msgstr "Ocultar %s"
 msgid "Quit"
 msgstr "Saír"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Edtar"
@@ -824,12 +827,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "As notas e axustes gardáronse en: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Comprobar a configuración da sincronización"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -989,9 +992,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Cadernos"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Esta nota foi modificada:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Abrir…"
 
@@ -1303,6 +1330,10 @@ msgstr "En proceso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "A sincronización xa está en proceso. Estado: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -1554,6 +1585,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Activar cifrado"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Valor incorrecto de opción: «%s». Os valores posíbeis son: %s."
@@ -1628,12 +1673,19 @@ msgstr "Non hai datos para exportar."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Indique o caderno ao que importar as notas."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Elementos que non se poden sincronizar"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Non foi posíbel gardar o caderno: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Non foi posíbel gardar o caderno: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1905,9 +1957,8 @@ msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
 msgid "Welcome"
 msgstr "Benvido/a"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Esta nota foi modificada:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/hr_HR.po

@@ -660,6 +660,9 @@ msgstr ""
 msgid "Quit"
 msgstr "Izađi"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Uredi"
@@ -830,13 +833,13 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Bilješke i postavke su pohranjene u: %s"
 
-msgid "Browse..."
-msgstr ""
-
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Prekini sinkronizaciju"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -987,9 +990,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Bilježnice"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Bilješka je promijenjena:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -1299,6 +1326,10 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinkronizacija je već u toku. Stanje: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr ""
 
@@ -1550,6 +1581,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Bilješka je promijenjena:"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Nevažeća vrijednost: \"%s\". Moguće vrijednosti su: %s."
@@ -1625,12 +1670,19 @@ msgstr ""
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Stavke koje se ne mogu sinkronizirati"
 
 #, fuzzy, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s %s (%s)"
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Bilježnicu nije moguće snimiti: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Bilježnicu nije moguće snimiti: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1902,8 +1954,8 @@ msgid "Welcome"
 msgstr "Dobro došli"
 
 #, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Bilješka je promijenjena:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s %s (%s)"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/it_IT.po

@@ -668,6 +668,9 @@ msgstr "Nascondi %s"
 msgid "Quit"
 msgstr "Esci"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Modifica"
@@ -841,12 +844,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Le note e le impostazioni sono memorizzate in: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Controlla la configurazione della sincronizzazione"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr "Applica"
 
@@ -1011,9 +1014,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Taccuini"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Questa note è stata modificata:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Apri ..."
 
@@ -1321,6 +1348,10 @@ msgstr "In corso"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "La sincronizzazione è già in corso. Stato: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Crittografato"
 
@@ -1573,6 +1604,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignora gli errori del certificato TLS"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Attiva Crittografia"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Opzione non valida: \"%s\". I valori possibili sono: %s."
@@ -1646,12 +1691,19 @@ msgstr "Non ci sono dati da esportare."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Si prega di specificare il Taccuino in cui importare le note."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Elementi che non possono essere sincronizzati"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Questo file non può essere aperto: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Questo file non può essere aperto: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1930,9 +1982,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvenuto"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Questa note è stata modificata:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/ja_JP.po

@@ -650,6 +650,9 @@ msgstr "%s を隠す"
 msgid "Quit"
 msgstr "終了"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "編集"
@@ -823,12 +826,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "ノートと設定は次の場所に保存されます: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "同期の設定を確認する"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr "適用"
 
@@ -989,9 +992,33 @@ msgstr "場所"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "ノートブック"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "ノートのプロパティ"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "ノートは変更されています："
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "開く..."
 
@@ -1298,6 +1325,10 @@ msgstr "実行中"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "同期作業はすでに実行中です。状態: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "暗号化済"
 
@@ -1551,6 +1582,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS証明書のエラーを無視"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "暗号化を有効にする"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "無効な設定値: \"%s\"。有効な値は: %sです。"
@@ -1624,12 +1669,19 @@ msgstr "エクスポートするデータがありません。"
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "ノートをどのノートブックにインポートするのか指定してください。"
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "同期ができなかったアイテム"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "次のファイルは開くことができません：%s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "次のファイルは開くことができません：%s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1908,9 +1960,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "ようこそ"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "ノートは変更されています："
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/joplin.pot

@@ -583,6 +583,9 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr ""
 
@@ -744,10 +747,10 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Browse..."
+msgid "Check synchronisation configuration"
 msgstr ""
 
-msgid "Check synchronisation configuration"
+msgid "Browse..."
 msgstr ""
 
 msgid "Apply"
@@ -894,9 +897,31 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+msgid "Note History"
+msgstr ""
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+msgid "This note has no history"
+msgstr ""
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -1191,6 +1216,10 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr ""
 
@@ -1425,6 +1454,19 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+msgid "Enable note history"
+msgstr ""
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
@@ -1492,11 +1534,18 @@ msgstr ""
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr ""
 
 #, javascript-format
-msgid "%s (%s): %s"
+msgid "%s (%s) could not be uploaded: %s"
+msgstr ""
+
+#, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
 msgstr ""
 
 msgid ""

CliClient/locales/ko.po

@@ -647,6 +647,9 @@ msgstr "%s 숨기기"
 msgid "Quit"
 msgstr "종료"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "편집"
@@ -819,12 +822,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "노트와 설정값이 다음에 저장되었습니다: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "동기화 설정 확인"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr "적용"
 
@@ -983,9 +986,33 @@ msgstr "위치"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "노트북"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "노트 속성"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "노트가 변경되었습니다:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "열기..."
 
@@ -1292,6 +1319,10 @@ msgstr "진행 중"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "동기화가 이미 진행되고 있습니다. 상태: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "암호화됨"
 
@@ -1543,6 +1574,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS 인증서 오류 무시"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "암호화 사용"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "올바르지 않은 옵션 값: \"%s\". 가능한 값은 다음과 같습니다: \"%s\"."
@@ -1616,12 +1661,19 @@ msgstr "내보낼 데이터가 없습니다."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "노트를 가져와서 저장할 노트북을 지정하세요."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "동기화를 할 수 없는 항목"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "다음 파일을 열 수 없습니다: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "다음 파일을 열 수 없습니다: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1897,9 +1949,8 @@ msgstr "노트북이 없습니다. (+) 버튼을 눌러 새로 만드세요."
 msgid "Welcome"
 msgstr "환영합니다"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "노트가 변경되었습니다:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/nb_NO.po

@@ -650,6 +650,9 @@ msgstr "Skjul %s"
 msgid "Quit"
 msgstr "Avslutt"
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr "&Rediger"
 
@@ -818,12 +821,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Notater og innstillinger er lagret i: %s"
 
-msgid "Browse..."
-msgstr "Utforsk..."
-
 msgid "Check synchronisation configuration"
 msgstr "Sjekk synkroniseringskonfigurasjon"
 
+msgid "Browse..."
+msgstr "Utforsk..."
+
 msgid "Apply"
 msgstr "Bruk"
 
@@ -987,9 +990,33 @@ msgstr "Lokasjon"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Notatliste"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Notategenskaper"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Dette notatet har blitt endret:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Åpne..."
 
@@ -1297,6 +1324,10 @@ msgstr "Pågår"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering pågår allerede. Status: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Kryptert"
 
@@ -1552,6 +1583,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorer TLS-sertifikatfeil"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Liste over innhold"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ugyldig verdi: \"%s\". Mulige verdier er: %s."
@@ -1621,12 +1666,19 @@ msgstr "Det er ingen data for eksportering."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Velg notatbok som notatene skal importeres til."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Elementer som ikke vil synkronisere"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Filen kunne ikke åpnes: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Filen kunne ikke åpnes: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1902,9 +1954,8 @@ msgstr "Du har enda ingen notatbok. Opprett en ved å klikke på (+)-knappen."
 msgid "Welcome"
 msgstr "Velkommen"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Dette notatet har blitt endret:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid "Table of contents"
 #~ msgstr "Liste over innhold"

CliClient/locales/nl_BE.po

@@ -665,6 +665,9 @@ msgstr ""
 msgid "Quit"
 msgstr "Stop"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Bewerk"
@@ -834,13 +837,13 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen zijn opgeslaan in %s"
 
-msgid "Browse..."
-msgstr ""
-
 #, fuzzy
 msgid "Check synchronisation configuration"
 msgstr "Annuleer synchronisatie"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -1004,9 +1007,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Notitieboeken"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Deze notitie werd aangepast:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr ""
 
@@ -1320,6 +1347,10 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synchronisatie is reeds bezig. Status: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1575,6 +1606,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Schakel encryptie in"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ongeldige optie: \"%s\". Geldige waarden zijn: %s."
@@ -1650,12 +1695,19 @@ msgstr ""
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Items die niet gesynchroniseerd kunnen worden"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Het notitieboek kon niet opgeslaan worden: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Het notitieboek kon niet opgeslaan worden: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1931,9 +1983,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Welkom"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Deze notitie werd aangepast:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/nl_NL.po

@@ -664,6 +664,9 @@ msgstr "%s verbergen"
 msgid "Quit"
 msgstr "Afsluiten"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Bewerken"
@@ -839,12 +842,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Notities en instellingen worden opgeslagen in: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Synchronisatieconfiguratie controleren"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -1012,9 +1015,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Notitieboeken"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Deze notitie is bewerkt:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Openen..."
 
@@ -1323,6 +1350,10 @@ msgstr "Bezig"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "De synchronisatie loopt al. Status: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Versleuteld"
 
@@ -1574,6 +1605,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS-certificaatfouten negeren"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Versleuteling inschakelen"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ongeldige optie: \"%s\". Geldige waarden zijn: %s."
@@ -1649,12 +1694,19 @@ msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 "Geef het notitieboek op waar de notities naar moeten worden geïmporteerd."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Items die niet kunnen worden gesynchroniseerd"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Dit bestand kan niet worden geopend: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Dit bestand kan niet worden geopend: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1934,9 +1986,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Welkom"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Deze notitie is bewerkt:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/pt_BR.po

@@ -661,6 +661,9 @@ msgstr "Ocultar %s"
 msgid "Quit"
 msgstr "Sair"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Editar"
@@ -835,12 +838,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Notas e configurações estão armazenadas em: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Verificar a configuração da sincronização"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1002,9 +1005,33 @@ msgstr "Localização"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Cadernos"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Propriedades da nota"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Esta nota foi modificada:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Abrir..."
 
@@ -1313,6 +1340,10 @@ msgstr "Em andamento"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sincronização já em andamento. Estado: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Encriptado"
 
@@ -1568,6 +1599,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorar erros de certificados TLS"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Habilitar encriptação"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Valor da opção inválida: \"%s\". Os valores possíveis são: %s."
@@ -1642,12 +1687,19 @@ msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 "Por favor, especifique o caderno para onde as notas deveriam ser importadas."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Os itens não podem ser sincronizados"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Este arquivo não pôde ser aberto: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Este arquivo não pôde ser aberto: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1928,9 +1980,8 @@ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
 msgid "Welcome"
 msgstr "Bem-vindo"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Esta nota foi modificada:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/ro.po

@@ -599,6 +599,9 @@ msgstr "Ascundeți %s"
 msgid "Quit"
 msgstr "Ieșiți"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Editați"
@@ -767,10 +770,10 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr ""
 
-msgid "Browse..."
+msgid "Check synchronisation configuration"
 msgstr ""
 
-msgid "Check synchronisation configuration"
+msgid "Browse..."
 msgstr ""
 
 msgid "Apply"
@@ -918,9 +921,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Caiete de notițe"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Această notiță a fost modificată:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Deschideți..."
 
@@ -1218,6 +1245,10 @@ msgstr "În progres"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Criptat"
 
@@ -1455,6 +1486,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignoră erorile de certificat TLS"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Activați criptarea"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
@@ -1526,12 +1571,19 @@ msgstr "Nu există date de exportat."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Itemii nu pot fi sincronizați"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Acest fișier nu a putut fi deschis: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Acest fișier nu a putut fi deschis: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1797,9 +1849,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bine ați venit"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Această notiță a fost modificată:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #, fuzzy
 #~ msgid "Joplin v%s"

CliClient/locales/ru_RU.po

@@ -663,6 +663,9 @@ msgstr "Скрыть %s"
 msgid "Quit"
 msgstr "Выход"
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr "&Правка"
 
@@ -831,12 +834,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Заметки и настройки сохранены в: %s"
 
-msgid "Browse..."
-msgstr "Обзор..."
-
 msgid "Check synchronisation configuration"
 msgstr "Проверить настройки синхронизации"
 
+msgid "Browse..."
+msgstr "Обзор..."
+
 msgid "Apply"
 msgstr "Применить"
 
@@ -999,9 +1002,33 @@ msgstr "Местоположение"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Список заметок"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Свойства заметки"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Эта заметка была изменена:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Открыть..."
 
@@ -1310,6 +1337,10 @@ msgstr "Выполнение"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Синхронизация уже выполняется. Состояние: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Зашифровано"
 
@@ -1566,6 +1597,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Игнорировать ошибки сертификата TLS"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Включить шифрование"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Неверное значение параметра: \"%s\". Доступные значения: %s."
@@ -1636,12 +1681,19 @@ msgid "Please specify the notebook where the notes should be imported to."
 msgstr ""
 "Пожалуйста, укажите блокнот, в который должны быть импортированы заметки."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Элементы, которые не могут быть синхронизированы"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Этот файл не может быть открыт: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Этот файл не может быть открыт: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1921,9 +1973,8 @@ msgstr "У вас сейчас нет блокнота. Создайте его
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Эта заметка была изменена:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/sl_SI.po

@@ -661,6 +661,9 @@ msgstr "Skrij %s"
 msgid "Quit"
 msgstr "Izhod"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Uredi"
@@ -830,12 +833,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Zabeležke in nastavitve so shranjene v: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "Preveri nastavitve sinhronizacije"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr ""
 
@@ -1003,9 +1006,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "Beležnice"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Ta zabeležka je bila spremenjena:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Odpri..."
 
@@ -1318,6 +1345,10 @@ msgstr "V postopku"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Sinhronizacija je že v postopku. Stanje: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Enkriptirano"
 
@@ -1569,6 +1600,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr ""
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Omogoči enkripcijo"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Neveljavna vrednost: \"%s\". Možne vrednosti so : %s."
@@ -1643,12 +1688,19 @@ msgstr "Ni datotek za izvoz."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Prosim navedite beležnico, kamor želite uvoziti zabeležke."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Predmeti ne morejo biti sinhronizirani"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Beležnica ne more biti shranjena: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Beležnica ne more biti shranjena: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1920,9 +1972,8 @@ msgstr "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Ta zabeležka je bila spremenjena:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/sv.po

@@ -665,6 +665,9 @@ msgstr "Dölj %s"
 msgid "Quit"
 msgstr "Avsluta"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Redigera"
@@ -837,12 +840,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Anteckningar och inställningar lagras i: %s"
 
-msgid "Browse..."
-msgstr "Bläddra..."
-
 msgid "Check synchronisation configuration"
 msgstr "Kontrollera synkroniseringskonfigurationen"
 
+msgid "Browse..."
+msgstr "Bläddra..."
+
 msgid "Apply"
 msgstr "Tillämpa"
 
@@ -1007,9 +1010,33 @@ msgstr "Plats"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Anteckningsboken"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Anteckningens egenskaper"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Denna anteckning har ändrats:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Öppna..."
 
@@ -1319,6 +1346,10 @@ msgstr "Pågår"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Synkronisering pågår redan. Tillstånd: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Krypterad"
 
@@ -1575,6 +1606,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "Ignorera TLS-certifikatfel"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Aktivera kryptering"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ogiltigt inställningsvärde: \"%s\". Möjliga värden är: %s."
@@ -1645,12 +1690,19 @@ msgstr "Det finns ingen data att exportera."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Ange anteckningsboken som anteckningarna ska importeras till."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Objekt som inte kan synkroniseras"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Den här filen kunde inte öppnas: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Den här filen kunde inte öppnas: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1936,9 +1988,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Välkommen"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Denna anteckning har ändrats:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/tr_TR.po

@@ -632,6 +632,9 @@ msgstr "Gizle %s"
 msgid "Quit"
 msgstr "Çıkış"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "Düzenle"
@@ -805,12 +808,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "Notlar ve ayarlar şu konumda saklanır: %s"
 
-msgid "Browse..."
-msgstr "Bul..."
-
 msgid "Check synchronisation configuration"
 msgstr "Senkronizasyon yapılandırmasını kontrol et"
 
+msgid "Browse..."
+msgstr "Bul..."
+
 msgid "Apply"
 msgstr "Uygula"
 
@@ -976,9 +979,33 @@ msgstr "Konum"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "Not listesi"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "Not özellikleri"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "Bu not değiştirildi:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "Aç..."
 
@@ -1288,6 +1315,10 @@ msgstr "Devam etmekte"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "Senkronizasyon zaten devam ediyor. Durum: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "Şifrelenmiş"
 
@@ -1542,6 +1573,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "TLS sertifikası hatalarını yoksay"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "Şifrelemeyi etkinleştir"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Geçersiz seçenek değeri:  \"%s\". Mümkün değerler: %s."
@@ -1611,12 +1656,19 @@ msgstr "Çıkartılacak veri bulunmuyor."
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "Lütfen notların alınacağı not defterini belirtin."
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "Senkronize edilemeyen öğeler"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "Bu dosya açılamadı: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "Bu dosya açılamadı: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1895,9 +1947,8 @@ msgstr ""
 msgid "Welcome"
 msgstr "Hoşgeldiniz"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "Bu not değiştirildi:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/locales/zh_CN.po

@@ -622,6 +622,9 @@ msgstr "隐藏 %s"
 msgid "Quit"
 msgstr "退出"
 
+msgid "Close Window"
+msgstr ""
+
 msgid "&Edit"
 msgstr "编辑 (&E)"
 
@@ -785,12 +788,12 @@ msgstr "该授权令牌仅用于允许第三方应用程序访问 Joplin。"
 msgid "Notes and settings are stored in: %s"
 msgstr "笔记与设置文件储存在：%s"
 
-msgid "Browse..."
-msgstr "浏览..."
-
 msgid "Check synchronisation configuration"
 msgstr "检查同步配置"
 
+msgid "Browse..."
+msgstr "浏览..."
+
 msgid "Apply"
 msgstr "应用"
 
@@ -944,9 +947,33 @@ msgstr "位置"
 msgid "URL"
 msgstr "URL"
 
+#, fuzzy
+msgid "Note History"
+msgstr "笔记列表"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr "笔记属性"
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "该笔记已被修改："
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "打开…"
 
@@ -1249,6 +1276,10 @@ msgstr "正在进行"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "已经在同步。状态：%s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "已加密"
 
@@ -1499,6 +1530,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "忽略 TLS 证书错误"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "目录"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "无效的选项值：\"%s\"。可用值有：%s。"
@@ -1566,12 +1611,19 @@ msgstr "没有可导出的数据。"
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "请指定导入笔记的目标笔记本。"
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "无法同步项目"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "该笔记本无法打开：%s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "该笔记本无法打开：%s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1842,9 +1894,8 @@ msgstr "您目前未有笔记本。点击 (+) 按钮创建。"
 msgid "Welcome"
 msgstr "欢迎"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "该笔记已被修改："
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid "Table of contents"
 #~ msgstr "目录"

CliClient/locales/zh_TW.po

@@ -627,6 +627,9 @@ msgstr "隱藏 %s"
 msgid "Quit"
 msgstr "結束"
 
+msgid "Close Window"
+msgstr ""
+
 #, fuzzy
 msgid "&Edit"
 msgstr "編輯"
@@ -798,12 +801,12 @@ msgstr ""
 msgid "Notes and settings are stored in: %s"
 msgstr "所有記事和設置均儲存於: %s"
 
-msgid "Browse..."
-msgstr ""
-
 msgid "Check synchronisation configuration"
 msgstr "檢測同步設置"
 
+msgid "Browse..."
+msgstr ""
+
 msgid "Apply"
 msgstr "套用"
 
@@ -958,9 +961,33 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#, fuzzy
+msgid "Note History"
+msgstr "記事本"
+
+msgid "Previous versions of this note"
+msgstr ""
+
 msgid "Note properties"
 msgstr ""
 
+#, javascript-format
+msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
+msgstr ""
+
+#, fuzzy
+msgid "This note has no history"
+msgstr "此記事已被修改:"
+
+msgid "Restore"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"Click \"%s\" to restore the note. It will be copied in the notebook named "
+"\"%s\". The current version of the note will not be replaced or modified."
+msgstr ""
+
 msgid "Open..."
 msgstr "開啟..."
 
@@ -1262,6 +1289,10 @@ msgstr "進行中"
 msgid "Synchronisation is already in progress. State: %s"
 msgstr "同步已在進行中。狀態: %s"
 
+msgid ""
+"Unknown item type downloaded - please upgrade Joplin to the latest version"
+msgstr ""
+
 msgid "Encrypted"
 msgstr "已加密"
 
@@ -1508,6 +1539,20 @@ msgstr ""
 msgid "Ignore TLS certificate errors"
 msgstr "忽略 TLS 證書錯誤"
 
+#, fuzzy
+msgid "Enable note history"
+msgstr "啟用加密"
+
+msgid "days"
+msgstr ""
+
+#, javascript-format
+msgid "%d days"
+msgstr ""
+
+msgid "Keep note history for"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "不正確選項值: \"%s\"。可能的值為: %s。"
@@ -1580,12 +1625,19 @@ msgstr "沒有資料可匯出。"
 msgid "Please specify the notebook where the notes should be imported to."
 msgstr "請指定將記事匯入到的筆記本。"
 
+msgid "Restored Notes"
+msgstr ""
+
 msgid "Items that cannot be synchronised"
 msgstr "無法同步的項目"
 
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr "%s (%s): %s"
+#, fuzzy, javascript-format
+msgid "%s (%s) could not be uploaded: %s"
+msgstr "無法開啟檔案: %s"
+
+#, fuzzy, javascript-format
+msgid "Item \"%s\" could not be downloaded: %s"
+msgstr "無法開啟檔案: %s"
 
 msgid ""
 "These items will remain on the device but will not be uploaded to the sync "
@@ -1854,9 +1906,8 @@ msgstr "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本
 msgid "Welcome"
 msgstr "歡迎"
 
-#, fuzzy
-#~ msgid "This note has no history"
-#~ msgstr "此記事已被修改:"
+#~ msgid "%s (%s): %s"
+#~ msgstr "%s (%s): %s"
 
 #~ msgid ""
 #~ "The path to synchronise with when file system synchronisation is enabled. "

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.0.126",
+  "version": "1.0.137",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

CliClient/package.json

@@ -20,7 +20,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.126",
+  "version": "1.0.137",
   "bin": {
     "joplin": "./main.js"
   },

CliClient/tests/synchronizer.js

@@ -53,6 +53,10 @@ async function remoteNotesFoldersResources() {
 	return remoteItemsByTypes([BaseModel.TYPE_NOTE, BaseModel.TYPE_FOLDER, BaseModel.TYPE_RESOURCE]);
 }
 
+async function remoteResources() {
+	return remoteItemsByTypes([BaseModel.TYPE_RESOURCE]);
+}
+
 async function localNotesFoldersSameAsRemote(locals, expect) {
 	let error = null;
 	try {
@@ -1320,4 +1324,31 @@ describe('Synchronizer', function() {
 		expect(syncItems[1].sync_disabled).toBe(1);
 	}));
 
+	it("should not upload a resource if it has not been fetched yet", asyncTest(async () => {
+		// In some rare cases, the synchronizer might try to upload a resource even though it
+		// doesn't have the resource file. It can happen in this situation:
+		// - C1 create resource
+		// - C1 sync
+		// - C2 sync
+		// - C2 resource metadata is received but ResourceFetcher hasn't downloaded the file yet
+		// - C2 enables E2EE - all the items are marked for forced sync
+		// - C2 sync
+		// The synchronizer will try to upload the resource, even though it doesn't have the file,
+		// so we need to make sure it doesn't. But also that once it gets the file, the resource
+		// does get uploaded.
+
+		const note1 = await Note.save({ title: 'note' });
+		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
+		const resource = (await Resource.all())[0];
+		await Resource.setLocalState(resource.id, { fetch_status: Resource.FETCH_STATUS_IDLE });
+		await synchronizer().start();
+
+		expect((await remoteResources()).length).toBe(0);
+
+		await Resource.setLocalState(resource.id, { fetch_status: Resource.FETCH_STATUS_DONE });
+		await synchronizer().start();
+
+		expect((await remoteResources()).length).toBe(1);
+	}));
+
 });

CliClient/tests/test-utils.js

@@ -74,6 +74,11 @@ const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1
 
 console.info('Testing with sync target: ' + SyncTargetRegistry.idToName(syncTargetId_));
 
+const dbLogger = new Logger();
+dbLogger.addTarget('console');
+dbLogger.addTarget('file', { path: logDir + '/log.txt' });
+dbLogger.setLevel(Logger.LEVEL_WARN);
+
 const logger = new Logger();
 logger.addTarget('console');
 logger.addTarget('file', { path: logDir + '/log.txt' });
@@ -181,7 +186,7 @@ async function setupDatabase(id = null) {
 	};
 
 	databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
-	databases_[id].setLogger(logger);
+	databases_[id].setLogger(dbLogger);
 	await databases_[id].open({ name: filePath });
 
 	BaseModel.db_ = databases_[id];

ElectronClient/app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.152",
+  "version": "1.0.153",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

ElectronClient/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.152",
+  "version": "1.0.153",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {

ElectronClient/app/plugins/GotoAnything.jsx

@@ -193,13 +193,25 @@ class Dialog extends React.PureComponent {
 		}
 	}
 
-	gotoItem(item) {
+	async gotoItem(item) {
 		this.props.dispatch({
 			pluginName: PLUGIN_NAME,
 			type: 'PLUGIN_DIALOG_SET',
 			open: false,
 		});
 
+		if (this.state.listType === BaseModel.TYPE_NOTE || this.state.listType === BaseModel.TYPE_FOLDER) {
+			const folderPath = await Folder.folderPath(this.props.folders, item.parent_id);
+
+			for (const folder of folderPath) {
+				this.props.dispatch({
+					type: "FOLDER_SET_COLLAPSED",
+					id: folder.id,
+					collapsed: false,
+				});
+			}
+		}		
+
 		if (this.state.listType === BaseModel.TYPE_NOTE) {
 			this.props.dispatch({
 				type: "FOLDER_AND_NOTE_SELECT",

README.md

@@ -20,9 +20,9 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download | Alternative
 -----------------|--------|-------------------
-Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-Setup-1.0.151.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-1.0.151.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-1.0.151-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash`
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-Setup-1.0.152.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
 
 ## Mobile applications
 
@@ -68,7 +68,8 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 
 - About
 
-	- [Changelog](https://github.com/laurent22/joplin/blob/master/readme/changelog.md)
+	- [Changelog (Desktop App)](https://github.com/laurent22/joplin/blob/master/readme/changelog.md)
+	- [Changelog (CLI App)](https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md)
 	- [Stats](https://github.com/laurent22/joplin/blob/master/readme/stats.md)
 	- [Donate](https://github.com/laurent22/joplin/blob/master/readme/donate.md)
 <!-- TOC -->
@@ -350,32 +351,32 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po)  |  عبد الناصر سعيد (as@althobaity.com)  |  95%
-![](https://joplinapp.org/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  54%
-![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  78%
-![](https://joplinapp.org/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić (trbuhom@net.hr)  |  44%
-![](https://joplinapp.org/images/flags/country-4x3/cz.png)  |  Czech  |  [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po)  |  Lukas Helebrandt (lukas@aiya.cz)  |  69%
-![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |  Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.  |  70%
-![](https://joplinapp.org/images/flags/country-4x3/de.png)  |  Deutsch  |  [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po)  |  Michael Sonntag (ms@editorei.de)  |  100%
+![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po)  |  عبد الناصر سعيد (as@althobaity.com)  |  93%
+![](https://joplinapp.org/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  53%
+![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  75%
+![](https://joplinapp.org/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić (trbuhom@net.hr)  |  43%
+![](https://joplinapp.org/images/flags/country-4x3/cz.png)  |  Czech  |  [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po)  |  Lukas Helebrandt (lukas@aiya.cz)  |  93%
+![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk  |  [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po)  |  Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.  |  68%
+![](https://joplinapp.org/images/flags/country-4x3/de.png)  |  Deutsch  |  [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po)  |  Michael Sonntag (ms@editorei.de)  |  97%
 ![](https://joplinapp.org/images/flags/country-4x3/gb.png)  |  English (UK)  |  [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po)  |    |  100%
 ![](https://joplinapp.org/images/flags/country-4x3/us.png)  |  English (US)  |  [en_US](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_US.po)  |    |  100%
-![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Andros Fenollosa (andros@fenollosa.email)  |  96%
-![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français  |  [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po)  |  Laurent Cozic  |  100%
-![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans (marcoslansgarza@gmail.com)  |  69%
-![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  86%
-![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  55%
-![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands  |  [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po)  |  Heimen Stoffels (vistausss@outlook.com)  |  83%
-![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian  |  [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po)  |  Mats Estensen (code@mxe.no)  |  96%
-![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos (rnbastos@gmail.com)  |  90%
-![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  54%
-![](https://joplinapp.org/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  68%
-![](https://joplinapp.org/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po)  |  Jonatan Nyberg (jonatan@autistici.org)  |  93%
-![](https://joplinapp.org/images/flags/country-4x3/tr.png)  |  Türkçe  |  [tr_TR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/tr_TR.po)  |  Zorbey Doğangüneş (zorbeyd@gmail.com)  |  90%
-![](https://joplinapp.org/images/flags/country-4x3/ru.png)  |  Русский  |  [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po)  |  Artyom Karlov (artyom.karlov@gmail.com)  |  96%
-![](https://joplinapp.org/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  96%
-![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  83%
-![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |  AWASHIRO Ikuya (ikunya@gmail.com)  |  90%
-![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  92%
+![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español  |  [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po)  |  Andros Fenollosa (andros@fenollosa.email)  |  93%
+![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français  |  [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po)  |  Laurent Cozic  |  97%
+![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician  |  [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po)  |  Marcos Lans (marcoslansgarza@gmail.com)  |  67%
+![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  83%
+![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  53%
+![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands  |  [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po)  |  Heimen Stoffels (vistausss@outlook.com)  |  81%
+![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian  |  [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po)  |  Mats Estensen (code@mxe.no)  |  93%
+![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos (rnbastos@gmail.com)  |  87%
+![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  53%
+![](https://joplinapp.org/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  66%
+![](https://joplinapp.org/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po)  |  Jonatan Nyberg (jonatan@autistici.org)  |  90%
+![](https://joplinapp.org/images/flags/country-4x3/tr.png)  |  Türkçe  |  [tr_TR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/tr_TR.po)  |  Zorbey Doğangüneş (zorbeyd@gmail.com)  |  87%
+![](https://joplinapp.org/images/flags/country-4x3/ru.png)  |  Русский  |  [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po)  |  Artyom Karlov (artyom.karlov@gmail.com)  |  93%
+![](https://joplinapp.org/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po)  |    |  93%
+![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po)  |  penguinsam (samliu@gmail.com)  |  81%
+![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語  |  [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po)  |  AWASHIRO Ikuya (ikunya@gmail.com)  |  87%
+![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국말  |  [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po)  |    |  89%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Known bugs

ReactNativeClient/ios/Joplin/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0.33</string>
+	<string>10.0.34</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>33</string>
+	<string>34</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

ReactNativeClient/lib/MdToHtml/noteStyle.js

@@ -161,6 +161,10 @@ module.exports = function(style, options) {
 			color: black;
 		}
 
+		.checkbox-label-checked {
+			opacity: 0.5;
+		}
+
 		@media print {
 			body {
 				height: auto !important;

ReactNativeClient/lib/MdToHtml/rules/checkbox.js

@@ -32,7 +32,16 @@ function createPrefixTokens(Token, id, checked, label, postMessageSyntax, source
 	// in calling code.
 	const lineIndex = sourceToken.map && sourceToken.map.length ? sourceToken.map[0] : 99999999;
 	const checkedString = checked ? 'checked' : 'unchecked';
-	const js = postMessageSyntax + "('checkboxclick:" + checkedString + ':' + lineIndex + "'); return true;";
+
+	const labelId = 'cb-label-' + id;
+
+	const js = `
+		${postMessageSyntax}('checkboxclick:${checkedString}:${lineIndex}');
+		const label = document.getElementById("${labelId}");
+		label.classList.remove(this.checked ? 'checkbox-label-unchecked' : 'checkbox-label-checked');
+		label.classList.add(this.checked ? 'checkbox-label-checked' : 'checkbox-label-unchecked');
+		return true;
+	`;
 
 	token = new Token('checkbox_input', 'input', 0);
 	token.attrs = [
@@ -44,7 +53,11 @@ function createPrefixTokens(Token, id, checked, label, postMessageSyntax, source
 	tokens.push(token);
 
 	token = new Token('label_open', 'label', 1);
-	token.attrs = [['for', id]];
+	token.attrs = [
+		['id', labelId],
+		['for', id],
+		['class', 'checkbox-label-' + checkedString],
+	];
 	tokens.push(token);
 
 	if (label) {

ReactNativeClient/lib/reducer.js

@@ -487,7 +487,7 @@ const reducer = (state = defaultState, action) => {
 				newState = Object.assign({}, state);
 				newState.collapsedFolderIds = action.ids.slice();
 				break;
-
+				
 			case 'TAG_UPDATE_ALL':
 
 				newState = Object.assign({}, state);

ReactNativeClient/lib/services/ResourceFetcher.js

@@ -99,12 +99,15 @@ class ResourceFetcher extends BaseService {
 		if (this.fetchingItems_[resourceId]) return;
 		this.fetchingItems_[resourceId] = true;
 
+		const resource = await Resource.load(resourceId);
+		const localState = await Resource.localState(resource);
+
 		const completeDownload = async (emitDownloadComplete = true, localResourceContentPath = '') => {
 
 			// 2019-05-12: This is only necessary to set the file size of the resources that come via
 			// sync. The other ones have been done using migrations/20.js. This code can be removed
 			// after a few months.
-			if (resource.size < 0 && localResourceContentPath && !resource.encryption_blob_encrypted) {
+			if (resource && resource.size < 0 && localResourceContentPath && !resource.encryption_blob_encrypted) {
 				await ResourceService.autoSetFileSizes();
 			}
 
@@ -119,8 +122,11 @@ class ResourceFetcher extends BaseService {
 			this.updateReport();
 		}
 
-		const resource = await Resource.load(resourceId);
-		const localState = await Resource.localState(resource);
+		if (!resource) {
+			this.logger().info('ResourceFetcher: Attempting to download a resource that does not exist (has been deleted?): ' + resourceId);
+			await completeDownload(false);
+			return;
+		}
 
 		// Shouldn't happen, but just to be safe don't re-download the
 		// resource if it's already been downloaded.
@@ -166,7 +172,7 @@ class ResourceFetcher extends BaseService {
 	async waitForAllFinished() {
 		return new Promise((resolve, reject) => {
 			const iid = setInterval(() => {
-				if (!this.queue_.length && !Object.getOwnPropertyNames(this.fetchingItems_).length) {
+				if (!this.updateReportIID_ && !this.scheduleQueueProcessIID_ && !this.addingResources_ && !this.queue_.length && !Object.getOwnPropertyNames(this.fetchingItems_).length) {
 					clearInterval(iid);
 					resolve();
 				}

ReactNativeClient/lib/services/ResourceService.js

@@ -113,6 +113,10 @@ class ResourceService extends BaseService {
 
 	static async autoSetFileSize(resourceId, filePath) {
 		const itDoes = await shim.fsDriver().waitTillExists(filePath);
+		if (!itDoes) {
+			// this.logger().warn('Trying to set file size on non-existent resource:', resourceId, filePath);
+			return;
+		}
 		const fileStat = await shim.fsDriver().stat(filePath);
 		await Resource.setFileSizeOnly(resourceId, fileStat.size);
 	}

ReactNativeClient/lib/services/RevisionService.js

@@ -10,6 +10,7 @@ const { shim } = require('lib/shim');
 const BaseService = require('lib/services/BaseService');
 const { _ } = require('lib/locale.js');
 const ArrayUtils = require('lib/ArrayUtils.js');
+const { sprintf } = require('sprintf-js');
 
 class RevisionService extends BaseService {
 
@@ -138,10 +139,12 @@ class RevisionService extends BaseService {
 						if (note) {
 							if (oldNote && oldNote.updated_time < this.oldNoteCutOffDate_()) {
 								// This is where we save the original version of this old note
-								await this.createNoteRevision_(oldNote);
+								const rev = await this.createNoteRevision_(oldNote);
+								if (rev) this.logger().debug(sprintf('RevisionService::collectRevisions: Saved revision %s (old note)', rev.id));
 							}
 
-							await this.createNoteRevision_(note);
+							const rev = await this.createNoteRevision_(note);
+							if (rev) this.logger().debug(sprintf('RevisionService::collectRevisions: Saved revision %s (Last rev was more than %d ms ago)', rev.id, Setting.value('revisionService.intervalBetweenRevisions')));
 							doneNoteIds.push(noteId);
 							this.isOldNotesCache_[noteId] = false;
 						}
@@ -150,7 +153,10 @@ class RevisionService extends BaseService {
 					if (change.type === ItemChange.TYPE_DELETE && !!change.before_change_item) {
 						const note = JSON.parse(change.before_change_item);
 						const revExists = await Revision.revisionExists(BaseModel.TYPE_NOTE, note.id, note.updated_time);
-						if (!revExists) await this.createNoteRevision_(note);
+						if (!revExists) {
+							const rev = await this.createNoteRevision_(note);
+							if (rev) this.logger().debug(sprintf('RevisionService::collectRevisions: Saved revision %s (for deleted note)', rev.id));
+						}
 						doneNoteIds.push(noteId);
 					}
 

ReactNativeClient/lib/synchronizer.js

@@ -231,6 +231,11 @@ class Synchronizer {
 
 			if (syncSteps.indexOf("update_remote") >= 0) {
 				let donePaths = [];
+
+				const completeItemProcessing = (path) => {
+					donePaths.push(path);
+				}
+
 				while (true) {
 					if (this.cancelling()) break;
 
@@ -290,6 +295,7 @@ class Synchronizer {
 								if (error.code === 'rejectedByTarget') {
 									this.progressReport_.errors.push(error);
 									this.logger().warn('Rejected by target: ' + path + ': ' + error.message);
+									completeItemProcessing(path);
 									continue;
 								} else {
 									throw error;
@@ -313,18 +319,23 @@ class Synchronizer {
 						this.logSyncOperation(action, local, remote, reason);
 
 						if (local.type_ == BaseModel.TYPE_RESOURCE && (action == "createRemote" || action === "updateRemote" || (action == "itemConflict" && remote))) {
-							try {
-								const remoteContentPath = this.resourceDirName_ + "/" + local.id;
-								const result = await Resource.fullPathForSyncUpload(local);
-								local = result.resource;
-								const localResourceContentPath = result.path;
-								await this.api().put(remoteContentPath, null, { path: localResourceContentPath, source: "file" });
-							} catch (error) {
-								if (error && ["rejectedByTarget", "fileNotFound"].indexOf(error.code) >= 0) {
-									await handleCannotSyncItem(ItemClass, syncTargetId, local, error.message);
-									action = null;
-								} else {
-									throw error;
+							const localState = await Resource.localState(local.id);
+							if (localState.fetch_status !== Resource.FETCH_STATUS_DONE) {
+								action = null;
+							} else {
+								try {
+									const remoteContentPath = this.resourceDirName_ + "/" + local.id;
+									const result = await Resource.fullPathForSyncUpload(local);
+									local = result.resource;
+									const localResourceContentPath = result.path;
+									await this.api().put(remoteContentPath, null, { path: localResourceContentPath, source: "file" });
+								} catch (error) {
+									if (error && ["rejectedByTarget", "fileNotFound"].indexOf(error.code) >= 0) {
+										await handleCannotSyncItem(ItemClass, syncTargetId, local, error.message);
+										action = null;
+									} else {
+										throw error;
+									}
 								}
 							}
 						}
@@ -422,7 +433,7 @@ class Synchronizer {
 							}
 						}
 
-						donePaths.push(path);
+						completeItemProcessing(path);
 					}
 
 					if (!result.hasMore) break;
@@ -491,7 +502,7 @@ class Synchronizer {
 							break;
 						}
 
-						// this.logSyncOperation("fetchingProcessed", null, null, "Processing fetched item");
+						this.logSyncOperation("fetchingProcessed", null, null, "Processing fetched item");
 
 						let remote = remotes[i];
 						if (!BaseItem.isSystemPath(remote.path)) continue; // The delta API might return things like the .sync, .resource or the root folder

Tools/build-website.js

@@ -353,6 +353,10 @@ function markdownToHtml(md) {
 
 			output = output.toLowerCase();
 
+			while (output.length && output[output.length - 1] === '-') {
+				output = output.substr(0, output.length - 1);
+			}
+
 			let temp = output;
 			let index = 1;
 			while (doneNames.indexOf(temp) >= 0) {
@@ -482,7 +486,8 @@ async function main() {
 
 	renderMdToHtml(makeHomePageMd(), rootDir + '/docs/index.html', {});
 
-	renderFileToHtml(rootDir + '/readme/changelog.md', rootDir + '/docs/changelog/index.html', { title: 'Changelog' });
+	renderFileToHtml(rootDir + '/readme/changelog.md', rootDir + '/docs/changelog/index.html', { title: 'Changelog (Desktop App)' });
+	renderFileToHtml(rootDir + '/readme/changelog_cli.md', rootDir + '/docs/changelog_cli/index.html', { title: 'Changelog (CLI App)' });
 	renderFileToHtml(rootDir + '/readme/clipper.md', rootDir + '/docs/clipper/index.html', { title: 'Web Clipper' });
 	renderFileToHtml(rootDir + '/readme/debugging.md', rootDir + '/docs/debugging/index.html', { title: 'Debugging' });
 	renderFileToHtml(rootDir + '/readme/desktop.md', rootDir + '/docs/desktop/index.html', { title: 'Desktop Application' });

Tools/release-cli.js

@@ -5,9 +5,10 @@ const moment = require('moment');
 
 const rootDir = path.dirname(__dirname);
 const appDir = rootDir + '/CliClient';
+const changelogPath = rootDir + '/readme/changelog_cli.md';
 
 async function insertChangelog(tag, changelog) {
-	const currentText = await fs.readFile(rootDir + '/readme/changelog_cli.md', 'UTF-8');
+	const currentText = await fs.readFile(changelogPath, 'UTF-8');
 	const lines = currentText.split('\n');
 
 	const beforeLines = [];
@@ -29,8 +30,7 @@ async function insertChangelog(tag, changelog) {
 
 	const header = [
 		'##',
-		'[' + tag + ']',
-		'(https://github.com/laurent22/joplin/releases/tag/' + tag + ')',
+		'[' + tag + '](https://github.com/laurent22/joplin/releases/tag/' + tag + ')',
 		'-',
 		moment.utc().format('YYYY-MM-DD\THH:mm:ss') + 'Z',
 	];
@@ -43,11 +43,7 @@ async function insertChangelog(tag, changelog) {
 
 	const output = beforeLines.concat(newLines).concat(afterLines);
 
-	console.info(header);
-
-	// console.info(beforeLines);
-	// console.info("****************************");
-	// console.info(afterLines);
+	return output.join('\n');
 }
 
 // Start with node Tools/release-cli.js --changelog-from cli-v1.0.126
@@ -55,78 +51,59 @@ async function insertChangelog(tag, changelog) {
 async function main() {
 	const argv = require('yargs').argv;
 
-	// SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-	// ROOT_DIR="$SCRIPT_DIR/.."
-
-	// # LAST_VERSION=$(cat package.json | jq -r .version)
-
-	// cd "$SCRIPT_DIR"
-	// npm version patch
-	// touch "$SCRIPT_DIR/app/main.js"
-	// bash $SCRIPT_DIR/build.sh
-	// cp "$SCRIPT_DIR/package.json" build/
-	// cp "$SCRIPT_DIR/../README.md" build/
-	// cd "$SCRIPT_DIR/build"
-	// npm publish
-
-
-	// git add -A
-	// git commit -m "CLI v$NEW_VERSION"
-	// git tag "cli-v$NEW_VERSION"
-	// git push && git push --tags
-
 	process.chdir(appDir);
 
 	const packageJson = await fs.readFile('package.json', 'UTF-8'); 
 	const packageConf = JSON.parse(packageJson);
 
-	const previousVersion = packageConf.version;
-	let changelogFrom = 'cli-v' + previousVersion;
+	const previousVersion = 'v' + packageConf.version;
+	let changelogFrom = 'cli-' + previousVersion;
 
 	if (argv.changelogFrom) changelogFrom = argv.changelogFrom;
 
 	const newVersion = await execCommand('npm version patch');
-	console.info('Building ' + newVersion);
-	const newTag = 'cli-v' + newVersion;
+	console.info('Building ' + newVersion + '...');
+	const newTag = 'cli-' + newVersion;
 	
 	await execCommand('touch app/main.js');
 	await execCommand('bash build.sh');
 	await execCommand('cp package.json build/');
 	await execCommand('cp ../README.md build/');
+	
+	process.chdir(appDir + '/build');
 
-	const changelog = await execCommand('node ../Tools/git-changelog ' + changelogFrom);
+	await execCommand('npm publish');
 
-	await insertChangelog(newTag, changelog);
+	const changelog = await execCommand('node ' + rootDir + '/Tools/git-changelog ' + changelogFrom);
 
+	const newChangelog = await insertChangelog(newTag, changelog);
 
-	// const argv = require('yargs').argv;
+	await fs.writeFile(changelogPath, newChangelog);
 
-	// const oauthToken = await githubOauthToken();
-	// process.chdir(appDir);
+	const defaultEditor = await execCommand('echo $EDITOR');
 
-	// console.info('Running from: ' + process.cwd());
+	const finalCmds = [
+		'git add -A',
+		'git commit -m "CLI ' + newVersion + '"',
+		'git tag "cli-' + newVersion + '"',
+		'git push',
+		'git push --tags',
+	];
 
-	// const version = (await execCommand('npm version patch')).trim();
-	// const tagName = version;
-
-	// console.info('New version number: ' + version);
-
-	// console.info(await execCommand('git add -A'));
-	// console.info(await execCommand('git commit -m "Electron release ' + version + '"'));
-	// console.info(await execCommand('git tag ' + tagName));
-	// console.info(await execCommand('git push && git push --tags'));
-
-	// const releaseOptions = { isDraft: true, isPreRelease: !!argv.beta };
-
-	// console.info('Release options: ', releaseOptions);
-
-	// const release = await githubRelease('joplin', tagName, releaseOptions);
-
-	// console.info('Created GitHub release: ' + release.html_url);
+	console.info('');
+	console.info('Verify that the changelog is correct:');
+	console.info('');
+	console.info(defaultEditor + ' "' + changelogPath + '"');
+	console.info('');
+	console.info('Then run these commands:');
+	console.info('');
+	console.info(finalCmds.join(' && '));
 }
 
 main().catch((error) => {
 	console.error('Fatal error');
 	console.error(error);
+	console.error('');
+	console.error('If the app cannot auto-detect the previous tag name, specify it using --changelog-from TAG_NAME');
 	process.exit(1);
 });

docs/api/index.html

@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>

docs/changelog/index.html

@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-	<title>Changelog | Joplin</title>
+	<title>Changelog (Desktop App) | Joplin</title>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
@@ -269,6 +270,18 @@
 </ul>
 </div>
 <h1><a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a>Joplin changelog</h1>
+<h2><a name="v1-0-152-https-github-com-laurent22-joplin-releases-tag-v1-0-152-2019-05-13t09-08-07z" href="#v1-0-152-https-github-com-laurent22-joplin-releases-tag-v1-0-152-2019-05-13t09-08-07z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.152">v1.0.152</a> - 2019-05-13T09:08:07Z</h2>
+<p>Same as v1.0.151 but with a fix to the migration issue, that was in turns affecting synchronisation.</p>
+<ul>
+<li>New: Support for note history (<a href="https://github.com/laurent22/joplin/issues/1415">#1415</a>) (<a href="https://github.com/laurent22/joplin/issues/712">#712</a>)</li>
+<li>Improved: Save size of a resource to the database; and added mechanism to run non-database migrations</li>
+<li>Improved: Improved note deletion dialog (<a href="https://github.com/laurent22/joplin/issues/1502">#1502</a>)</li>
+<li>Fixed: Allow resources greater than 10 MB but they won't be synced on mobile (<a href="https://github.com/laurent22/joplin/issues/371">#371</a>)</li>
+<li>Fixed: Improved handling of images when using external editor, so that it works in Atom, VSCode and Typora (<a href="https://github.com/laurent22/joplin/issues/1425">#1425</a>)</li>
+<li>Fixed: Some images were not being displayed</li>
+<li>Fixed: Resets the undo manager when creating new notes (<a href="https://github.com/laurent22/joplin/issues/1495">#1495</a>) (<a href="https://github.com/laurent22/joplin/issues/355">#355</a>)</li>
+<li>Fixed: Prevents notes with no title to break after synchronize (<a href="https://github.com/laurent22/joplin/issues/1472">#1472</a>)</li>
+</ul>
 <h2><a name="v1-0-151-https-github-com-laurent22-joplin-releases-tag-v1-0-151-2019-05-12t15-14-32z" href="#v1-0-151-https-github-com-laurent22-joplin-releases-tag-v1-0-151-2019-05-12t15-14-32z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.151">v1.0.151</a> - 2019-05-12T15:14:32Z</h2>
 <p>Same as v1.0.150 but with a small fix to set the resources file size.</p>
 <ul>

docs/changelog_cli/index.html

@@ -0,0 +1,330 @@
+<!doctype html>
+<html>
+<head>
+	<title>Changelog (CLI App) | Joplin</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
+	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
+	<style>
+	body {
+		background-color: #F1F1F1;
+		color: #333333;
+	}
+	table {
+		margin-bottom: 1em;
+	}
+	td, th {
+		padding: .8em;
+		border: 1px solid #ccc;
+	}
+	h1, h2 {
+		border-bottom: 1px solid #eaecef;
+		padding-bottom: 0.3em;
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+		font-weight: 600;
+		font-size: 2em;
+		margin-bottom: 16px;
+	}
+	h2 {
+		font-size: 1.6em;
+	}
+	h3 {
+		font-size: 1.3em;
+	}
+	code {
+		color: black;
+		background-color: #eee;
+		border: 1px solid #ccc;
+		font-size: .85em;
+	}
+	pre code {
+		border: none;
+	}
+	pre {
+		font-size: .85em;
+	}
+	#toc ul {
+		margin-bottom: 10px;
+	}
+	#toc {
+		padding-bottom: 1em;
+	}
+	.title-icon {
+		height: 2em;
+	}
+	.sub-title {
+		font-weight: bold;
+		font-size: 1.5em;
+	}
+	.container {
+		background-color: white;
+		padding: 0;
+		box-shadow: 0 10px 20px #888888;
+	}
+	table.screenshots {
+		margin-top: 2em;
+		margin-bottom: 2em;
+	}
+	table.screenshots th {
+		height: 3em;
+		text-align: center;
+	}
+	table.screenshots th, 
+	table.screenshots td {
+		border: 1px solid #C2C2C2;
+	}
+	img[align="left"] {
+		margin-right: 10px;
+		margin-bottom: 10px;
+	}
+	.mobile-screenshot {
+		height: 40em;
+		padding: 1em;
+	}
+	.cli-screenshot-wrapper {
+		background-color: black;
+		vertical-align: top;
+		padding: 1em 2em 1em 1em;
+	}
+	.cli-screenshot {
+		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
+		background-color: black;
+		color: white;
+		border: none;
+	}
+	.cli-screenshot .prompt {
+		color: #48C2F0;
+	}
+	.top-screenshot {
+		margin-top: 2em;
+		text-align: center;
+	}
+	.header {
+		position: relative;
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-top: 1em;
+		padding-bottom: 1em;
+		color: white;
+		background-color: #2B2B3D;
+	}
+	.header a h1 {
+		color: white;
+	}
+	.content {
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-bottom: 2em;
+		padding-top: 2em;
+	}
+	.forkme {
+		position: absolute;
+		right: 0;
+		top:0;
+	}
+	.nav-wrapper {
+		position: relative;
+		width: inherit;
+	}
+	.nav {
+		background-color: black;
+		display: table;
+		width: inherit;
+	}
+	.nav.sticky {
+		position:fixed;
+		top: 0;
+		width: inherit;
+		box-shadow: 0 0 10px #000000;
+	}
+	.nav a {
+		color: white;
+		display: inline-block;
+		padding: .6em .9em .6em .9em;
+	}
+	.nav ul {
+		padding-left: 2em;
+		margin-bottom: 0;
+		display: table-cell;
+		min-width: 250px;
+	}
+	.nav ul li {
+		display: inline-block;
+		padding: 0;
+	}
+	.nav li.selected {
+		background-color: #222;
+		font-weight: bold;
+	}
+	.nav-right {
+		display: table-cell;
+		width: 100%;
+		text-align: right;
+		vertical-align: middle;
+		line-height: 0;
+	}
+	.nav-right .share-btn {
+		display: none;
+	}
+	.nav-right .small-share-btn {
+		display: none;
+	}
+	.footer {
+		padding-top: 1em;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 2em;
+		color: gray;
+		font-size: .9em;
+	}
+	a.heading-anchor {
+		display: inline-block;
+		opacity: 0;
+		width: 1.3em;
+		font-size: 0.7em;
+		margin-left: -1.3em;
+		line-height: 1em;
+		text-decoration: none;
+	}
+	a.heading-anchor:hover,
+	h1:hover a.heading-anchor,
+	h2:hover a.heading-anchor,
+	h3:hover a.heading-anchor,
+	h4:hover a.heading-anchor,
+	h5:hover a.heading-anchor,
+	h6:hover a.heading-anchor {
+		opacity: 1;
+	}
+	@media all and (min-width: 400px) {
+		.nav-right .share-btn {
+			display: inline-block;
+		}
+		.nav-right .small-share-btn {
+			display: none;
+		}
+	}
+</style>
+</head>
+
+<body>
+
+<div class="container">
+
+<div class="header">
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</h1></a>
+	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities.</p>
+</div>
+
+<div class="nav-wrapper">
+	<div class="nav">
+		<ul>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
+			<li><a class="help" href="#" title="Menu">Menu</a></li>
+		</ul>
+		<div class="nav-right">
+			<!--
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+			-->
+			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+		</div>
+	</div>
+</div>
+
+<div class="content">
+	<div id="toc"><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="https://joplinapp.org/desktop">Desktop application</a></li>
+<li><a href="https://joplinapp.org/mobile">Mobile applications</a></li>
+<li><a href="https://joplinapp.org/terminal">Terminal application</a></li>
+<li><a href="https://joplinapp.org/clipper">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplin.cozic.net">Joplin Forum</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/stats">Stats</a></li>
+<li><a href="https://joplinapp.org/donate">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1><a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a>Joplin terminal app changelog</h1>
+<h2><a name="cli-v1-0-129-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-129-2019-05-13t22-17-20z" href="#cli-v1-0-129-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-129-2019-05-13t22-17-20z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.129">cli-v1.0.129</a> - 2019-05-13T22:17:20Z</h2>
+<ul>
+<li>New: Added option to disable creation of welcome items</li>
+<li>New: Support for note history (#1415) (#712)</li>
+<li>Improved: Save size of a resource to the database; and added mechanism to run non-database migrations</li>
+<li>Improved: Display better error message when trying to sync with a new sync target from an old version of Joplin</li>
+<li>Improved: Update sharp (for node 12 compatibility) (#1471)</li>
+<li>Fixed: Do not resize images if they are already below the max dimensions</li>
+<li>Fixed: Allow resources greater than 10 MB but they won't be synced on mobile (#371)</li>
+<li>Fixed: Bump sqlite3 to v4.0.7 for node12 support (#1508)</li>
+<li>Fixed: Prevents notes with no title to break after synchronize (#1472)</li>
+<li>Fixed: Import lists and sub-lists from Enex files with correct indentation (#1476)</li>
+</ul>
+<h2><a name="cli-v1-0-125-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-125-2019-04-29t18-38-05z" href="#cli-v1-0-125-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-125-2019-04-29t18-38-05z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.125">cli-v1.0.125</a> - 2019-04-29T18:38:05Z</h2>
+<ul>
+<li>Improved: Improved support for Japanese, Chinese, Korean search queries (also applies to Goto Anything)</li>
+<li>Improved: Display warning when changing dir for filesystem sync</li>
+<li>Fixed: Remove message &quot;Processing a path that has already been done&quot; as this is not an error (#1353)</li>
+<li>Fixed: Some resources could incorrectly be deleted even though they are still present in a note. Also added additional verifications before deleting a resource. (#1433)</li>
+<li>Fixed: Handle invalid resource tags that contain no data when importing ENEX (#1405)</li>
+<li>Fixed: Restored inline code styling (#1326)</li>
+</ul>
+
+<script>
+	function stickyHeader() { 
+		return; // Disabled
+
+		if ($(window).scrollTop() > 179) {
+			$('.nav').addClass('sticky'); 
+		} else {
+			$('.nav').removeClass('sticky');
+		}
+	}
+
+	$('#toc').hide();
+
+	$('.help').click(function(event) {
+		event.preventDefault();
+		$('#toc').show();
+	});
+
+	$(window).scroll(function() {
+		stickyHeader();
+	});
+
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+	ga('create', 'UA-103586105-1', 'auto');
+	ga('send', 'pageview');
+</script>
+
+<div class="footer">
+Copyright (c) 2016-2019 Laurent Cozic
+</div>
+</body>
+</html>