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

2021-08-14 16:58:42 +01:00 · 2021-08-14 16:58:42 +01:00 · c8ccab808f
parent d27f3b6ad3 c8dad95c38
commit c8ccab808f
2 changed files with 515 additions and 510 deletions
--- a/packages/tools/locales/sv.po
+++ b/packages/tools/locales/sv.po
@ -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"
--- a/packages/tools/locales/vi.po
+++ b/packages/tools/locales/vi.po