Merge branch 'develop' into 'master'

`master` refresh with `develop`

See merge request pleroma/pleroma-fe!1028

1 files changed, 4 insertions, 1 deletions

diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index ab697948..c56ae205 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -16,13 +16,15 @@ const messages = {
   eo: require('./eo.json'),
   es: require('./es.json'),
   et: require('./et.json'),
+  eu: require('./eu.json'),
   fi: require('./fi.json'),
   fr: require('./fr.json'),
   ga: require('./ga.json'),
   he: require('./he.json'),
   hu: require('./hu.json'),
   it: require('./it.json'),
-  ja: require('./ja.json'),
+  ja: require('./ja_pedantic.json'),
+  ja_easy: require('./ja_easy.json'),
   ko: require('./ko.json'),
   nb: require('./nb.json'),
   nl: require('./nl.json'),
@@ -31,6 +33,7 @@ const messages = {
   pt: require('./pt.json'),
   ro: require('./ro.json'),
   ru: require('./ru.json'),
+  te: require('./te.json'),
   zh: require('./zh.json')
 }