mastodon/config/locales
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
..
activerecord.ar.yml
activerecord.ca.yml
activerecord.co.yml
activerecord.de.yml Weblate translations (#5922) 2017-12-08 01:59:44 +01:00
activerecord.en.yml
activerecord.es.yml
activerecord.eu.yml
activerecord.fa.yml
activerecord.fr.yml
activerecord.gl.yml
activerecord.he.yml
activerecord.id.yml
activerecord.it.yml
activerecord.ja.yml
activerecord.nl.yml Weblate translations (2018-05-10) (#7438) 2018-05-10 14:48:26 +02:00
activerecord.no.yml
activerecord.oc.yml
activerecord.pl.yml
activerecord.pt-BR.yml
activerecord.pt.yml
activerecord.ru.yml
activerecord.sk.yml
activerecord.sl.yml
activerecord.sr-Latn.yml
activerecord.sr.yml
activerecord.th.yml
activerecord.uk.yml
activerecord.zh-CN.yml Updating Chinese (Simplified) translations (#5508) 2017-10-30 12:34:58 +09:00
activerecord.zh-HK.yml improve zh-HK localization by referring zh-TW and zh-CN (#6988) 2018-04-01 21:57:26 +09:00
ar.yml
bg.yml
ca.yml
co.yml
de.yml
devise.ar.yml
devise.bg.yml
devise.ca.yml
devise.co.yml
devise.de.yml
devise.en.yml
devise.eo.yml
devise.es.yml
devise.eu.yml
devise.fa.yml
devise.fi.yml
devise.fr.yml
devise.gl.yml
devise.he.yml
devise.hr.yml
devise.hu.yml
devise.id.yml Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
devise.io.yml
devise.it.yml
devise.ja.yml
devise.nl.yml
devise.no.yml
devise.oc.yml
devise.pl.yml
devise.pt-BR.yml
devise.pt.yml
devise.ru.yml
devise.sk.yml
devise.sl.yml
devise.sr-Latn.yml
devise.sr.yml
devise.sv.yml
devise.th.yml
devise.tr.yml
devise.uk.yml
devise.zh-CN.yml
devise.zh-HK.yml
devise.zh-TW.yml Weblate translations (2018-04-02) (#7007) 2018-04-02 13:43:30 +02:00
doorkeeper.ar.yml Weblate translations (2018-04-02) (#7007) 2018-04-02 13:43:30 +02:00
doorkeeper.bg.yml
doorkeeper.ca.yml
doorkeeper.co.yml
doorkeeper.de.yml
doorkeeper.en.yml
doorkeeper.eo.yml
doorkeeper.es.yml
doorkeeper.eu.yml
doorkeeper.fa.yml
doorkeeper.fi.yml
doorkeeper.fr.yml
doorkeeper.gl.yml
doorkeeper.he.yml
doorkeeper.hr.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.hu.yml
doorkeeper.id.yml
doorkeeper.io.yml
doorkeeper.it.yml Weblate translations (2018-04-24) (#7252) 2018-04-24 11:48:11 +02:00
doorkeeper.ja.yml
doorkeeper.nl.yml
doorkeeper.no.yml
doorkeeper.oc.yml
doorkeeper.pl.yml
doorkeeper.pt-BR.yml
doorkeeper.pt.yml Weblate translations (#6228) 2018-01-09 20:30:28 +09:00
doorkeeper.ru.yml
doorkeeper.sk.yml
doorkeeper.sl.yml
doorkeeper.sr-Latn.yml
doorkeeper.sr.yml Adding Serbian translation (#6133) 2017-12-31 17:28:20 +09:00
doorkeeper.sv.yml
doorkeeper.th.yml
doorkeeper.uk.yml
doorkeeper.zh-CN.yml
doorkeeper.zh-HK.yml
doorkeeper.zh-TW.yml
el.yml
en.yml Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
eo.yml Weblate translations (2018-05-10) (#7438) 2018-05-10 14:48:26 +02:00
es.yml Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
eu.yml
fa.yml
fi.yml
fr.yml
gl.yml
he.yml
hr.yml
hu.yml
id.yml Add resend confirmation for admin (#7378) 2018-05-06 10:59:03 +02:00
io.yml
it.yml
ja.yml
ko.yml
ms.yml
nl.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-05-16 21:52:38 +02:00
no.yml
oc.yml
pl.yml
pt-BR.yml
pt.yml
ru.yml
simple_form.ar.yml
simple_form.bg.yml
simple_form.ca.yml Weblate translations (2018-05-10) (#7438) 2018-05-10 14:48:26 +02:00
simple_form.co.yml
simple_form.de.yml
simple_form.en.yml
simple_form.eo.yml
simple_form.es.yml
simple_form.eu.yml
simple_form.fa.yml
simple_form.fi.yml
simple_form.fr.yml
simple_form.gl.yml
simple_form.he.yml Change avatar size on form hints (#6707) 2018-03-09 10:57:33 +01:00
simple_form.hr.yml
simple_form.hu.yml
simple_form.id.yml
simple_form.io.yml
simple_form.it.yml
simple_form.ja.yml
simple_form.ko.yml
simple_form.nl.yml
simple_form.no.yml
simple_form.oc.yml [l10n] Occitan update (#7505) 2018-05-16 23:18:32 +09:00
simple_form.pl.yml
simple_form.pt-BR.yml
simple_form.pt.yml
simple_form.ru.yml
simple_form.sk.yml
simple_form.sl.yml
simple_form.sr-Latn.yml
simple_form.sr.yml
simple_form.sv.yml
simple_form.th.yml
simple_form.tr.yml
simple_form.uk.yml
simple_form.zh-CN.yml
simple_form.zh-HK.yml
simple_form.zh-TW.yml
sk.yml
sl.yml
sr-Latn.yml
sr.yml
sv.yml Add resend confirmation for admin (#7378) 2018-05-06 10:59:03 +02:00
te.yml Weblate translations 20180503 (#7325) 2018-05-03 19:12:09 +09:00
th.yml
tr.yml
uk.yml
zh-CN.yml Add resend confirmation for admin (#7378) 2018-05-06 10:59:03 +02:00
zh-HK.yml
zh-TW.yml