Android release v1.0.282

* First pass of adding support for templates

* remove default value from template prompt

* Add template placeholder text

* Add mustache templates with datetime support for new notes

* Moved template code to utils, added separate prompt for templates

* Add templates to menu and allow for keyboad only use

* update template prompt for dark theme

* update with laurents suggestions, add refresh button

* revert template command, remove new note prompt

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,4 @@
+👉 Please follow one of these issue templates:
+- https://github.com/laurent22/joplin/issues/new/choose
+
+Note: to keep the backlog clean and actionable, issues may be immediately closed if they do not follow one of the above issue templates.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: "🐛 Bug Report"
+about: Report a reproducible bug or regression in Joplin.
+title: ''
+labels: 'bug'
+
+---
+
+<!--
+  Please provide a clear and concise description of what the bug is. (In the section Steps To Reproduce.)
+  Include screenshots if needed.
+  Please test using the latest Joplin release to make sure your issue has not already been fixed.
+-->
+
+## Environment
+
+Joplin version:
+Platform:
+OS specifcs:
+<!--
+  Platform can be one of: macOS, Linux, Windows, Android, iOS, terminal (or a combination)
+  OS specifcs: e.g. OS version, Linux distribution, Android/iOS version, ...
+-->
+
+## Steps To Reproduce
+
+1.
+2.
+
+<!--
+  Issues without reproduction steps are likely to stall.
+-->
+
+Describe what you expected to happen:
+
+
+
+## Logfile
+
+<!--
+  Please attach a debug log. Issues without a debug log are likely to stall.
+  For information on how to collect a log file: https://joplinapp.org/debugging/
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,33 @@
+---
+name: Feature request
+about: Suggest a feature for Joplin.
+title: '[Feature request] '
+labels: 'feature request'
+
+---
+
+<!--
+  Please search open issues first - many features have already been requested!
+-->
+
+## Has it been discussed in the forum? Link to topic.
+<!--
+  Feature requests should be discussed in the forum first. https://discourse.joplinapp.org
+  Please provide a link to the topic.
+-->
+
+
+## Is your feature request related to a problem? Please describe.
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+
+## Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+
+## Describe alternatives you've considered
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+
+## Additional context
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,29 @@
+---
+name: "🤔 Questions and Help"
+about: The issue tracker is not for questions. Please ask questions on https://discourse.joplinapp.org/.
+title: 'Question: '
+labels: 'question'
+
+---
+
+🚨 The issue tracker is not for questions. 🚨
+
+As it happens, support requests that are created as issues are likely to be closed. We want to make sure you are able to find the help you seek.
+
+## Questions and Help
+
+Please read the [documentation](https://joplinapp.org/) and [FAQ](https://joplinapp.org/faq/) first.
+
+### https://discourse.joplinapp.org/
+
+If you have still questions related to Joplin, please open a topic in the [forum](https://discourse.joplinapp.org/).
+You can use your GitHub credentials to login to the forum.
+
+## Links
+
+- Documentation: https://joplinapp.org
+- FAQ: https://joplinapp.org/faq/
+- Forum: https://discourse.joplinapp.org
+- How to enable end-to-end encryption: https://joplinapp.org/e2ee/
+- API documentation: https://joplinapp.org/api/
+- How to enable debug mode: https://joplinapp.org/debugging/

.github/stale.yml

@@ -0,0 +1,25 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "good first issue"
+  - "essential"
+  - "essential-reviewed"
+  - "help wanted"
+  - "nice to have"
+  - "upstream"
+  - "backlog"
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Hey there, it looks like there has been no activity on this issue recently. Has the issue been fixed, or does it still require the community's attention? This issue may be closed if no further activity occurs.
+  You may also label this issue as "backlog" and I will leave it open.
+  Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  Closing this issue after a prolonged period of inactivity. If this issue is still present in the latest release, please feel free to create a new issue with up-to-date information.
+only: issues

CONTRIBUTING.md

@@ -16,10 +16,12 @@ File bugs in the [Github Issue Tracker](https://github.com/laurent22/joplin/issu
 
 Please check that your request has not already been posted in the [Github Issue Tracker](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). If it has, **up-voting the issue** increases the chances it'll be noticed and implemented in the future. "+1" comments are not tracked.
 
-As a general rule, suggestions to _improve Joplin_ should be posted first in the [Joplin Forum](https://discourse.joplinapp.org/) for discussion.
+As a general rule, suggestions to *improve Joplin* should be posted first in the [Joplin Forum](https://discourse.joplinapp.org/) for discussion.
 
 Avoid listing multiple requests in one report in the [Github Issue Tracker](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). One issue per request makes it easier to track and discuss it.
 
+Finally, when submitting a pull request, don't forget to [test your code](#unit-tests).
+
 # Contribute to the project
 
 ## Contributing to Joplin's translation
@@ -42,3 +44,20 @@ There are only two rules, but not following them means the pull request will not
 
 - **Please use tabs, NOT spaces.**
 - **Please do not add or remove optional characters, such as spaces or colons.** Please setup your editor so that it only changes what you are working on and is not making automated changes elsewhere. The reason for this is that small white space changes make diff hard to read and can cause needless conflicts.
+
+## Unit tests
+
+When submitting a pull request for a new feature or bug fix, please add unit tests for your code. Unit testing GUI changes is not always possible so it is not required, but any change in a file under /lib for example should be unit tested.
+
+The tests are under CliClient/tests. To get them running, you first need to build the CLI app:
+
+    cd CliClient
+    npm i
+
+Then to run all the test units:
+
+    ./run_test.sh
+
+To run just one particular file:
+
+    ./run_test.sh markdownUtils # Don't add the .js extension

CliClient/app/app.js

@@ -378,8 +378,6 @@ class Application extends BaseApplication {
 			return this.stdout(object);
 		});
 
-		await WelcomeUtils.install(this.dispatch.bind(this));
-
 		// If we have some arguments left at this point, it's a command
 		// so execute it.
 		if (argv.length) {

CliClient/locales/ar.po

@@ -611,6 +611,27 @@ msgstr "خيارات التشفير"
 msgid "Web clipper options"
 msgstr "خيارات Web clipper"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "إدراج التاريخ والوقت"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "دليل تصدير بيانات Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -627,6 +648,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "البحث جارٍ عن تحديثات..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "استيراد"
 
@@ -670,12 +694,18 @@ msgstr "مائل"
 msgid "Link"
 msgstr "رابط"
 
+msgid "Code"
+msgstr "رمز"
+
 msgid "Insert Date Time"
 msgstr "إدراج التاريخ والوقت"
 
 msgid "Edit in external editor"
 msgstr "التحرير في محرر خارجي"
 
+msgid "Tags"
+msgstr "وسوم"
+
 msgid "Search in all the notes"
 msgstr "البحث في كل الملاحظات"
 
@@ -1053,9 +1083,6 @@ msgstr "إدراج ارتباط تشعبي"
 msgid "Attach file"
 msgstr "إرفاق ملف"
 
-msgid "Tags"
-msgstr "وسوم"
-
 msgid "Set alarm"
 msgstr "ضبط منبّه"
 
@@ -1066,9 +1093,6 @@ msgstr "في: %s"
 msgid "Hyperlink"
 msgstr "ارتباط تشعبي"
 
-msgid "Code"
-msgstr "رمز"
-
 msgid "Numbered List"
 msgstr "قائمة مرقّمة"
 
@@ -1569,9 +1593,6 @@ msgstr ""
 "أمر محرر النصوص (قد يتضمن معامِلات) الذي سيستخدم لفتح ملاحظة. إذا لم يجر "
 "التزويد بأي محرر فسيحاول التطبيق اكتشاف المحرِّر التلقائي آلياً."
 
-msgid "Show advanced options"
-msgstr "إظهار خيارات متقدمة"
-
 msgid "Custom TLS certificates"
 msgstr "شهادات TLS خاصة"
 
@@ -1750,18 +1771,6 @@ msgstr "لا توجد ملاحظات حالياً. أنشئ واحدة بالض
 msgid "Delete these notes?"
 msgstr "حذف هذه الملاحظات؟"
 
-msgid "Log"
-msgstr "السجل"
-
-msgid "Export Debug Report"
-msgstr "تصدير تقرير إصلاح الأخطاء"
-
-msgid "Encryption Config"
-msgstr "ضبط التشفير"
-
-msgid "Configuration"
-msgstr "الضبط"
-
 msgid "Move to notebook..."
 msgstr "النقل إلى دفتر ملاحظات..."
 
@@ -1784,8 +1793,24 @@ msgstr "إختر التاريخ"
 msgid "Confirm"
 msgstr "تأكيد"
 
-msgid "Cancel synchronisation"
-msgstr "إلغاء المزامنة"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "دفاتر ملاحظات"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "لا يمكن تعديل العناصر المشفَّرة"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "دفتر ملاحظات جديد"
+
+msgid "Configuration"
+msgstr "الضبط"
+
+#, fuzzy
+msgid "All notes"
+msgstr "ملاحظة"
 
 msgid "Checking... Please wait."
 msgstr "التحقق جارٍ... فضلاً انتظر."
@@ -1825,6 +1850,50 @@ msgstr "وسوم جديدة:"
 msgid "Type new tags or select from list"
 msgstr "أكتب وسوماً جديدة أو اخترها من القائمة"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "الضبط"
+
+msgid "Encryption Config"
+msgstr "ضبط التشفير"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&أدوات"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "الحالة"
+
+msgid "Log"
+msgstr "السجل"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "إنشاء %s جديد ..."
+
+msgid "Export Debug Report"
+msgstr "تصدير تقرير إصلاح الأخطاء"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "الضبط"
@@ -1889,6 +1958,10 @@ msgstr "لم يتم حفظ دفتر الملاحظات: %s"
 msgid "Edit notebook"
 msgstr "تحرير دفتر الملاحظات"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "عنوان دفتر الملاحظات:"
+
 msgid "Show all"
 msgstr "إظهار الكل"
 
@@ -1912,10 +1985,32 @@ msgstr "لا يوجد عنصر بالمعرّف %s"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "تطبيق Joplin على الهاتف الجوال لا يدعم حالياً هذا النوع من الربط : %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "نوع صورة غير مدعوم: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "تم تحديثها: %d."
+
+msgid "View on map"
+msgstr "عرض على الخريطة"
+
+msgid "Go to source URL"
+msgstr "الذهاب إلى عنوان URL المصدر"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "بحث..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "إظهار خيارات متقدمة"
+
 msgid "Take photo"
 msgstr "التقاط صورة"
 
@@ -1934,23 +2029,19 @@ msgstr "تحويل إلى ملاحظة"
 msgid "Convert to todo"
 msgstr "تحويل إلى قائمة مهام"
 
-msgid "Hide metadata"
-msgstr "إخفاء البيانات الوصفية"
+#, fuzzy
+msgid "Properties"
+msgstr "خصائص الملاحظة"
 
-msgid "Show metadata"
-msgstr "إظهار البيانات الوصفية"
-
-msgid "View on map"
-msgstr "عرض على الخريطة"
-
-msgid "Go to source URL"
-msgstr "الذهاب إلى عنوان URL المصدر"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "تحرير"
 
-msgid "Delete notebook"
-msgstr "حذف دفتر الملاحظات"
+#, fuzzy
+msgid "Add title"
+msgstr "العنوان"
 
 msgid "Login with OneDrive"
 msgstr "تسجيل الدخول عبر OneDrive"
@@ -1958,18 +2049,35 @@ msgstr "تسجيل الدخول عبر OneDrive"
 msgid "Search"
 msgstr "بحث"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"اضغط على زر (+) لتنشئ ملاحظة أو دفتر ملاحظات جديداً. اضغط على القائمة "
-"الجانبية للوصول إلى دفاتر ملاحظاتك القائمة."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "الإذن باستخدام الكاميرا"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "ليس لديك دفاتر ملاحظات حالياً. أنشئ واحدة بالضغط على زر (+)."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "إلغاء المزامنة"
 
-msgid "Welcome"
-msgstr "مرحباً"
+#~ msgid "Hide metadata"
+#~ msgstr "إخفاء البيانات الوصفية"
+
+#~ msgid "Show metadata"
+#~ msgstr "إظهار البيانات الوصفية"
+
+#~ msgid "Delete notebook"
+#~ msgstr "حذف دفتر الملاحظات"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "اضغط على زر (+) لتنشئ ملاحظة أو دفتر ملاحظات جديداً. اضغط على القائمة "
+#~ "الجانبية للوصول إلى دفاتر ملاحظاتك القائمة."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "ليس لديك دفاتر ملاحظات حالياً. أنشئ واحدة بالضغط على زر (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "مرحباً"
 
 #~ msgid "Some items cannot be decrypted."
 #~ msgstr "لا يمكن فك تشفير بعض العناصر."

CliClient/locales/ca.po

@@ -635,6 +635,26 @@ msgstr "Opcions del xifratge"
 msgid "Web clipper options"
 msgstr "Opcions del desa-retalls de webs"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Directori d'exportació del Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -652,6 +672,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Comprova les actualitzacions..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importació"
 
@@ -697,12 +720,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr "Etiquetes"
+
 msgid "Search in all the notes"
 msgstr "Cerca a totes les notes"
 
@@ -1093,9 +1122,6 @@ msgstr ""
 msgid "Attach file"
 msgstr "Adjunta un fitxer"
 
-msgid "Tags"
-msgstr "Etiquetes"
-
 msgid "Set alarm"
 msgstr "Estableix una alarma"
 
@@ -1106,9 +1132,6 @@ msgstr "A: %s"
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1612,9 +1635,6 @@ msgstr ""
 "L'editor que s'usarà per a obrir una nota. Si no s'indica cap, intentarà "
 "detectar automàticament l'editor predeterminat."
 
-msgid "Show advanced options"
-msgstr "Mostra les opcions avançades"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1794,18 +1814,6 @@ msgstr "Ara mateix no hi ha cap nota. Creeu-ne una fent clic en el botó (+)."
 msgid "Delete these notes?"
 msgstr "Voleu suprimir aquestes notes?"
 
-msgid "Log"
-msgstr "Registre"
-
-msgid "Export Debug Report"
-msgstr "Exporta l'informe de depuració"
-
-msgid "Encryption Config"
-msgstr "Configuració del xifratge"
-
-msgid "Configuration"
-msgstr "Configuració"
-
 msgid "Move to notebook..."
 msgstr "Mou al bloc de notes..."
 
@@ -1829,8 +1837,24 @@ msgstr "Seleccioneu una data"
 msgid "Confirm"
 msgstr "Confirmació"
 
-msgid "Cancel synchronisation"
-msgstr "Cancel·la la sincronització"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Blocs de notes"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Els elements xifrats no es poden modificar"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Bloc de notes nou"
+
+msgid "Configuration"
+msgstr "Configuració"
+
+#, fuzzy
+msgid "All notes"
+msgstr "nota"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1868,6 +1892,50 @@ msgstr "Etiquetes noves:"
 msgid "Type new tags or select from list"
 msgstr "Escriviu etiquetes noves o seleccioneu-ne de la llista"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Configuració"
+
+msgid "Encryption Config"
+msgstr "Configuració del xifratge"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Eines"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Estat"
+
+msgid "Log"
+msgstr "Registre"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "S'està creant una %s..."
+
+msgid "Export Debug Report"
+msgstr "Exporta l'informe de depuració"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Configuració"
@@ -1936,6 +2004,10 @@ msgstr "No s'ha pogut desar el bloc de notes: %s"
 msgid "Edit notebook"
 msgstr "Edita el bloc de notes"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Títol del bloc de notes:"
+
 msgid "Show all"
 msgstr "Mostra-ho tot"
 
@@ -1960,10 +2032,32 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "L'aplicació mòbil del Joplin, ara per ara, no admet aquest tipus d'enllaç: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipus d'imatge no admesa: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Acualitzades: %d."
+
+msgid "View on map"
+msgstr "Mostra-ho al mapa"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Cerca..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Mostra les opcions avançades"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Adjunta una imatge"
@@ -1983,23 +2077,18 @@ msgstr "Converteix a nota"
 msgid "Convert to todo"
 msgstr "Converteix a llistat de tasques pendents"
 
-msgid "Hide metadata"
-msgstr "Amaga les metadades"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Mostra les metadades"
-
-msgid "View on map"
-msgstr "Mostra-ho al mapa"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Edita"
 
-msgid "Delete notebook"
-msgstr "Suprimeix el bloc de notes"
+#, fuzzy
+msgid "Add title"
+msgstr "títol"
 
 msgid "Login with OneDrive"
 msgstr "Inicia sessió amb OneDrive"
@@ -2007,19 +2096,32 @@ msgstr "Inicia sessió amb OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Feu clic en el botó (+) per a crear una nota o bloc de notes. Feu clic en el "
-"menú lateral per a accedir als blocs de notes existents."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Cancel·la la sincronització"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"Ara mateix no teniu cap bloc de notes. Creeu-ne un fent clic al botó (+)."
+#~ msgid "Hide metadata"
+#~ msgstr "Amaga les metadades"
 
-msgid "Welcome"
-msgstr "Benvingut"
+#~ msgid "Show metadata"
+#~ msgstr "Mostra les metadades"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Suprimeix el bloc de notes"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Feu clic en el botó (+) per a crear una nota o bloc de notes. Feu clic en "
+#~ "el menú lateral per a accedir als blocs de notes existents."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Ara mateix no teniu cap bloc de notes. Creeu-ne un fent clic al botó (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Benvingut"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separeu les etiquetes amb comes."

CliClient/locales/cs_CZ.po

@@ -618,6 +618,27 @@ msgstr "Nastavení šifrování"
 msgid "Web clipper options"
 msgstr "Web clipper volby"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Vložit datum a čas"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Složka pro export"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -635,6 +656,9 @@ msgstr "Nastavení..."
 msgid "Check for updates..."
 msgstr "Zkontrolovat updaty..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Import"
 
@@ -679,12 +703,18 @@ msgstr "Kurzíva"
 msgid "Link"
 msgstr "Odkaz"
 
+msgid "Code"
+msgstr "Kód"
+
 msgid "Insert Date Time"
 msgstr "Vložit datum a čas"
 
 msgid "Edit in external editor"
 msgstr "Upravit externím editorem"
 
+msgid "Tags"
+msgstr "Tagy"
+
 msgid "Search in all the notes"
 msgstr "Hledat ve všech poznámkách"
 
@@ -1067,9 +1097,6 @@ msgstr "Vložit odkaz"
 msgid "Attach file"
 msgstr "Přiložit soubor"
 
-msgid "Tags"
-msgstr "Tagy"
-
 msgid "Set alarm"
 msgstr "Nastavit alarm"
 
@@ -1080,9 +1107,6 @@ msgstr "%s: %s"
 msgid "Hyperlink"
 msgstr "Odkaz"
 
-msgid "Code"
-msgstr "Kód"
-
 msgid "Numbered List"
 msgstr "Číslovanáý seznam"
 
@@ -1587,9 +1611,6 @@ msgstr ""
 "Editor ve kterém budou otvírány poznámky. Pokud není specifikováno, aplikace "
 "se pokusí o autodetekci defaultního editoru."
 
-msgid "Show advanced options"
-msgstr "Ukázat pokročilé volby"
-
 msgid "Custom TLS certificates"
 msgstr "Vlastní TLS certifikát"
 
@@ -1768,18 +1789,6 @@ msgstr "Nemáte žádné poznámky. Vytvořte jednu kliknutím na tlačítko (+)
 msgid "Delete these notes?"
 msgstr "Smazat tyto poznámky?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Exportovat Debug Report"
-
-msgid "Encryption Config"
-msgstr "Nastavení šifrování"
-
-msgid "Configuration"
-msgstr "Nastavení"
-
 msgid "Move to notebook..."
 msgstr "Přesunout do zápisníku..."
 
@@ -1802,8 +1811,24 @@ msgstr "Vybrat datum"
 msgid "Confirm"
 msgstr "Potvrdit"
 
-msgid "Cancel synchronisation"
-msgstr "Zrušit synchronizaci"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Zápisníky"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Nelze editovat zašifrovanou položku"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Nový zápisník"
+
+msgid "Configuration"
+msgstr "Nastavení"
+
+#, fuzzy
+msgid "All notes"
+msgstr "poznámka"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1846,6 +1871,50 @@ msgstr "Nové tagy:"
 msgid "Type new tags or select from list"
 msgstr "Zadejte nové tagy, nebo vyberte existující ze seznamu"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Nastavení"
+
+msgid "Encryption Config"
+msgstr "Nastavení šifrování"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Nástroje"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Vytvářím %s..."
+
+msgid "Export Debug Report"
+msgstr "Exportovat Debug Report"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Nastavení"
@@ -1912,6 +1981,10 @@ msgstr "Nebylo možné uložit zápisník: %s"
 msgid "Edit notebook"
 msgstr "Upravit zápisník"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Název zápisníku:"
+
 msgid "Show all"
 msgstr "Zobrazit vše"
 
@@ -1935,10 +2008,32 @@ msgstr "Nenalezena položka s ID %s"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "Mobilní aplikace Joplin aktuálně nepodporuje tento typ odkazu:% s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodporovaný formát obrázku: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Upraveno: %d."
+
+msgid "View on map"
+msgstr "Zobrazit na map+"
+
+msgid "Go to source URL"
+msgstr "Jít na zdrojovou URL"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Hledat..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Ukázat pokročilé volby"
+
 msgid "Take photo"
 msgstr "Přiložit foto"
 
@@ -1957,23 +2052,19 @@ msgstr "Konvertovat na poznámku"
 msgid "Convert to todo"
 msgstr "Konvertovat na todo"
 
-msgid "Hide metadata"
-msgstr "Schovat metadata"
+#, fuzzy
+msgid "Properties"
+msgstr "Nastavení poznámek"
 
-msgid "Show metadata"
-msgstr "Zobrazit metadata"
-
-msgid "View on map"
-msgstr "Zobrazit na map+"
-
-msgid "Go to source URL"
-msgstr "Jít na zdrojovou URL"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Upravit"
 
-msgid "Delete notebook"
-msgstr "Smazat zápisník"
+#, fuzzy
+msgid "Add title"
+msgstr "bez názvu"
 
 msgid "Login with OneDrive"
 msgstr "Přihlásit se pomocí OneDrive"
@@ -1981,18 +2072,35 @@ msgstr "Přihlásit se pomocí OneDrive"
 msgid "Search"
 msgstr "Hledání"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Vytvořte novou poznámku či zápisník kliknutím na tlačítko (+). Pro přístup k "
-"existujícím zápisníkům použijte postranní menu."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Oprávnění použít kameru"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+)."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Zrušit synchronizaci"
 
-msgid "Welcome"
-msgstr "Vítejte"
+#~ msgid "Hide metadata"
+#~ msgstr "Schovat metadata"
+
+#~ msgid "Show metadata"
+#~ msgstr "Zobrazit metadata"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Smazat zápisník"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Vytvořte novou poznámku či zápisník kliknutím na tlačítko (+). Pro "
+#~ "přístup k existujícím zápisníkům použijte postranní menu."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Vítejte"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Tagy oddělujte čárkami."

CliClient/locales/da_DK.po

@@ -622,6 +622,26 @@ msgstr "Krypterings muligheder"
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin eksport mappe"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -639,6 +659,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Checker om der er opdateringer.."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importer"
 
@@ -684,12 +707,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr "Mærker"
+
 msgid "Search in all the notes"
 msgstr "Søg i alle noter"
 
@@ -1070,9 +1099,6 @@ msgstr ""
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
-msgid "Tags"
-msgstr "Mærker"
-
 msgid "Set alarm"
 msgstr "Indstil alarm"
 
@@ -1083,9 +1109,6 @@ msgstr "%s: %s"
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1594,9 +1617,6 @@ msgstr ""
 "Editor der bruges til at åbne note. Hvis ingen valgt/udfyldt, vil auto-"
 "funktion søge efter standard editor."
 
-msgid "Show advanced options"
-msgstr "Vis avancerede indstillinger"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1776,18 +1796,6 @@ msgstr "Der er ingen noter. Opret note ved at klikke på (+) knappen."
 msgid "Delete these notes?"
 msgstr "Slet disse noter?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Eksporter undersøgelses rapport"
-
-msgid "Encryption Config"
-msgstr "Krypterings indstillinger"
-
-msgid "Configuration"
-msgstr "Indstillinger"
-
 msgid "Move to notebook..."
 msgstr "Flyt til notesbog..."
 
@@ -1812,8 +1820,24 @@ msgstr "Vælg dato"
 msgid "Confirm"
 msgstr "Bekræft"
 
-msgid "Cancel synchronisation"
-msgstr "Afbryd synkronisering"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Notesbøger"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Krypteret emner kan ikke rettes"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Ny notesbog"
+
+msgid "Configuration"
+msgstr "Indstillinger"
+
+#, fuzzy
+msgid "All notes"
+msgstr "note"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1851,6 +1875,50 @@ msgstr "Nye tags:"
 msgid "Type new tags or select from list"
 msgstr "Indtast nye tags eller vælg fra listen"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Indstillinger"
+
+msgid "Encryption Config"
+msgstr "Krypterings indstillinger"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Værktøjer"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Opretter ny %s..."
+
+msgid "Export Debug Report"
+msgstr "Eksporter undersøgelses rapport"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Indstillinger"
@@ -1913,6 +1981,10 @@ msgstr "Notesbogen kan ikke gemmes: %s"
 msgid "Edit notebook"
 msgstr "Rediger notesbog"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Notesbogs titel:"
+
 msgid "Show all"
 msgstr "Vis alt"
 
@@ -1936,10 +2008,32 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Ulovlig billedtype: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Opdateret %d."
+
+msgid "View on map"
+msgstr "Vis på kort"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Søg"
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Vis avancerede indstillinger"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Vedhæft foto"
@@ -1959,23 +2053,18 @@ msgstr "Konverter til note"
 msgid "Convert to todo"
 msgstr "Konverter til opgave"
 
-msgid "Hide metadata"
-msgstr "Skjul metadata"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Vis metadata"
-
-msgid "View on map"
-msgstr "Vis på kort"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Ret"
 
-msgid "Delete notebook"
-msgstr "Slet notesbog"
+#, fuzzy
+msgid "Add title"
+msgstr "Samlet"
 
 msgid "Login with OneDrive"
 msgstr "Log på med OneDrive"
@@ -1983,18 +2072,31 @@ msgstr "Log på med OneDrive"
 msgid "Search"
 msgstr "Søg"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Klik på (+) knappen for at oprette ny note eller notesbog. Klik på side menu "
-"for at åbne eksisterende notesbøger."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Afbryd synkronisering"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
+#~ msgid "Hide metadata"
+#~ msgstr "Skjul metadata"
 
-msgid "Welcome"
-msgstr "Velkommen"
+#~ msgid "Show metadata"
+#~ msgstr "Vis metadata"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Slet notesbog"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Klik på (+) knappen for at oprette ny note eller notesbog. Klik på side "
+#~ "menu for at åbne eksisterende notesbøger."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
+
+#~ msgid "Welcome"
+#~ msgstr "Velkommen"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Adskil hver mærke med komma."

CliClient/locales/de_DE.po

@@ -597,7 +597,7 @@ msgstr ""
 
 #, javascript-format
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr "Exportiere „%s“ ins „%s“ Format. Bitte warten..."
+msgstr "Exportiere „%s“ ins „%s“-Format. Bitte warten..."
 
 msgid "Sidebar"
 msgstr "Seitenleiste"
@@ -606,14 +606,14 @@ msgid "Note list"
 msgstr "Notizen-Liste"
 
 msgid "Note title"
-msgstr "Notiz Titel"
+msgstr "Notiz-Titel"
 
 msgid "Note body"
-msgstr "Notiz Text"
+msgstr "Notiz-Text"
 
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "Importiere „%s“ ins „%s“ Format. Bitte warten..."
+msgstr "Importiere „%s“ als „%s“-Format. Bitte warten..."
 
 msgid "PDF File"
 msgstr "PDF-Datei"
@@ -642,6 +642,27 @@ msgstr "Verschlüsselungsoptionen"
 msgid "Web clipper options"
 msgstr "Web-Clipper Optionen"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Datum / Uhrzeit einfügen"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin Export Verzeichnis"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -658,6 +679,9 @@ msgstr "Einstellungen..."
 msgid "Check for updates..."
 msgstr "Überprüfe auf Aktualisierungen..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importieren"
 
@@ -701,12 +725,18 @@ msgstr "Kursiv"
 msgid "Link"
 msgstr "Link"
 
+msgid "Code"
+msgstr "Code"
+
 msgid "Insert Date Time"
 msgstr "Datum / Uhrzeit einfügen"
 
 msgid "Edit in external editor"
 msgstr "Im externen Editor bearbeiten"
 
+msgid "Tags"
+msgstr "Schlagwörter"
+
 msgid "Search in all the notes"
 msgstr "Alle Notizen durchsuchen"
 
@@ -1100,9 +1130,6 @@ msgstr "Weblink einfügen"
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-msgid "Tags"
-msgstr "Schlagwörter"
-
 msgid "Set alarm"
 msgstr "Alarm erstellen"
 
@@ -1113,9 +1140,6 @@ msgstr "In: %s"
 msgid "Hyperlink"
 msgstr "Weblink"
 
-msgid "Code"
-msgstr "Code"
-
 msgid "Numbered List"
 msgstr "Nummerierte Liste"
 
@@ -1626,9 +1650,6 @@ msgstr ""
 "Der Editor, mit dem Notizen geöffnet werden. Wenn keiner ausgewählt wurde, "
 "wird Joplin versuchen den Standardeditor zu erkennen."
 
-msgid "Show advanced options"
-msgstr "Erweiterte Optionen anzeigen"
-
 msgid "Custom TLS certificates"
 msgstr "Benutzerdefinierte TLS-Zertifikate"
 
@@ -1815,18 +1836,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr "Sollen diese Notizen gelöscht werden?"
 
-msgid "Log"
-msgstr "Protokoll"
-
-msgid "Export Debug Report"
-msgstr "Fehlerbericht exportieren"
-
-msgid "Encryption Config"
-msgstr "Verschlüsselungskonfiguration"
-
-msgid "Configuration"
-msgstr "Konfiguration"
-
 msgid "Move to notebook..."
 msgstr "In Notizbuch verschieben..."
 
@@ -1849,8 +1858,24 @@ msgstr "Datum auswählen"
 msgid "Confirm"
 msgstr "Bestätigen"
 
-msgid "Cancel synchronisation"
-msgstr "Synchronisation abbrechen"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Notizbücher"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Verschlüsselte Objekte können nicht verändert werden"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Neues Notizbuch"
+
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#, fuzzy
+msgid "All notes"
+msgstr "Notizen löschen?"
 
 msgid "Checking... Please wait."
 msgstr "Überprüfe… Bitte warten."
@@ -1893,6 +1918,50 @@ msgstr "Neue Schlagwörter:"
 msgid "Type new tags or select from list"
 msgstr "Neues Schlagwort eingeben oder aus der Liste auswählen"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Weitere Information"
+
+msgid "Encryption Config"
+msgstr "Verschlüsselungskonfiguration"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&Werkzeuge"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Protokoll"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Erstelle neue %s..."
+
+msgid "Export Debug Report"
+msgstr "Fehlerbericht exportieren"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 msgid "More information"
 msgstr "Weitere Information"
 
@@ -1959,6 +2028,10 @@ msgstr "Dieses Notizbuch konnte nicht gespeichert werden: %s"
 msgid "Edit notebook"
 msgstr "Notizbuch bearbeiten"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Notizbuch-Titel:"
+
 msgid "Show all"
 msgstr "Zeige Alles"
 
@@ -1983,10 +2056,32 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "Die Joplin Handy-Applikation unterstützt derzeit diese Art von Link nicht: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr "Verweise mit dem Protokoll \"%s\" sind nicht unterstützt"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nicht unterstütztes Fotoformat: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Aktualisiert: %d."
+
+msgid "View on map"
+msgstr "Auf der Karte anzeigen"
+
+msgid "Go to source URL"
+msgstr "Zur Quell-URL gehen"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Suchen..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Erweiterte Optionen anzeigen"
+
 msgid "Take photo"
 msgstr "Foto aufnehmen"
 
@@ -2005,23 +2100,19 @@ msgstr "In eine Notiz umwandeln"
 msgid "Convert to todo"
 msgstr "In ein To-Do umwandeln"
 
-msgid "Hide metadata"
-msgstr "Metadaten verstecken"
+#, fuzzy
+msgid "Properties"
+msgstr "Notiz-Eigenschaften"
 
-msgid "Show metadata"
-msgstr "Metadaten anzeigen"
-
-msgid "View on map"
-msgstr "Auf der Karte anzeigen"
-
-msgid "Go to source URL"
-msgstr "Zur Quell-URL gehen"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Bearbeiten"
 
-msgid "Delete notebook"
-msgstr "Notizbuch löschen"
+#, fuzzy
+msgid "Add title"
+msgstr "Titel"
 
 msgid "Login with OneDrive"
 msgstr "Mit OneDrive anmelden"
@@ -2029,21 +2120,38 @@ msgstr "Mit OneDrive anmelden"
 msgid "Search"
 msgstr "Suchen"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Drücke auf die (+)-Schaltfläche, um eine neue Notiz oder ein neues Notizbuch "
-"zu erstellen. Tippe auf die Seitenleiste, um auf deine existierenden "
-"Notizbücher zuzugreifen."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Berechtigung zur Verwendung der Kamera"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"Du hast noch kein Notizbuch angelegt. Erstelle eines, indem du auf den (+) "
-"Knopf drückst."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Synchronisation abbrechen"
 
-msgid "Welcome"
-msgstr "Willkommen"
+#~ msgid "Hide metadata"
+#~ msgstr "Metadaten verstecken"
+
+#~ msgid "Show metadata"
+#~ msgstr "Metadaten anzeigen"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Notizbuch löschen"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Drücke auf die (+)-Schaltfläche, um eine neue Notiz oder ein neues "
+#~ "Notizbuch zu erstellen. Tippe auf die Seitenleiste, um auf deine "
+#~ "existierenden Notizbücher zuzugreifen."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Du hast noch kein Notizbuch angelegt. Erstelle eines, indem du auf den "
+#~ "(+) Knopf drückst."
+
+#~ msgid "Welcome"
+#~ msgstr "Willkommen"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Trenne jedes Schlagwort mit einem Komma."
@@ -2070,9 +2178,6 @@ msgstr "Willkommen"
 #~ msgid "Remove?"
 #~ msgstr "Löschen?"
 
-#~ msgid "Delete notes?"
-#~ msgstr "Notizen löschen?"
-
 #~ msgid "State: %s."
 #~ msgstr "Status: %s."
 

CliClient/locales/en_GB.po

@@ -551,6 +551,25 @@ msgstr ""
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+msgid "Open template directory"
+msgstr ""
+
+msgid "Refresh templates"
+msgstr ""
+
+#, javascript-format
+msgid "Revision: %s (%s)"
+msgstr ""
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr ""
@@ -567,6 +586,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr ""
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr ""
 
@@ -610,12 +632,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr ""
 
@@ -969,9 +997,6 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Set alarm"
 msgstr ""
 
@@ -982,9 +1007,6 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1462,9 +1484,6 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
-msgid "Show advanced options"
-msgstr ""
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1632,18 +1651,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr ""
 
-msgid "Log"
-msgstr ""
-
-msgid "Export Debug Report"
-msgstr ""
-
-msgid "Encryption Config"
-msgstr ""
-
-msgid "Configuration"
-msgstr ""
-
 msgid "Move to notebook..."
 msgstr ""
 
@@ -1666,7 +1673,20 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-msgid "Cancel synchronisation"
+#, javascript-format
+msgid "Notebook: %s"
+msgstr ""
+
+msgid "Encrypted notebooks cannot be renamed"
+msgstr ""
+
+msgid "New Notebook"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "All notes"
 msgstr ""
 
 msgid "Checking... Please wait."
@@ -1702,6 +1722,46 @@ msgstr ""
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+msgid "Information"
+msgstr ""
+
+msgid "Encryption Config"
+msgstr ""
+
+msgid "Tools"
+msgstr ""
+
+msgid "Sync Status"
+msgstr ""
+
+msgid "Log"
+msgstr ""
+
+msgid "Creating report..."
+msgstr ""
+
+msgid "Export Debug Report"
+msgstr ""
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 msgid "More information"
 msgstr ""
 
@@ -1762,6 +1822,9 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Enter notebook title"
+msgstr ""
+
 msgid "Show all"
 msgstr ""
 
@@ -1785,10 +1848,30 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Updated: %s"
+msgstr ""
+
+msgid "View on map"
+msgstr ""
+
+msgid "Go to source URL"
+msgstr ""
+
+msgid "Attach..."
+msgstr ""
+
+msgid "Choose an option"
+msgstr ""
+
 msgid "Take photo"
 msgstr ""
 
@@ -1807,22 +1890,16 @@ msgstr ""
 msgid "Convert to todo"
 msgstr ""
 
-msgid "Hide metadata"
+msgid "Properties"
 msgstr ""
 
-msgid "Show metadata"
-msgstr ""
-
-msgid "View on map"
-msgstr ""
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 
-msgid "Delete notebook"
+msgid "Add title"
 msgstr ""
 
 msgid "Login with OneDrive"
@@ -1830,14 +1907,3 @@ msgstr ""
 
 msgid "Search"
 msgstr ""
-
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-
-msgid "Welcome"
-msgstr ""

CliClient/locales/en_US.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "To delete a tag, untag the associated notes."
@@ -557,6 +557,25 @@ msgstr ""
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+msgid "Open template directory"
+msgstr ""
+
+msgid "Refresh templates"
+msgstr ""
+
+#, javascript-format
+msgid "Revision: %s (%s)"
+msgstr ""
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr ""
@@ -573,6 +592,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr ""
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr ""
 
@@ -616,12 +638,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr "Search in all notes"
 
@@ -987,9 +1015,6 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Set alarm"
 msgstr ""
 
@@ -1000,9 +1025,6 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1318,7 +1340,7 @@ msgid "WebDAV password"
 msgstr ""
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "Attachment download behavior"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
@@ -1487,9 +1509,6 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
-msgid "Show advanced options"
-msgstr ""
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1603,9 +1622,8 @@ msgstr ""
 msgid "Item \"%s\" could not be downloaded: %s"
 msgstr ""
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Items that cannot be synchronized"
+msgstr ""
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
@@ -1658,18 +1676,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr ""
 
-msgid "Log"
-msgstr ""
-
-msgid "Export Debug Report"
-msgstr ""
-
-msgid "Encryption Config"
-msgstr ""
-
-msgid "Configuration"
-msgstr ""
-
 msgid "Move to notebook..."
 msgstr ""
 
@@ -1692,8 +1698,21 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-msgid "Cancel synchronisation"
-msgstr "Cancel synchronization"
+#, javascript-format
+msgid "Notebook: %s"
+msgstr ""
+
+msgid "Encrypted notebooks cannot be renamed"
+msgstr ""
+
+msgid "New Notebook"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "All notes"
+msgstr ""
 
 msgid "Checking... Please wait."
 msgstr ""
@@ -1733,6 +1752,47 @@ msgstr ""
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+msgid "Information"
+msgstr ""
+
+msgid "Encryption Config"
+msgstr ""
+
+msgid "Tools"
+msgstr ""
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Synchronization Status"
+
+msgid "Log"
+msgstr ""
+
+msgid "Creating report..."
+msgstr ""
+
+msgid "Export Debug Report"
+msgstr ""
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 msgid "More information"
 msgstr ""
 
@@ -1795,6 +1855,9 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Enter notebook title"
+msgstr ""
+
 msgid "Show all"
 msgstr ""
 
@@ -1818,10 +1881,30 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Updated: %s"
+msgstr ""
+
+msgid "View on map"
+msgstr ""
+
+msgid "Go to source URL"
+msgstr ""
+
+msgid "Attach..."
+msgstr ""
+
+msgid "Choose an option"
+msgstr ""
+
 msgid "Take photo"
 msgstr ""
 
@@ -1840,22 +1923,16 @@ msgstr ""
 msgid "Convert to todo"
 msgstr ""
 
-msgid "Hide metadata"
+msgid "Properties"
 msgstr ""
 
-msgid "Show metadata"
-msgstr ""
-
-msgid "View on map"
-msgstr ""
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 
-msgid "Delete notebook"
+msgid "Add title"
 msgstr ""
 
 msgid "Login with OneDrive"
@@ -1864,13 +1941,5 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-
-msgid "Welcome"
-msgstr ""
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Cancel synchronization"

CliClient/locales/es_ES.po

@@ -632,6 +632,27 @@ msgstr "Opciones de cifrado"
 msgid "Web clipper options"
 msgstr "Opciones de recorte web"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Introduce fecha"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Directorio para exportar de Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -648,6 +669,9 @@ msgstr "Preferencias..."
 msgid "Check for updates..."
 msgstr "Comprobar actualizaciones..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importar"
 
@@ -691,12 +715,18 @@ msgstr "Cursiva"
 msgid "Link"
 msgstr "Enlace"
 
+msgid "Code"
+msgstr "Código"
+
 msgid "Insert Date Time"
 msgstr "Introduce fecha"
 
 msgid "Edit in external editor"
 msgstr "Editar con un editor externo"
 
+msgid "Tags"
+msgstr "Etiquetas"
+
 msgid "Search in all the notes"
 msgstr "Buscar en todas las notas"
 
@@ -1081,9 +1111,6 @@ msgstr "Insertar hipervínculo"
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
-msgid "Tags"
-msgstr "Etiquetas"
-
 msgid "Set alarm"
 msgstr "Establecer alarma"
 
@@ -1094,9 +1121,6 @@ msgstr "En: %s"
 msgid "Hyperlink"
 msgstr "Hipervínculo"
 
-msgid "Code"
-msgstr "Código"
-
 msgid "Numbered List"
 msgstr "Lista numerada"
 
@@ -1609,9 +1633,6 @@ msgstr ""
 "una nota. Si no se provee ninguno se intentará auto detectar el editor por "
 "defecto."
 
-msgid "Show advanced options"
-msgstr "Mostrar opciones avanzadas"
-
 msgid "Custom TLS certificates"
 msgstr "Certificados TLS personalizados"
 
@@ -1790,18 +1811,6 @@ msgstr "No hay notas. Cree una pulsando en el botón (+)."
 msgid "Delete these notes?"
 msgstr "¿Desea borrar estas notas?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Exportar informe de depuración"
-
-msgid "Encryption Config"
-msgstr "Configuración de cifrado"
-
-msgid "Configuration"
-msgstr "Configuración"
-
 msgid "Move to notebook..."
 msgstr "Mover a la libreta..."
 
@@ -1824,8 +1833,24 @@ msgstr "Seleccione fecha"
 msgid "Confirm"
 msgstr "Confirmar"
 
-msgid "Cancel synchronisation"
-msgstr "Cancelar sincronización"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Libretas"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Los elementos cifrados no pueden ser modificados"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Nueva libreta"
+
+msgid "Configuration"
+msgstr "Configuración"
+
+#, fuzzy
+msgid "All notes"
+msgstr "¿Desea eliminar notas?"
 
 msgid "Checking... Please wait."
 msgstr "Comprobando... Por favor espere."
@@ -1867,6 +1892,50 @@ msgstr "Nuevas etiquetas:"
 msgid "Type new tags or select from list"
 msgstr "Escriba nuevas etiquetas o seleccionelas de la lista"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Configuración"
+
+msgid "Encryption Config"
+msgstr "Configuración de cifrado"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&Herramientas"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Estado"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Creando nuevo %s..."
+
+msgid "Export Debug Report"
+msgstr "Exportar informe de depuración"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Configuración"
@@ -1935,6 +2004,10 @@ msgstr "No se ha podido guardar esta libreta: %s"
 msgid "Edit notebook"
 msgstr "Editar libreta"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Título de libreta:"
+
 msgid "Show all"
 msgstr "Mostrar todo"
 
@@ -1959,10 +2032,32 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "La aplicación móvil de Joplin no soporta actualmente este tipo de enlace: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagen no soportado: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Actualizado: %d."
+
+msgid "View on map"
+msgstr "Ver en un mapa"
+
+msgid "Go to source URL"
+msgstr "Ir a  origen URL"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Buscar..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Mostrar opciones avanzadas"
+
 msgid "Take photo"
 msgstr "Tomar foto"
 
@@ -1981,23 +2076,19 @@ msgstr "Convertir a nota"
 msgid "Convert to todo"
 msgstr "Convertir a lista de tareas"
 
-msgid "Hide metadata"
-msgstr "Ocultar metadatos"
+#, fuzzy
+msgid "Properties"
+msgstr "Propiedades de nota"
 
-msgid "Show metadata"
-msgstr "Mostrar metadatos"
-
-msgid "View on map"
-msgstr "Ver en un mapa"
-
-msgid "Go to source URL"
-msgstr "Ir a  origen URL"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Editar"
 
-msgid "Delete notebook"
-msgstr "Borrar libreta"
+#, fuzzy
+msgid "Add title"
+msgstr "título"
 
 msgid "Login with OneDrive"
 msgstr "Acceder con OneDrive"
@@ -2005,19 +2096,36 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Pulse en el botón (+) para crear una nueva nota o libreta. Pulse en el menú "
-"lateral para acceder a las libretas existentes."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Permiso para usar tu cámara"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"No hay ninguna libreta. Cree una nueva libreta pulsando en el botón (+)."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Cancelar sincronización"
 
-msgid "Welcome"
-msgstr "Bienvenido"
+#~ msgid "Hide metadata"
+#~ msgstr "Ocultar metadatos"
+
+#~ msgid "Show metadata"
+#~ msgstr "Mostrar metadatos"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Borrar libreta"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Pulse en el botón (+) para crear una nueva nota o libreta. Pulse en el "
+#~ "menú lateral para acceder a las libretas existentes."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "No hay ninguna libreta. Cree una nueva libreta pulsando en el botón (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Bienvenido"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separar cada etiqueta por una coma."
@@ -2041,9 +2149,6 @@ msgstr "Bienvenido"
 #~ msgid "Remove?"
 #~ msgstr "¿Borrar?"
 
-#~ msgid "Delete notes?"
-#~ msgstr "¿Desea eliminar notas?"
-
 #~ msgid "State: %s."
 #~ msgstr "Estado: «%s»."
 

CliClient/locales/eu.po

@@ -629,6 +629,25 @@ msgstr "Zifratzeko aukerak"
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+msgid "Open template directory"
+msgstr ""
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -646,6 +665,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr ""
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Inportatu"
 
@@ -692,12 +714,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr "Etiketak"
+
 msgid "Search in all the notes"
 msgstr "Bilatu ohar guztietan"
 
@@ -1079,9 +1107,6 @@ msgstr ""
 msgid "Attach file"
 msgstr "Erantsi fitxategia"
 
-msgid "Tags"
-msgstr "Etiketak"
-
 msgid "Set alarm"
 msgstr "Ezarri alarma"
 
@@ -1092,9 +1117,6 @@ msgstr "%s: %s"
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1614,9 +1636,6 @@ msgstr ""
 "Editorea erabiliko da oharra zabaltzeko. Ez badago zehaztutakorik lehenetsia "
 "igartzen ahaleginduko da."
 
-msgid "Show advanced options"
-msgstr "Erakutsi aukera aurreratuak"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1796,18 +1815,6 @@ msgstr "Ez dago oharrik. Sortu bat (+) botoian klik eginaz."
 msgid "Delete these notes?"
 msgstr "Oharrok ezabatu?"
 
-msgid "Log"
-msgstr "Egunkaria"
-
-msgid "Export Debug Report"
-msgstr "Esportatu arazketa txostena"
-
-msgid "Encryption Config"
-msgstr "Zifratze Ezarpenak"
-
-msgid "Configuration"
-msgstr "Konfigurazioa"
-
 msgid "Move to notebook..."
 msgstr "Mugitu ... koadernora"
 
@@ -1832,8 +1839,24 @@ msgstr "Data aukeratu"
 msgid "Confirm"
 msgstr "Baieztatu"
 
-msgid "Cancel synchronisation"
-msgstr "Sinkronizazioa utzi"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Koadernoak"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Zifratutako itemak ezin aldatu daitezke"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Koaderno berria"
+
+msgid "Configuration"
+msgstr "Konfigurazioa"
+
+#, fuzzy
+msgid "All notes"
+msgstr "Ohar berria"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1871,6 +1894,50 @@ msgstr ""
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Konfigurazioa"
+
+msgid "Encryption Config"
+msgstr "Zifratze Ezarpenak"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Tresnak"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Egoera"
+
+msgid "Log"
+msgstr "Egunkaria"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Oharrak inportatzen..."
+
+msgid "Export Debug Report"
+msgstr "Esportatu arazketa txostena"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Konfigurazioa"
@@ -1934,6 +2001,10 @@ msgstr "Koadernoa ezin gorde daiteke: %s"
 msgid "Edit notebook"
 msgstr "Editatu koadernoa"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Koadernoaren izenburua: "
+
 msgid "Show all"
 msgstr ""
 
@@ -1957,10 +2028,32 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Irudi formatua ez onartua: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Eguneratuta: %d."
+
+msgid "View on map"
+msgstr "Ikusi mapan"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Bilatu"
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Erakutsi aukera aurreratuak"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Argazkia erantsi"
@@ -1980,23 +2073,18 @@ msgstr "Oharra bihurtu"
 msgid "Convert to todo"
 msgstr "Zeregina bihurtu"
 
-msgid "Hide metadata"
-msgstr "Ezkutatu metadatuak"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Erakutsi metadatuak"
-
-msgid "View on map"
-msgstr "Ikusi mapan"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Editatu"
 
-msgid "Delete notebook"
-msgstr "Ezabatu koadernoa"
+#, fuzzy
+msgid "Add title"
+msgstr "Titulu gabekoa"
 
 msgid "Login with OneDrive"
 msgstr "Login with OneDrive"
@@ -2004,18 +2092,31 @@ msgstr "Login with OneDrive"
 msgid "Search"
 msgstr "Bilatu"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Sakatu (+) botoian ohar edo koaderno berria sortzeko. Klik alboko menuan "
-"dagoeneko badiren koadernoak."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Sinkronizazioa utzi"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
+#~ msgid "Hide metadata"
+#~ msgstr "Ezkutatu metadatuak"
 
-msgid "Welcome"
-msgstr "Ongi etorri!"
+#~ msgid "Show metadata"
+#~ msgstr "Erakutsi metadatuak"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Ezabatu koadernoa"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Sakatu (+) botoian ohar edo koaderno berria sortzeko. Klik alboko menuan "
+#~ "dagoeneko badiren koadernoak."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
+
+#~ msgid "Welcome"
+#~ msgstr "Ongi etorri!"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Banatu etiketak koma erabiliaz."

CliClient/locales/fa.po

@@ -557,6 +557,27 @@ msgstr "تنظیمات رمزنگاری"
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "وارد کردن تاریخ و ساعت"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "فولدر خروجی Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s، %s)"
@@ -573,6 +594,9 @@ msgstr "تنظیمات..."
 msgid "Check for updates..."
 msgstr ""
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "بارگذاری"
 
@@ -617,12 +641,18 @@ msgstr ""
 msgid "Link"
 msgstr "لینک"
 
+msgid "Code"
+msgstr "کد"
+
 msgid "Insert Date Time"
 msgstr "وارد کردن تاریخ و ساعت"
 
 msgid "Edit in external editor"
 msgstr "تنظیم ویرایشگر خارجی"
 
+msgid "Tags"
+msgstr "برچسب‌ها"
+
 msgid "Search in all the notes"
 msgstr "جستجو در تمام یادداشت ها"
 
@@ -981,9 +1011,6 @@ msgstr "وارد کردن لینک"
 msgid "Attach file"
 msgstr "پیوست فایل"
 
-msgid "Tags"
-msgstr "برچسب‌ها"
-
 msgid "Set alarm"
 msgstr ""
 
@@ -994,9 +1021,6 @@ msgstr "در: %s"
 msgid "Hyperlink"
 msgstr "لینک"
 
-msgid "Code"
-msgstr "کد"
-
 #, fuzzy
 msgid "Numbered List"
 msgstr "لیست ترتیبی"
@@ -1482,9 +1506,6 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
-msgid "Show advanced options"
-msgstr "نمایش گزینه های پیشرفته"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1652,18 +1673,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr "این یادداشت ها پاک شوند؟"
 
-msgid "Log"
-msgstr "لاگ"
-
-msgid "Export Debug Report"
-msgstr ""
-
-msgid "Encryption Config"
-msgstr "تنظیمات رمزنگاری"
-
-msgid "Configuration"
-msgstr "تنظیمات"
-
 msgid "Move to notebook..."
 msgstr "انتقال به دفترچه..."
 
@@ -1686,9 +1695,23 @@ msgstr "انتخاب تاریخ"
 msgid "Confirm"
 msgstr "تایید"
 
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "دفترچه ها"
+
+msgid "Encrypted notebooks cannot be renamed"
+msgstr ""
+
 #, fuzzy
-msgid "Cancel synchronisation"
-msgstr "لغو سینک"
+msgid "New Notebook"
+msgstr "دفترچه جدید"
+
+msgid "Configuration"
+msgstr "تنظیمات"
+
+#, fuzzy
+msgid "All notes"
+msgstr "یادداشت"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1724,6 +1747,50 @@ msgstr "برچسب جدید:"
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "تنظیمات"
+
+msgid "Encryption Config"
+msgstr "تنظیمات رمزنگاری"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&ابزارها"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "وضعیت"
+
+msgid "Log"
+msgstr "لاگ"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "بارگذاری یادداشت‌ها..."
+
+msgid "Export Debug Report"
+msgstr ""
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "تنظیمات"
@@ -1785,6 +1852,10 @@ msgstr ""
 msgid "Edit notebook"
 msgstr "ویرایش دفترچه"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "موضوع دفترچه:"
+
 msgid "Show all"
 msgstr "نمایش همه"
 
@@ -1808,10 +1879,32 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "به‌روز شده: %d."
+
+msgid "View on map"
+msgstr "نمایش بر روی نقشه"
+
+msgid "Go to source URL"
+msgstr "رفتن به آدرس منبع"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "جستجو..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "نمایش گزینه های پیشرفته"
+
 msgid "Take photo"
 msgstr "گرفتن عکس"
 
@@ -1831,24 +1924,18 @@ msgid "Convert to todo"
 msgstr "تبدیل به فهرست کارها"
 
 #, fuzzy
-msgid "Hide metadata"
-msgstr "پنهان کردن متادیتا"
+msgid "Properties"
+msgstr "جزییات یادداشت"
 
-#, fuzzy
-msgid "Show metadata"
-msgstr "نمایش متادیتا"
-
-msgid "View on map"
-msgstr "نمایش بر روی نقشه"
-
-msgid "Go to source URL"
-msgstr "رفتن به آدرس منبع"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "ویرایش"
 
-msgid "Delete notebook"
-msgstr "پاک کردن دفترچه"
+#, fuzzy
+msgid "Add title"
+msgstr "موضوع"
 
 msgid "Login with OneDrive"
 msgstr "ورود با OneDrive"
@@ -1856,18 +1943,33 @@ msgstr "ورود با OneDrive"
 msgid "Search"
 msgstr "جستجو"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "اجازه برای استفاده از دوربین"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"شما هیچ دفترچه ای ندارید. با کلیک کردن بر روی (+) یک دفترچه ی جدید ایجاد "
-"کنید."
+#, fuzzy
+#~ msgid "Cancel synchronisation"
+#~ msgstr "لغو سینک"
 
-msgid "Welcome"
-msgstr "خوش آمدید"
+#, fuzzy
+#~ msgid "Hide metadata"
+#~ msgstr "پنهان کردن متادیتا"
+
+#, fuzzy
+#~ msgid "Show metadata"
+#~ msgstr "نمایش متادیتا"
+
+#~ msgid "Delete notebook"
+#~ msgstr "پاک کردن دفترچه"
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "شما هیچ دفترچه ای ندارید. با کلیک کردن بر روی (+) یک دفترچه ی جدید ایجاد "
+#~ "کنید."
+
+#~ msgid "Welcome"
+#~ msgstr "خوش آمدید"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "هر برچسب را با ویرگول شده کنید."

CliClient/locales/fr_FR.po

@@ -627,6 +627,25 @@ msgstr "Options de chiffrement"
 msgid "Web clipper options"
 msgstr "Options du Web Clipper"
 
+msgid "Create note from template"
+msgstr "Créer une note à partir d'un modèle"
+
+msgid "Create to-do from template"
+msgstr "Créer une tâche à partir d'un modèle"
+
+msgid "Insert template"
+msgstr "Insérer un modèle"
+
+msgid "Open template directory"
+msgstr "Ouvrir le dossier des modèles"
+
+msgid "Refresh templates"
+msgstr "Rafraichir modèles"
+
+#, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "Révision : %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -643,6 +662,9 @@ msgstr "Préférences…"
 msgid "Check for updates..."
 msgstr "Vérifier les mises à jour..."
 
+msgid "Templates"
+msgstr "Modèles"
+
 msgid "Import"
 msgstr "Importer"
 
@@ -686,12 +708,18 @@ msgstr "Italique"
 msgid "Link"
 msgstr "Lien"
 
+msgid "Code"
+msgstr "Code"
+
 msgid "Insert Date Time"
 msgstr "Insérer la date et l'heure"
 
 msgid "Edit in external editor"
 msgstr "Ouvrir dans un éditeur externe"
 
+msgid "Tags"
+msgstr "Étiquettes"
+
 msgid "Search in all the notes"
 msgstr "Chercher dans toutes les notes"
 
@@ -984,7 +1012,7 @@ msgid "View them now"
 msgstr "Les voir maintenant"
 
 msgid "One or more master keys need a password."
-msgstr "L'une des clefs maîtres requiert un mot de passe :"
+msgstr "L'une des clefs maîtres requiert un mot de passe."
 
 msgid "Set the password"
 msgstr "Définir le mot de passe"
@@ -1084,9 +1112,6 @@ msgstr "Insérer lien"
 msgid "Attach file"
 msgstr "Attacher un fichier"
 
-msgid "Tags"
-msgstr "Étiquettes"
-
 msgid "Set alarm"
 msgstr "Régler alarme"
 
@@ -1097,9 +1122,6 @@ msgstr "Dans : %s"
 msgid "Hyperlink"
 msgstr "Lien"
 
-msgid "Code"
-msgstr "Code"
-
 msgid "Numbered List"
 msgstr "Liste numérotée"
 
@@ -1439,9 +1461,9 @@ msgid ""
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
 "En mode \"manuel\", les ressources sont téléchargées uniquement lorsque vous "
-"cliquez dessus. En mode \"auto\", elle sont téléchargée lorsque vous ouvrez "
-"la note. En mode \"toujours\", toutes les ressources sont téléchargées, que "
-"vous ayez ouvert la note ou pas."
+"cliquez dessus. En mode \"auto\", elles sont téléchargées lorsque vous "
+"ouvrez la note. En mode \"toujours\", toutes les ressources sont "
+"téléchargées, que vous ayez ouvert la note ou pas."
 
 msgid "Always"
 msgstr "Toujours"
@@ -1609,9 +1631,6 @@ msgstr ""
 "La commande de l'éditeur de texte (peut inclure des options) pour ouvrir et "
 "modifier les notes. Si non-spécifiée, elle sera détectée automatiquement."
 
-msgid "Show advanced options"
-msgstr "Montrer les options avancées"
-
 msgid "Custom TLS certificates"
 msgstr "Certificats TLS personnalisés"
 
@@ -1794,18 +1813,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr "Supprimer ces notes ?"
 
-msgid "Log"
-msgstr "Journal"
-
-msgid "Export Debug Report"
-msgstr "Exporter rapport de débogage"
-
-msgid "Encryption Config"
-msgstr "Config chiffrement"
-
-msgid "Configuration"
-msgstr "Configuration"
-
 msgid "Move to notebook..."
 msgstr "Déplacer vers..."
 
@@ -1828,8 +1835,21 @@ msgstr "Sélectionner date"
 msgid "Confirm"
 msgstr "Confirmer"
 
-msgid "Cancel synchronisation"
-msgstr "Annuler synchronisation"
+#, javascript-format
+msgid "Notebook: %s"
+msgstr "Carnet : %s"
+
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Les carnets chiffrés ne peuvent être renommés"
+
+msgid "New Notebook"
+msgstr "Nouveau carnet"
+
+msgid "Configuration"
+msgstr "Configuration"
+
+msgid "All notes"
+msgstr "Toutes les notes"
 
 msgid "Checking... Please wait."
 msgstr "Vérification... Veuillez attendre."
@@ -1871,6 +1891,50 @@ msgstr "Nouvelles étiquettes :"
 msgid "Type new tags or select from list"
 msgstr "Entrez de nouvelles étiquettes ou sélectionnez de la liste"
 
+msgid "Warning"
+msgstr "Avertissement"
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+"Pour utiliser la synchronisation par système de fichiers, votre autorisation "
+"pour écrire sur le stockage externe est requise."
+
+msgid "Information"
+msgstr "Information"
+
+msgid "Encryption Config"
+msgstr "Config chiffrement"
+
+msgid "Tools"
+msgstr "Outils"
+
+msgid "Sync Status"
+msgstr "État synchronisation"
+
+msgid "Log"
+msgstr "Journal"
+
+msgid "Creating report..."
+msgstr "Création du rapport..."
+
+msgid "Export Debug Report"
+msgstr "Exporter rapport de débogage"
+
+msgid "Fixing search index..."
+msgstr "Correction de l'index..."
+
+msgid "Fix search index"
+msgstr "Corriger index de recherche"
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+"Utilisez ceci pour corriger l'index du moteur de recherche en cas de "
+"problème. Cela peut prendre assez longtemps selon le nombre de notes."
+
 msgid "More information"
 msgstr "Plus d'information"
 
@@ -1937,6 +2001,9 @@ msgstr "Ce carnet n'a pas pu être sauvegardé : %s"
 msgid "Edit notebook"
 msgstr "Éditer le carnet"
 
+msgid "Enter notebook title"
+msgstr "Entrez le titre du carnet"
+
 msgid "Show all"
 msgstr "Afficher tous"
 
@@ -1961,10 +2028,30 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "L'application mobile Joplin ne gère pas pour l'instant ce type de lien : %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr "Le schéma d'URI \"%s\" n'est pas supporté"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Type d'image non géré : %s"
 
+#, javascript-format
+msgid "Updated: %s"
+msgstr "Mis à jour : %s"
+
+msgid "View on map"
+msgstr "Voir sur carte"
+
+msgid "Go to source URL"
+msgstr "Aller à l'URL source"
+
+msgid "Attach..."
+msgstr "Joindre..."
+
+msgid "Choose an option"
+msgstr "Choisissez une option"
+
 msgid "Take photo"
 msgstr "Prendre une photo"
 
@@ -1983,23 +2070,17 @@ msgstr "Convertir en note"
 msgid "Convert to todo"
 msgstr "Convertir en tâche"
 
-msgid "Hide metadata"
-msgstr "Cacher les métadonnées"
+msgid "Properties"
+msgstr "Propriétés"
 
-msgid "Show metadata"
-msgstr "Voir métadonnées"
-
-msgid "View on map"
-msgstr "Voir sur carte"
-
-msgid "Go to source URL"
-msgstr "Aller à l'URL source"
+msgid "Add body"
+msgstr "Ajoutez le contenu"
 
 msgid "Edit"
 msgstr "Édition"
 
-msgid "Delete notebook"
-msgstr "Supprimer le carnet"
+msgid "Add title"
+msgstr "Ajoutez le titre"
 
 msgid "Login with OneDrive"
 msgstr "Se connecter à OneDrive"
@@ -2007,20 +2088,43 @@ msgstr "Se connecter à OneDrive"
 msgid "Search"
 msgstr "Chercher"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Appuyez sur le bouton (+) pour créer une nouvelle note ou carnet. Ouvrez le "
-"menu latéral pour accéder à vos carnets."
+#~ msgid ""
+#~ "Joplin does not have permission to access \"%s\". Either choose a "
+#~ "different sync target, or give Joplin the \"Storage\" permission."
+#~ msgstr ""
+#~ "Joplin ne peut pas accéder au dossier \"%s\". Choisissez une autre cible "
+#~ "de synchronisation, ou donnez à Joplin l'autorisation \"Stockage\"."
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"Vous n'avez pour l'instant pas de carnets. Créez-en un en pressant le bouton "
-"(+)."
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Autorisation d'écrire sur le stockage externe"
 
-msgid "Welcome"
-msgstr "Bienvenue"
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Annuler synchronisation"
+
+#~ msgid "Hide metadata"
+#~ msgstr "Cacher les métadonnées"
+
+#~ msgid "Show metadata"
+#~ msgstr "Voir métadonnées"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Supprimer le carnet"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Appuyez sur le bouton (+) pour créer une nouvelle note ou carnet. Ouvrez "
+#~ "le menu latéral pour accéder à vos carnets."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Vous n'avez pour l'instant pas de carnets. Créez-en un en pressant le "
+#~ "bouton (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Bienvenue"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Séparez chaque étiquette par une virgule."
@@ -2047,9 +2151,6 @@ msgstr "Bienvenue"
 #~ msgid "Remove?"
 #~ msgstr "Supprimer ?"
 
-#~ msgid "Delete notes?"
-#~ msgstr "Supprimer les notes ?"
-
 #~ msgid "State: %s."
 #~ msgstr "État : %s."
 

CliClient/locales/gl_ES.po

@@ -622,6 +622,26 @@ msgstr "Opcións de cifrado"
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Cartafol de exportación do Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -639,6 +659,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Buscar actualizacións…"
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importar"
 
@@ -684,12 +707,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr "Etiquetas"
+
 msgid "Search in all the notes"
 msgstr "Buscar en todas as notas"
 
@@ -1069,9 +1098,6 @@ msgstr ""
 msgid "Attach file"
 msgstr "Anexar un ficheiro"
 
-msgid "Tags"
-msgstr "Etiquetas"
-
 msgid "Set alarm"
 msgstr "Estabelecer alarma"
 
@@ -1082,9 +1108,6 @@ msgstr "%s: %s"
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1594,9 +1617,6 @@ msgstr ""
 "Editor a usar para abrir unha nota. Se non se indica ningún tentará detectar "
 "automaticamente o editor predeterminado."
 
-msgid "Show advanced options"
-msgstr "Mostrar opcións avanzadas"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1776,18 +1796,6 @@ msgstr "Non ten notas actualmente. Cree unha premendo no botón (+)."
 msgid "Delete these notes?"
 msgstr "Desexa eliminar estas notas?"
 
-msgid "Log"
-msgstr "Rexistro"
-
-msgid "Export Debug Report"
-msgstr "Exportar informe de depuración"
-
-msgid "Encryption Config"
-msgstr "Configuración de cifrado"
-
-msgid "Configuration"
-msgstr "Configuración"
-
 msgid "Move to notebook..."
 msgstr "Mover para o caderno..."
 
@@ -1812,8 +1820,24 @@ msgstr "Seleccionar data"
 msgid "Confirm"
 msgstr "Confirmar"
 
-msgid "Cancel synchronisation"
-msgstr "Cancelar sincronización"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Cadernos"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Non é posíbel modificar elementos cifrados"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Novo caderno"
+
+msgid "Configuration"
+msgstr "Configuración"
+
+#, fuzzy
+msgid "All notes"
+msgstr "nota"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1851,6 +1875,50 @@ msgstr "Etiquetas novas:"
 msgid "Type new tags or select from list"
 msgstr "Escriba etiquetas novas ou seleccione da lista"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Configuración"
+
+msgid "Encryption Config"
+msgstr "Configuración de cifrado"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Ferramentas"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Estado"
+
+msgid "Log"
+msgstr "Rexistro"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Criando novo %s..."
+
+msgid "Export Debug Report"
+msgstr "Exportar informe de depuración"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Configuración"
@@ -1913,6 +1981,10 @@ msgstr "Non foi posíbel gardar o caderno: %s"
 msgid "Edit notebook"
 msgstr "Editar caderno"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Título do caderno:"
+
 msgid "Show all"
 msgstr "Mostrar todo"
 
@@ -1936,10 +2008,32 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imaxe incompatíbel: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Actualizado: %d."
+
+msgid "View on map"
+msgstr "Ver no mapa"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Buscar…"
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Mostrar opcións avanzadas"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Anexar foto"
@@ -1959,23 +2053,18 @@ msgstr "Converter para nota"
 msgid "Convert to todo"
 msgstr "Converter para tarefa"
 
-msgid "Hide metadata"
-msgstr "Ocultar metadados"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Mostrar metadatos"
-
-msgid "View on map"
-msgstr "Ver no mapa"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Edtar"
 
-msgid "Delete notebook"
-msgstr "Eliminar caderno"
+#, fuzzy
+msgid "Add title"
+msgstr "Sen título"
 
 msgid "Login with OneDrive"
 msgstr "Acceder con OneDrive"
@@ -1983,18 +2072,31 @@ msgstr "Acceder con OneDrive"
 msgid "Search"
 msgstr "Buscar"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Prema no botón (+) para crear unha nota ou caderno. Prema no menú lateral "
-"para acceder aos cadernos existentes."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Cancelar sincronización"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
+#~ msgid "Hide metadata"
+#~ msgstr "Ocultar metadados"
 
-msgid "Welcome"
-msgstr "Benvido/a"
+#~ msgid "Show metadata"
+#~ msgstr "Mostrar metadatos"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Eliminar caderno"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Prema no botón (+) para crear unha nota ou caderno. Prema no menú lateral "
+#~ "para acceder aos cadernos existentes."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Benvido/a"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separar cada etiqueta por unha coma."

CliClient/locales/hr_HR.po

@@ -626,6 +626,25 @@ msgstr ""
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+msgid "Open template directory"
+msgstr ""
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -643,6 +662,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr ""
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Uvoz"
 
@@ -689,12 +711,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr "Oznake"
+
 msgid "Search in all the notes"
 msgstr "Pretraži u svim bilješkama"
 
@@ -1064,9 +1092,6 @@ msgstr ""
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
-msgid "Tags"
-msgstr "Oznake"
-
 msgid "Set alarm"
 msgstr "Postavi upozorenje"
 
@@ -1077,9 +1102,6 @@ msgstr "%s: %s"
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1588,9 +1610,6 @@ msgstr ""
 "Program za uređivanje koji će biti korišten za uređivanje bilješki. Ako ni "
 "jedan nije odabran, pokušati će se sa default programom."
 
-msgid "Show advanced options"
-msgstr "Prikaži napredne opcije"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1768,18 +1787,6 @@ msgstr "Trenutno nema bilješki. Stvori novu klikom na (+) gumb."
 msgid "Delete these notes?"
 msgstr "Obriši ove bilješke?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Izvezi Debug izvještaj"
-
-msgid "Encryption Config"
-msgstr ""
-
-msgid "Configuration"
-msgstr "Konfiguracija"
-
 msgid "Move to notebook..."
 msgstr "Premjesti u bilježnicu..."
 
@@ -1804,8 +1811,24 @@ msgstr "Odaberi datum"
 msgid "Confirm"
 msgstr "Potvrdi"
 
-msgid "Cancel synchronisation"
-msgstr "Prekini sinkronizaciju"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Bilježnice"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Neke stavke se ne mogu sinkronizirati."
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Nova bilježnica"
+
+msgid "Configuration"
+msgstr "Konfiguracija"
+
+#, fuzzy
+msgid "All notes"
+msgstr "Nova bilješka"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1843,6 +1866,50 @@ msgstr ""
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Konfiguracija"
+
+msgid "Encryption Config"
+msgstr ""
+
+#, fuzzy
+msgid "Tools"
+msgstr "Alati"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Uvozim bilješke..."
+
+msgid "Export Debug Report"
+msgstr "Izvezi Debug izvještaj"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Konfiguracija"
@@ -1907,6 +1974,10 @@ msgstr "Bilježnicu nije moguće snimiti: %s"
 msgid "Edit notebook"
 msgstr "Uredi bilježnicu"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Naslov bilježnice:"
+
 msgid "Show all"
 msgstr ""
 
@@ -1930,10 +2001,32 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodržana vrsta slike: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Ažurirano: %d."
+
+msgid "View on map"
+msgstr "Vidi na karti"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Traži"
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Prikaži napredne opcije"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Priloži sliku"
@@ -1953,23 +2046,18 @@ msgstr "Pretvori u bilješku"
 msgid "Convert to todo"
 msgstr "Pretvori u zadatak"
 
-msgid "Hide metadata"
-msgstr "Sakrij metapodatke"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Prikaži metapodatke"
-
-msgid "View on map"
-msgstr "Vidi na karti"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Uredi"
 
-msgid "Delete notebook"
-msgstr "Obriši bilježnicu"
+#, fuzzy
+msgid "Add title"
+msgstr "Nenaslovljen"
 
 msgid "Login with OneDrive"
 msgstr "Prijavi se u OneDrive"
@@ -1977,18 +2065,31 @@ msgstr "Prijavi se u OneDrive"
 msgid "Search"
 msgstr "Traži"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Klikni (+) gumb za dodavanje nove bilješke ili bilježnice ili odaberi "
-"postojeću bilježnicu iz izbornika."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Prekini sinkronizaciju"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
+#~ msgid "Hide metadata"
+#~ msgstr "Sakrij metapodatke"
 
-msgid "Welcome"
-msgstr "Dobro došli"
+#~ msgid "Show metadata"
+#~ msgstr "Prikaži metapodatke"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Obriši bilježnicu"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Klikni (+) gumb za dodavanje nove bilješke ili bilježnice ili odaberi "
+#~ "postojeću bilježnicu iz izbornika."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
+
+#~ msgid "Welcome"
+#~ msgstr "Dobro došli"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Odvoji oznake zarezom."

CliClient/locales/it_IT.po

@@ -633,6 +633,27 @@ msgstr "Opzioni Crittografia"
 msgid "Web clipper options"
 msgstr "Opzioni Web Clipper"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Inserisci data e ora"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Cartella di esportazione di Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -649,6 +670,9 @@ msgstr "Preferenze..."
 msgid "Check for updates..."
 msgstr "Controlla aggiornamenti..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importa"
 
@@ -692,12 +716,18 @@ msgstr "Corsivo"
 msgid "Link"
 msgstr "Link"
 
+msgid "Code"
+msgstr "Codice"
+
 msgid "Insert Date Time"
 msgstr "Inserisci data e ora"
 
 msgid "Edit in external editor"
 msgstr "Modifica in un editor esterno"
 
+msgid "Tags"
+msgstr "Tag"
+
 msgid "Search in all the notes"
 msgstr "Cerca in tutte le note"
 
@@ -729,7 +759,7 @@ msgid "Make a donation"
 msgstr "Fai una donazione"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "Attiva / disattiva strumenti di sviluppo"
 
 #, javascript-format
 msgid "Open %s"
@@ -749,7 +779,7 @@ msgstr "La versione attuale è aggiornata."
 
 #, javascript-format
 msgid "%s (pre-release)"
-msgstr ""
+msgstr "%s (pre-rilascio)"
 
 msgid "An update is available, do you want to download it now?"
 msgstr "È disponibile un aggiornamento, vuoi scaricarlo ora?"
@@ -985,9 +1015,8 @@ msgstr "Alcuni elementi non possono essere sincronizzati."
 msgid "View them now"
 msgstr "Mostrali ora"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "Inserisci password principale:"
+msgstr "Una o più chiavi master necessitano di una password."
 
 msgid "Set the password"
 msgstr "Imposta la password"
@@ -1084,9 +1113,6 @@ msgstr "Inserire collegamento ipertestuale"
 msgid "Attach file"
 msgstr "Allega File"
 
-msgid "Tags"
-msgstr "Tag"
-
 msgid "Set alarm"
 msgstr "Imposta Allarme"
 
@@ -1097,9 +1123,6 @@ msgstr "In: %s"
 msgid "Hyperlink"
 msgstr "Collegamento ipertestuale"
 
-msgid "Code"
-msgstr "Codice"
-
 msgid "Numbered List"
 msgstr "Elenco Numerato"
 
@@ -1185,18 +1208,19 @@ msgstr "Taccuini"
 msgid "Decrypting items: %d/%d"
 msgstr "Decrittografia Elementi: %d/%d"
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Fetching resources: %d/%d"
-msgstr "Risorse: %d/%d"
+msgstr "Recupero risorse: %d/%d"
 
 msgid "Please select where the sync status should be exported to"
 msgstr ""
+"Prego selezionare dove lo stato della sincronizzazione deve essere esportato"
 
 msgid "Retry"
-msgstr ""
+msgstr "Riprova"
 
 msgid "Add or remove tags"
-msgstr "Aggiungi o rimuovi etichetta"
+msgstr "Aggiungi o rimuovi etichette"
 
 msgid "Duplicate"
 msgstr "Duplicare"
@@ -1229,9 +1253,11 @@ msgid ""
 "Type a note title to jump to it. Or type # followed by a tag name, or @ "
 "followed by a notebook name."
 msgstr ""
+"Scrivi il titolo di una nota per saltare ad essa. Oppure digita # seguito "
+"dal nome di una etichetta, oppure @ seguito dal nome di un taccuino."
 
 msgid "Goto Anything..."
-msgstr ""
+msgstr "Vai a..."
 
 #, javascript-format
 msgid "Usage: %s"
@@ -1348,6 +1374,8 @@ msgstr "La sincronizzazione è già in corso. Stato: %s"
 msgid ""
 "Unknown item type downloaded - please upgrade Joplin to the latest version"
 msgstr ""
+"Tipo elemento scaricato sconosciuto - prego aggiornare Joplin all’ultima "
+"versione"
 
 msgid "Encrypted"
 msgstr "Crittografato"
@@ -1391,6 +1419,9 @@ msgid ""
 "to it before syncing, otherwise all files will be removed! See the FAQ for "
 "more details: %s"
 msgstr ""
+"Attenzione: se si cambia questa posizione, accertarsi di copiare tutto il "
+"contenuto prima di sincronizzare, altrimenti tutti i file saranno rimossi! "
+"Vedi le FAQ per maggiori dettagli: %s"
 
 msgid "Synchronisation target"
 msgstr "Destinazione di sincronizzazione"
@@ -1424,13 +1455,16 @@ msgid "WebDAV password"
 msgstr "Password WebDAV"
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "Comportamento scaricamento allegati"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"In modalità \"Manuale\", gli allegati sono scaricati solo quando si clicca "
+"su di essi. In \"Auto\" sono scaricati quando si apre la nota. In \"Sempre\" "
+"tutti gli allegati sono scaricati sia che si apra o no la nota."
 
 msgid "Always"
 msgstr "Sempre"
@@ -1442,7 +1476,7 @@ msgid "Auto"
 msgstr "Auto"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "Massimo numero di connessioni concorrenti"
 
 msgid "Language"
 msgstr "Linguaggio"
@@ -1499,7 +1533,7 @@ msgid "Enable math expressions"
 msgstr "Attiva espressioni matematiche"
 
 msgid "Enable ==mark== syntax"
-msgstr ""
+msgstr "Attiva sintassi ==mark=="
 
 msgid "Enable footnotes"
 msgstr "Attiva note a piè pagina"
@@ -1508,10 +1542,10 @@ msgid "Enable table of contents extension"
 msgstr ""
 
 msgid "Enable ~sub~ syntax"
-msgstr ""
+msgstr "Attiva sintassi ~sub~"
 
 msgid "Enable ^sup^ syntax"
-msgstr ""
+msgstr "Attiva sintassi ^sup^"
 
 msgid "Enable deflist syntax"
 msgstr ""
@@ -1523,7 +1557,7 @@ msgid "Enable markdown emoji"
 msgstr ""
 
 msgid "Enable ++insert++ syntax"
-msgstr ""
+msgstr "Attiva sintassi ++insert++"
 
 msgid "Enable multimarkdown table extension"
 msgstr ""
@@ -1544,7 +1578,7 @@ msgstr ""
 "costantemente le tue note e quindi ridurre il numero di conflitti."
 
 msgid "Start application minimised in the tray icon"
-msgstr ""
+msgstr "Avvia applicazione minimizzata nell’icona del vassoio"
 
 msgid "Global zoom percentage"
 msgstr "Percentuale di zoom globale"
@@ -1567,11 +1601,11 @@ msgid "Automatically update the application"
 msgstr "Aggiorna automaticamente l'applicazione"
 
 msgid "Get pre-releases when checking for updates"
-msgstr ""
+msgstr "Ottieni pre-rilasci durante controllo aggiornamenti"
 
 #, javascript-format
 msgid "See the pre-release page for more details: %s"
-msgstr ""
+msgstr "Vedi la pagina di pre-rilascio per maggiori dettagli: %s"
 
 msgid "Synchronisation interval"
 msgstr "Intervallo di sincronizzazione"
@@ -1599,9 +1633,6 @@ msgstr ""
 "una nota. Se non ne viene fornita alcuna, cercherà di rilevare "
 "automaticamente l'editor predefinito."
 
-msgid "Show advanced options"
-msgstr "Mostra opzioni avanzate"
-
 msgid "Custom TLS certificates"
 msgstr "Certificati TLS personalizzati"
 
@@ -1631,7 +1662,7 @@ msgid "%d days"
 msgstr "%d giorni"
 
 msgid "Keep note history for"
-msgstr ""
+msgstr "Mantieni cronologia nota per"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1650,7 +1681,7 @@ msgid "Note"
 msgstr "Nota"
 
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 msgid "Application"
 msgstr "Applicazione"
@@ -1725,15 +1756,17 @@ msgstr "%s (%s) non può essere caricato: %s"
 msgid "Item \"%s\" could not be downloaded: %s"
 msgstr "Elemento \"%s\" non può essere scaricato: %s"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "Elementi che non possono essere sincronizzati"
+msgstr "Elementi che non possono essere decriptati"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin ha fallito la decriptazione di questi elementi più volte, forse "
+"perché sono corrotti o troppo grandi. Questi elementi rimarranno sul "
+"dispositivo, ma Joplin non proverà più a decriptarli."
 
 msgid "Sync status (synced items / total items)"
 msgstr "Stato di sincronizzazione (Elementi sincronizzati / Elementi totali)"
@@ -1780,18 +1813,6 @@ msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
 msgid "Delete these notes?"
 msgstr "Cancellare queste note?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Esporta il Report di Debug"
-
-msgid "Encryption Config"
-msgstr "Configurazione Crittografia"
-
-msgid "Configuration"
-msgstr "Configurazione"
-
 msgid "Move to notebook..."
 msgstr "Sposta sul Taccuino..."
 
@@ -1814,8 +1835,24 @@ msgstr "Seleziona la data"
 msgid "Confirm"
 msgstr "Conferma"
 
-msgid "Cancel synchronisation"
-msgstr "Cancella la sincronizzazione"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Taccuini"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Gli elementi crittografati non possono essere modificati"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Nuovo taccuino"
+
+msgid "Configuration"
+msgstr "Configurazione"
+
+#, fuzzy
+msgid "All notes"
+msgstr "Eliminare le note?"
 
 msgid "Checking... Please wait."
 msgstr "Controllo... Attendere per favore."
@@ -1828,6 +1865,9 @@ msgid ""
 "Error. Please check that URL, username, password, etc. are correct and that "
 "the sync target is accessible. The reported error was:"
 msgstr ""
+"Errore. Prego controllare che URL, nome utente, password, etc. siano "
+"corretti e che la destinazione di sincronizzazione sia accessibile. L’errore "
+"riportato era:"
 
 msgid "The application has been authorised!"
 msgstr "L'applicazione è stata autorizzata con successo!"
@@ -1840,6 +1880,11 @@ msgid ""
 "\n"
 "Please try again."
 msgstr ""
+"Non è stato possibile autorizzare l’applicazione:\n"
+"\n"
+"%s\n"
+"\n"
+"Riprovare prego."
 
 #, javascript-format
 msgid "Decrypted items: %s / %s"
@@ -1851,9 +1896,52 @@ msgstr "Nuovi tag:"
 msgid "Type new tags or select from list"
 msgstr "Digita nuovi tag o seleziona dalla lista"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
 #, fuzzy
+msgid "Information"
+msgstr "Maggiori informazioni"
+
+msgid "Encryption Config"
+msgstr "Configurazione Crittografia"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&Strumenti"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Stato"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Creare nuovo %s..."
+
+msgid "Export Debug Report"
+msgstr "Esporta il Report di Debug"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 msgid "More information"
-msgstr "Configurazione"
+msgstr "Maggiori informazioni"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1920,6 +2008,10 @@ msgstr "Il Taccuino non può essere salvato: %s"
 msgid "Edit notebook"
 msgstr "Modifica Taccuino"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Titolo del Taccuino:"
+
 msgid "Show all"
 msgstr "Mostra tutto"
 
@@ -1944,10 +2036,32 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "L'app mobile Joplin attualmente non supporta questo tipo di collegamento: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr "Collegamenti con protocollo \"%s\" non sono supportati"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo di immagine non supportata: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Aggiornato: %d."
+
+msgid "View on map"
+msgstr "Guarda sulla mappa"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Cerca..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Mostra opzioni avanzate"
+
 msgid "Take photo"
 msgstr "Scatta foto"
 
@@ -1966,23 +2080,19 @@ msgstr "Converti in nota"
 msgid "Convert to todo"
 msgstr "Converti in Todo"
 
-msgid "Hide metadata"
-msgstr "Nascondi i Metadati"
+#, fuzzy
+msgid "Properties"
+msgstr "Proprietà della nota"
 
-msgid "Show metadata"
-msgstr "Mostra i metadati"
-
-msgid "View on map"
-msgstr "Guarda sulla mappa"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Modifica"
 
-msgid "Delete notebook"
-msgstr "Cancella Taccuino"
+#, fuzzy
+msgid "Add title"
+msgstr "titolo"
 
 msgid "Login with OneDrive"
 msgstr "Accedi a OneDrive"
@@ -1990,19 +2100,37 @@ msgstr "Accedi a OneDrive"
 msgid "Search"
 msgstr "Cerca"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Fare clic sul pulsante (+) per creare una nuova Nota o un nuovo Taccuino. "
-"Fare clic sul menu laterale per accedere ai tuoi Taccuini esistenti."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Permesso di usare la fotocamera"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"Attualmente non hai nessun Taccuino. Crearne uno cliccando sul pulsante (+)."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Cancella la sincronizzazione"
 
-msgid "Welcome"
-msgstr "Benvenuto"
+#~ msgid "Hide metadata"
+#~ msgstr "Nascondi i Metadati"
+
+#~ msgid "Show metadata"
+#~ msgstr "Mostra i metadati"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Cancella Taccuino"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Fare clic sul pulsante (+) per creare una nuova Nota o un nuovo Taccuino. "
+#~ "Fare clic sul menu laterale per accedere ai tuoi Taccuini esistenti."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Attualmente non hai nessun Taccuino. Crearne uno cliccando sul pulsante "
+#~ "(+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Benvenuto"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separa ogni etichetta da una virgola."
@@ -2023,9 +2151,6 @@ msgstr "Benvenuto"
 #~ msgid "Joplin v%s"
 #~ msgstr "Joplin v%s"
 
-#~ msgid "Delete notes?"
-#~ msgstr "Eliminare le note?"
-
 #~ msgid "State: %s."
 #~ msgstr "Stato: %s."
 

CliClient/locales/ja_JP.po

@@ -617,6 +617,27 @@ msgstr "暗号化のオプション"
 msgid "Web clipper options"
 msgstr "Webクリッパーのオプション"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "日付の入力"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin エクスポートディレクトリ"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -634,6 +655,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "アップデートのチェック..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "インポート"
 
@@ -678,12 +702,18 @@ msgstr "斜体"
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr "コード"
+
 msgid "Insert Date Time"
 msgstr "日付の入力"
 
 msgid "Edit in external editor"
 msgstr "外部エディターで編集"
 
+msgid "Tags"
+msgstr "タグ"
+
 msgid "Search in all the notes"
 msgstr "すべてのノートを検索"
 
@@ -1069,9 +1099,6 @@ msgstr "ハイパーリンクの挿入"
 msgid "Attach file"
 msgstr "ファイルを添付する"
 
-msgid "Tags"
-msgstr "タグ"
-
 msgid "Set alarm"
 msgstr "アラームをセット"
 
@@ -1082,9 +1109,6 @@ msgstr "内: %s"
 msgid "Hyperlink"
 msgstr "ハイパーリンク"
 
-msgid "Code"
-msgstr "コード"
-
 msgid "Numbered List"
 msgstr "番号つきリスト"
 
@@ -1587,9 +1611,6 @@ msgstr ""
 "このエディターコマンド（と引数）はノートを開く際に使用されます。空欄の場合は"
 "既定のエディターを自動的に検出します。"
 
-msgid "Show advanced options"
-msgstr "詳細な設定の表示"
-
 msgid "Custom TLS certificates"
 msgstr "TLS証明書のカスタマイズ"
 
@@ -1772,18 +1793,6 @@ msgstr "ノートがありません。(+)ボタンを押して新しいノート
 msgid "Delete these notes?"
 msgstr "ノートを削除しますか？"
 
-msgid "Log"
-msgstr "ログ"
-
-msgid "Export Debug Report"
-msgstr "デバッグレポートの出力"
-
-msgid "Encryption Config"
-msgstr "暗号化の設定"
-
-msgid "Configuration"
-msgstr "設定"
-
 msgid "Move to notebook..."
 msgstr "ノートブックへ移動..."
 
@@ -1806,8 +1815,24 @@ msgstr "日付の選択"
 msgid "Confirm"
 msgstr "確認"
 
-msgid "Cancel synchronisation"
-msgstr "同期の中止"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "ノートブック"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "暗号化したアイテムは修正できません"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "新しいノートブック"
+
+msgid "Configuration"
+msgstr "設定"
+
+#, fuzzy
+msgid "All notes"
+msgstr "ノート"
 
 msgid "Checking... Please wait."
 msgstr "確認中...お待ちください。"
@@ -1849,6 +1874,50 @@ msgstr "新しいタグ:"
 msgid "Type new tags or select from list"
 msgstr "新しいタグを入力するか、リストから選択してください"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "設定"
+
+msgid "Encryption Config"
+msgstr "暗号化の設定"
+
+#, fuzzy
+msgid "Tools"
+msgstr "ツール"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "状態"
+
+msgid "Log"
+msgstr "ログ"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "新しい %s を作成中..."
+
+msgid "Export Debug Report"
+msgstr "デバッグレポートの出力"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "設定"
@@ -1915,6 +1984,10 @@ msgstr "ノートブックは保存できませんでした：%s"
 msgid "Edit notebook"
 msgstr "ノートブックの編集"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "ノートブックの題名："
+
 msgid "Show all"
 msgstr "すべて表示"
 
@@ -1938,10 +2011,32 @@ msgstr "ID %s のアイテムはありません"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "Joplinモバイルアプリは次のタイプのリンクをまだサポートしていません: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "サポートされていない画像の形式: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "アップデート: %d."
+
+msgid "View on map"
+msgstr "地図上に表示"
+
+msgid "Go to source URL"
+msgstr "ソースURLに行く"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "検索..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "詳細な設定の表示"
+
 msgid "Take photo"
 msgstr "写真を撮影する"
 
@@ -1960,23 +2055,19 @@ msgstr "ノートに変換"
 msgid "Convert to todo"
 msgstr "ToDoに変換"
 
-msgid "Hide metadata"
-msgstr "メタデータを隠す"
+#, fuzzy
+msgid "Properties"
+msgstr "ノートのプロパティ"
 
-msgid "Show metadata"
-msgstr "メタデータを表示"
-
-msgid "View on map"
-msgstr "地図上に表示"
-
-msgid "Go to source URL"
-msgstr "ソースURLに行く"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "編集"
 
-msgid "Delete notebook"
-msgstr "ノートブックを削除"
+#, fuzzy
+msgid "Add title"
+msgstr "タイトル"
 
 msgid "Login with OneDrive"
 msgstr "OneDriveログイン"
@@ -1984,20 +2075,37 @@ msgstr "OneDriveログイン"
 msgid "Search"
 msgstr "検索"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"(+)ボタンを押してノートやノートブックを作成してください。サイドメニューからあ"
-"なたのノートブックにアクセスができます。"
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "カメラ使用の許可"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"ノートブックがありません。(+)をクリックして新しいノートブックを作成してくださ"
-"い。"
+#~ msgid "Cancel synchronisation"
+#~ msgstr "同期の中止"
 
-msgid "Welcome"
-msgstr "ようこそ"
+#~ msgid "Hide metadata"
+#~ msgstr "メタデータを隠す"
+
+#~ msgid "Show metadata"
+#~ msgstr "メタデータを表示"
+
+#~ msgid "Delete notebook"
+#~ msgstr "ノートブックを削除"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "(+)ボタンを押してノートやノートブックを作成してください。サイドメニューか"
+#~ "らあなたのノートブックにアクセスができます。"
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "ノートブックがありません。(+)をクリックして新しいノートブックを作成してく"
+#~ "ださい。"
+
+#~ msgid "Welcome"
+#~ msgstr "ようこそ"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "それぞれのタグをカンマ(,)で区切ってください。"

CliClient/locales/joplin.pot

@@ -551,6 +551,25 @@ msgstr ""
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+msgid "Open template directory"
+msgstr ""
+
+msgid "Refresh templates"
+msgstr ""
+
+#, javascript-format
+msgid "Revision: %s (%s)"
+msgstr ""
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr ""
@@ -567,6 +586,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr ""
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr ""
 
@@ -610,12 +632,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Search in all the notes"
 msgstr ""
 
@@ -969,9 +997,6 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Set alarm"
 msgstr ""
 
@@ -982,9 +1007,6 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1462,9 +1484,6 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
-msgid "Show advanced options"
-msgstr ""
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1632,18 +1651,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr ""
 
-msgid "Log"
-msgstr ""
-
-msgid "Export Debug Report"
-msgstr ""
-
-msgid "Encryption Config"
-msgstr ""
-
-msgid "Configuration"
-msgstr ""
-
 msgid "Move to notebook..."
 msgstr ""
 
@@ -1666,7 +1673,20 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-msgid "Cancel synchronisation"
+#, javascript-format
+msgid "Notebook: %s"
+msgstr ""
+
+msgid "Encrypted notebooks cannot be renamed"
+msgstr ""
+
+msgid "New Notebook"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "All notes"
 msgstr ""
 
 msgid "Checking... Please wait."
@@ -1702,6 +1722,46 @@ msgstr ""
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+msgid "Information"
+msgstr ""
+
+msgid "Encryption Config"
+msgstr ""
+
+msgid "Tools"
+msgstr ""
+
+msgid "Sync Status"
+msgstr ""
+
+msgid "Log"
+msgstr ""
+
+msgid "Creating report..."
+msgstr ""
+
+msgid "Export Debug Report"
+msgstr ""
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 msgid "More information"
 msgstr ""
 
@@ -1762,6 +1822,9 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Enter notebook title"
+msgstr ""
+
 msgid "Show all"
 msgstr ""
 
@@ -1785,10 +1848,30 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Updated: %s"
+msgstr ""
+
+msgid "View on map"
+msgstr ""
+
+msgid "Go to source URL"
+msgstr ""
+
+msgid "Attach..."
+msgstr ""
+
+msgid "Choose an option"
+msgstr ""
+
 msgid "Take photo"
 msgstr ""
 
@@ -1807,22 +1890,16 @@ msgstr ""
 msgid "Convert to todo"
 msgstr ""
 
-msgid "Hide metadata"
+msgid "Properties"
 msgstr ""
 
-msgid "Show metadata"
-msgstr ""
-
-msgid "View on map"
-msgstr ""
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 
-msgid "Delete notebook"
+msgid "Add title"
 msgstr ""
 
 msgid "Login with OneDrive"
@@ -1830,14 +1907,3 @@ msgstr ""
 
 msgid "Search"
 msgstr ""
-
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-
-msgid "Welcome"
-msgstr ""

CliClient/locales/ko.po

@@ -614,6 +614,27 @@ msgstr "암호화 옵션"
 msgid "Web clipper options"
 msgstr "웹 수집기 옵션"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "날짜와 시간 입력"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "조플린 내보내기 폴더"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -631,6 +652,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "업데이트 확인..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "가져오기"
 
@@ -675,12 +699,18 @@ msgstr "기울임"
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr "코드"
+
 msgid "Insert Date Time"
 msgstr "날짜와 시간 입력"
 
 msgid "Edit in external editor"
 msgstr "외부 편집기에서 편집하기"
 
+msgid "Tags"
+msgstr "태그"
+
 msgid "Search in all the notes"
 msgstr "모든 노트에서 검색"
 
@@ -1063,9 +1093,6 @@ msgstr "하이퍼링크 삽입"
 msgid "Attach file"
 msgstr "파일 첨부"
 
-msgid "Tags"
-msgstr "태그"
-
 msgid "Set alarm"
 msgstr "알람 설정"
 
@@ -1076,9 +1103,6 @@ msgstr "내부: %s"
 msgid "Hyperlink"
 msgstr "하이퍼링크"
 
-msgid "Code"
-msgstr "코드"
-
 msgid "Numbered List"
 msgstr "숫자가 매겨진 목록"
 
@@ -1579,9 +1603,6 @@ msgstr ""
 "노트를 여는데 사용할 텍스트 편집기 명령어(인자를 포함할 수 있습니다)를 지정합"
 "니다. 주어진 명령어가 없을 시 기본 편집기를 자동으로 탐지할 것입니다."
 
-msgid "Show advanced options"
-msgstr "고급 옵션"
-
 msgid "Custom TLS certificates"
 msgstr "임의의 TLS 인증서"
 
@@ -1764,18 +1785,6 @@ msgstr "노트가 없습니다. (+) 버튼을 선택해 새로 만드세요."
 msgid "Delete these notes?"
 msgstr "노트를 삭제할까요?"
 
-msgid "Log"
-msgstr "로그"
-
-msgid "Export Debug Report"
-msgstr "디버그 보고서 내보내기"
-
-msgid "Encryption Config"
-msgstr "암호화 설정"
-
-msgid "Configuration"
-msgstr "설정"
-
 msgid "Move to notebook..."
 msgstr "노트북으로 옮기기..."
 
@@ -1798,8 +1807,24 @@ msgstr "날짜 선택"
 msgid "Confirm"
 msgstr "확인"
 
-msgid "Cancel synchronisation"
-msgstr "동기화 취소"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "노트북"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "암호화된 항목은 변경될 수 없습니다"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "새 노트북"
+
+msgid "Configuration"
+msgstr "설정"
+
+#, fuzzy
+msgid "All notes"
+msgstr "노트"
 
 msgid "Checking... Please wait."
 msgstr "확인 중입니다... 잠시만 기다리세요."
@@ -1841,6 +1866,50 @@ msgstr "새 태그:"
 msgid "Type new tags or select from list"
 msgstr "새 태그를 입력하거나 목록에서 선택하세요"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "설정"
+
+msgid "Encryption Config"
+msgstr "암호화 설정"
+
+#, fuzzy
+msgid "Tools"
+msgstr "도구"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "상태"
+
+msgid "Log"
+msgstr "로그"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "%s 새로 만들기..."
+
+msgid "Export Debug Report"
+msgstr "디버그 보고서 내보내기"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "설정"
@@ -1906,6 +1975,10 @@ msgstr "노트북을 저장할 수 없습니다: %s"
 msgid "Edit notebook"
 msgstr "노트북 편집"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "노트북 제목:"
+
 msgid "Show all"
 msgstr "모두 표시"
 
@@ -1929,10 +2002,32 @@ msgstr "ID %s에 해당하는 항목이 없습니다"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "조플린 모바일 앱은 현재 해당 형식의 링크를 지원하지 않습니다: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "지원하지 않는 이미지 형식: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "업데이트됨: %d."
+
+msgid "View on map"
+msgstr "지도에 표시"
+
+msgid "Go to source URL"
+msgstr "소스 URL로 이동"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "찾기..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "고급 옵션"
+
 msgid "Take photo"
 msgstr "사진 찍기"
 
@@ -1951,23 +2046,19 @@ msgstr "노트로 변환"
 msgid "Convert to todo"
 msgstr "'할 일'로 변환"
 
-msgid "Hide metadata"
-msgstr "메타데이터 숨김"
+#, fuzzy
+msgid "Properties"
+msgstr "노트 속성"
 
-msgid "Show metadata"
-msgstr "메타데이터 표시"
-
-msgid "View on map"
-msgstr "지도에 표시"
-
-msgid "Go to source URL"
-msgstr "소스 URL로 이동"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "편집"
 
-msgid "Delete notebook"
-msgstr "노트북 삭제"
+#, fuzzy
+msgid "Add title"
+msgstr "제목"
 
 msgid "Login with OneDrive"
 msgstr "OneDrive 로그인"
@@ -1975,18 +2066,35 @@ msgstr "OneDrive 로그인"
 msgid "Search"
 msgstr "검색"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"(+) 버튼을 눌러 새 노트 및 노트북을 만드세요. 측면 메뉴를 눌러 기존의 노트북"
-"을 관리하세요."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "카메라 사용 허가"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "노트북이 없습니다. (+) 버튼을 눌러 새로 만드세요."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "동기화 취소"
 
-msgid "Welcome"
-msgstr "환영합니다"
+#~ msgid "Hide metadata"
+#~ msgstr "메타데이터 숨김"
+
+#~ msgid "Show metadata"
+#~ msgstr "메타데이터 표시"
+
+#~ msgid "Delete notebook"
+#~ msgstr "노트북 삭제"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "(+) 버튼을 눌러 새 노트 및 노트북을 만드세요. 측면 메뉴를 눌러 기존의 노트"
+#~ "북을 관리하세요."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "노트북이 없습니다. (+) 버튼을 눌러 새로 만드세요."
+
+#~ msgid "Welcome"
+#~ msgstr "환영합니다"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "각각의 태그를 쉼표로 구분합니다."

CliClient/locales/nb_NO.po

@@ -618,6 +618,27 @@ msgstr "Krypteringsvalg"
 msgid "Web clipper options"
 msgstr "Web Clipper-innstillinger"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Sett inn dato/tid"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin-eksportert katalog"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -634,6 +655,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Se etter oppdatering..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importer"
 
@@ -677,12 +701,18 @@ msgstr "Kursiv"
 msgid "Link"
 msgstr "Lenke"
 
+msgid "Code"
+msgstr "Kode"
+
 msgid "Insert Date Time"
 msgstr "Sett inn dato/tid"
 
 msgid "Edit in external editor"
 msgstr "Rediger i ekstern editor"
 
+msgid "Tags"
+msgstr "Merkelapper"
+
 msgid "Search in all the notes"
 msgstr "Søk i alle notater"
 
@@ -1066,9 +1096,6 @@ msgstr "Sett inn hyperlenke"
 msgid "Attach file"
 msgstr "Legg ved fil"
 
-msgid "Tags"
-msgstr "Merkelapper"
-
 msgid "Set alarm"
 msgstr "Angi alarm"
 
@@ -1079,9 +1106,6 @@ msgstr "I: %s"
 msgid "Hyperlink"
 msgstr "Hyperlenke"
 
-msgid "Code"
-msgstr "Kode"
-
 msgid "Numbered List"
 msgstr "Nummerert liste"
 
@@ -1588,9 +1612,6 @@ msgstr ""
 "Teksteditor som skal brukes til å åpne et notat. Hvis det ikke er satt vil "
 "den prøve å automatisk velge standardprogram."
 
-msgid "Show advanced options"
-msgstr "Vis avanserte innstillinger"
-
 msgid "Custom TLS certificates"
 msgstr "Egendefinerte TLS-sertifikater"
 
@@ -1769,18 +1790,6 @@ msgstr "Det finnes enda ingen notater. Lag en ved å klikke på (+)-knappen."
 msgid "Delete these notes?"
 msgstr "Slett disse notatene?"
 
-msgid "Log"
-msgstr "Logg"
-
-msgid "Export Debug Report"
-msgstr "Eksporter feilsøkingsrapport"
-
-msgid "Encryption Config"
-msgstr "Krypteringsinnstillinger"
-
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
 msgid "Move to notebook..."
 msgstr "Flytt til notatbok..."
 
@@ -1803,8 +1812,24 @@ msgstr "Velg dato"
 msgid "Confirm"
 msgstr "Bekreft"
 
-msgid "Cancel synchronisation"
-msgstr "Avbryt synkronisering"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Notatbøker"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Krypterte elementer kan ikke modifiseres"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Ny notatbok"
+
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#, fuzzy
+msgid "All notes"
+msgstr "notat"
 
 msgid "Checking... Please wait."
 msgstr "Sjekker… Vennligst vent."
@@ -1846,6 +1871,50 @@ msgstr "Nye merkelapper:"
 msgid "Type new tags or select from list"
 msgstr "Skriv inn nye merkelapper eller velg fra listen"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Konfigurasjon"
+
+msgid "Encryption Config"
+msgstr "Krypteringsinnstillinger"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&Verktøy"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Logg"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Oppretter nytt %s..."
+
+msgid "Export Debug Report"
+msgstr "Eksporter feilsøkingsrapport"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Konfigurasjon"
@@ -1911,6 +1980,10 @@ msgstr "Denne notatboken kunne ikke lagres: %s"
 msgid "Edit notebook"
 msgstr "Rediger notatbok"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Tittel på notatbok:"
+
 msgid "Show all"
 msgstr "Vis alle"
 
@@ -1934,10 +2007,32 @@ msgstr "Ingen elementer med ID %s"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "Joplins mobilapp støtter for tiden ikke denne type linker: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Bildetypen er ikke støttet: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Oppdatert: %d."
+
+msgid "View on map"
+msgstr "Vis på kart"
+
+msgid "Go to source URL"
+msgstr "Gå til kilde-URL"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Søk..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Vis avanserte innstillinger"
+
 msgid "Take photo"
 msgstr "Ta bilde"
 
@@ -1956,23 +2051,19 @@ msgstr "Konverter til notat"
 msgid "Convert to todo"
 msgstr "Konverter til gjøremål"
 
-msgid "Hide metadata"
-msgstr "Skjul metadata"
+#, fuzzy
+msgid "Properties"
+msgstr "Notategenskaper"
 
-msgid "Show metadata"
-msgstr "Vis metadata"
-
-msgid "View on map"
-msgstr "Vis på kart"
-
-msgid "Go to source URL"
-msgstr "Gå til kilde-URL"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Rediger"
 
-msgid "Delete notebook"
-msgstr "Slett notatbok"
+#, fuzzy
+msgid "Add title"
+msgstr "tittel"
 
 msgid "Login with OneDrive"
 msgstr "Innlogging med OneDrive"
@@ -1980,18 +2071,35 @@ msgstr "Innlogging med OneDrive"
 msgid "Search"
 msgstr "Søk"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Klikk på (+)-knappen for å lage et nytt notat eller en ny notatbok. Klikk på "
-"sidepanelet for tilgang til dine eksisterende notatbøker."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Tillatelse til å bruke kamera"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Du har enda ingen notatbok. Opprett en ved å klikke på (+)-knappen."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Avbryt synkronisering"
 
-msgid "Welcome"
-msgstr "Velkommen"
+#~ msgid "Hide metadata"
+#~ msgstr "Skjul metadata"
+
+#~ msgid "Show metadata"
+#~ msgstr "Vis metadata"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Slett notatbok"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Klikk på (+)-knappen for å lage et nytt notat eller en ny notatbok. Klikk "
+#~ "på sidepanelet for tilgang til dine eksisterende notatbøker."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Du har enda ingen notatbok. Opprett en ved å klikke på (+)-knappen."
+
+#~ msgid "Welcome"
+#~ msgstr "Velkommen"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separer hver merkelapp med komma."

CliClient/locales/nl_BE.po

@@ -631,6 +631,25 @@ msgstr "Versleutelopties"
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+msgid "Open template directory"
+msgstr ""
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -648,6 +667,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr ""
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importeer"
 
@@ -694,12 +716,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr "Tags"
+
 msgid "Search in all the notes"
 msgstr "Zoek in alle notities"
 
@@ -1083,9 +1111,6 @@ msgstr ""
 msgid "Attach file"
 msgstr "Voeg bestand toe"
 
-msgid "Tags"
-msgstr "Tags"
-
 msgid "Set alarm"
 msgstr "Zet melding"
 
@@ -1096,9 +1121,6 @@ msgstr "%s: %s"
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1615,9 +1637,6 @@ msgstr ""
 "geen meegegeven wordt, zal het programma de standaard editor proberen te "
 "detecteren. "
 
-msgid "Show advanced options"
-msgstr "Toon geavanceerde opties"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1799,18 +1818,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr "Deze notities verwijderen?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Exporteer debug rapport"
-
-msgid "Encryption Config"
-msgstr "Encryptie configuratie"
-
-msgid "Configuration"
-msgstr "Configuratie"
-
 msgid "Move to notebook..."
 msgstr "Verplaats naar notitieboek..."
 
@@ -1835,8 +1842,24 @@ msgstr "Selecteer datum"
 msgid "Confirm"
 msgstr "Bevestig"
 
-msgid "Cancel synchronisation"
-msgstr "Annuleer synchronisatie"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Notitieboeken"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Versleutelde items kunnen niet aangepast worden"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Nieuw notitieboek"
+
+msgid "Configuration"
+msgstr "Configuratie"
+
+#, fuzzy
+msgid "All notes"
+msgstr "Nieuwe notitie"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1874,6 +1897,50 @@ msgstr ""
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Configuratie"
+
+msgid "Encryption Config"
+msgstr "Encryptie configuratie"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Tools"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Notities importeren..."
+
+msgid "Export Debug Report"
+msgstr "Exporteer debug rapport"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Configuratie"
@@ -1937,6 +2004,10 @@ msgstr "Het notitieboek kon niet opgeslaan worden: %s"
 msgid "Edit notebook"
 msgstr "Bewerk notitieboek"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Notitieboek titel:"
+
 msgid "Show all"
 msgstr ""
 
@@ -1960,10 +2031,32 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Afbeeldingstype %s wordt niet ondersteund"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Bijgewerkt: %d."
+
+msgid "View on map"
+msgstr "Toon op de kaart"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Zoeken"
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Toon geavanceerde opties"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Voeg foto toe"
@@ -1983,23 +2076,18 @@ msgstr "Converteer naar notitie"
 msgid "Convert to todo"
 msgstr "Converteer naar to-do"
 
-msgid "Hide metadata"
-msgstr "Verberg metadata"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Toon metadata"
-
-msgid "View on map"
-msgstr "Toon op de kaart"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Bewerk"
 
-msgid "Delete notebook"
-msgstr "Verwijder notitieboek"
+#, fuzzy
+msgid "Add title"
+msgstr "Untitled"
 
 msgid "Login with OneDrive"
 msgstr "Log in met OneDrive"
@@ -2007,20 +2095,33 @@ msgstr "Log in met OneDrive"
 msgid "Search"
 msgstr "Zoeken"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Klik op de (+) om een nieuwe notitie of een nieuw notitieboek aan te maken. "
-"Klik in het menu om uw bestaande notitieboeken te raadplegen."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Annuleer synchronisatie"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"U heeft momenteel geen notitieboek. Maak een notitieboek door op (+) te "
-"klikken."
+#~ msgid "Hide metadata"
+#~ msgstr "Verberg metadata"
 
-msgid "Welcome"
-msgstr "Welkom"
+#~ msgid "Show metadata"
+#~ msgstr "Toon metadata"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Verwijder notitieboek"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Klik op de (+) om een nieuwe notitie of een nieuw notitieboek aan te "
+#~ "maken. Klik in het menu om uw bestaande notitieboeken te raadplegen."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "U heeft momenteel geen notitieboek. Maak een notitieboek door op (+) te "
+#~ "klikken."
+
+#~ msgid "Welcome"
+#~ msgstr "Welkom"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Scheid iedere tag met een komma."

CliClient/locales/pl_PL.po

@@ -637,6 +637,27 @@ msgstr "Opcje szyfrowania"
 msgid "Web clipper options"
 msgstr "Opcje Web clipper"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Wstaw stempel czasowy"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Katalog Joplin Export"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -653,6 +674,9 @@ msgstr "Preferencje..."
 msgid "Check for updates..."
 msgstr "Sprawdź dostępność aktualizacji..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Zaimportuj"
 
@@ -696,12 +720,18 @@ msgstr "Kursywa"
 msgid "Link"
 msgstr "Odnośnik"
 
+msgid "Code"
+msgstr "Kod"
+
 msgid "Insert Date Time"
 msgstr "Wstaw stempel czasowy"
 
 msgid "Edit in external editor"
 msgstr "Edytuj w edytorze zewnętrznym"
 
+msgid "Tags"
+msgstr "Znaczniki"
+
 msgid "Search in all the notes"
 msgstr "Wyszukaj we wszystkich notatkach"
 
@@ -1088,9 +1118,6 @@ msgstr "Wstaw Hyperlink"
 msgid "Attach file"
 msgstr "Załącz plik"
 
-msgid "Tags"
-msgstr "Znaczniki"
-
 msgid "Set alarm"
 msgstr "Ustaw powiadomienie"
 
@@ -1101,9 +1128,6 @@ msgstr "W: %s"
 msgid "Hyperlink"
 msgstr "Hyperlink"
 
-msgid "Code"
-msgstr "Kod"
-
 msgid "Numbered List"
 msgstr "Lista numerowana"
 
@@ -1619,9 +1643,6 @@ msgstr ""
 "aby otwierać notatkę. Jeżeli nie zostanie podana, program spróbuje wykryć "
 "domyślny edytor."
 
-msgid "Show advanced options"
-msgstr "Wyświetl opcje zaawansowane"
-
 msgid "Custom TLS certificates"
 msgstr "Niestandardowe ceryfikaty TLS"
 
@@ -1800,18 +1821,6 @@ msgstr "Brak notatek. Aby utworzyć, naciśnij przycisk (+)."
 msgid "Delete these notes?"
 msgstr "Usunąć notatki?"
 
-msgid "Log"
-msgstr "Dziennik"
-
-msgid "Export Debug Report"
-msgstr "Raport odpluskwiania eksportu"
-
-msgid "Encryption Config"
-msgstr "Konfiguracja szyfrowania"
-
-msgid "Configuration"
-msgstr "Konfiguracja"
-
 msgid "Move to notebook..."
 msgstr "Przenieś do notatnika..."
 
@@ -1834,8 +1843,24 @@ msgstr "Wybierz datę"
 msgid "Confirm"
 msgstr "Potwierdź"
 
-msgid "Cancel synchronisation"
-msgstr "Anuluj synchronizację"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Notatniki"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Zaszyfrowanie obiekty nie mogą być modyfikowane"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Nowy notatnik"
+
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+#, fuzzy
+msgid "All notes"
+msgstr "notatka"
 
 msgid "Checking... Please wait."
 msgstr "Sprawdzanie... Proszę czekać."
@@ -1877,6 +1902,50 @@ msgstr "Nowe znaczniki:"
 msgid "Type new tags or select from list"
 msgstr "Wprowadź nowe znaczniki lub wybierz z listy"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Konfiguracja"
+
+msgid "Encryption Config"
+msgstr "Konfiguracja szyfrowania"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&Narzędzia"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Dziennik"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Tworzenie nowego %s..."
+
+msgid "Export Debug Report"
+msgstr "Raport odpluskwiania eksportu"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Konfiguracja"
@@ -1946,6 +2015,10 @@ msgstr "Notatnik nie może zostać zapisany: %s"
 msgid "Edit notebook"
 msgstr "Edytuj notatnik"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Tytuł notatnika:"
+
 msgid "Show all"
 msgstr "Pokaż wszystko"
 
@@ -1970,10 +2043,32 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "Aplikacja mobilna Joplin nie wspiera aktualnie odnośników tego typu: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Niewspierany typ obrazu: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Zaaktualizowano: %d."
+
+msgid "View on map"
+msgstr "Pokaż na mapie"
+
+msgid "Go to source URL"
+msgstr "Idź do adresu źródłowego odnośnika"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Wyszukaj..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Wyświetl opcje zaawansowane"
+
 msgid "Take photo"
 msgstr "Wykonaj zdjęcie"
 
@@ -1992,23 +2087,19 @@ msgstr "Przekonwertuj do notatki"
 msgid "Convert to todo"
 msgstr "Przekonwertuj do zadania"
 
-msgid "Hide metadata"
-msgstr "Ukryj metadane"
+#, fuzzy
+msgid "Properties"
+msgstr "Właściwośći notatki"
 
-msgid "Show metadata"
-msgstr "Pokaż metadane"
-
-msgid "View on map"
-msgstr "Pokaż na mapie"
-
-msgid "Go to source URL"
-msgstr "Idź do adresu źródłowego odnośnika"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Edytuj"
 
-msgid "Delete notebook"
-msgstr "Usuń notatnik"
+#, fuzzy
+msgid "Add title"
+msgstr "tytuł"
 
 msgid "Login with OneDrive"
 msgstr "Zaloguj z OneDrive"
@@ -2016,18 +2107,35 @@ msgstr "Zaloguj z OneDrive"
 msgid "Search"
 msgstr "Wyszukaj"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Naciśnij przycisk (+) aby utworzyć nową notatkę lub notatnik. Naciśnij menu "
-"boczne, aby mieć dostęp do istniejących notatników."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Uprawenie do użytkowania kamery"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Brak notatników. Utwórz nowy naciskając przycisk (+)."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Anuluj synchronizację"
 
-msgid "Welcome"
-msgstr "Witaj"
+#~ msgid "Hide metadata"
+#~ msgstr "Ukryj metadane"
+
+#~ msgid "Show metadata"
+#~ msgstr "Pokaż metadane"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Usuń notatnik"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Naciśnij przycisk (+) aby utworzyć nową notatkę lub notatnik. Naciśnij "
+#~ "menu boczne, aby mieć dostęp do istniejących notatników."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Brak notatników. Utwórz nowy naciskając przycisk (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Witaj"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Oddziel każdy znacznik przecinkiem."

CliClient/locales/pt_BR.po

@@ -625,6 +625,27 @@ msgstr "Opções de Encriptação"
 msgid "Web clipper options"
 msgstr "Opções do Web clipper"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Inserir Data e Hora"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Diretório de Exportação do Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -641,6 +662,9 @@ msgstr "Preferências..."
 msgid "Check for updates..."
 msgstr "Verificar atualizações..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importar"
 
@@ -684,12 +708,18 @@ msgstr "Itálico"
 msgid "Link"
 msgstr "Link"
 
+msgid "Code"
+msgstr "Código"
+
 msgid "Insert Date Time"
 msgstr "Inserir Data e Hora"
 
 msgid "Edit in external editor"
 msgstr "Editar com editor externo"
 
+msgid "Tags"
+msgstr "Tags"
+
 msgid "Search in all the notes"
 msgstr "Pesquisar em todas as notas"
 
@@ -1072,9 +1102,6 @@ msgstr "Inserir Hiperlink"
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-msgid "Tags"
-msgstr "Tags"
-
 msgid "Set alarm"
 msgstr "Definir alarme"
 
@@ -1085,9 +1112,6 @@ msgstr "Em: %s"
 msgid "Hyperlink"
 msgstr "Hiperlink"
 
-msgid "Code"
-msgstr "Código"
-
 msgid "Numbered List"
 msgstr "Lista numerada"
 
@@ -1596,9 +1620,6 @@ msgstr ""
 "nota. Se nenhum for indicado, ele tentará detectar automaticamente o editor "
 "padrão."
 
-msgid "Show advanced options"
-msgstr "Mostrar opções avançadas"
-
 msgid "Custom TLS certificates"
 msgstr "Certificados TLS customizados"
 
@@ -1778,18 +1799,6 @@ msgstr "Atualmente, não há notas. Crie uma, clicando no botão (+)."
 msgid "Delete these notes?"
 msgstr "Excluir estas notas?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Exportar Relatório de Debug"
-
-msgid "Encryption Config"
-msgstr "Configuração de Encriptação"
-
-msgid "Configuration"
-msgstr "Configuração"
-
 msgid "Move to notebook..."
 msgstr "Mover para o caderno..."
 
@@ -1812,8 +1821,24 @@ msgstr "Selecionar data"
 msgid "Confirm"
 msgstr "Confirmar"
 
-msgid "Cancel synchronisation"
-msgstr "Cancelar sincronização"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Cadernos"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Itens encriptados não podem ser modificados"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Novo caderno"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+#, fuzzy
+msgid "All notes"
+msgstr "Excluir notas?"
 
 msgid "Checking... Please wait."
 msgstr "Verificando... Por favor aguarde."
@@ -1856,6 +1881,50 @@ msgstr "Novas tags:"
 msgid "Type new tags or select from list"
 msgstr "Digite novsa tags, ou selecione da lista"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Configuração"
+
+msgid "Encryption Config"
+msgstr "Configuração de Encriptação"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&Ferramentas"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Criando novo %s..."
+
+msgid "Export Debug Report"
+msgstr "Exportar Relatório de Debug"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Configuração"
@@ -1924,6 +1993,10 @@ msgstr "O caderno não pôde ser salvo: %s"
 msgid "Edit notebook"
 msgstr "Editar caderno"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Título do caderno:"
+
 msgid "Show all"
 msgstr "Exibir tudo"
 
@@ -1947,10 +2020,32 @@ msgstr "Nenhum item com ID %s"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "O app mobile do Joplin não suporta, atualmente, esse tipo de link: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Tipo de imagem não suportada: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Atualizado: %d."
+
+msgid "View on map"
+msgstr "Ver no mapa"
+
+msgid "Go to source URL"
+msgstr "Ir para a URL de origem"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Pesquisar..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Mostrar opções avançadas"
+
 msgid "Take photo"
 msgstr "Tirar foto"
 
@@ -1969,23 +2064,19 @@ msgstr "Converter para nota"
 msgid "Convert to todo"
 msgstr "Converter para tarefa"
 
-msgid "Hide metadata"
-msgstr "Ocultar metadados"
+#, fuzzy
+msgid "Properties"
+msgstr "Propriedades da nota"
 
-msgid "Show metadata"
-msgstr "Exibir metadados"
-
-msgid "View on map"
-msgstr "Ver no mapa"
-
-msgid "Go to source URL"
-msgstr "Ir para a URL de origem"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Editar"
 
-msgid "Delete notebook"
-msgstr "Excluir caderno"
+#, fuzzy
+msgid "Add title"
+msgstr "título"
 
 msgid "Login with OneDrive"
 msgstr "Login com OneDrive"
@@ -1993,18 +2084,35 @@ msgstr "Login com OneDrive"
 msgid "Search"
 msgstr "Procurar"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Clique no botão (+) para criar uma nova nota ou caderno. Clique no menu "
-"lateral para acessar seus cadernos existentes."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Permissão para utilizar sua câmera"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Cancelar sincronização"
 
-msgid "Welcome"
-msgstr "Bem-vindo"
+#~ msgid "Hide metadata"
+#~ msgstr "Ocultar metadados"
+
+#~ msgid "Show metadata"
+#~ msgstr "Exibir metadados"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Excluir caderno"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Clique no botão (+) para criar uma nova nota ou caderno. Clique no menu "
+#~ "lateral para acessar seus cadernos existentes."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Bem-vindo"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separe cada tag por vírgula."
@@ -2026,9 +2134,6 @@ msgstr "Bem-vindo"
 #~ msgid "Joplin v%s"
 #~ msgstr "Site do Joplin"
 
-#~ msgid "Delete notes?"
-#~ msgstr "Excluir notas?"
-
 #~ msgid "State: %s."
 #~ msgstr "Estado: \"%s\"."
 

CliClient/locales/ro.po

@@ -566,6 +566,25 @@ msgstr "Opțiuni de criptare"
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+msgid "Open template directory"
+msgstr ""
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -583,6 +602,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Verificați actualizările..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importați"
 
@@ -628,12 +650,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr "Cod"
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr "Editați într-un editor extern"
 
+msgid "Tags"
+msgstr "Etichete"
+
 msgid "Search in all the notes"
 msgstr "Căutați în toate notițele"
 
@@ -995,9 +1023,6 @@ msgstr "Introduceți hyperlink"
 msgid "Attach file"
 msgstr "Atașați fișier"
 
-msgid "Tags"
-msgstr "Etichete"
-
 msgid "Set alarm"
 msgstr "Setați alarma"
 
@@ -1008,9 +1033,6 @@ msgstr "În: %s"
 msgid "Hyperlink"
 msgstr "Hyperlink"
 
-msgid "Code"
-msgstr "Cod"
-
 msgid "Numbered List"
 msgstr "Listă numerotată"
 
@@ -1494,9 +1516,6 @@ msgid ""
 "If none is provided it will try to auto-detect the default editor."
 msgstr ""
 
-msgid "Show advanced options"
-msgstr "Afișați opțiunile avansate"
-
 msgid "Custom TLS certificates"
 msgstr "Certificate TLS cusomizate"
 
@@ -1670,18 +1689,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr "Ștergeți aceste notițe?"
 
-msgid "Log"
-msgstr ""
-
-msgid "Export Debug Report"
-msgstr ""
-
-msgid "Encryption Config"
-msgstr ""
-
-msgid "Configuration"
-msgstr "Configurare"
-
 msgid "Move to notebook..."
 msgstr "Mutați în caietul de notițe..."
 
@@ -1705,8 +1712,24 @@ msgstr "Selectați data"
 msgid "Confirm"
 msgstr "Confirmați"
 
-msgid "Cancel synchronisation"
-msgstr "Amânați sincronizarea"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Caiete de notițe"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Itemii criptați nu pot fi editați"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Adăugați un nou caiet de notițe"
+
+msgid "Configuration"
+msgstr "Configurare"
+
+#, fuzzy
+msgid "All notes"
+msgstr "notiță"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1742,6 +1765,50 @@ msgstr "Etichete noi:"
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Configurare"
+
+msgid "Encryption Config"
+msgstr ""
+
+#, fuzzy
+msgid "Tools"
+msgstr "Unelte"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr ""
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Se crează un %s..."
+
+msgid "Export Debug Report"
+msgstr ""
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Configurare"
@@ -1803,6 +1870,10 @@ msgstr "Caietul de notițe nu a puut fi salvat: %s"
 msgid "Edit notebook"
 msgstr "Editați caietul de notițe"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Titlul caietului de notițe:"
+
 msgid "Show all"
 msgstr "Afișați tot"
 
@@ -1826,10 +1897,32 @@ msgstr "Niciun item cu ID-ul %s"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr ""
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Actualizat: %d."
+
+msgid "View on map"
+msgstr "Vizualizați pe hartă"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Caută..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Afișați opțiunile avansate"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Atașează imagine"
@@ -1849,23 +1942,18 @@ msgstr ""
 msgid "Convert to todo"
 msgstr ""
 
-msgid "Hide metadata"
-msgstr "Ascundeți metadatele"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Afișați metadatele"
-
-msgid "View on map"
-msgstr "Vizualizați pe hartă"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Editați"
 
-msgid "Delete notebook"
-msgstr "Ștergeți caiet de notițe"
+#, fuzzy
+msgid "Add title"
+msgstr "titlu"
 
 # vezi context
 msgid "Login with OneDrive"
@@ -1874,18 +1962,26 @@ msgstr "Autentificare prin OneDrive"
 msgid "Search"
 msgstr "Caută"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Amânați sincronizarea"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"Nu aveți niciun caiet de notițe creat. Creați unul făcând click pe butonnul "
-"(+)."
+#~ msgid "Hide metadata"
+#~ msgstr "Ascundeți metadatele"
 
-msgid "Welcome"
-msgstr "Bine ați venit"
+#~ msgid "Show metadata"
+#~ msgstr "Afișați metadatele"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Ștergeți caiet de notițe"
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Nu aveți niciun caiet de notițe creat. Creați unul făcând click pe "
+#~ "butonnul (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Bine ați venit"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separați fiecare etichetă printr-o virgulă."

CliClient/locales/ru_RU.po

@@ -631,6 +631,27 @@ msgstr "Настройки шифрования"
 msgid "Web clipper options"
 msgstr "Настройки веб-клиппера"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Вставить дату и время"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Каталог экспорта Joplin"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -647,6 +668,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Проверить обновления..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Импорт"
 
@@ -690,12 +714,18 @@ msgstr "Наклонный"
 msgid "Link"
 msgstr "Ссылка"
 
+msgid "Code"
+msgstr "Код"
+
 msgid "Insert Date Time"
 msgstr "Вставить дату и время"
 
 msgid "Edit in external editor"
 msgstr "Редактировать во внешнем редакторе"
 
+msgid "Tags"
+msgstr "Метки"
+
 msgid "Search in all the notes"
 msgstr "Поиск во всех заметках"
 
@@ -1080,9 +1110,6 @@ msgstr "Вставить гиперссылку"
 msgid "Attach file"
 msgstr "Прикрепить файл"
 
-msgid "Tags"
-msgstr "Метки"
-
 msgid "Set alarm"
 msgstr "Установить напоминание"
 
@@ -1093,9 +1120,6 @@ msgstr "В: %s"
 msgid "Hyperlink"
 msgstr "Гиперссылка"
 
-msgid "Code"
-msgstr "Код"
-
 msgid "Numbered List"
 msgstr "Нумерованный список"
 
@@ -1601,9 +1625,6 @@ msgstr ""
 "Если не задан, будет произведена попытка автоматического определения "
 "редактора по умолчанию."
 
-msgid "Show advanced options"
-msgstr "Показывать расширенные настройки"
-
 msgid "Custom TLS certificates"
 msgstr "Пользовательские сертификаты TLS"
 
@@ -1784,18 +1805,6 @@ msgstr "Сейчас здесь нет заметок. Создайте нову
 msgid "Delete these notes?"
 msgstr "Удалить эти заметки?"
 
-msgid "Log"
-msgstr "Журнал"
-
-msgid "Export Debug Report"
-msgstr "Экспортировать отладочный отчет"
-
-msgid "Encryption Config"
-msgstr "Конфигурация шифрования"
-
-msgid "Configuration"
-msgstr "Конфигурация"
-
 msgid "Move to notebook..."
 msgstr "Переместить в блокнот..."
 
@@ -1818,8 +1827,24 @@ msgstr "Выбрать дату"
 msgid "Confirm"
 msgstr "Подтвердить"
 
-msgid "Cancel synchronisation"
-msgstr "Отменить синхронизацию"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Блокноты"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Зашифрованные элементы не могут быть изменены"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Новый блокнот"
+
+msgid "Configuration"
+msgstr "Конфигурация"
+
+#, fuzzy
+msgid "All notes"
+msgstr "заметка"
 
 msgid "Checking... Please wait."
 msgstr "Проверка... Пожалуйста, подождите."
@@ -1861,6 +1886,50 @@ msgstr "Новые метки:"
 msgid "Type new tags or select from list"
 msgstr "Введите новые метки или выберите из списка"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Конфигурация"
+
+msgid "Encryption Config"
+msgstr "Конфигурация шифрования"
+
+#, fuzzy
+msgid "Tools"
+msgstr "&Сервис"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Статус"
+
+msgid "Log"
+msgstr "Журнал"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Создание новой %s..."
+
+msgid "Export Debug Report"
+msgstr "Экспортировать отладочный отчет"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Конфигурация"
@@ -1928,6 +1997,10 @@ msgstr "Блокнот не может быть сохранен: %s"
 msgid "Edit notebook"
 msgstr "Редактировать блокнот"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Название блокнота:"
+
 msgid "Show all"
 msgstr "Показать все"
 
@@ -1953,10 +2026,32 @@ msgstr ""
 "Мобильное приложение Joplin в настоящее время не поддерживает этот тип "
 "ссылки: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Неподдерживаемый формат изображения: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Обновлено: %d."
+
+msgid "View on map"
+msgstr "Посмотреть на карте"
+
+msgid "Go to source URL"
+msgstr "Перейти к исходному URL"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Поиск..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Показывать расширенные настройки"
+
 msgid "Take photo"
 msgstr "Сделать фото"
 
@@ -1975,23 +2070,19 @@ msgstr "Преобразовать в заметку"
 msgid "Convert to todo"
 msgstr "Преобразовать в задачу"
 
-msgid "Hide metadata"
-msgstr "Скрыть метаданные"
+#, fuzzy
+msgid "Properties"
+msgstr "Свойства заметки"
 
-msgid "Show metadata"
-msgstr "Показать метаданные"
-
-msgid "View on map"
-msgstr "Посмотреть на карте"
-
-msgid "Go to source URL"
-msgstr "Перейти к исходному URL"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Правка"
 
-msgid "Delete notebook"
-msgstr "Удалить блокнот"
+#, fuzzy
+msgid "Add title"
+msgstr "заголовок"
 
 msgid "Login with OneDrive"
 msgstr "Войти с OneDrive"
@@ -1999,18 +2090,35 @@ msgstr "Войти с OneDrive"
 msgid "Search"
 msgstr "Поиск"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Нажмите на кнопку (+) для создания новой заметки или нового блокнота. "
-"Нажмите на боковое меню для доступа к вашим существующим блокнотам."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Разрешение на использование камеры"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "У вас сейчас нет блокнота. Создайте его нажатием на кнопку (+)."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Отменить синхронизацию"
 
-msgid "Welcome"
-msgstr "Добро пожаловать"
+#~ msgid "Hide metadata"
+#~ msgstr "Скрыть метаданные"
+
+#~ msgid "Show metadata"
+#~ msgstr "Показать метаданные"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Удалить блокнот"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Нажмите на кнопку (+) для создания новой заметки или нового блокнота. "
+#~ "Нажмите на боковое меню для доступа к вашим существующим блокнотам."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "У вас сейчас нет блокнота. Создайте его нажатием на кнопку (+)."
+
+#~ msgid "Welcome"
+#~ msgstr "Добро пожаловать"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Разделяйте каждую метку запятой."

CliClient/locales/sl_SI.po

@@ -628,6 +628,26 @@ msgstr "Možnosti enkripcije"
 msgid "Web clipper options"
 msgstr ""
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+msgid "Insert template"
+msgstr ""
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin izvozno mesto"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -645,6 +665,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Preverjanje za posodobitvami..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Uvozi"
 
@@ -690,12 +713,18 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr ""
+
 msgid "Insert Date Time"
 msgstr ""
 
 msgid "Edit in external editor"
 msgstr ""
 
+msgid "Tags"
+msgstr "Oznake"
+
 msgid "Search in all the notes"
 msgstr "Išči znotraj vseh zabeležk"
 
@@ -1083,9 +1112,6 @@ msgstr ""
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
-msgid "Tags"
-msgstr "Oznake"
-
 msgid "Set alarm"
 msgstr "Nastavi alarm"
 
@@ -1096,9 +1122,6 @@ msgstr "%s: %s"
 msgid "Hyperlink"
 msgstr ""
 
-msgid "Code"
-msgstr ""
-
 msgid "Numbered List"
 msgstr ""
 
@@ -1609,9 +1632,6 @@ msgstr ""
 "Urejevalnik, ki bo uporabljen za odpiranje zabeležk. Če noben ni izbran, bo "
 "avtomatsko zaznan privzeti urejevalnik."
 
-msgid "Show advanced options"
-msgstr "Pokaži napredne možnosti"
-
 msgid "Custom TLS certificates"
 msgstr ""
 
@@ -1791,18 +1811,6 @@ msgstr "Trenutno ni zabeležk. Ustvarite jo s klikom na (+) gumb."
 msgid "Delete these notes?"
 msgstr "Izbriši te zabeležke?"
 
-msgid "Log"
-msgstr "Dnevnik"
-
-msgid "Export Debug Report"
-msgstr "Izvozi poročilo o napakah"
-
-msgid "Encryption Config"
-msgstr "Nastavite enkripcije"
-
-msgid "Configuration"
-msgstr "Nastavitve"
-
 msgid "Move to notebook..."
 msgstr "Premakni v beležnico..."
 
@@ -1827,8 +1835,24 @@ msgstr "Izberi datum"
 msgid "Confirm"
 msgstr "Potrdi"
 
-msgid "Cancel synchronisation"
-msgstr "Prekliči sinhronizacijo"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Beležnice"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Enkriptirani predmeti ne morejo biti spremenjeni"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Nova beležnica"
+
+msgid "Configuration"
+msgstr "Nastavitve"
+
+#, fuzzy
+msgid "All notes"
+msgstr "zabeležka"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1866,6 +1890,50 @@ msgstr ""
 msgid "Type new tags or select from list"
 msgstr ""
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Nastavitve"
+
+msgid "Encryption Config"
+msgstr "Nastavite enkripcije"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Orodja"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Status"
+
+msgid "Log"
+msgstr "Dnevnik"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Ustvarjanje nove %s..."
+
+msgid "Export Debug Report"
+msgstr "Izvozi poročilo o napakah"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Nastavitve"
@@ -1928,6 +1996,10 @@ msgstr "Beležnica ne more biti shranjena: %s"
 msgid "Edit notebook"
 msgstr "Uredi beležnico"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Naslov beležnice:"
+
 msgid "Show all"
 msgstr "Prikaži vse"
 
@@ -1951,10 +2023,32 @@ msgstr ""
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Nepodprt tip slike: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Posodobljeno: %d."
+
+msgid "View on map"
+msgstr "Prikaži na zemljevidu"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Išči"
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Pokaži napredne možnosti"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "Pripni fotografijo"
@@ -1974,23 +2068,18 @@ msgstr "Pretvori v zabeležko"
 msgid "Convert to todo"
 msgstr "Pretvori v za narediti"
 
-msgid "Hide metadata"
-msgstr "Skrij meta podatke"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "Prikaži meta podatke"
-
-msgid "View on map"
-msgstr "Prikaži na zemljevidu"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "Uredi"
 
-msgid "Delete notebook"
-msgstr "Izbriši beležnico"
+#, fuzzy
+msgid "Add title"
+msgstr "Neimenovano"
 
 msgid "Login with OneDrive"
 msgstr "Prijavi se z OneDrive"
@@ -1998,18 +2087,32 @@ msgstr "Prijavi se z OneDrive"
 msgid "Search"
 msgstr "Išči"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Kliknite na (+) gumb, da ustvarite novo zabeležko ali beležnico. Kliknite na "
-"stranski menu za dostop do obstoječih beležnic."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Prekliči sinhronizacijo"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
+#~ msgid "Hide metadata"
+#~ msgstr "Skrij meta podatke"
 
-msgid "Welcome"
-msgstr "Dobrodošli"
+#~ msgid "Show metadata"
+#~ msgstr "Prikaži meta podatke"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Izbriši beležnico"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Kliknite na (+) gumb, da ustvarite novo zabeležko ali beležnico. Kliknite "
+#~ "na stranski menu za dostop do obstoječih beležnic."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
+
+#~ msgid "Welcome"
+#~ msgstr "Dobrodošli"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Loči vsako oznako z vejico."

CliClient/locales/sv.po

@@ -632,6 +632,27 @@ msgstr "Krypteringsinställningar"
 msgid "Web clipper options"
 msgstr "Web clipper-inställningar"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Infoga datumtid"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin-exporteringskatalog"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -649,6 +670,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Sök efter uppdateringar..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "Importera"
 
@@ -693,12 +717,18 @@ msgstr "Kursiv"
 msgid "Link"
 msgstr "Länk"
 
+msgid "Code"
+msgstr "Kod"
+
 msgid "Insert Date Time"
 msgstr "Infoga datumtid"
 
 msgid "Edit in external editor"
 msgstr "Redigera i extern redigerare"
 
+msgid "Tags"
+msgstr "Taggar"
+
 msgid "Search in all the notes"
 msgstr "Sök i alla anteckningarna"
 
@@ -1088,9 +1118,6 @@ msgstr "Infoga hyperlänk"
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-msgid "Tags"
-msgstr "Taggar"
-
 msgid "Set alarm"
 msgstr "Sätt alarm"
 
@@ -1101,9 +1128,6 @@ msgstr "I: %s"
 msgid "Hyperlink"
 msgstr "Hyperlänk"
 
-msgid "Code"
-msgstr "Kod"
-
 msgid "Numbered List"
 msgstr "Numrerad lista"
 
@@ -1610,9 +1634,6 @@ msgstr ""
 "anteckning. Om inget tillhandahålls försöker det automatiskt identifiera "
 "standardredigeraren."
 
-msgid "Show advanced options"
-msgstr "Visa avancerade inställningar"
-
 msgid "Custom TLS certificates"
 msgstr "Anpassade TLS-certifikat"
 
@@ -1795,18 +1816,6 @@ msgstr ""
 msgid "Delete these notes?"
 msgstr "Ta bort dessa anteckningar?"
 
-msgid "Log"
-msgstr "Logg"
-
-msgid "Export Debug Report"
-msgstr "Exportera felsökningsrapport"
-
-msgid "Encryption Config"
-msgstr "Kryptering-konfiguration"
-
-msgid "Configuration"
-msgstr "Konfiguration"
-
 msgid "Move to notebook..."
 msgstr "Flytta till anteckningsbok..."
 
@@ -1829,8 +1838,24 @@ msgstr "Välj datum"
 msgid "Confirm"
 msgstr "Bekräfta"
 
-msgid "Cancel synchronisation"
-msgstr "Avbryt synkronisering"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Anteckningsböcker"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Krypterade objekt kan inte ändras"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Ny anteckningsbok"
+
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#, fuzzy
+msgid "All notes"
+msgstr "anteckning"
 
 msgid "Checking... Please wait."
 msgstr "Kontrollerar... vänta."
@@ -1872,6 +1897,50 @@ msgstr "Nya taggar:"
 msgid "Type new tags or select from list"
 msgstr "Skriv nya taggar eller välj från listan"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Konfiguration"
+
+msgid "Encryption Config"
+msgstr "Kryptering-konfiguration"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Verktyg"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Tillstånd"
+
+msgid "Log"
+msgstr "Logg"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Skapar ny %s..."
+
+msgid "Export Debug Report"
+msgstr "Exportera felsökningsrapport"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Konfiguration"
@@ -1941,6 +2010,10 @@ msgstr "Anteckningsboken kunde inte sparas: %s"
 msgid "Edit notebook"
 msgstr "Redigera anteckningsbok"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Titel på anteckningsbok:"
+
 msgid "Show all"
 msgstr "Visa alla"
 
@@ -1965,10 +2038,32 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "Den mobila appen Joplin stöder för närvarande inte denna typ av länk: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Bildstorlek som inte stöds: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Uppdaterad: %d."
+
+msgid "View on map"
+msgstr "Visa på karta"
+
+msgid "Go to source URL"
+msgstr "Gå till källans URL"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Sök..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Visa avancerade inställningar"
+
 msgid "Take photo"
 msgstr "Ta ett foto"
 
@@ -1987,23 +2082,19 @@ msgstr "Konvertera till anteckning"
 msgid "Convert to todo"
 msgstr "Konvertera till att-göra"
 
-msgid "Hide metadata"
-msgstr "Dölj metadata"
+#, fuzzy
+msgid "Properties"
+msgstr "Anteckningens egenskaper"
 
-msgid "Show metadata"
-msgstr "Visa metadata"
-
-msgid "View on map"
-msgstr "Visa på karta"
-
-msgid "Go to source URL"
-msgstr "Gå till källans URL"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Redigera"
 
-msgid "Delete notebook"
-msgstr "Ta bort anteckningsbok"
+#, fuzzy
+msgid "Add title"
+msgstr "titel"
 
 msgid "Login with OneDrive"
 msgstr "Logga in med OneDrive"
@@ -2011,21 +2102,38 @@ msgstr "Logga in med OneDrive"
 msgid "Search"
 msgstr "Sök"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Klicka på (+)-knappen för att skapa en ny anteckning eller anteckningsbok. "
-"Klicka på sidomenyn för att få tillgång till dina befintliga "
-"anteckningsböcker."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Tillåtelse att använda kameran"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"Du har för närvarande ingen anteckningsbok. Skapa en genom att klicka på (+)-"
-"knappen."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Avbryt synkronisering"
 
-msgid "Welcome"
-msgstr "Välkommen"
+#~ msgid "Hide metadata"
+#~ msgstr "Dölj metadata"
+
+#~ msgid "Show metadata"
+#~ msgstr "Visa metadata"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Ta bort anteckningsbok"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Klicka på (+)-knappen för att skapa en ny anteckning eller "
+#~ "anteckningsbok. Klicka på sidomenyn för att få tillgång till dina "
+#~ "befintliga anteckningsböcker."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Du har för närvarande ingen anteckningsbok. Skapa en genom att klicka på "
+#~ "(+)-knappen."
+
+#~ msgid "Welcome"
+#~ msgstr "Välkommen"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Separera varje tagg med ett komma."

CliClient/locales/tr_TR.po

@@ -599,6 +599,27 @@ msgstr "Şifreleme seçenekleri"
 msgid "Web clipper options"
 msgstr "Web alıntılama ayarları"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "Tarih Ekle"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin Dizin Dışa Aktarım"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -616,6 +637,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "Güncellemeleri kontrol et..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "İçe aktar"
 
@@ -660,12 +684,18 @@ msgstr "İtalik"
 msgid "Link"
 msgstr "Bağlantı"
 
+msgid "Code"
+msgstr "Kod"
+
 msgid "Insert Date Time"
 msgstr "Tarih Ekle"
 
 msgid "Edit in external editor"
 msgstr "Başka editörde düzenle"
 
+msgid "Tags"
+msgstr "Etiketler"
+
 msgid "Search in all the notes"
 msgstr "Tüm notlarda ara"
 
@@ -1058,9 +1088,6 @@ msgstr "Köprü ekle"
 msgid "Attach file"
 msgstr "Dosya ekle"
 
-msgid "Tags"
-msgstr "Etiketler"
-
 msgid "Set alarm"
 msgstr "Alarm kur"
 
@@ -1071,9 +1098,6 @@ msgstr "İçinde: %s"
 msgid "Hyperlink"
 msgstr "Köprü"
 
-msgid "Code"
-msgstr "Kod"
-
 msgid "Numbered List"
 msgstr "Numaralı liste"
 
@@ -1577,9 +1601,6 @@ msgstr ""
 "Editör komutu (argüman içerebilir) not açmak için kullanılacaktır. Eğer "
 "sağlanmadıysa, varsayılan düzenleyiciyi otomatik olarak algılamaya çalışır."
 
-msgid "Show advanced options"
-msgstr "Gelişmiş ayarları göster"
-
 msgid "Custom TLS certificates"
 msgstr "Özel TLS sertifikaları"
 
@@ -1759,18 +1780,6 @@ msgstr "Şu anda not yok. (+) butonuna tıklayarak bir tane oluşturun."
 msgid "Delete these notes?"
 msgstr "Bu notlar silinsin mi?"
 
-msgid "Log"
-msgstr "Log"
-
-msgid "Export Debug Report"
-msgstr "Hata Ayıklama Raporunu Dışa Aktar"
-
-msgid "Encryption Config"
-msgstr "Yapılandırmayı şifrele"
-
-msgid "Configuration"
-msgstr "Yapılandırma"
-
 msgid "Move to notebook..."
 msgstr "Not defterine taşı..."
 
@@ -1793,8 +1802,24 @@ msgstr "Tarih seç"
 msgid "Confirm"
 msgstr "Onayla"
 
-msgid "Cancel synchronisation"
-msgstr "Senkronizasyonu iptal et"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "Not defterleri"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "Şifrelenmiş öğeler değiştirilemez"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "Yeni not defteri"
+
+msgid "Configuration"
+msgstr "Yapılandırma"
+
+#, fuzzy
+msgid "All notes"
+msgstr "not"
 
 msgid "Checking... Please wait."
 msgstr "Kontrol ediliyor... Lütfen bekleyin."
@@ -1836,6 +1861,50 @@ msgstr "Yeni etiketler:"
 msgid "Type new tags or select from list"
 msgstr "Yeni etiketler yazın veya listeden seçin"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "Yapılandırma"
+
+msgid "Encryption Config"
+msgstr "Yapılandırmayı şifrele"
+
+#, fuzzy
+msgid "Tools"
+msgstr "Araçlar"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "Durum"
+
+msgid "Log"
+msgstr "Log"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "Yeni %s oluşturuluyor..."
+
+msgid "Export Debug Report"
+msgstr "Hata Ayıklama Raporunu Dışa Aktar"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "Yapılandırma"
@@ -1902,6 +1971,10 @@ msgstr "Not defteri kaydedilemedi: %s"
 msgid "Edit notebook"
 msgstr "Not defterini düzenle"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "Not defteri başlığı:"
+
 msgid "Show all"
 msgstr "Tümünü göster"
 
@@ -1926,10 +1999,32 @@ msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr ""
 "Joplin mobil uygulaması şu anda bu tür bir bağlantıyı desteklemiyor: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "Desteklenmeyen resim türü: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "Güncellenme: %d."
+
+msgid "View on map"
+msgstr "Haritada gör"
+
+msgid "Go to source URL"
+msgstr "URL kaynağına git"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "Ara..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "Gelişmiş ayarları göster"
+
 msgid "Take photo"
 msgstr "Fotoğraf çek"
 
@@ -1948,23 +2043,19 @@ msgstr "Nota çevir"
 msgid "Convert to todo"
 msgstr "Yapılacak olarak çevir"
 
-msgid "Hide metadata"
-msgstr "Metadata'yı gizle"
+#, fuzzy
+msgid "Properties"
+msgstr "Not özellikleri"
 
-msgid "Show metadata"
-msgstr "Metadata'yı göster"
-
-msgid "View on map"
-msgstr "Haritada gör"
-
-msgid "Go to source URL"
-msgstr "URL kaynağına git"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "Düzenle"
 
-msgid "Delete notebook"
-msgstr "Not defterini sil"
+#, fuzzy
+msgid "Add title"
+msgstr "başlık"
 
 msgid "Login with OneDrive"
 msgstr "OneDrive ile giriş yapın"
@@ -1972,19 +2063,36 @@ msgstr "OneDrive ile giriş yapın"
 msgid "Search"
 msgstr "Arama"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr ""
-"Yeni bir not veya not defteri oluşturmak için (+) düğmesine tıklayın. Mevcut "
-"not defterlerinize erişmek için yandaki menüye tıklayın."
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "Kamera kullanımı için izin"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr ""
-"Şu anda not defteriniz yok. (+) butonuna tıklayarak bir tane oluşturun."
+#~ msgid "Cancel synchronisation"
+#~ msgstr "Senkronizasyonu iptal et"
 
-msgid "Welcome"
-msgstr "Hoşgeldiniz"
+#~ msgid "Hide metadata"
+#~ msgstr "Metadata'yı gizle"
+
+#~ msgid "Show metadata"
+#~ msgstr "Metadata'yı göster"
+
+#~ msgid "Delete notebook"
+#~ msgstr "Not defterini sil"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr ""
+#~ "Yeni bir not veya not defteri oluşturmak için (+) düğmesine tıklayın. "
+#~ "Mevcut not defterlerinize erişmek için yandaki menüye tıklayın."
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr ""
+#~ "Şu anda not defteriniz yok. (+) butonuna tıklayarak bir tane oluşturun."
+
+#~ msgid "Welcome"
+#~ msgstr "Hoşgeldiniz"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "Her etiketi virgülle ayırın."

CliClient/locales/zh_CN.po

@@ -22,7 +22,7 @@ msgid "Please select the note or notebook to be deleted first."
 msgstr "请先选择需要删除的笔记或笔记本。"
 
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
-msgstr "按 Ctrl+D 或输入 \"exit\" 退出程序"
+msgstr "按 Ctrl+D 或输入“exit”退出程序"
 
 #, javascript-format
 msgid "More than one item match \"%s\". Please narrow down your query."
@@ -55,7 +55,7 @@ msgstr "不存在该命令：%s"
 
 #, javascript-format
 msgid "The command \"%s\" is only available in GUI mode"
-msgstr "命令 \"%s\" 仅在GUI模式下可用"
+msgstr "命令“%s”仅在 GUI 模式下可用"
 
 msgid "Cannot change encrypted item"
 msgstr "无法更改加密项目"
@@ -80,7 +80,7 @@ msgstr "将选定文件添加到笔记中。"
 
 #, javascript-format
 msgid "Cannot find \"%s\"."
-msgstr "无法找到 \"%s\"。"
+msgstr "无法找到“%s”。"
 
 msgid "Displays the given note."
 msgstr "显示选定笔记。"
@@ -119,7 +119,7 @@ msgstr "标记待办事项为完成。"
 
 #, javascript-format
 msgid "Note is not a to-do: \"%s\""
-msgstr "笔记非待办事项：\"%s\""
+msgstr "笔记非待办事项：“%s”"
 
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
@@ -237,7 +237,7 @@ msgid ""
 msgstr "通过方向键与 page up/down 键来滚动列表与文本区域（包含此控制台）。"
 
 msgid "To maximise/minimise the console, press \"tc\"."
-msgstr "按 \"TC\" 最大化/最小化控制台。"
+msgstr "按“TC”最大化/最小化控制台。"
 
 msgid "To enter command line mode, press \":\""
 msgstr "按“:”键进入命令行模式"
@@ -314,7 +314,7 @@ msgstr ""
 "待办事项。"
 
 msgid "Either \"text\" or \"json\""
-msgstr "\"text\" 或 \"json\""
+msgstr "“text”或“json”"
 
 msgid ""
 "Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
@@ -418,8 +418,8 @@ msgid ""
 "taking place, you may delete the lock file at \"%s\" and resume the "
 "operation."
 msgstr ""
-"锁定文件已被保存。如果您确认当前未在进行任何同步，可删除锁定文件 \"%s\" 后继"
-"续上一部操作。"
+"锁定文件已被保存。如果您确认当前未在进行任何同步，可删除锁定文件“%s”后继续上"
+"一部操作。"
 
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
@@ -442,13 +442,13 @@ msgid ""
 "[tag] from [note], or to list the notes associated with [tag]. The command "
 "`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> 可以是 \"add\"、\"remove\" 或者 \"list\"， 用于从 [note] 中赋值"
-"或删除 [tag]，或者列出与 [tag] 相关的笔记。`tag list` 命令可以用于列出所有的"
-"标签（对于过长选项请使用 -l 参数）。"
+"<tag-command> 可以是“add”、“remove”或者“list”， 用于从 [note] 中赋值或删除 "
+"[tag]，或者列出与 [tag] 相关的笔记。`tag list` 命令可以用于列出所有的标签（对"
+"于过长选项请使用 -l 参数）。"
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
-msgstr "无效命令：\"%s\""
+msgstr "无效命令：“%s”"
 
 msgid ""
 "<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
@@ -456,9 +456,9 @@ msgid ""
 "target is a regular note it will be converted to a to-do). Use \"clear\" to "
 "convert the to-do back to a regular note."
 msgstr ""
-"<todo-command> 可以是 \"toggle\" 或者 \"clear\"。使用 \"toggle\" 命令来切换待"
-"办事项的完成状态（若目标为普通笔记则将会转换成待办事项）。使用 \"clear\" 命令"
-"来把待办事项转换到普通笔记。"
+"<todo-command> 可以是“toggle”或者“clear”。使用“toggle”命令来切换待办事项的完"
+"成状态（若目标为普通笔记则将会转换成待办事项）。使用“clear”命令来把待办事项转"
+"换到普通笔记。"
 
 msgid "Marks a to-do as non-completed."
 msgstr "标记待办事项为未完成。"
@@ -513,9 +513,9 @@ msgid ""
 "any files outside this directory nor to any other personal data. No data "
 "will be shared with any third party."
 msgstr ""
-"请在浏览器中打开以下链接激活该应用程序。该应用会建立 \"Apps/Joplin\" 文件目"
-"录，并只会读写该目录中的文件。它没有任何权限访问此目录以外的任何文件或个人信"
-"息。也不会与第三方分享任何数据。"
+"请在浏览器中打开以下链接激活该应用程序。该应用会建立“Apps/Joplin”文件目录，并"
+"只会读写该目录中的文件。它没有任何权限访问此目录以外的任何文件或个人信息。也"
+"不会与第三方分享任何数据。"
 
 msgid "Search:"
 msgstr "搜索："
@@ -545,7 +545,7 @@ msgstr ""
 
 #, javascript-format
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr "从 \"%s\" 导出，导出格式为 \"%s\"。请稍等…"
+msgstr "从“%s”导出，导出格式为“%s”。请稍等……"
 
 msgid "Sidebar"
 msgstr "边栏"
@@ -561,7 +561,7 @@ msgstr "笔记正文"
 
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "从 \"%s\" 导入，导入格式为 \"%s\" 。请稍等…"
+msgstr "从“%s”导入，导入格式为“%s”。请稍等……"
 
 msgid "PDF File"
 msgstr "PDF 文件"
@@ -590,6 +590,27 @@ msgstr "加密选项"
 msgid "Web clipper options"
 msgstr "网页剪辑选项"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "插入时间"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin 导出目录"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -606,6 +627,9 @@ msgstr "偏好……"
 msgid "Check for updates..."
 msgstr "检查更新..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "导入"
 
@@ -649,12 +673,18 @@ msgstr "斜体"
 msgid "Link"
 msgstr "链接"
 
+msgid "Code"
+msgstr "代码"
+
 msgid "Insert Date Time"
 msgstr "插入时间"
 
 msgid "Edit in external editor"
 msgstr "在外部编辑器中打开"
 
+msgid "Tags"
+msgstr "标签"
+
 msgid "Search in all the notes"
 msgstr "在所有笔记内搜索"
 
@@ -686,7 +716,7 @@ msgid "Make a donation"
 msgstr "捐赠"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "切换开发者工具"
 
 #, javascript-format
 msgid "Open %s"
@@ -893,7 +923,7 @@ msgstr "返回"
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
-msgstr "将新建的笔记本“%s”，并将文件 \"%s\" 导入其中"
+msgstr "将新建的笔记本“%s”，并将文件“%s”导入其中"
 
 msgid "Please create a notebook first."
 msgstr "请先创建笔记本。"
@@ -928,19 +958,18 @@ msgstr "一些项目无法被同步。"
 msgid "View them now"
 msgstr "立刻查看"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "输入主密码："
+msgstr "一个或多个主密钥需要密码。"
 
 msgid "Set the password"
 msgstr "设置密码"
 
 msgid "No notes in here. Create one by clicking on \"New note\"."
-msgstr "此处没有任何笔记。点击\"新建笔记\"创建。"
+msgstr "此处没有任何笔记。点击“新建笔记”创建。"
 
 msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
-msgstr "此处没有任何笔记本。点击\"新建笔记本\"创建。"
+msgstr "此处没有任何笔记本。点击“新建笔记本”创建。"
 
 msgid "Location"
 msgstr "位置"
@@ -959,7 +988,7 @@ msgstr "笔记属性"
 
 #, javascript-format
 msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
-msgstr "笔记\"%s\"已成功恢复到笔记本\"%s\"中。"
+msgstr "笔记“%s”已成功恢复到笔记本“%s”中。"
 
 msgid "This note has no history"
 msgstr "此笔记没有历史记录"
@@ -972,8 +1001,8 @@ 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 ""
-"单击 \"%s\" 以恢复笔记。它将会被复制到名为 \"%s\" 的笔记本中。笔记的当前版本"
-"不会被替换或修改。"
+"单击“%s”以恢复笔记。它将会被复制到名为“%s”的笔记本中。笔记的当前版本不会被替"
+"换或修改。"
 
 msgid "Open..."
 msgstr "打开…"
@@ -1022,9 +1051,6 @@ msgstr "插入超链接"
 msgid "Attach file"
 msgstr "附加文件"
 
-msgid "Tags"
-msgstr "标签"
-
 msgid "Set alarm"
 msgstr "设置提醒"
 
@@ -1035,9 +1061,6 @@ msgstr "在: %s"
 msgid "Hyperlink"
 msgstr "超链接"
 
-msgid "Code"
-msgstr "代码"
-
 msgid "Numbered List"
 msgstr "有序列表"
 
@@ -1131,7 +1154,7 @@ msgid "Please select where the sync status should be exported to"
 msgstr "请选择同步状态的导出位置"
 
 msgid "Retry"
-msgstr ""
+msgstr "重试"
 
 msgid "Add or remove tags"
 msgstr "添加或删除标签"
@@ -1306,7 +1329,7 @@ msgstr "无法移动笔记本到该位置"
 
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
-msgstr "笔记本无法被命名为 \"%s\"，这个标题被留作他用。"
+msgstr "笔记本无法被命名为“%s”，这个标题被留作他用。"
 
 msgid "created date"
 msgstr "创建日期"
@@ -1362,25 +1385,27 @@ msgid "WebDAV password"
 msgstr "WebDAV 密码"
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "附件下载行为"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"在“手动”模式下，只有单击附件时才会下载它们。在“自动”中，当你打开笔记时，它们"
+"就会被下载下来。在“总是”中，无论你是否打开笔记，所有的附件都会被下载。"
 
 msgid "Always"
-msgstr ""
+msgstr "总是"
 
 msgid "Manual"
-msgstr ""
+msgstr "手动"
 
 msgid "Auto"
-msgstr ""
+msgstr "自动"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "最大并发连接数"
 
 msgid "Language"
 msgstr "语言"
@@ -1534,9 +1559,6 @@ msgstr ""
 "该文本编辑器命令（可能包括参数）将会被用于打开笔记。若未提供将尝试自动检测默"
 "认编辑器。"
 
-msgid "Show advanced options"
-msgstr "显示高级选项"
-
 msgid "Custom TLS certificates"
 msgstr "自定义 TLS 证书"
 
@@ -1564,11 +1586,11 @@ msgid "%d days"
 msgstr ""
 
 msgid "Keep note history for"
-msgstr ""
+msgstr "保留笔记历史记录"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
-msgstr "无效的选项值：\"%s\"。可用值有：%s。"
+msgstr "无效的选项值：“%s”。可用值有：%s。"
 
 msgid "General"
 msgstr "通用选项"
@@ -1590,7 +1612,7 @@ msgstr "应用程序"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr "标签 \"%s\" 已存在。请选择一个不同的名称。"
+msgstr "标签“%s”已存在。请选择一个不同的名称。"
 
 msgid "Joplin Export File"
 msgstr "Joplin 导出文件"
@@ -1615,7 +1637,7 @@ msgstr "文件目录"
 
 #, javascript-format
 msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr "无法加载 \"%s\" 模块用于读取 \"%s\" 格式"
+msgstr "无法加载“%s”模块用于读取“%s”格式"
 
 #, javascript-format
 msgid "Please specify import format for %s"
@@ -1625,7 +1647,7 @@ msgstr "请指定 %s 的导入格式"
 msgid ""
 "This item is currently encrypted: %s \"%s\". Please wait for all items to be "
 "decrypted and try again."
-msgstr "该项目当前已加密：%s \"%s\"。请等待所有项目解密后再重试。"
+msgstr "该项目当前已加密：%s“%s”。请等待所有项目解密后再重试。"
 
 msgid "There is no data to export."
 msgstr "没有可导出的数据。"
@@ -1653,17 +1675,18 @@ msgstr "%s (%s) 无法上传到：%s"
 
 #, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "项目 \"%s\" 无法从 %s 中下载"
+msgstr "项目“%s”无法从 %s 中下载"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "无法同步项目"
+msgstr "无法解密的项目"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin 多次解密这些项目均已失败，可能是它们太大或已经损坏导致的。这些项目会保"
+"留再设备上，但 Joplin 不会再尝试对它们进行解密。"
 
 msgid "Sync status (synced items / total items)"
 msgstr "同步状态（已同步项目/项目总数）"
@@ -1710,18 +1733,6 @@ msgstr "当前没有任何笔记。点击 (+) 按钮创建。"
 msgid "Delete these notes?"
 msgstr "是否删除这些笔记？"
 
-msgid "Log"
-msgstr "日志"
-
-msgid "Export Debug Report"
-msgstr "导出调试报告"
-
-msgid "Encryption Config"
-msgstr "加密配置"
-
-msgid "Configuration"
-msgstr "配置"
-
 msgid "Move to notebook..."
 msgstr "移动到笔记本..."
 
@@ -1744,8 +1755,24 @@ msgstr "选择日期"
 msgid "Confirm"
 msgstr "确认"
 
-msgid "Cancel synchronisation"
-msgstr "取消同步"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "笔记本"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "无法修改已加密的项目"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "新建笔记本"
+
+msgid "Configuration"
+msgstr "配置"
+
+#, fuzzy
+msgid "All notes"
+msgstr "笔记"
 
 msgid "Checking... Please wait."
 msgstr "正在检查... 请稍候。"
@@ -1787,9 +1814,52 @@ msgstr "新建标签："
 msgid "Type new tags or select from list"
 msgstr "输入新的标签或从列表中选择"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
 #, fuzzy
+msgid "Information"
+msgstr "更多信息"
+
+msgid "Encryption Config"
+msgstr "加密配置"
+
+#, fuzzy
+msgid "Tools"
+msgstr "工具 (&T)"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "状态"
+
+msgid "Log"
+msgstr "日志"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "新建 %s…"
+
+msgid "Export Debug Report"
+msgstr "导出调试报告"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 msgid "More information"
-msgstr "配置"
+msgstr "更多信息"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1850,6 +1920,10 @@ msgstr "该笔记本无法保存：%s"
 msgid "Edit notebook"
 msgstr "编辑笔记本"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "笔记本标题："
+
 msgid "Show all"
 msgstr "显示全部"
 
@@ -1873,10 +1947,32 @@ msgstr "没有 ID 为 %s 的项"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "Joplin 手机应用目前不支持这种类型的链接：%s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr "不支持“%s”协议链接"
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "不支持的图片格式：%s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "已更新：%d条。"
+
+msgid "View on map"
+msgstr "查看地图"
+
+msgid "Go to source URL"
+msgstr "定位到源 URL"
+
+#, fuzzy
+msgid "Attach..."
+msgstr "搜索..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "显示高级选项"
+
 msgid "Take photo"
 msgstr "拍照"
 
@@ -1895,23 +1991,19 @@ msgstr "转换为笔记"
 msgid "Convert to todo"
 msgstr "转换为待办事项"
 
-msgid "Hide metadata"
-msgstr "隐藏元数据"
+#, fuzzy
+msgid "Properties"
+msgstr "笔记属性"
 
-msgid "Show metadata"
-msgstr "显示元数据"
-
-msgid "View on map"
-msgstr "查看地图"
-
-msgid "Go to source URL"
-msgstr "定位到源 URL"
+msgid "Add body"
+msgstr ""
 
 msgid "Edit"
 msgstr "编辑"
 
-msgid "Delete notebook"
-msgstr "删除笔记本"
+#, fuzzy
+msgid "Add title"
+msgstr "标题"
 
 msgid "Login with OneDrive"
 msgstr "通过 OneDrive 登录"
@@ -1919,16 +2011,33 @@ msgstr "通过 OneDrive 登录"
 msgid "Search"
 msgstr "搜索"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr "单击 (+) 按钮新建笔记或笔记本。单击切换侧边栏来访问现有的笔记本。"
+#, fuzzy
+#~ msgid "Permission to write to external storage"
+#~ msgstr "使用摄像头的权限"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "您目前未有笔记本。点击 (+) 按钮创建。"
+#~ msgid "Cancel synchronisation"
+#~ msgstr "取消同步"
 
-msgid "Welcome"
-msgstr "欢迎"
+#~ msgid "Hide metadata"
+#~ msgstr "隐藏元数据"
+
+#~ msgid "Show metadata"
+#~ msgstr "显示元数据"
+
+#~ msgid "Delete notebook"
+#~ msgstr "删除笔记本"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr "单击 (+) 按钮新建笔记或笔记本。单击切换侧边栏来访问现有的笔记本。"
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "您目前未有笔记本。点击 (+) 按钮创建。"
+
+#~ msgid "Welcome"
+#~ msgstr "欢迎"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "用半角逗号“,”分开每个标签。"

CliClient/locales/zh_TW.po

@@ -594,6 +594,27 @@ msgstr "加密選項"
 msgid "Web clipper options"
 msgstr "Web clipper 選項"
 
+msgid "Create note from template"
+msgstr ""
+
+msgid "Create to-do from template"
+msgstr ""
+
+#, fuzzy
+msgid "Insert template"
+msgstr "插入日期時間"
+
+#, fuzzy
+msgid "Open template directory"
+msgstr "Joplin 匯出目錄"
+
+msgid "Refresh templates"
+msgstr ""
+
+#, fuzzy, javascript-format
+msgid "Revision: %s (%s)"
+msgstr "%s %s (%s)"
+
 #, javascript-format
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
@@ -611,6 +632,9 @@ msgstr ""
 msgid "Check for updates..."
 msgstr "檢查更新..."
 
+msgid "Templates"
+msgstr ""
+
 msgid "Import"
 msgstr "匯入"
 
@@ -656,12 +680,18 @@ msgstr "斜體"
 msgid "Link"
 msgstr ""
 
+msgid "Code"
+msgstr "引言"
+
 msgid "Insert Date Time"
 msgstr "插入日期時間"
 
 msgid "Edit in external editor"
 msgstr "使用外部編輯器編輯"
 
+msgid "Tags"
+msgstr "標籤"
+
 msgid "Search in all the notes"
 msgstr "在所有記事中搜尋"
 
@@ -1036,9 +1066,6 @@ msgstr "插入超連結"
 msgid "Attach file"
 msgstr "附加檔案"
 
-msgid "Tags"
-msgstr "標籤"
-
 msgid "Set alarm"
 msgstr "設置提醒"
 
@@ -1049,9 +1076,6 @@ msgstr "在: %s"
 msgid "Hyperlink"
 msgstr "超連結"
 
-msgid "Code"
-msgstr "引言"
-
 msgid "Numbered List"
 msgstr "編號清單"
 
@@ -1545,9 +1569,6 @@ msgstr ""
 "用於開啟筆記的編輯器命令 (可能包括參數)。如果沒有指明，程式將嘗試自動檢測預設"
 "的編輯器。"
 
-msgid "Show advanced options"
-msgstr "顯示進階選項"
-
 msgid "Custom TLS certificates"
 msgstr "自訂 TLS 證書"
 
@@ -1727,18 +1748,6 @@ msgstr "您當前沒有任何筆記。通過按一下 (+) 鍵去新增一則筆
 msgid "Delete these notes?"
 msgstr "刪除這些記事？"
 
-msgid "Log"
-msgstr "日誌"
-
-msgid "Export Debug Report"
-msgstr "匯出除錯報告"
-
-msgid "Encryption Config"
-msgstr "加密設置"
-
-msgid "Configuration"
-msgstr "設置"
-
 msgid "Move to notebook..."
 msgstr "移動至記事本..."
 
@@ -1762,8 +1771,24 @@ msgstr "選擇日期"
 msgid "Confirm"
 msgstr "確認"
 
-msgid "Cancel synchronisation"
-msgstr "取消同步"
+#, fuzzy, javascript-format
+msgid "Notebook: %s"
+msgstr "記事本"
+
+#, fuzzy
+msgid "Encrypted notebooks cannot be renamed"
+msgstr "無法修改已加密項目"
+
+#, fuzzy
+msgid "New Notebook"
+msgstr "新增記事本"
+
+msgid "Configuration"
+msgstr "設置"
+
+#, fuzzy
+msgid "All notes"
+msgstr "記事"
 
 #, fuzzy
 msgid "Checking... Please wait."
@@ -1801,6 +1826,50 @@ msgstr "新增標籤:"
 msgid "Type new tags or select from list"
 msgstr "輸入新標籤，或在清單中選擇"
 
+msgid "Warning"
+msgstr ""
+
+msgid ""
+"In order to use file system synchronization your permission to write to "
+"external storage is required."
+msgstr ""
+
+#, fuzzy
+msgid "Information"
+msgstr "設置"
+
+msgid "Encryption Config"
+msgstr "加密設置"
+
+#, fuzzy
+msgid "Tools"
+msgstr "工具"
+
+#, fuzzy
+msgid "Sync Status"
+msgstr "狀態"
+
+msgid "Log"
+msgstr "日誌"
+
+#, fuzzy
+msgid "Creating report..."
+msgstr "建立新 %s..."
+
+msgid "Export Debug Report"
+msgstr "匯出除錯報告"
+
+msgid "Fixing search index..."
+msgstr ""
+
+msgid "Fix search index"
+msgstr ""
+
+msgid ""
+"Use this to rebuild the search index if there is a problem with search. It "
+"may take some times depending on the number of notes."
+msgstr ""
+
 #, fuzzy
 msgid "More information"
 msgstr "設置"
@@ -1864,6 +1933,10 @@ msgstr "無法儲存記事本: %s"
 msgid "Edit notebook"
 msgstr "編輯記事本"
 
+#, fuzzy
+msgid "Enter notebook title"
+msgstr "記事本標題:"
+
 msgid "Show all"
 msgstr "顯示全部"
 
@@ -1887,10 +1960,32 @@ msgstr "沒有 ID 為 %s 的項目"
 msgid "The Joplin mobile app does not currently support this type of link: %s"
 msgstr "Joplin 移動應用程式暫時不支援此類型的連結: %s"
 
+#, javascript-format
+msgid "Links with protocol \"%s\" are not supported"
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported image type: %s"
 msgstr "不支援的圖像類型: %s"
 
+#, fuzzy, javascript-format
+msgid "Updated: %s"
+msgstr "已更新: %d。"
+
+msgid "View on map"
+msgstr "在地圖上顯示"
+
+msgid "Go to source URL"
+msgstr ""
+
+#, fuzzy
+msgid "Attach..."
+msgstr "搜尋..."
+
+#, fuzzy
+msgid "Choose an option"
+msgstr "顯示進階選項"
+
 #, fuzzy
 msgid "Take photo"
 msgstr "附加相片"
@@ -1910,23 +2005,18 @@ msgstr "轉換為記事"
 msgid "Convert to todo"
 msgstr "轉換為待辦事項"
 
-msgid "Hide metadata"
-msgstr "隱藏後設資料 (metadata)"
+msgid "Properties"
+msgstr ""
 
-msgid "Show metadata"
-msgstr "顯示後設資料 (metadata)"
-
-msgid "View on map"
-msgstr "在地圖上顯示"
-
-msgid "Go to source URL"
+msgid "Add body"
 msgstr ""
 
 msgid "Edit"
 msgstr "編輯"
 
-msgid "Delete notebook"
-msgstr "刪除記事本"
+#, fuzzy
+msgid "Add title"
+msgstr "標題"
 
 msgid "Login with OneDrive"
 msgstr "以 OneDrive 登錄"
@@ -1934,16 +2024,29 @@ msgstr "以 OneDrive 登錄"
 msgid "Search"
 msgstr "搜尋"
 
-msgid ""
-"Click on the (+) button to create a new note or notebook. Click on the side "
-"menu to access your existing notebooks."
-msgstr "您可以點撃 (+) 鍵去新增記事或記事本。點撃側邊欄去檢視現有的記事本。"
+#~ msgid "Cancel synchronisation"
+#~ msgstr "取消同步"
 
-msgid "You currently have no notebook. Create one by clicking on (+) button."
-msgstr "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本筆記。"
+#~ msgid "Hide metadata"
+#~ msgstr "隱藏後設資料 (metadata)"
 
-msgid "Welcome"
-msgstr "歡迎"
+#~ msgid "Show metadata"
+#~ msgstr "顯示後設資料 (metadata)"
+
+#~ msgid "Delete notebook"
+#~ msgstr "刪除記事本"
+
+#~ msgid ""
+#~ "Click on the (+) button to create a new note or notebook. Click on the "
+#~ "side menu to access your existing notebooks."
+#~ msgstr "您可以點撃 (+) 鍵去新增記事或記事本。點撃側邊欄去檢視現有的記事本。"
+
+#~ msgid ""
+#~ "You currently have no notebook. Create one by clicking on (+) button."
+#~ msgstr "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本筆記。"
+
+#~ msgid "Welcome"
+#~ msgstr "歡迎"
 
 #~ msgid "Separate each tag by a comma."
 #~ msgstr "您可用逗號分隔每個標籤。"

CliClient/package-lock.json

@@ -15,30 +15,23 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "acorn": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
+      "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="
     },
     "acorn-globals": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz",
-      "integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
+      "integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.0.6",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz",
-          "integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA=="
-        }
       }
     },
     "acorn-walk": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
-      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
     },
     "ajv": {
       "version": "5.5.2",
@@ -165,6 +158,11 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -453,17 +451,35 @@
         }
       }
     },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
     "cssom": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz",
-      "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
     },
     "cssstyle": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.1.1.tgz",
-      "integrity": "sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.3.0.tgz",
+      "integrity": "sha512-wXsoRfsRfsLVNaVzoKdqvEmK/5PFaEXNspVT22Ots6K/cnJdpoDKuQFw+qlMiXnmaif1OgeC466X1zISgAOcGg==",
       "requires": {
-        "cssom": "0.3.x"
+        "cssom": "~0.3.6"
       }
     },
     "cwise-compiler": {
@@ -495,18 +511,6 @@
         "abab": "^2.0.0",
         "whatwg-mimetype": "^2.2.0",
         "whatwg-url": "^7.0.0"
-      },
-      "dependencies": {
-        "whatwg-url": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
       }
     },
     "debug": {
@@ -517,6 +521,11 @@
         "ms": "2.0.0"
       }
     },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
     "decompress-response": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
@@ -661,9 +670,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
-      "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
+      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
       "requires": {
         "esprima": "^3.1.3",
         "estraverse": "^4.2.0",
@@ -1437,71 +1446,24 @@
       "dev": true
     },
     "joplin-turndown": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.11.tgz",
-      "integrity": "sha512-2oiwWX0nKYi1NVcaprSsrXQkYdGoRtPWFmnXdWQnQW44jlgjFV38B4VrgliwX5ZMq7cbx6A9IBwfXcBL2YV2NA==",
+      "version": "4.0.17",
+      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.17.tgz",
+      "integrity": "sha512-57mw92ZOKoR77YBLUkauN1xNq1xlxOm2KaPty/jlYrkEyGotUBBvq46a6wXh6d3aM4CccGuwymSge18/9IoB3A==",
       "requires": {
+        "css": "^2.2.4",
+        "html-entities": "^1.2.1",
         "jsdom": "^11.9.0"
-      }
-    },
-    "joplin-turndown-plugin-gfm": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz",
-      "integrity": "sha512-uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="
-    },
-    "jpeg-js": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz",
-      "integrity": "sha1-E1uZLAV1yYXPoPSUoyJ+0jhYPs4="
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "jsdom": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
-      "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^5.5.3",
-        "acorn-globals": "^4.1.0",
-        "array-equal": "^1.0.0",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": "^1.0.0",
-        "data-urls": "^1.0.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.9.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.3.0",
-        "nwsapi": "^2.0.7",
-        "parse5": "4.0.0",
-        "pn": "^1.1.0",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.5",
-        "sax": "^1.2.4",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.4",
-        "w3c-hr-time": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.3",
-        "whatwg-mimetype": "^2.1.0",
-        "whatwg-url": "^6.4.1",
-        "ws": "^5.2.0",
-        "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
+        "acorn": {
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+        },
         "ajv": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
-          "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz",
+          "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==",
           "requires": {
             "fast-deep-equal": "^2.0.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -1515,9 +1477,9 @@
           "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
         },
         "combined-stream": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-          "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
           "requires": {
             "delayed-stream": "~1.0.0"
           }
@@ -1551,22 +1513,55 @@
             "har-schema": "^2.0.0"
           }
         },
+        "jsdom": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+          "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+          "requires": {
+            "abab": "^2.0.0",
+            "acorn": "^5.5.3",
+            "acorn-globals": "^4.1.0",
+            "array-equal": "^1.0.0",
+            "cssom": ">= 0.3.2 < 0.4.0",
+            "cssstyle": "^1.0.0",
+            "data-urls": "^1.0.0",
+            "domexception": "^1.0.1",
+            "escodegen": "^1.9.1",
+            "html-encoding-sniffer": "^1.0.2",
+            "left-pad": "^1.3.0",
+            "nwsapi": "^2.0.7",
+            "parse5": "4.0.0",
+            "pn": "^1.1.0",
+            "request": "^2.87.0",
+            "request-promise-native": "^1.0.5",
+            "sax": "^1.2.4",
+            "symbol-tree": "^3.2.2",
+            "tough-cookie": "^2.3.4",
+            "w3c-hr-time": "^1.0.1",
+            "webidl-conversions": "^4.0.2",
+            "whatwg-encoding": "^1.0.3",
+            "whatwg-mimetype": "^2.1.0",
+            "whatwg-url": "^6.4.1",
+            "ws": "^5.2.0",
+            "xml-name-validator": "^3.0.0"
+          }
+        },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "mime-db": {
-          "version": "1.37.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-          "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
         },
         "mime-types": {
-          "version": "2.1.21",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
-          "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "requires": {
-            "mime-db": "~1.37.0"
+            "mime-db": "1.40.0"
           }
         },
         "oauth-sign": {
@@ -1574,6 +1569,11 @@
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
           "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
         },
+        "parse5": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+          "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+        },
         "request": {
           "version": "2.88.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
@@ -1613,17 +1613,56 @@
           }
         },
         "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
         },
         "uuid": {
           "version": "3.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
           "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        },
+        "whatwg-url": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+          "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        },
+        "ws": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
         }
       }
     },
+    "joplin-turndown-plugin-gfm": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz",
+      "integrity": "sha512-uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="
+    },
+    "jpeg-js": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz",
+      "integrity": "sha1-E1uZLAV1yYXPoPSUoyJ+0jhYPs4="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -2030,9 +2069,9 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "nwsapi": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.9.tgz",
-      "integrity": "sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ=="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
+      "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
     },
     "oauth-sign": {
       "version": "0.8.2",
@@ -2169,11 +2208,6 @@
         "data-uri-to-buffer": "0.0.3"
       }
     },
-    "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
-    },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -2411,21 +2445,28 @@
       }
     },
     "request-promise-core": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
-      "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
+      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
       "requires": {
-        "lodash": "^4.13.1"
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
+        }
       }
     },
     "request-promise-native": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz",
-      "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
+      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
       "requires": {
-        "request-promise-core": "1.1.1",
-        "stealthy-require": "^1.1.0",
-        "tough-cookie": ">=2.3.3"
+        "request-promise-core": "1.1.2",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
       }
     },
     "requires-port": {
@@ -2433,6 +2474,11 @@
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
     "retry": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
@@ -2590,6 +2636,23 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+    },
     "split-skip": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/split-skip/-/split-skip-0.0.2.tgz",
@@ -2852,9 +2915,9 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "symbol-tree": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "syswide-cas": {
       "version": "5.2.0",
@@ -3106,6 +3169,11 @@
         }
       }
     },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
     "url-parse": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
@@ -3177,9 +3245,9 @@
       "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
     },
     "whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
       "requires": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
@@ -3232,14 +3300,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "ws": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",

CliClient/package.json

@@ -43,7 +43,7 @@
     "html-minifier": "^3.5.15",
     "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.11",
+    "joplin-turndown": "^4.0.17",
     "joplin-turndown-plugin-gfm": "^1.0.8",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",

CliClient/tests/EnexToMd.js

@@ -35,7 +35,7 @@ describe('EnexToMd', function() {
 			const htmlPath = basePath + '/' + htmlFilename;
 			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
 
-			// if (htmlFilename !== 'list5.html') continue;
+			// if (htmlFilename !== 'multiline_inner_text.html') continue;
 
 			const html = await shim.fsDriver().readFile(htmlPath);
 			let expectedMd = await shim.fsDriver().readFile(mdPath);

CliClient/tests/HtmlToMd.js

@@ -37,12 +37,22 @@ describe('HtmlToMd', function() {
 			const htmlPath = basePath + '/' + htmlFilename;
 			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
 
-			// if (htmlFilename !== 'picture.html') continue;
+			// if (htmlFilename !== 'mathjax_block.html') continue;
+
+			const htmlToMdOptions = {}
+
+			if (htmlFilename === 'anchor_local.html') {
+				// Normally the list of anchor names in the document are retrieved from the HTML code
+				// This is straightforward when the document is still in DOM format, as with the clipper,
+				// but otherwise it would need to be somehow parsed out from the HTML. Here we just
+				// hard code the anchors that we know are in the file.
+				htmlToMdOptions.anchorNames = ['first', 'second']
+			}
 
 			const html = await shim.fsDriver().readFile(htmlPath);
 			let expectedMd = await shim.fsDriver().readFile(mdPath);
 
-			let actualMd = await htmlToMd.parse('<div>' + html + '</div>', []);
+			let actualMd = await htmlToMd.parse('<div>' + html + '</div>', htmlToMdOptions);
 
 			if (os.EOL === '\r\n') {
 				expectedMd = expectedMd.replace(/\r\n/g, '\n')

CliClient/tests/enex_to_md/multiline_inner_text.html

@@ -0,0 +1,7 @@
+<div>Sometimes Evernote
+wraps lines inside blocks</div>
+<div>Sometimes it doesn't wrap them</div>
+<pre>But
+careful
+with
+pre tags</pre>

CliClient/tests/enex_to_md/multiline_inner_text.md

@@ -0,0 +1,6 @@
+Sometimes Evernote wraps lines inside blocks
+Sometimes it doesn't wrap them
+But
+careful
+with
+pre tags

CliClient/tests/htmlUtils.js

@@ -0,0 +1,105 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const htmlUtils = require('lib/htmlUtils.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('htmlUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should extract image URLs', async (done) => {
+		const testCases = [
+			['<img src="http://test.com/img.png"/>', ['http://test.com/img.png']],
+			['<img src="http://test.com/img.png"/> <img src="http://test.com/img2.png"/>', ['http://test.com/img.png', 'http://test.com/img2.png']],
+			['<img src="http://test.com/img.png" alt="testing"  >', ['http://test.com/img.png']],
+			['nothing here', []],
+			['', []],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const expected = testCases[i][1];
+
+			expect(htmlUtils.extractImageUrls(md).join(' ')).toBe(expected.join(' '));
+		}
+
+		done();
+	});
+
+	it('should replace image URLs', async (done) => {
+		const testCases = [
+			['<img src="http://test.com/img.png"/>', ['http://other.com/img2.png'], '<img src="http://other.com/img2.png"/>'],
+			['<img src="http://test.com/img.png"/> <img src="http://test.com/img2.png"/>', ['http://other.com/img2.png', 'http://other.com/img3.png'], '<img src="http://other.com/img2.png"/> <img src="http://other.com/img3.png"/>'],
+			['<img src="http://test.com/img.png" alt="testing"  >', ['http://other.com/img.png'], '<img src="http://other.com/img.png" alt="testing"  >'],
+		];
+
+		const callback = (urls) => {
+			let i = -1;
+
+			return function(src) {
+				i++;
+				return urls[i];
+			}
+		}
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const r = htmlUtils.replaceImageUrls(md, callback(testCases[i][1]));
+			expect(r.trim()).toBe(testCases[i][2].trim());
+		}
+
+		done();
+	});
+
+	it('should encode attributes', async (done) => {
+		const testCases = [
+			[{ a: 'one', b: 'two' }, 'a="one" b="two"'],
+			[{ a: 'one&two' }, 'a="one&amp;two"'],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const attrs = testCases[i][0];
+			const expected = testCases[i][1];
+			expect(htmlUtils.attributesHtml(attrs)).toBe(expected);
+		}
+
+		done();
+	});
+
+	it('should prepend a base URL', async (done) => {
+		const testCases = [
+			[
+				'<a href="a.html">Something</a>',
+				'http://test.com',
+				'<a href="http://test.com/a.html">Something</a>',
+			],
+			[
+				'<a href="a.html">a</a> <a href="b.html">b</a>',
+				'http://test.com',
+				'<a href="http://test.com/a.html">a</a> <a href="http://test.com/b.html">b</a>',
+			],
+			[
+				'<a href="a.html">a</a> <a href="b.html">b</a>',
+				'http://test.com',
+				'<a href="http://test.com/a.html">a</a> <a href="http://test.com/b.html">b</a>',
+			],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const html = testCases[i][0];
+			const baseUrl = testCases[i][1];
+			const expected = testCases[i][2];
+			expect(htmlUtils.prependBaseUrl(html, baseUrl)).toBe(expected);
+		}
+
+		done();
+	});
+
+});

CliClient/tests/html_to_md/anchor_local.html

@@ -0,0 +1,6 @@
+<p><a href="#first">First</a></p>
+<p><a href="#second">Second</a></p>
+<p>Third</p>
+<p><a name="first"></a>First</p>
+<p><a id="second"></a>Second</p>
+<p><a id="third"></a>Third</p>

CliClient/tests/html_to_md/anchor_local.md

@@ -0,0 +1,11 @@
+[First](#first)
+
+[Second](#second)
+
+Third
+
+<a id="first"></a>First
+
+<a id="second"></a>Second
+
+Third

CliClient/tests/html_to_md/anchor_with_js.md

@@ -1 +1 @@
-[Some text]()
+Some text

CliClient/tests/html_to_md/code_1.md

@@ -1,5 +1,7 @@
-    def ma_fonction():
-        """
-            C'est une super fonction
-        """
-        pass
+```
+def ma_fonction():
+    """
+        C'est une super fonction
+    """
+    pass
+```

CliClient/tests/html_to_md/code_2.html

@@ -0,0 +1,2 @@
+<pre style="font-family: Menlo, Monaco, Consolas, &quot;Courier New&quot;, monospace;"><strong><font color="#008080">thatsCode();</font></strong></pre>
+<pre>thatsJustPre(); // In that case we do not have enough info to know if it is a codeblock or not, so we leave it as plain text</pre>

CliClient/tests/html_to_md/code_2.md

@@ -0,0 +1,5 @@
+```
+thatsCode();
+```
+
+thatsJustPre(); // In that case we do not have enough info to know if it is a codeblock or not, so we leave it as plain text

CliClient/tests/html_to_md/mathjax_block.md

@@ -0,0 +1,5 @@
+_Block formulas_ are surrounded by double dollar signs. For example, `$$x = \frac{-b \pm \sqrt{b^2 - 4ac} }{2a}$$` renders, _on a separate line_, as
+
+$$
+x = \frac{-b \pm \sqrt{b^2 - 4ac} }{2a}.
+$$

CliClient/tests/html_to_md/mathjax_inline.html

@@ -0,0 +1 @@
+<p><em>Inline formulas</em> are surrounded by single dollar signs. For example, <code>$f(x) = ax^2 + bx + c$</code> renders as <span class="MathJax_Preview" style="color: inherit;"></span><span class="MathJax" id="MathJax-Element-2-Frame" tabindex="0" style="position: relative;" data-mathml="<math xmlns=&quot;http://www.w3.org/1998/Math/MathML&quot;><mi>f</mi><mo stretchy=&quot;false&quot;>(</mo><mi>x</mi><mo stretchy=&quot;false&quot;>)</mo><mo>=</mo><mi>a</mi><msup><mi>x</mi><mn>2</mn></msup><mo>+</mo><mi>b</mi><mi>x</mi><mo>+</mo><mi>c</mi></math>" role="presentation"><nobr aria-hidden="true"><span class="math" id="MathJax-Span-26" style="width: 9.372em; display: inline-block;"><span style="display: inline-block; position: relative; width: 8.408em; height: 0px; font-size: 111%;"><span style="position: absolute; clip: rect(1.562em, 1008.39em, 2.95em, -1000em); top: -2.583em; left: 0em;"><span class="mrow" id="MathJax-Span-27"><span class="mi" id="MathJax-Span-28" style="font-family: STIXGeneral; font-style: italic;">𝑓<span style="display: inline-block; overflow: hidden; height: 1px; width: 0.06em;"></span></span><span class="mo" id="MathJax-Span-29" style="font-family: STIXGeneral;">(</span><span class="mi" id="MathJax-Span-30" style="font-family: STIXGeneral; font-style: italic;">𝑥</span><span class="mo" id="MathJax-Span-31" style="font-family: STIXGeneral;">)</span><span class="mo" id="MathJax-Span-32" style="font-family: STIXGeneral; padding-left: 0.313em;">=</span><span class="mi" id="MathJax-Span-33" style="font-family: STIXGeneral; font-style: italic; padding-left: 0.313em;">𝑎</span><span class="msubsup" id="MathJax-Span-34"><span style="display: inline-block; position: relative; width: 0.979em; height: 0px;"><span style="position: absolute; clip: rect(3.403em, 1000.51em, 4.213em, -1000em); top: -4.024em; left: 0em;"><span class="mi" id="MathJax-Span-35" style="font-family: STIXGeneral; font-style: italic;">𝑥</span><span style="display: inline-block; width: 0px; height: 4.024em;"></span></span><span style="position: absolute; top: -4.387em; left: 0.55em;"><span class="mn" id="MathJax-Span-36" style="font-size: 70.7%; font-family: STIXGeneral;">2</span><span style="display: inline-block; width: 0px; height: 4.024em;"></span></span></span></span><span class="mo" id="MathJax-Span-37" style="font-family: STIXGeneral; padding-left: 0.25em;">+</span><span class="mi" id="MathJax-Span-38" style="font-family: STIXGeneral; font-style: italic; padding-left: 0.25em;">𝑏</span><span class="mi" id="MathJax-Span-39" style="font-family: STIXGeneral; font-style: italic;">𝑥</span><span class="mo" id="MathJax-Span-40" style="font-family: STIXGeneral; padding-left: 0.25em;">+</span><span class="mi" id="MathJax-Span-41" style="font-family: STIXGeneral; font-style: italic; padding-left: 0.25em;">𝑐</span></span><span style="display: inline-block; width: 0px; height: 2.583em;"></span></span></span><span style="display: inline-block; overflow: hidden; vertical-align: -0.274em; border-left: 0px solid; width: 0px; height: 1.274em;"></span></span></nobr><span class="MJX_Assistive_MathML" role="presentation"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>f</mi><mo stretchy="false">(</mo><mi>x</mi><mo stretchy="false">)</mo><mo>=</mo><mi>a</mi><msup><mi>x</mi><mn>2</mn></msup><mo>+</mo><mi>b</mi><mi>x</mi><mo>+</mo><mi>c</mi></math></span></span><script type="math/tex" id="MathJax-Element-2">f(x)=ax^2+bx+c</script>.</p>

CliClient/tests/html_to_md/mathjax_inline.md

@@ -0,0 +1 @@
+_Inline formulas_ are surrounded by single dollar signs. For example, `$f(x) = ax^2 + bx + c$` renders as $f(x)=ax^2+bx+c$.

CliClient/tests/html_to_md/text_with_escaped_html.md

@@ -6,4 +6,6 @@ Some text, not an image, so it should remain escaped:
 
 But this is code so it can be unescaped:
 
-    <img src="http://test.com/image.png" />
+```
+<img src="http://test.com/image.png" />
+```

CliClient/tests/services_rest_Api.js

@@ -5,9 +5,10 @@ const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synch
 const markdownUtils = require('lib/markdownUtils.js');
 const Api = require('lib/services/rest/Api');
 const Folder = require('lib/models/Folder');
+const Resource = require('lib/models/Resource');
 const Note = require('lib/models/Note');
 const Tag = require('lib/models/Tag');
-const Resource = require('lib/models/Resource');
+const { shim } = require('lib/shim');
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
@@ -156,6 +157,25 @@ describe('services_rest_Api', function() {
 		done();
 	});
 
+	it('should preserve user timestamps when creating notes', async (done) => {
+		let response = null;
+		const f = await Folder.save({ title: "mon carnet" });
+
+		const updatedTime = Date.now() - 1000;
+		const createdTime = Date.now() - 10000;
+		
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			parent_id: f.id,
+			user_updated_time: updatedTime,
+			user_created_time: createdTime,
+		}));
+
+		expect(response.user_updated_time).toBe(updatedTime);
+		expect(response.user_created_time).toBe(createdTime);
+
+		done();
+	});
+
 	it('should create notes with supplied ID', async (done) => {
 		let response = null;
 		const f = await Folder.save({ title: "mon carnet" });
@@ -170,6 +190,39 @@ describe('services_rest_Api', function() {
 		done();
 	});
 
+	it('should create todos', async (done) => {
+		let response = null;
+		const f = await Folder.save({ title: "stuff to do" });
+
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing',
+			parent_id: f.id,
+			is_todo: 1
+		}));
+		expect(response.is_todo).toBe(1);
+
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing 2',
+			parent_id: f.id,
+			is_todo: 0
+		}));
+		expect(response.is_todo).toBe(0);
+
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing 3',
+			parent_id: f.id,
+		}));
+		expect(response.is_todo).toBeUndefined();
+
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing 4',
+			parent_id: f.id,
+			is_todo: '1'
+		}));
+		expect(response.is_todo).toBe(1);
+		done();
+	});
+
 	it('should create folders with supplied ID', async (done) => {
 		const response = await api.route('POST', 'folders', null, JSON.stringify({
 			id: '12345678123456781234567812345678',
@@ -200,6 +253,28 @@ describe('services_rest_Api', function() {
 		done();
 	});
 
+	it('should delete resources', async (done) => {
+		let response = null;
+		const f = await Folder.save({ title: "mon carnet" });
+		
+		response = await api.route('POST', 'notes', null, JSON.stringify({
+			title: 'testing image',
+			parent_id: f.id,
+			image_data_url: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANZJREFUeNoAyAA3/wFwtO3K6gUB/vz2+Prw9fj/+/r+/wBZKAAExOgF4/MC9ff+MRH6Ui4E+/0Bqc/zutj6AgT+/Pz7+vv7++nu82c4DlMqCvLs8goA/gL8/fz09fb59vXa6vzZ6vjT5fbn6voD/fwC8vX4UiT9Zi//APHyAP8ACgUBAPv5APz7BPj2+DIaC2o3E+3o6ywaC5fT6gD6/QD9/QEVf9kD+/dcLQgJA/7v8vqfwOf18wA1IAIEVycAyt//v9XvAPv7APz8LhoIAPz9Ri4OAgwARgx4W/6fVeEAAAAASUVORK5CYII="
+		}));
+
+		const resource = (await Resource.all())[0];
+
+		const filePath = Resource.fullPath(resource);
+		expect(await shim.fsDriver().exists(filePath)).toBe(true);
+
+		await api.route('DELETE', 'resources/' + resource.id);
+		expect(await shim.fsDriver().exists(filePath)).toBe(false);
+		expect(!(await Resource.load(resource.id))).toBe(true);
+		
+		done();
+	});
+
 	it('should create notes from HTML', async (done) => {
 		let response = null;
 		const f = await Folder.save({ title: "mon carnet" });
@@ -297,4 +372,4 @@ describe('services_rest_Api', function() {
 		done();
 	});
 
-});
+});

CliClient/tests/synchronizer.js

@@ -947,6 +947,9 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 		expect((await remoteNotesFoldersResources()).length).toBe(2);
 
+		const remoteBlob = await fileApi().stat('.resource/' + resource1.id);
+		expect(!remoteBlob).toBe(true);
+
 		await switchClient(1);
 
 		expect(await shim.fsDriver().exists(resourcePath1)).toBe(true);

CliClient/tests/urlUtils.js

@@ -30,6 +30,7 @@ describe('urlUtils', function() {
 		expect(urlUtils.prependBaseUrl('mailto:emailme@example.com', 'http://example.com')).toBe('mailto:emailme@example.com');
 		expect(urlUtils.prependBaseUrl('javascript:var%20testing=true', 'http://example.com')).toBe('javascript:var%20testing=true');
 		expect(urlUtils.prependBaseUrl('http://alreadyabsolute.com', 'http://example.com')).toBe('http://alreadyabsolute.com');
+		expect(urlUtils.prependBaseUrl('#local-anchor', 'http://example.com')).toBe('#local-anchor');
 
 		done();
 	});

Clipper/joplin-webclipper/background.js

@@ -23,11 +23,12 @@ window.joplinEnv = function() {
 	return env_;
 }
 
-async function browserCaptureVisibleTabs(windowId, options) {
-	if (browserSupportsPromises_) return browser_.tabs.captureVisibleTab(windowId, { format: 'jpeg' });
+async function browserCaptureVisibleTabs(windowId) {
+	const options = { format: 'jpeg' };
+	if (browserSupportsPromises_) return browser_.tabs.captureVisibleTab(windowId, options);
 
 	return new Promise((resolve, reject) => {
-		browser_.tabs.captureVisibleTab(windowId, { format: 'jpeg' }, (image) => {
+		browser_.tabs.captureVisibleTab(windowId, options, (image) => {
 			resolve(image);
 		});
 	});
@@ -56,7 +57,7 @@ browser_.runtime.onMessage.addListener(async (command) => {
 
 		const zoom = await browserGetZoom();
 
-		const imageDataUrl = await browserCaptureVisibleTabs(null, { format: 'jpeg' });
+		const imageDataUrl = await browserCaptureVisibleTabs(null);
 		content = Object.assign({}, command.content);
 		content.image_data_url = imageDataUrl;
 

Clipper/joplin-webclipper/content_scripts/index.js

@@ -19,7 +19,7 @@
 		const protocol = url.toLowerCase().split(':')[0];
 		if (['http', 'https', 'file'].indexOf(protocol) >= 0) return url;
 
-		if (url.indexOf('//')) {
+		if (url.indexOf('//') === 0) {
 			return location.protocol + url;
 		} else if (url[0] === '/') {
 			return location.protocol + '//' + location.host + url;
@@ -34,8 +34,20 @@
 		return document.title.trim();
 	}
 
+	function pageLocationOrigin() {
+		// location.origin normally returns the protocol + domain + port (eg. https://example.com:8080)
+		// but for file:// protocol this is browser dependant and in particular Firefox returns "null"
+		// in this case.
+
+		if (location.protocol === 'file:') {
+			return 'file://';
+		} else {
+			return location.origin;
+		}
+	}
+
 	function baseUrl() {
-		let output = location.origin + location.pathname;
+		let output = pageLocationOrigin() + location.pathname;
 		if (output[output.length - 1] !== '/') {
 			output = output.split('/');
 			output.pop();
@@ -49,43 +61,174 @@
 		const output = {};
 		for (let i = 0; i < images.length; i++) {
 			const img = images[i];
-			const src = forceAbsoluteUrls ? absoluteUrl(img.src) : img.src;
-			output[src] = {
+			if (img.classList && img.classList.contains('joplin-clipper-hidden')) continue;
+
+			let src = imageSrc(img);
+			src = forceAbsoluteUrls ? absoluteUrl(src) : src;
+
+			if (!output[src]) output[src] = [];
+
+			output[src].push({
 				width: img.width,
 				height: img.height,
 				naturalWidth: img.naturalWidth,
 				naturalHeight: img.naturalHeight,
-			};
+			});
 		}
 		return output;
 	}
 
+	function getAnchorNames(element) {
+		const anchors = element.getElementsByTagName('a');
+		const output = [];
+		for (let i = 0; i < anchors.length; i++) {
+			const anchor = anchors[i];
+			if (anchor.id) {
+				output.push(anchor.id);
+			} else if (anchor.name) {
+				output.push(anchor.name);
+			}
+		}
+		return output;
+	}
+
+	// In general we should use currentSrc because that's the image that's currently displayed,
+	// especially within <picture> tags or with srcset. In these cases there can be multiple
+	// sources and the best one is probably the one being displayed, thus currentSrc.
+	function imageSrc(image) {
+		if (image.currentSrc) return image.currentSrc;
+		return image.src;
+	}
+
 	// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
-	function cleanUpElement(element, imageSizes) {
+	// And hard-code the image dimensions so that the information can be used by the clipper server to
+	// display them at the right sizes in the notes.
+	function cleanUpElement(convertToMarkup, element, imageSizes, imageIndexes) {
 		const childNodes = element.childNodes;
+		const hiddenNodes = [];
 
 		for (let i = 0; i < childNodes.length; i++) {
 			const node = childNodes[i];
+			const nodeName = node.nodeName.toLowerCase();
 
-			let isVisible = node.nodeType === 1 ? window.getComputedStyle(node).display !== 'none' : true;
-			if (isVisible && ['input', 'textarea', 'script', 'noscript', 'style', 'select', 'option', 'button'].indexOf(node.nodeName.toLowerCase()) >= 0) isVisible = false;
+			const isHidden = node && node.classList && node.classList.contains('joplin-clipper-hidden');
 
-			if (!isVisible) {
-				element.removeChild(node);
+			if (isHidden) {
+				hiddenNodes.push(node);
 			} else {
 
-				if (node.nodeName.toLowerCase() === 'img') {
-					node.src = absoluteUrl(node.src);
-					const imageSize = imageSizes[node.src];
-					if (imageSize) {
+				// If the data-joplin-clipper-value has been set earlier, create a new DIV element
+				// to replace the input or text area, so that it can be exported.
+				if (node.getAttribute && node.getAttribute('data-joplin-clipper-value')) {
+					const div = document.createElement('div');
+					div.innerText = node.getAttribute('data-joplin-clipper-value');
+					node.parentNode.insertBefore(div, node.nextSibling);
+					element.removeChild(node);
+				}
+
+				if (nodeName === 'img') {
+					const src = absoluteUrl(imageSrc(node));
+					node.setAttribute('src', src);
+					if (!(src in imageIndexes)) imageIndexes[src] = 0;
+					const imageSize = imageSizes[src][imageIndexes[src]];
+					imageIndexes[src]++;
+					if (imageSize && convertToMarkup === 'markdown') {
 						node.width = imageSize.width;
 						node.height = imageSize.height;
 					}
 				}
 
-				cleanUpElement(node, imageSizes);
+				cleanUpElement(convertToMarkup, node, imageSizes, imageIndexes);
 			}
 		}
+
+		for (const hiddenNode of hiddenNodes) {
+			if (!hiddenNode.parentNode) continue;
+			hiddenNode.parentNode.removeChild(hiddenNode);
+		}
+	}
+
+	// When we clone the document before cleaning it, we lose some of the information that might have been set via CSS or
+	// JavaScript, in particular whether an element was hidden or not. This function pre-process the document by
+	// adding a "joplin-clipper-hidden" class to all currently hidden elements in the current document.
+	// This class is then used in cleanUpElement() on the cloned document to find an element should be visible or not.
+	function preProcessDocument(element) {
+		const childNodes = element.childNodes;
+
+		for (let i = childNodes.length - 1; i >= 0; i--) {
+			const node = childNodes[i];
+			const nodeName = node.nodeName.toLowerCase();
+			const nodeParent = node.parentNode;
+			const nodeParentName = nodeParent ? nodeParent.nodeName.toLowerCase() : '';
+
+			let isVisible = node.nodeType === 1 ? window.getComputedStyle(node).display !== 'none' : true;
+			if (isVisible && ['script', 'noscript', 'style', 'select', 'option', 'button'].indexOf(nodeName) >= 0) isVisible = false;
+
+			// If it's a text input or a textarea and it has a value, save
+			// that value to data-joplin-clipper-value. This is then used
+			// when cleaning up the document to export the value.
+			if (['input', 'textarea'].indexOf(nodeName) >= 0) {
+				isVisible = !!node.value;
+				if (nodeName === 'input' && node.getAttribute('type') !== 'text') isVisible = false;
+				if (isVisible) node.setAttribute('data-joplin-clipper-value', node.value);
+			}
+
+			if (nodeName === 'script') {
+				const a = node.getAttribute('type');
+				if (a && a.toLowerCase().indexOf('math/tex') >= 0) isVisible = true;
+			}
+
+			if (nodeName === 'source' && nodeParentName === 'picture') {
+				isVisible = false
+			}
+
+			if (node.nodeType === 8) { // Comments are just removed since we can't add a class
+				node.parentNode.removeChild(node);
+			} else if (!isVisible) {
+				node.classList.add('joplin-clipper-hidden');
+			} else {
+				preProcessDocument(node);
+			}
+		}
+	}
+
+	// This sets the PRE elements computed style to the style attribute, so that
+	// the info can be exported and later processed by the htmlToMd converter
+	// to detect code blocks.
+	function hardcodePreStyles(doc) {
+		const preElements = doc.getElementsByTagName('pre');
+
+		for (const preElement of preElements) {
+			const fontFamily = getComputedStyle(preElement).getPropertyValue('font-family');
+			const fontFamilyArray = fontFamily.split(',').map(f => f.toLowerCase().trim());
+			if (fontFamilyArray.indexOf('monospace') >= 0) {
+				preElement.style.fontFamily = fontFamily;
+			}
+		}
+	}
+
+	// Given a document, return a <style> tag that contains all the styles
+	// required to render the page. Not currently used but could be as an 
+	// option to clip pages as HTML.
+	function getStyleSheets(doc) {
+		const output = [];
+		for (var i=0; i<doc.styleSheets.length; i++) {
+			var sheet = doc.styleSheets[i];
+			try {
+				for (const cssRule of sheet.cssRules) {
+					output.push({ type: 'text', value: cssRule.cssText });
+				}
+			} catch (error) {
+				// Calling sheet.cssRules will throw a CORS error on Chrome if the stylesheet is on a different domain.
+				// In that case, we skip it and add it to the list of stylesheet URLs. These URls will be downloaded
+				// by the desktop application, since it doesn't have CORS restrictions.
+				console.info('Could not retrieve stylesheet now:', sheet.href);
+				console.info('It will downloaded by the main application.');
+				console.info(error);
+				output.push({ type: 'url', value: sheet.href });
+			}
+		}
+		return output;
 	}
 
 	function documentForReadability() {
@@ -117,16 +260,22 @@
 	async function prepareCommandResponse(command) {
 		console.info('Got command: ' + command.name);
 
-		const clippedContentResponse = (title, html, imageSizes) => {
+		const convertToMarkup = command.preProcessFor ? command.preProcessFor : 'markdown';
+
+		const clippedContentResponse = (title, html, imageSizes, anchorNames, stylesheets) => {
 			return {
 				name: 'clippedContent',
 				title: title,
 				html: html,
 				base_url: baseUrl(),
-				url: location.origin + location.pathname + location.search,
+				url: pageLocationOrigin() + location.pathname + location.search,
 				parent_id: command.parent_id,
 				tags: command.tags || '',
 				image_sizes: imageSizes,
+				anchor_names: anchorNames,
+				source_command: Object.assign({}, command),
+				convert_to: convertToMarkup,
+				stylesheets: stylesheets,
 			};			
 		}
 
@@ -143,27 +292,38 @@
 				response.warning = 'Could not retrieve simplified version of page - full page has been saved instead.';
 				return response;
 			}
-			return clippedContentResponse(article.title, article.body, getImageSizes(document));
+			return clippedContentResponse(article.title, article.body, getImageSizes(document), getAnchorNames(document));
 
 		} else if (command.name === "isProbablyReaderable") {
 
 			const ok = isProbablyReaderable(documentForReadability());
-			console.info('isProbablyReaderable', ok);
 			return { name: 'isProbablyReaderable', value: ok };
 
 		} else if (command.name === "completePageHtml") {
 
+			hardcodePreStyles(document);
+			preProcessDocument(document);
+			// Because cleanUpElement is going to modify the DOM and remove elements we don't want to work
+			// directly on the document, so we make a copy of it first.
 			const cleanDocument = document.body.cloneNode(true);
 			const imageSizes = getImageSizes(document, true);
-			cleanUpElement(cleanDocument, imageSizes);
-			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes);
+			const imageIndexes = {};
+			cleanUpElement(convertToMarkup, cleanDocument, imageSizes, imageIndexes);
+
+			const stylesheets = convertToMarkup === 'html' ? getStyleSheets(document) : null;
+			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes, getAnchorNames(document), stylesheets);
 
 		} else if (command.name === "selectedHtml") {
 
-		    const range = window.getSelection().getRangeAt(0);
-		    const container = document.createElement('div');
-		    container.appendChild(range.cloneContents());
-		    return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document));
+			hardcodePreStyles(document);
+			preProcessDocument(document);
+			const range = window.getSelection().getRangeAt(0);
+			const container = document.createElement('div');
+			container.appendChild(range.cloneContents());
+			const imageSizes = getImageSizes(document, true);
+			const imageIndexes = {};
+			cleanUpElement(convertToMarkup, container, imageSizes, imageIndexes);
+			return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document), getAnchorNames(document));
 
 		} else if (command.name === 'screenshot') {
 
@@ -265,7 +425,7 @@
 					const content = {
 						title: pageTitle(),
 						crop_rect: selectionArea,
-						url: location.origin + location.pathname,
+						url: pageLocationOrigin() + location.pathname,
 						parent_id: command.parent_id,
 						tags: command.tags,
 					};
@@ -286,8 +446,8 @@
 
 		} else if (command.name === "pageUrl") {
 
-			let url = location.origin + location.pathname + location.search;
-			return clippedContentResponse(pageTitle(), url, getImageSizes(document));
+			let url = pageLocationOrigin() + location.pathname + location.search;
+			return clippedContentResponse(pageTitle(), url, getImageSizes(document), getAnchorNames(document));
 
 		} else {
 			throw new Error('Unknown command: ' + JSON.stringify(command));

Clipper/joplin-webclipper/manifest.json

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

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

@@ -1,6 +1,6 @@
 .App {
 	width: 400px;
-	height: 600px;
+	
 	overflow-x: hidden;
 	overflow-y: hidden;
 	display: flex;

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

@@ -7,6 +7,20 @@ import led_orange from './led_orange.png';
 const { connect } = require('react-redux');
 const { bridge } = require('./bridge');
 
+function commandUserString(command) {
+	const s = [];
+
+	if (command.name === 'simplifiedPageHtml') s.push('Simplified page');
+	if (command.name === 'completePageHtml') s.push('Complete page');
+	if (command.name === 'selectedHtml') s.push('Selection');
+	if (command.name === 'pageUrl') s.push('URL only');
+
+	const p = command.preProcessFor ? command.preProcessFor : 'markdown';
+	s.push('(' + p + ')');
+
+	return s.join(' ');
+}
+
 class PreviewComponent extends React.PureComponent {
 
 	constructor() {
@@ -16,6 +30,8 @@ class PreviewComponent extends React.PureComponent {
 	}
 
 	componentDidMount() {
+		if (!this.bodyRef.current) return;
+
 		// Because the text size is made twice smaller with CSS, we need
 		// to also reduce the size of the images
 		const imgs = this.bodyRef.current.getElementsByTagName('img');
@@ -28,14 +44,23 @@ class PreviewComponent extends React.PureComponent {
 	render() {
 		return (
 			<div className="Preview">
-				<a className={"Confirm Button"} onClick={this.props.onConfirmClick}>Confirm</a>
-				<h2>Preview:</h2>
+				<h2>Title:</h2>
 				<input className={"Title"} value={this.props.title} onChange={this.props.onTitleChange}/>
-				<div className={"BodyWrapper"}>
-					<div className={"Body"} ref={this.bodyRef} dangerouslySetInnerHTML={{__html: this.props.body_html}}></div>
-				</div>
+				<p><span>Type:</span> {commandUserString(this.props.command)}</p>
+				<a className={"Confirm Button"} onClick={this.props.onConfirmClick}>Confirm</a>
 			</div>
 		);
+
+		// return (
+		// 	<div className="Preview">
+		// 		<a className={"Confirm Button"} onClick={this.props.onConfirmClick}>Confirm</a>
+		// 		<h2>Preview:</h2>
+		// 		<input className={"Title"} value={this.props.title} onChange={this.props.onTitleChange}/>
+		// 		<div className={"BodyWrapper"}>
+		// 			<div className={"Body"} ref={this.bodyRef} dangerouslySetInnerHTML={{__html: this.props.body_html}}></div>
+		// 		</div>
+		// 	</div>
+		// );
 	}
 
 }
@@ -74,6 +99,14 @@ class AppComponent extends Component {
 		this.clipComplete_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'completePageHtml',
+				preProcessFor: 'markdown',
+			});
+		}
+
+		this.clipCompleteHtml_click = () => {
+			bridge().sendCommandToActiveTab({
+				name: 'completePageHtml',
+				preProcessFor: 'html',
 			});
 		}
 
@@ -249,6 +282,7 @@ class AppComponent extends Component {
 				title={content.title}
 				body_html={content.body_html}
 				onTitleChange={this.contentTitle_change}
+				command={content.source_command}
 			/>
 		}
 
@@ -350,6 +384,7 @@ class AppComponent extends Component {
 					<ul>
 						<li><a className="Button" onClick={this.clipSimplified_click} title={simplifiedPageButtonTooltip}>{simplifiedPageButtonLabel}</a></li>
 						<li><a className="Button" onClick={this.clipComplete_click}>Clip complete page</a></li>
+						<li><a className="Button" onClick={this.clipCompleteHtml_click}>Clip complete page (HTML) (Beta)</a></li>
 						<li><a className="Button" onClick={this.clipSelection_click}>Clip selection</a></li>
 						<li><a className="Button" onClick={this.clipScreenshot_click}>Clip screenshot</a></li>
 						<li><a className="Button" onClick={this.clipUrl_click}>Clip URL</a></li>

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

@@ -34,6 +34,10 @@ class Bridge {
 					parent_id: command.parent_id,
 					tags: command.tags || '',
 					image_sizes: command.image_sizes || {},
+					anchor_names: command.anchor_names || [],
+					source_command: command.source_command,
+					convert_to: command.convert_to,
+					stylesheets: command.stylesheets,
 				};
 
 				this.dispatch({ type: 'CLIPPED_CONTENT_SET', content: content });

ElectronClient/app/app.js

@@ -26,11 +26,13 @@ const ResourceService = require('lib/services/ResourceService');
 const ClipperServer = require('lib/ClipperServer');
 const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
 const { bridge } = require('electron').remote.require('./bridge');
+const { shell } = require('electron');
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
 const PluginManager = require('lib/services/PluginManager');
 const RevisionService = require('lib/services/RevisionService');
 const MigrationService = require('lib/services/MigrationService');
+const TemplateUtils = require('lib/TemplateUtils');
 
 const pluginClasses = [
 	require('./plugins/GotoAnything.min'),
@@ -209,7 +211,7 @@ class Application extends BaseApplication {
 			// The bridge runs within the main process, with its own instance of locale.js
 			// so it needs to be set too here.
 			bridge().setLocale(Setting.value('locale'));
-			this.refreshMenu();
+			await this.refreshMenu();
 		}
 
 		if (action.type == 'SETTING_UPDATE_ONE' && action.key == 'showTrayIcon' || action.type == 'SETTING_UPDATE_ALL') {
@@ -239,13 +241,17 @@ class Application extends BaseApplication {
 			Setting.setValue('sidebarVisibility', newState.sidebarVisibility);
 		}
 
+		if (action.type.indexOf('NOTE_SELECT') === 0 || action.type.indexOf('FOLDER_SELECT') === 0) {
+			this.updateMenuItemStates();
+		}
+
 		return result;
 	}
 
-	refreshMenu() {
+	async refreshMenu() {
 		const screen = this.lastMenuScreen_;
 		this.lastMenuScreen_ = null;
-		this.updateMenu(screen);
+		await this.updateMenu(screen);
 	}
 
 	focusElement_(target) {
@@ -256,7 +262,7 @@ class Application extends BaseApplication {
 		});
 	}
 
-	updateMenu(screen) {
+	async updateMenu(screen) {
 		if (this.lastMenuScreen_ === screen) return;
 
 		const sortNoteFolderItems = (type) => {
@@ -324,6 +330,7 @@ class Application extends BaseApplication {
 		const exportItems = [];
 		const preferencesItems = [];
 		const toolsItemsFirst = [];
+    const templateItems = [];
 		const ioService = new InteropService();
 		const ioModules = ioService.modules();
 		for (let i = 0; i < ioModules.length; i++) {
@@ -500,6 +507,57 @@ class Application extends BaseApplication {
 			screens: ['Main'],
 		});
 
+		const templateDirExists = await shim.fsDriver().exists(Setting.value('templateDir'));
+
+		templateItems.push({
+			label: _('Create note from template'),
+			visible: templateDirExists,
+			click: () => {
+				this.dispatch({
+					type: 'WINDOW_COMMAND',
+					name: 'selectTemplate',
+					noteType: 'note',
+				});
+			}
+		}, {
+			label: _('Create to-do from template'),
+			visible: templateDirExists,
+			click: () => {
+				this.dispatch({
+					type: 'WINDOW_COMMAND',
+					name: 'selectTemplate',
+					noteType: 'todo',
+				});
+			}
+		}, {
+			label: _('Insert template'),
+			visible: templateDirExists,
+			accelerator: 'CommandOrControl+Alt+I',
+			click: () => {
+				this.dispatch({
+					type: 'WINDOW_COMMAND',
+					name: 'selectTemplate',
+				});
+			}
+		}, {
+			label: _('Open template directory'),
+			click: () => {
+				const templateDir = Setting.value('templateDir');
+				if (!templateDirExists) shim.fsDriver().mkdir(templateDir);
+				shell.openItem(templateDir);
+			}
+		}, {
+			label: _('Refresh templates'),
+			click: async () => {
+				const templates = await TemplateUtils.loadTemplates(Setting.value('templateDir'));
+
+				this.store().dispatch({
+					type: 'TEMPLATE_UPDATE_ALL',
+					templates: templates
+				});
+			}
+		});
+
 		const toolsItems = toolsItemsFirst.concat(preferencesItems);
 
 		function _checkForUpdates(ctx) {
@@ -508,12 +566,20 @@ class Application extends BaseApplication {
 
 		function _showAbout() {
 			const p = packageInfo;
+			let gitInfo = '';
+			if ("git" in p) {
+				gitInfo = _('Revision: %s (%s)', p.git.hash, p.git.branch);
+			}
 			let message = [
 				p.description,
 				'',
 				'Copyright © 2016-2019 Laurent Cozic',
 				_('%s %s (%s, %s)', p.name, p.version, Setting.value('env'), process.platform),
 			];
+			if (!!gitInfo) {
+				message.push("\n" + gitInfo);
+				console.info(gitInfo);
+			}
 			bridge().showInfoMessageBox(message.join('\n'), {
 				icon: bridge().electronApp().buildDir() + '/icons/32x32.png',
 			});
@@ -551,6 +617,13 @@ class Application extends BaseApplication {
 			shim.isMac() ? noItem : newNotebookItem, {
 				type: 'separator',
 				visible: shim.isMac() ? false : true
+			}, {
+				label: _('Templates'),
+				visible: shim.isMac() ? false : true,
+				submenu: templateItems,
+			}, {
+				type: 'separator',
+				visible: shim.isMac() ? false : true
 			}, {
 				label: _('Import'),
 				visible: shim.isMac() ? false : true,
@@ -601,6 +674,11 @@ class Application extends BaseApplication {
 					platforms: ['darwin'],
 					accelerator: 'Command+W',
 					selector: 'performClose:',
+				},  {
+					type: 'separator',
+				}, {
+					label: _('Templates'),
+					submenu: templateItems,
 				}, {
 					type: 'separator',
 				}, {
@@ -618,20 +696,25 @@ class Application extends BaseApplication {
 
 		const rootMenus = {
 			edit: {
+				id: 'edit',
 				label: _('&Edit'),
 				submenu: [{
+					id: 'edit:copy',
 					label: _('Copy'),
 					role: 'copy',
 					accelerator: 'CommandOrControl+C',
 				}, {
+					id: 'edit:cut',
 					label: _('Cut'),
 					role: 'cut',
 					accelerator: 'CommandOrControl+X',
 				}, {
+					id: 'edit:paste',
 					label: _('Paste'),
 					role: 'paste',
 					accelerator: 'CommandOrControl+V',
 				}, {
+					id: 'edit:selectAll',
 					label: _('Select all'),
 					role: 'selectall',
 					accelerator: 'CommandOrControl+A',
@@ -639,6 +722,7 @@ class Application extends BaseApplication {
 					type: 'separator',
 					screens: ['Main'],
 				}, {
+					id: 'edit:bold',
 					label: _('Bold'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+B',
@@ -649,6 +733,7 @@ class Application extends BaseApplication {
 						});
 					},
 				}, {
+					id: 'edit:italic',
 					label: _('Italic'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+I',
@@ -659,6 +744,7 @@ class Application extends BaseApplication {
 						});
 					},
 				}, {
+					id: 'edit:link',
 					label: _('Link'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+K',
@@ -669,6 +755,7 @@ class Application extends BaseApplication {
 						});
 					},
 				}, {
+					id: 'edit:code',
 					label: _('Code'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+`',
@@ -682,6 +769,7 @@ class Application extends BaseApplication {
 					type: 'separator',
 					screens: ['Main'],
 				}, {
+					id: 'edit:insertDateTime',
 					label: _('Insert Date Time'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+Shift+T',
@@ -695,6 +783,7 @@ class Application extends BaseApplication {
 					type: 'separator',
 					screens: ['Main'],
 				}, {
+					id: 'edit:commandStartExternalEditing',
 					label: _('Edit in external editor'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+E',
@@ -704,20 +793,37 @@ class Application extends BaseApplication {
 							name: 'commandStartExternalEditing',
 						});
 					},
+				}, {
+					id: 'edit:setTags',
+					label: _('Tags'),
+					screens: ['Main'],
+					accelerator: 'CommandOrControl+Alt+T',
+					click: () => {
+						const selectedNoteIds = this.store().getState().selectedNoteIds;
+						if (selectedNoteIds.length !== 1) return;
+
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'setTags',
+							noteId: selectedNoteIds[0],
+						});
+					},
 				}, {
 					type: 'separator',
 					screens: ['Main'],
 				}, {
+					id: 'edit:focusSearch',
 					label: _('Search in all the notes'),
 					screens: ['Main'],
 					accelerator: shim.isMac() ? 'Shift+Command+F' : 'F6',
 					click: () => {
 						this.dispatch({
 							type: 'WINDOW_COMMAND',
-							name: 'focus_search',
+							name: 'focusSearch',
 						});
 					},
 				}, {
+					id: 'edit:showLocalSearch',
 					label: _('Search in current note'),
 					screens: ['Main'],
 					accelerator: 'CommandOrControl+F',
@@ -914,6 +1020,20 @@ class Application extends BaseApplication {
 		this.lastMenuScreen_ = screen;
 	}
 
+	async updateMenuItemStates() {
+		if (!this.lastMenuScreen_) return;
+		if (!this.store()) return;
+
+		const selectedNoteIds = this.store().getState().selectedNoteIds;
+		const note = selectedNoteIds.length === 1 ? await Note.load(selectedNoteIds[0]) : null;
+
+		for (const itemId of ['copy', 'paste', 'cut', 'selectAll', 'bold', 'italic', 'link', 'code', 'insertDateTime', 'commandStartExternalEditing', 'setTags', 'showLocalSearch']) {
+			const menuItem = Menu.getApplicationMenu().getMenuItemById('edit:' + itemId);
+			if (!menuItem) continue;
+			menuItem.enabled = !!note && note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN;
+		}
+	}
+
 	updateTray() {
 		const app = bridge().electronApp();
 
@@ -1027,6 +1147,13 @@ class Application extends BaseApplication {
 			css: cssString
 		});
 
+		const templates = await TemplateUtils.loadTemplates(Setting.value('templateDir'));
+
+		this.store().dispatch({
+			type: 'TEMPLATE_UPDATE_ALL',
+			templates: templates
+		});
+
 		// Note: Auto-update currently doesn't work in Linux: it downloads the update
 		// but then doesn't install it on exit.
 		if (shim.isWindows() || shim.isMac()) {
@@ -1082,6 +1209,8 @@ class Application extends BaseApplication {
 
 		RevisionService.instance().runInBackground();
 
+		this.updateMenuItemStates();
+
 		// Make it available to the console window - useful to call revisionService.collectRevisions()
 		window.revisionService = RevisionService.instance();
 		window.migrationService = MigrationService.instance();

ElectronClient/app/compile-package-info.js

@@ -1,4 +1,5 @@
 const fs = require('fs-extra');
+const execSync = require('child_process').execSync;
 
 // Electron Builder strip off certain important keys from package.json, which we need, in particular build.appId
 // so this script is used to preserve the keys that we need.
@@ -16,6 +17,19 @@ const appId = packageInfo.build.appId;
 delete packageInfo.build;
 packageInfo.build = { appId: appId };
 
+let branch;
+let hash;
+try {
+	branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
+	hash   = execSync('git log --pretty="%h" -1').toString().trim();
+}
+catch(err) {
+	console.warn("Could not get git info", err);
+}
+if (typeof branch !== 'undefined' && typeof hash !== 'undefined') {
+	packageInfo.git = { branch: branch, hash: hash };
+}
+
 let fileContent = "// Auto-generated by compile-package-info.js\n// Do not change directly\nconst packageInfo = " + JSON.stringify(packageInfo, null, 4) + ';';
 fileContent += "\n";
 fileContent += "module.exports = packageInfo;";

ElectronClient/app/compile.js

@@ -47,7 +47,7 @@ convertJsx(__dirname + '/plugins');
 const libContent = [
 	fs.readFileSync(basePath + '/ReactNativeClient/lib/string-utils-common.js', 'utf8'),
 	fs.readFileSync(basePath + '/ReactNativeClient/lib/markJsUtils.js', 'utf8'),
-	fs.readFileSync(basePath + '/ReactNativeClient/lib/MdToHtml/webviewLib.js', 'utf8'),
+	fs.readFileSync(basePath + '/ReactNativeClient/lib/renderers/webviewLib.js', 'utf8'),
 ];
 
 fs.writeFileSync(__dirname + '/gui/note-viewer/lib.js', libContent.join('\n'), 'utf8');

ElectronClient/app/gui/Header.jsx

@@ -96,7 +96,7 @@ class HeaderComponent extends React.Component {
 
 		let commandProcessed = true;
 
-		if (command.name === 'focus_search' && this.searchElement_) {
+		if (command.name === 'focusSearch' && this.searchElement_) {
 			this.searchElement_.focus();
 		} else {
 			commandProcessed = false;
@@ -137,14 +137,17 @@ class HeaderComponent extends React.Component {
 			opacity: isEnabled ? 1 : 0.4,
 		});
 
+		const title = options.title ? options.title : '';
+
 		return <a
 			className={classes.join(' ')}
 			style={finalStyle}
 			key={key}
 			href="#"
+			title={title}
 			onClick={() => { if (isEnabled) options.onClick() }}
 		>
-			{icon}{options.title ? options.title : ''}
+			{icon}<span className="title">{title}</span>
 		</a>
 	}
 

ElectronClient/app/gui/ItemList.jsx

@@ -52,7 +52,7 @@ class ItemList extends React.Component {
 
 	makeItemIndexVisible(itemIndex) {
 		const top = Math.min(this.props.items.length - 1, this.state.topItemIndex + 1);
-		const bottom = Math.max(0, this.state.bottomItemIndex - 1)
+		const bottom = Math.max(0, this.state.bottomItemIndex)
 
 		if (itemIndex >= top && itemIndex <= bottom) return;
 

ElectronClient/app/gui/MainScreen.jsx

@@ -74,12 +74,13 @@ class MainScreenComponent extends React.Component {
 	async doCommand(command) {
 		if (!command) return;
 
-		const createNewNote = async (title, isTodo) => {
+		const createNewNote = async (template, isTodo) => {
 			const folderId = Setting.value('activeFolderId');
 			if (!folderId) return;
 
 			const newNote = {
 				parent_id: folderId,
+				template: template,
 				is_todo: isTodo ? 1 : 0,
 			};
 
@@ -94,17 +95,15 @@ class MainScreenComponent extends React.Component {
 		if (command.name === 'newNote') {
 			if (!this.props.folders.length) {
 				bridge().showErrorMessageBox(_('Please create a notebook first.'));
-				return;
+			} else {
+				await createNewNote(null, false);
 			}
-
-			await createNewNote(null, false);
 		} else if (command.name === 'newTodo') {
 			if (!this.props.folders.length) {
 				bridge().showErrorMessageBox(_('Please create a notebook first'));
-				return;
+			} else {
+				await createNewNote(null, true);
 			}
-
-			await createNewNote(null, true);
 		} else if (command.name === 'newNotebook') {
 			this.setState({
 				promptOptions: {
@@ -153,47 +152,47 @@ class MainScreenComponent extends React.Component {
 			});
 		} else if (command.name === 'renameFolder') {
 			const folder = await Folder.load(command.id);
-			if (!folder) return;
-
-			this.setState({
-				promptOptions: {
-					label: _('Rename notebook:'),
-					value: folder.title,
-					onClose: async (answer) => {
-						if (answer !== null) {
-							try {
-								folder.title = answer;
-								await Folder.save(folder, { fields: ['title'], userSideValidation: true });
-							} catch (error) {
-								bridge().showErrorMessageBox(error.message);
+			
+			if (folder) {
+				this.setState({
+					promptOptions: {
+						label: _('Rename notebook:'),
+						value: folder.title,
+						onClose: async (answer) => {
+							if (answer !== null) {
+								try {
+									folder.title = answer;
+									await Folder.save(folder, { fields: ['title'], userSideValidation: true });
+								} catch (error) {
+									bridge().showErrorMessageBox(error.message);
+								}
 							}
+							this.setState({ promptOptions: null });
 						}
-						this.setState({ promptOptions: null });
-					}
-				},
-			});
+					},
+				});
+			}
 		} else if (command.name === 'renameTag') {
 			const tag = await Tag.load(command.id);
-			if(!tag) return;
-
-			this.setState({
-				promptOptions: {
-					label: _('Rename tag:'),
-					value: tag.title,
-					onClose: async (answer) => {
-						if (answer !== null) {
-							try {
-								tag.title = answer;
-								await Tag.save(tag, { fields: ['title'], userSideValidation: true });
-							} catch (error) {
-								bridge().showErrorMessageBox(error.message);
+			if (tag) {
+				this.setState({
+					promptOptions: {
+						label: _('Rename tag:'),
+						value: tag.title,
+						onClose: async (answer) => {
+							if (answer !== null) {
+								try {
+									tag.title = answer;
+									await Tag.save(tag, { fields: ['title'], userSideValidation: true });
+								} catch (error) {
+									bridge().showErrorMessageBox(error.message);
+								}
 							}
+							this.setState({promptOptions: null });
 						}
-						this.setState({promptOptions: null });
 					}
-				}
-			})
-
+				})
+			}
 		} else if (command.name === 'search') {
 
 			if (!this.searchId_) this.searchId_ = uuid.create();
@@ -274,6 +273,30 @@ class MainScreenComponent extends React.Component {
 							eventManager.emit('alarmChange', { noteId: note.id });
 						}
 
+						this.setState({ promptOptions: null });
+					}
+				},
+			});
+		} else if (command.name === 'selectTemplate') {
+			this.setState({
+				promptOptions: {
+					label: _('Template file:'),
+					inputType: 'dropdown',
+					value: this.props.templates[0], // Need to start with some value
+					autocomplete: this.props.templates,
+					onClose: async (answer) => {
+						if (answer) {
+							if (command.noteType === 'note' || command.noteType === 'todo') {
+								createNewNote(answer.value, command.noteType === 'todo');
+							} else {
+								this.props.dispatch({
+									type: 'WINDOW_COMMAND',
+									name: 'insertTemplate',
+									value: answer.value,
+								});
+							}
+						}
+
 						this.setState({ promptOptions: null });
 					}
 				},
@@ -525,6 +548,7 @@ const mapStateToProps = (state) => {
 		selectedNoteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null,
 		plugins: state.plugins,
 		noteDevToolsVisible: state.noteDevToolsVisible,
+		templates: state.templates,
 	};
 };
 

ElectronClient/app/gui/NotePropertiesDialog.jsx

@@ -33,6 +33,7 @@ class NotePropertiesDialog extends React.Component {
 			location: _('Location'),
 			source_url: _('URL'),
 			revisionsLink: _('Note History'),
+			markup_language: _('Markup'),
 		};
 	}
 
@@ -82,6 +83,7 @@ class NotePropertiesDialog extends React.Component {
 		}
 
 		formNote.revisionsLink = note.id;
+		formNote.markup_language = Note.markupLanguageToLabel(note.markup_language);
 		formNote.id = note.id;
 
 		return formNote;
@@ -292,7 +294,7 @@ class NotePropertiesDialog extends React.Component {
 				controlComp = <div style={Object.assign({}, theme.textStyle, {display: 'inline-block'})}>{displayedValue}</div>
 			}
 
-			if (key !== 'id' && key !== 'revisionsLink') {
+			if (['id', 'revisionsLink', 'markup_language'].indexOf(key) < 0) {
 				editCompHandler = () => {this.editPropertyButtonClick(key, value)};
 				editCompIcon = 'fa-edit';
 			}

ElectronClient/app/gui/NoteRevisionViewer.jsx

@@ -9,7 +9,7 @@ const Revision = require('lib/models/Revision');
 const Setting = require('lib/models/Setting');
 const RevisionService = require('lib/services/RevisionService');
 const shared = require('lib/components/shared/note-screen-shared.js');
-const MdToHtml = require('lib/MdToHtml');
+const MarkupToHtml = require('lib/renderers/MarkupToHtml');
 const { time } = require('lib/time-utils.js');
 const ReactTooltip = require('react-tooltip');
 const { substrWithEllipsis } = require('lib/string-utils');
@@ -92,6 +92,7 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 
 	async reloadNote() {
 		let noteBody = '';
+		let markupLanguage = Note.MARKUP_LANGUAGE_MARKDOWN;
 		if (!this.state.revisions.length || !this.state.currentRevId) {
 			noteBody = _('This note has no history');
 			this.setState({ note: null });
@@ -100,16 +101,17 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 			const note = await RevisionService.instance().revisionNote(this.state.revisions, revIndex);
 			if (!note) return;
 			noteBody = note.body;
+			markupLanguage = note.markup_language;
 			this.setState({ note: note });
 		}
 
 		const theme = themeStyle(this.props.theme);
 
-		const mdToHtml = new MdToHtml({
+		const markupToHtml = new MarkupToHtml({
 			resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
 		});
 
-		const result = mdToHtml.render(noteBody, theme, {
+		const result = markupToHtml.render(markupLanguage, noteBody, theme, {
 			codeTheme: theme.codeThemeCss,
 			userCss: this.props.customCss ? this.props.customCss : '',
 			resources: await shared.attachedResources(noteBody),

ElectronClient/app/gui/NoteText.jsx

@@ -12,7 +12,7 @@ const TagList = require('./TagList.min.js');
 const { connect } = require('react-redux');
 const { _ } = require('lib/locale.js');
 const { reg } = require('lib/registry.js');
-const MdToHtml = require('lib/MdToHtml');
+const MarkupToHtml = require('lib/renderers/MarkupToHtml');
 const shared = require('lib/components/shared/note-screen-shared.js');
 const { bridge } = require('electron').remote.require('./bridge');
 const { themeStyle } = require('../theme.js');
@@ -40,6 +40,7 @@ const DecryptionWorker = require('lib/services/DecryptionWorker');
 const ModelCache = require('lib/services/ModelCache');
 const NoteTextViewer = require('./NoteTextViewer.min');
 const NoteRevisionViewer = require('./NoteRevisionViewer.min');
+const TemplateUtils = require('lib/TemplateUtils');
 
 require('brace/mode/markdown');
 // https://ace.c9.io/build/kitchen-sink.html
@@ -62,8 +63,6 @@ class NoteTextComponent extends React.Component {
 
 		this.state = {
 			note: null,
-			noteMetadata: '',
-			showNoteMetadata: false,
 			folder: null,
 			lastSavedNote: null,
 			isLoading: true,
@@ -73,6 +72,7 @@ class NoteTextComponent extends React.Component {
 			newNote: null,
 			noteTags: [],
 			showRevisions: false,
+			loading: false,
 
 			// If the current note was just created, and the title has never been
 			// changed by the user, this variable contains that note ID. Used
@@ -97,6 +97,7 @@ class NoteTextComponent extends React.Component {
 		this.lastSetMarkers_ = '';
 		this.lastSetMarkersOptions_ = {};
 		this.selectionRange_ = null;
+		this.lastComponentUpdateNoteId_ = null;
 		this.noteSearchBar_ = React.createRef();
 
 		// Complicated but reliable method to get editor content height
@@ -327,12 +328,12 @@ class NoteTextComponent extends React.Component {
 		}
 	}
 
-	mdToHtml() {
-		if (this.mdToHtml_) return this.mdToHtml_;
-		this.mdToHtml_ = new MdToHtml({
+	markupToHtml() {
+		if (this.markupToHtml_) return this.markupToHtml_;
+		this.markupToHtml_ = new MarkupToHtml({
 			resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
 		});
-		return this.mdToHtml_;
+		return this.markupToHtml_;
 	}
 
 	async componentWillMount() {
@@ -357,7 +358,7 @@ class NoteTextComponent extends React.Component {
 
 		this.lastLoadedNoteId_ = note ? note.id : null;
 
-		this.updateHtml(note && note.body ? note.body : '');
+		this.updateHtml(note ? note.markup_language : null, note && note.body ? note.body : '');
 
 		eventManager.on('alarmChange', this.onAlarmChange_);
 		eventManager.on('noteTypeToggle', this.onNoteTypeToggle_);
@@ -371,7 +372,7 @@ class NoteTextComponent extends React.Component {
 	componentWillUnmount() {
 		this.saveIfNeeded();
 
-		this.mdToHtml_ = null;
+		this.markupToHtml_ = null;
 
 		eventManager.removeListener('alarmChange', this.onAlarmChange_);
 		eventManager.removeListener('noteTypeToggle', this.onNoteTypeToggle_);
@@ -390,6 +391,14 @@ class NoteTextComponent extends React.Component {
 				this.webviewRef().closeDevTools();
 			}
 		}
+
+		const currentNoteId = this.state.note ? this.state.note.id : null;
+		if (this.lastComponentUpdateNoteId_ !== currentNoteId && this.editor_) {
+			const undoManager = this.editor_.editor.getSession().getUndoManager();
+			undoManager.reset();
+			this.editor_.editor.getSession().setUndoManager(undoManager);
+			this.lastComponentUpdateNoteId_ = currentNoteId;
+		}
 	}
 
 	webviewRef() {
@@ -398,7 +407,9 @@ class NoteTextComponent extends React.Component {
 		return this.webviewRef_.current.wrappedInstance;
 	}
 
-	async saveIfNeeded(saveIfNewNote = false) {
+	async saveIfNeeded(saveIfNewNote = false, options = {}) {
+		if (this.state.loading) return;
+
 		const forceSave = saveIfNewNote && (this.state.note && !this.state.note.id);
 
 		if (this.scheduleSaveTimeout_) clearTimeout(this.scheduleSaveTimeout_);
@@ -406,7 +417,7 @@ class NoteTextComponent extends React.Component {
 		if (!forceSave) {
 			if (!shared.isModified(this)) return;
 		}
-		await shared.saveNoteButton_press(this);
+		await shared.saveNoteButton_press(this, null, options);
 
 		ExternalEditWatcher.instance().updateNoteFile(this.state.note);
 	}
@@ -449,19 +460,29 @@ class NoteTextComponent extends React.Component {
 
 		await this.saveIfNeeded();
 
+		const defer = () => {
+			this.setState({ loading: false });
+		}
+
+		this.setState({ loading: true });
+
 		const previousNote = this.state.note ? Object.assign({}, this.state.note) : null;
 
 		const stateNoteId = this.state.note ? this.state.note.id : null;
 		let noteId = null;
 		let note = null;
+		let newNote = null;
 		let loadingNewNote = true;
 		let parentFolder = null;
 		let noteTags = [];
 		let scrollPercent = 0;
 
 		if (props.newNote) {
-			note = Object.assign({}, props.newNote);
+			// assign new note and prevent body from being null
+			note = Object.assign({}, props.newNote, {body: ''});
 			this.lastLoadedNoteId_ = null;
+			if (note.template)
+				note.body = TemplateUtils.render(note.template);
 		} else {
 			noteId = props.noteId;
 
@@ -472,18 +493,18 @@ class NoteTextComponent extends React.Component {
 			noteTags = await Tag.tagsByNoteId(noteId);
 			this.lastLoadedNoteId_ = noteId;
 			note = noteId ? await Note.load(noteId) : null;
-			if (noteId !== this.lastLoadedNoteId_) return; // Race condition - current note was changed while this one was loading
-			if (options.noReloadIfLocalChanges && this.isModified()) return;
+			if (noteId !== this.lastLoadedNoteId_) return defer(); // Race condition - current note was changed while this one was loading
+			if (options.noReloadIfLocalChanges && this.isModified()) return defer();
 
 			// If the note hasn't been changed, exit now
 			if (this.state.note && note) {
 				let diff = Note.diffObjects(this.state.note, note);
 				delete diff.type_;
-				if (!Object.getOwnPropertyNames(diff).length) return;
+				if (!Object.getOwnPropertyNames(diff).length) return defer();
 			}
 		}
 
-		this.mdToHtml_ = null;
+		this.markupToHtml_ = null;
 
 		// If we are loading nothing (noteId == null), make sure to
 		// set webviewReady to false too because the webview component
@@ -517,22 +538,6 @@ class NoteTextComponent extends React.Component {
 			}
 
 			if (this.editor_) {
-				// Calling setValue here does two things:
-				// 1. It sets the initial value as recorded by the undo manager. If we were to set it instead to "" and wait for the render
-				//    phase to set the value, the initial value would still be "", which means pressing "undo" on a note that has just loaded
-				//    would clear it.
-				// 2. It resets the undo manager - fixes https://github.com/laurent22/joplin/issues/355
-				// Note: calling undoManager.reset() doesn't work
-				try {
-					this.editor_.editor.getSession().setValue(note && note.body? note.body : '');
-				} catch (error) {
-					if (error.message === "Cannot read property 'match' of undefined") {
-						// The internals of Ace Editor throws an exception when creating a new note,
-						// but that can be ignored.
-					} else {
-						console.error(error);
-					}
-				}
 				this.editor_.editor.clearSelection();
 				this.editor_.editor.moveCursorTo(0,0);
 
@@ -597,7 +602,9 @@ class NoteTextComponent extends React.Component {
 
 		// if (newState.note) await shared.refreshAttachedResources(this, newState.note.body);
 
-		this.updateHtml(newState.note ? newState.note.body : '');
+		await this.updateHtml(newState.note ? newState.note.markup_language : null, newState.note ? newState.note.body : '');
+
+		defer();
 	}
 
 	async componentWillReceiveProps(nextProps) {
@@ -644,10 +651,6 @@ class NoteTextComponent extends React.Component {
 		return false;
 	}
 
-	refreshNoteMetadata(force = null) {
-		return shared.refreshNoteMetadata(this, force);
-	}
-
 	async noteRevisionViewer_onBack() {
 		this.setState({ showRevisions: false });
 
@@ -666,17 +669,13 @@ class NoteTextComponent extends React.Component {
 		this.scheduleSave();
 	}
 
-	showMetadata_onPress() {
-		shared.showMetadata_onPress(this);
-	}
-
 	async webview_ipcMessage(event) {
 		const msg = event.channel ? event.channel : '';
 		const args = event.args;		
 		const arg0 = args && args.length >= 1 ? args[0] : null;
 		const arg1 = args && args.length >= 2 ? args[1] : null;
 
-		console.info('Got ipc-message: ' + msg, args);
+		if (msg !== 'percentScroll') console.info('Got ipc-message: ' + msg, args);
 
 		if (msg.indexOf('checkboxclick:') === 0) {
 			// Ugly hack because setting the body here will make the scrollbar
@@ -863,7 +862,7 @@ class NoteTextComponent extends React.Component {
 			this.editor_.editor.renderer.on('afterRender', this.onAfterEditorRender_);
 
 			const cancelledKeys = [];
-			const letters = ['F', 'T', 'P', 'Q', 'L', ',', 'G'];
+			const letters = ['F', 'T', 'P', 'Q', 'L', ',', 'G', 'K'];
 			for (let i = 0; i < letters.length; i++) {
 				const l = letters[i];
 				cancelledKeys.push('Ctrl+' + l);
@@ -940,12 +939,20 @@ class NoteTextComponent extends React.Component {
 		}
 	}
 
-	async updateHtml(body = null, options = null) {
+	async updateHtml(markupLanguage = null, body = null, options = null) {
 		if (!options) options = {};
 		if (!('useCustomCss' in options)) options.useCustomCss = true;
 
 		let bodyToRender = body;
-		if (bodyToRender === null) bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+
+		if (bodyToRender === null) {
+			bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+			markupLanguage = this.state.note ? this.state.note.markup_language : Note.MARKUP_LANGUAGE_MARKDOWN;
+		}
+
+		if (!markupLanguage) markupLanguage = Note.MARKUP_LANGUAGE_MARKDOWN;
+
+		const resources = await shared.attachedResources(bodyToRender);
 
 		const theme = themeStyle(this.props.theme);
 
@@ -953,7 +960,8 @@ class NoteTextComponent extends React.Component {
 			codeTheme: theme.codeThemeCss,
 			postMessageSyntax: 'ipcProxySendToHost',
 			userCss: options.useCustomCss ? this.props.customCss : '',
-			resources: await shared.attachedResources(bodyToRender),
+			resources: resources,
+			codeHighlightCacheKey: this.state.note ? this.state.note.id : null,
 		};
 
 		let bodyHtml = '';
@@ -962,10 +970,10 @@ class NoteTextComponent extends React.Component {
 
 		if (!bodyToRender.trim() && visiblePanes.indexOf('viewer') >= 0 && visiblePanes.indexOf('editor') < 0) {
 			// Fixes https://github.com/laurent22/joplin/issues/217
-			bodyToRender = '*' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '*';
+			bodyToRender = '<i>' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '</i>';
 		}
 
-		const result = this.mdToHtml().render(bodyToRender, theme, mdOptions);
+		const result = this.markupToHtml().render(markupLanguage, bodyToRender, theme, mdOptions);
 
 		this.setState({
 			bodyHtml: result.html,
@@ -1021,6 +1029,8 @@ class NoteTextComponent extends React.Component {
 				fn = this.commandShowLocalSearch;
 			} else if (command.name === 'textCode') {
 				fn = this.commandTextCode;
+			} else if (command.name === 'insertTemplate') {
+				fn = () => { return this.commandTemplate(command.value); };
 			}
 		}
 
@@ -1088,7 +1098,7 @@ class NoteTextComponent extends React.Component {
 					lastSavedNote: Object.assign({}, note),
 				});
 
-				this.updateHtml(note.body);
+				this.updateHtml(note.markup_language, note.body);
 			} catch (error) {
 				reg.logger().error(error);
 				bridge().showErrorMessageBox(error.message);
@@ -1117,13 +1127,13 @@ class NoteTextComponent extends React.Component {
 		const previousTheme = Setting.value('theme');
 		Setting.setValue('theme', Setting.THEME_LIGHT);
 		this.lastSetHtml_ = '';
-		await this.updateHtml(tempBody, { useCustomCss: false });
+		await this.updateHtml(this.state.note.markup_language, tempBody, { useCustomCss: false });
 		this.forceUpdate();
 
 		const restoreSettings = async () => {
 			Setting.setValue('theme', previousTheme);
 			this.lastSetHtml_ = '';
-			await this.updateHtml(previousBody);
+			await this.updateHtml(this.state.note.markup_language, previousBody);
 			this.forceUpdate();
 		}
 
@@ -1172,6 +1182,9 @@ class NoteTextComponent extends React.Component {
 
 	async commandStartExternalEditing() {
 		try {
+			await this.saveIfNeeded(true, {
+				autoTitle: false,
+			});
 			await ExternalEditWatcher.instance().openAndWatch(this.state.note);
 		} catch (error) {
 			bridge().showErrorMessageBox(_('Error opening note in editor: %s', error.message));
@@ -1355,6 +1368,10 @@ class NoteTextComponent extends React.Component {
 		this.wrapSelectionWithStrings('`', '`');
 	}
 
+	commandTemplate(value) {
+		this.wrapSelectionWithStrings(TemplateUtils.render(value));
+	}
+
 	addListItem(string1, string2 = '', defaultText = '') {
 		const currentLine = this.selectionRangeCurrentLine();
 		let newLine = '\n'
@@ -1414,6 +1431,8 @@ class NoteTextComponent extends React.Component {
 	}
 
 	createToolbarItems(note) {
+		const markupLanguage = note.markup_language;
+
 		const toolbarItems = [];
 		if (note && this.state.folder && ['Search', 'Tag'].includes(this.props.notesParentType)) {
 			toolbarItems.push({
@@ -1426,7 +1445,6 @@ class NoteTextComponent extends React.Component {
 						noteId: note.id,
 					});
 				},
-				// enabled: false,
 			});
 		}
 
@@ -1449,83 +1467,85 @@ class NoteTextComponent extends React.Component {
 			});
 		}
 
-		toolbarItems.push({
-			tooltip: _('Bold'),
-			iconName: 'fa-bold',
-			onClick: () => { return this.commandTextBold(); },
-		});
+		if (note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN) {
+			toolbarItems.push({
+				tooltip: _('Bold'),
+				iconName: 'fa-bold',
+				onClick: () => { return this.commandTextBold(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Italic'),
-			iconName: 'fa-italic',
-			onClick: () => { return this.commandTextItalic(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Italic'),
+				iconName: 'fa-italic',
+				onClick: () => { return this.commandTextItalic(); },
+			});
 
-		toolbarItems.push({
-			type: 'separator',
-		});
+			toolbarItems.push({
+				type: 'separator',
+			});
 
-		toolbarItems.push({
-			tooltip: _('Hyperlink'),
-			iconName: 'fa-link',
-			onClick: () => { return this.commandTextLink(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Hyperlink'),
+				iconName: 'fa-link',
+				onClick: () => { return this.commandTextLink(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Code'),
-			iconName: 'fa-code',
-			onClick: () => { return this.commandTextCode(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Code'),
+				iconName: 'fa-code',
+				onClick: () => { return this.commandTextCode(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Attach file'),
-			iconName: 'fa-paperclip',
-			onClick: () => { return this.commandAttachFile(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Attach file'),
+				iconName: 'fa-paperclip',
+				onClick: () => { return this.commandAttachFile(); },
+			});
 
-		toolbarItems.push({
-			type: 'separator',
-		});
+			toolbarItems.push({
+				type: 'separator',
+			});
 
-		toolbarItems.push({
-			tooltip: _('Numbered List'),
-			iconName: 'fa-list-ol',
-			onClick: () => { return this.commandTextListOl(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Numbered List'),
+				iconName: 'fa-list-ol',
+				onClick: () => { return this.commandTextListOl(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Bulleted List'),
-			iconName: 'fa-list-ul',
-			onClick: () => { return this.commandTextListUl(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Bulleted List'),
+				iconName: 'fa-list-ul',
+				onClick: () => { return this.commandTextListUl(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Checkbox'),
-			iconName: 'fa-check-square',
-			onClick: () => { return this.commandTextCheckbox(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Checkbox'),
+				iconName: 'fa-check-square',
+				onClick: () => { return this.commandTextCheckbox(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Heading'),
-			iconName: 'fa-header',
-			onClick: () => { return this.commandTextHeading(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Heading'),
+				iconName: 'fa-header',
+				onClick: () => { return this.commandTextHeading(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Horizontal Rule'),
-			iconName: 'fa-ellipsis-h',
-			onClick: () => { return this.commandTextHorizontalRule(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Horizontal Rule'),
+				iconName: 'fa-ellipsis-h',
+				onClick: () => { return this.commandTextHorizontalRule(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Insert Date Time'),
-			iconName: 'fa-calendar-plus-o',
-			onClick: () => { return this.commandDateTime(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Insert Date Time'),
+				iconName: 'fa-calendar-plus-o',
+				onClick: () => { return this.commandDateTime(); },
+			});
 
-		toolbarItems.push({
-			type: 'separator',
-		});
+			toolbarItems.push({
+				type: 'separator',
+			});
+		}
 
 		if (note && this.props.watchedNoteFiles.indexOf(note.id) >= 0) {
 			toolbarItems.push({
@@ -1641,6 +1661,7 @@ class NoteTextComponent extends React.Component {
 		const style = this.props.style;
 		const note = this.state.note;
 		const body = note && note.body ? note.body : '';
+		const markupLanguage = note ? note.markup_language : Note.MARKUP_LANGUAGE_MARKDOWN;
 		const theme = themeStyle(this.props.theme);
 		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
 		const isTodo = note && !!note.is_todo;
@@ -1698,6 +1719,7 @@ class NoteTextComponent extends React.Component {
 			backgroundColor: theme.backgroundColor,
 			border: '1px solid',
 			borderColor: theme.dividerColor,
+			fontSize: theme.fontSize,
 		};
 
 		const toolbarStyle = {
@@ -1791,6 +1813,7 @@ class NoteTextComponent extends React.Component {
 					accuracy: 'partially',
 				}]
 				markerOptions.selectedIndex = this.state.localSearch.selectedIndex;
+				markerOptions.separateWordSearch = false;
 			} else {
 				const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);
 				if (search) {
@@ -1848,7 +1871,7 @@ class NoteTextComponent extends React.Component {
 		delete editorRootStyle.fontSize;
 		const editor =  <AceEditor
 			value={body}
-			mode="markdown"
+			mode={markupLanguage === Note.MARKUP_LANGUAGE_HTML ? 'text' : 'markdown'}
 			theme={editorRootStyle.editorTheme}
 			style={editorRootStyle}
 			width={editorStyle.width + 'px'}
@@ -1914,7 +1937,6 @@ const mapStateToProps = (state) => {
 		itemType: state.selectedItemType,
 		folders: state.folders,
 		theme: state.settings.theme,
-		showAdvancedOptions: state.settings.showAdvancedOptions,
 		syncStarted: state.syncStarted,
 		newNote: state.newNote,
 		windowCommand: state.windowCommand,
@@ -1925,6 +1947,7 @@ const mapStateToProps = (state) => {
 		customCss: state.customCss,
 		lastEditorScrollPercents: state.lastEditorScrollPercents,
 		historyNotes: state.historyNotes,
+		templates: state.templates,
 	};
 };
 

ElectronClient/app/gui/PromptDialog.jsx

@@ -6,6 +6,7 @@ const { themeStyle } = require('../theme.js');
 const { time } = require('lib/time-utils.js');
 const Datetime = require('react-datetime');
 const CreatableSelect = require('react-select/lib/Creatable').default;
+const Select = require('react-select').default;
 const makeAnimated = require('react-select/lib/animated').default;
 
 class PromptDialog extends React.Component {
@@ -101,7 +102,7 @@ class PromptDialog extends React.Component {
 			borderColor: theme.dividerColor,
 		};
 
-		this.styles_.tagList = {
+		this.styles_.select = {
 			control: (provided) => (Object.assign(provided, {
 				minWidth: width * 0.2,
 				maxWidth: width * 0.5,
@@ -115,6 +116,10 @@ class PromptDialog extends React.Component {
 				fontFamily: theme.fontFamily,
 				backgroundColor: theme.backgroundColor,
 			})),
+			option: (provided) => (Object.assign(provided, {
+				color: theme.color,
+				fontFamily: theme.fontFamily,
+			})),
 			multiValueLabel: (provided) => (Object.assign(provided, {
 				fontFamily: theme.fontFamily,
 			})),
@@ -123,14 +128,22 @@ class PromptDialog extends React.Component {
 			})),
 		};
 
-		this.styles_.tagListTheme = (tagTheme) => (Object.assign(tagTheme, {
+		this.styles_.selectTheme = (tagTheme) => (Object.assign(tagTheme, {
 			borderRadius: 2,
 			colors: Object.assign(tagTheme.colors, {
 				primary: theme.raisedBackgroundColor,
 				primary25: theme.raisedBackgroundColor,
 				neutral0: theme.backgroundColor,
+				neutral5: theme.backgroundColor,
 				neutral10: theme.raisedBackgroundColor,
+				neutral20: theme.raisedBackgroundColor,
+				neutral30: theme.raisedBackgroundColor,
+				neutral40: theme.color,
+				neutral50: theme.color,
+				neutral60: theme.color,
+				neutral70: theme.color,
 				neutral80: theme.color,
+				neutral90: theme.color,
 				danger: theme.backgroundColor,
 				dangerLight: theme.colorError2,
 			}),
@@ -179,14 +192,19 @@ class PromptDialog extends React.Component {
 			this.setState({ answer: momentObject });
 		}
 
-		const onTagsChange = (newTags) => {
-			this.setState({ answer: newTags });
+		const onSelectChange = (newValue) => {
+			this.setState({ answer: newValue });
 			this.focusInput_ = true;
 		}
 
 		const onKeyDown = (event) => {
-			if (event.key === 'Enter' && this.props.inputType !== 'tags') {
-				onClose(true);
+			if (event.key === 'Enter') {
+				if (this.props.inputType !== 'tags' && this.props.inputType !== 'dropdown') {
+					onClose(true);
+				} else if (this.answerInput_.current && !this.answerInput_.current.state.menuIsOpen) {
+					// The menu will be open if the user is selecting a new item
+					onClose(true);
+				}
 			} else if (event.key === 'Escape') {
 				onClose(false);
 			}
@@ -206,17 +224,30 @@ class PromptDialog extends React.Component {
 			/>
 		} else if (this.props.inputType === 'tags') {
 			inputComp = <CreatableSelect
-				styles={styles.tagList}
-				theme={styles.tagListTheme}
+				styles={styles.select}
+				theme={styles.selectTheme}
 				ref={this.answerInput_}
 				value={this.state.answer}
-				placeholder={this.props.label ? this.props.label.replace(':', '') : ''}
+				placeholder=""
 				components={makeAnimated()}
 				isMulti={true}
 				isClearable={false}
 				backspaceRemovesValue={true}
 				options={this.props.autocomplete}
-				onChange={onTagsChange}
+				onChange={onSelectChange}
+				onKeyDown={(event) => onKeyDown(event)}
+			/>
+		} else if (this.props.inputType === 'dropdown') {
+			inputComp = <Select
+				styles={styles.select}
+				theme={styles.selectTheme}
+				ref={this.answerInput_}
+				components={makeAnimated()}
+				value={this.props.answer}
+				defaultValue={this.props.defaultValue}
+				isClearable={false}
+				options={this.props.autocomplete}
+				onChange={onSelectChange}
 				onKeyDown={(event) => onKeyDown(event)}
 			/>
 		} else {

ElectronClient/app/gui/SideBar.jsx

@@ -103,7 +103,7 @@ class SideBarComponent extends React.Component {
 		};
 	}
 
-	style() {
+	style(depth) {
 		const theme = themeStyle(this.props.theme);
 
 		const itemHeight = 25;
@@ -118,6 +118,8 @@ class SideBarComponent extends React.Component {
 				// paddingLeft: 14,
 				display: "flex",
 				alignItems: "stretch",
+				// Allow 3 levels of color depth
+				backgroundColor: theme.depthColor.replace('OPACITY', Math.min(depth * 0.1, 0.3)),
 			},
 			listItem: {
 				fontFamily: theme.fontFamily,
@@ -417,7 +419,7 @@ class SideBarComponent extends React.Component {
 
 		const itemTitle = Folder.displayTitle(folder);
 
-		let containerStyle = Object.assign({}, this.style().listItemContainer);
+		let containerStyle = Object.assign({}, this.style(depth).listItemContainer);
 		if (selected) containerStyle = Object.assign(containerStyle, this.style().listItemSelected);
 
 		let expandLinkStyle = Object.assign({}, this.style().listItemExpandIcon);

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

@@ -9,10 +9,15 @@
 		}
 
 		#content {
+			/* Needs this in case the content contains elements with absolute positioning */
+			/* Without this they would just stay at a fixed position when scrolling */
+			position: relative;
 			overflow-y: auto;
-			height: 100%;
 			padding-left: 10px;
 			padding-right: 10px;
+
+			/* Note: the height is set via updateBodyHeight(). Setting it here to 100% */
+			/* won't work with some pages due to the position: relative */
 		}
 
 		mark {
@@ -205,15 +210,19 @@
 				elementIndex++;
 			}
 
+			const markKeywordOptions = {
+				each: onEachElement,
+			};
+
+			if ('separateWordSearch' in options) markKeywordOptions.separateWordSearch = options.separateWordSearch;
+
 			for (let i = 0; i < keywords.length; i++) {
 				let keyword = keywords[i];
 
 				markJsUtils.markKeyword(mark_, keyword, {
 					pregQuote: pregQuote,
 					replaceRegexDiacritics: replaceRegexDiacritics,
-				}, {
-					each: onEachElement,				
-				});
+				}, markKeywordOptions);
 			}
 
 			ipcProxySendToHost('setMarkerCount', elementIndex);
@@ -249,6 +258,7 @@
 		// The body element needs to have a fixed height for the content to be scrollable
 		function updateBodyHeight() {
 			document.getElementById('body').style.height = window.innerHeight + 'px';
+			document.getElementById('content').style.height = window.innerHeight + 'px';
 		}
 
 		contentElement.addEventListener('scroll', webviewLib.logEnabledEventHandler(e => {

ElectronClient/app/locales/index.js

@@ -1,6 +1,7 @@
 var locales = {};
 locales['en_GB'] = require('./en_GB.json');
 locales['ar'] = require('./ar.json');
+locales['bg_BG'] = require('./bg_BG.json');
 locales['ca'] = require('./ca.json');
 locales['cs_CZ'] = require('./cs_CZ.json');
 locales['da_DK'] = require('./da_DK.json');
@@ -23,6 +24,7 @@ locales['pt_BR'] = require('./pt_BR.json');
 locales['ro'] = require('./ro.json');
 locales['ru_RU'] = require('./ru_RU.json');
 locales['sl_SI'] = require('./sl_SI.json');
+locales['sr_RS'] = require('./sr_RS.json');
 locales['sv'] = require('./sv.json');
 locales['tr_TR'] = require('./tr_TR.json');
 locales['zh_CN'] = require('./zh_CN.json');