Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff ...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js

2017-06-22 15:04:33 +01:00

..

ar.json

Update from Weblate. (#4272)

2017-06-11 20:42:24 +01:00

basefile.json

Language generation and file structure

2017-05-26 16:48:21 +01:00

be.json

fix myriad bugs in i18n files

2017-06-01 00:51:56 +01:00

bn_BD.json

Added translation using Weblate (Bengali (Bangladesh))

2017-06-15 04:10:16 +00:00

bn_IN.json

Added translation using Weblate (Bengali (India))

2017-06-15 08:57:35 +00:00

da.json

fix myriad bugs in i18n files

2017-06-01 00:51:56 +01:00

de_DE.json

Translated using Weblate (German)

2017-06-19 17:18:38 +00:00

el.json

fix broken http status i18n

2017-06-18 23:54:29 +01:00

en_EN.json

Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff

2017-06-22 15:04:33 +01:00

en_US.json

Remove 'Redact' from en_US and en_EN as it is no longer needed

2017-06-19 16:31:59 -06:00

eo.json

Translated using Weblate (Esperanto)

2017-06-18 23:30:50 +00:00

es.json

fix broken http status i18n

2017-06-18 23:54:29 +01:00

fi.json

Translated using Weblate (Finnish)

2017-05-27 11:30:14 +00:00

fr.json

fix broken http status i18n

2017-06-18 23:54:29 +01:00

he.json

fix hebrew vars

2017-06-08 22:56:09 +01:00

hi.json

Translated using Weblate (Hindi)

2017-06-18 20:37:20 +00:00

hu.json

fix broken http status i18n

2017-06-18 23:54:29 +01:00

id.json

Added translation using Weblate (Indonesian)

2017-06-14 21:29:40 +00:00

it.json

Translated using Weblate (Italian)

2017-06-18 20:37:20 +00:00

ko.json

fix broken http status i18n

2017-06-18 23:54:29 +01:00

ml.json

fix broken vars

2017-06-19 00:01:11 +01:00

nb_NO.json

fix myriad bugs in i18n files

2017-06-01 00:51:56 +01:00

nl.json

Translated using Weblate (Dutch)

2017-06-19 10:38:04 +00:00

pl.json

fix broken http status i18n

2017-06-18 23:54:29 +01:00

pt_BR.json

Translated using Weblate (Portuguese (Brazil))

2017-06-19 13:23:34 +00:00

pt.json

Update from Weblate. (#4177)

2017-06-04 09:52:02 +01:00

ru.json

Translated using Weblate (Russian)

2017-06-20 09:00:47 +00:00

sv.json

Translated using Weblate (Swedish)

2017-06-06 13:07:22 +00:00

te.json

Added translation using Weblate (Telugu)

2017-05-30 12:22:01 +00:00

th.json

fix broken http status i18n

2017-06-18 23:54:29 +01:00

tr.json

fix broken vars

2017-06-19 00:01:11 +01:00

uk.json

Translated using Weblate (Ukrainian)

2017-06-20 09:00:47 +00:00

zh_Hans.json

fix broken vars

2017-06-19 00:01:11 +01:00

zh_Hant.json

Update from Weblate. (#4272)

2017-06-11 20:42:24 +01:00