Mastodon

Files

Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +02:00

ar.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

bg.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

ca.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

co.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

de.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

defaultMessages.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

el.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

en.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

eo.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

es.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

eu.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

fa.json

Weblate translations (2018-06-19) (#7847 )

2018-06-19 02:25:29 +02:00

fi.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

fr.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

gl.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

he.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

hr.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

hu.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

hy.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

id.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

index.js

…

io.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

it.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

ja.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

ko.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

nl.json

Weblate translations (2018-06-19) (#7847 )

2018-06-19 02:25:29 +02:00

no.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

oc.json

Weblate translations (2018-06-18) (#7839 )

2018-06-18 15:41:40 +02:00

pl.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

pt-BR.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

pt.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

ru.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

sk.json

Weblate translations (2018-06-19) (#7847 )

2018-06-19 02:25:29 +02:00

sl.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

sr-Latn.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

sr.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

sv.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

te.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

th.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

tr.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

uk.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

whitelist_ar.json

…

whitelist_bg.json

…

whitelist_ca.json

…

whitelist_co.json

Add Corsican localization (#7390 )

2018-05-07 01:34:19 +02:00

whitelist_de.json

…

whitelist_el.json

Add el and te (#7332 )

2018-05-03 15:54:10 +02:00

whitelist_en.json

…

whitelist_eo.json

…

whitelist_es.json

…

whitelist_eu.json

Add el and te (#7332 )

2018-05-03 15:54:10 +02:00

whitelist_fa.json

…

whitelist_fi.json

…

whitelist_fr.json

…

whitelist_gl.json

…

whitelist_he.json

…

whitelist_hr.json

…

whitelist_hu.json

…

whitelist_hy.json

…

whitelist_id.json

…

whitelist_io.json

…

whitelist_it.json

…

whitelist_ja.json

…

whitelist_ko.json

…

whitelist_nl.json

…

whitelist_no.json

…

whitelist_oc.json

…

whitelist_pl.json

…

whitelist_pt-BR.json

…

whitelist_pt.json

…

whitelist_ru.json

…

whitelist_sk.json

…

whitelist_sl.json

Weblate translations (2018-05-10) (#7438 )

2018-05-10 14:48:26 +02:00

whitelist_sr-Latn.json

…

whitelist_sr.json

…

whitelist_sv.json

…

whitelist_te.json

Add el and te (#7332 )

2018-05-03 15:54:10 +02:00

whitelist_th.json

…

whitelist_tr.json

…

whitelist_uk.json

…

whitelist_zh-CN.json

…

whitelist_zh-HK.json

…

whitelist_zh-TW.json

…

zh-CN.json

Update Chinese (Simplified) Translations (#7816 )

2018-06-16 18:24:54 +09:00

zh-HK.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00

zh-TW.json

Weblate translations (2018-06-16) (#7815 )

2018-06-16 12:56:28 +02:00