Merge branch 'dev' of github.com:laurent22/joplin into dev

This commit is contained in:
Laurent Cozic committed 2021-08-14 16:58:42 +01:00
commit c8ccab808f
2 files changed
+515 -510

No files matched your search

+2 -2
View File
@@ -3153,7 +3153,7 @@ msgstr "titel"
#: packages/lib/models/Folder.js:39 packages/lib/models/Note.js:37
msgid "updated date"
msgstr "uppdaterad datum"
msgstr "uppdaterat datum"
#: packages/lib/models/Folder.js:103
msgid "Conflicts"
@@ -3171,7 +3171,7 @@ msgstr ""
#: packages/lib/models/Note.js:38
msgid "created date"
msgstr "skapad datum"
msgstr "skapat datum"
#: packages/lib/models/Note.js:39
msgid "custom order"
File diff suppressed because it is too large. Load diff