Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
activerecord.ar.yml
activerecord.ast.yml
activerecord.bg.yml
activerecord.bn.yml
activerecord.ca.yml
activerecord.co.yml
activerecord.cs.yml	I18n: Update Czech translation (#10410)	2019-03-28 18:01:28 +01:00
activerecord.cy.yml
activerecord.da.yml
activerecord.de.yml
activerecord.el.yml
activerecord.en.yml
activerecord.eo.yml
activerecord.es.yml
activerecord.eu.yml
activerecord.fa.yml
activerecord.fi.yml
activerecord.fr.yml	Weblate translations (2019-04-10) (#10545)	2019-04-10 18:17:24 +02:00
activerecord.gl.yml
activerecord.he.yml
activerecord.hr.yml
activerecord.hu.yml
activerecord.hy.yml
activerecord.id.yml
activerecord.io.yml
activerecord.it.yml
activerecord.ja.yml
activerecord.ka.yml
activerecord.kk.yml
activerecord.ko.yml
activerecord.lt.yml
activerecord.lv.yml
activerecord.ms.yml
activerecord.nl.yml
activerecord.no.yml
activerecord.oc.yml
activerecord.pl.yml
activerecord.pt-BR.yml
activerecord.pt.yml
activerecord.ro.yml
activerecord.ru.yml
activerecord.sk.yml
activerecord.sl.yml
activerecord.sq.yml
activerecord.sr-Latn.yml
activerecord.sr.yml
activerecord.sv.yml
activerecord.ta.yml
activerecord.te.yml
activerecord.th.yml
activerecord.tr.yml
activerecord.uk.yml
activerecord.zh-CN.yml
activerecord.zh-HK.yml
activerecord.zh-TW.yml
activerecord.zh_Hant.yml
ar.yml
ast.yml
bg.yml
bn.yml
ca.yml
co.yml
cs.yml
cy.yml
da.yml
de.yml
devise.ar.yml
devise.ast.yml
devise.bg.yml
devise.bn.yml
devise.ca.yml
devise.co.yml
devise.cs.yml
devise.cy.yml	New Crowdin translations (#11077)	2019-06-18 22:58:18 +02:00
devise.da.yml
devise.de.yml
devise.el.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.hy.yml
devise.id.yml
devise.io.yml
devise.it.yml
devise.ja.yml
devise.ka.yml
devise.kk.yml
devise.ko.yml
devise.lt.yml
devise.lv.yml
devise.ms.yml
devise.nl.yml
devise.no.yml
devise.oc.yml
devise.pl.yml
devise.pt-BR.yml
devise.pt.yml
devise.ro.yml
devise.ru.yml
devise.sk.yml
devise.sl.yml
devise.sq.yml
devise.sr-Latn.yml
devise.sr.yml
devise.sv.yml
devise.ta.yml
devise.te.yml
devise.th.yml
devise.tr.yml
devise.uk.yml
devise.zh-CN.yml
devise.zh-HK.yml
devise.zh-TW.yml
doorkeeper.ar.yml
doorkeeper.ast.yml
doorkeeper.bg.yml
doorkeeper.bn.yml
doorkeeper.ca.yml
doorkeeper.co.yml
doorkeeper.cs.yml
doorkeeper.cy.yml
doorkeeper.da.yml
doorkeeper.de.yml
doorkeeper.el.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
doorkeeper.hu.yml
doorkeeper.hy.yml
doorkeeper.id.yml
doorkeeper.io.yml
doorkeeper.it.yml
doorkeeper.ja.yml
doorkeeper.ka.yml
doorkeeper.kk.yml
doorkeeper.ko.yml
doorkeeper.lt.yml
doorkeeper.lv.yml
doorkeeper.ms.yml
doorkeeper.nl.yml
doorkeeper.no.yml
doorkeeper.oc.yml
doorkeeper.pl.yml
doorkeeper.pt-BR.yml
doorkeeper.pt.yml
doorkeeper.ro.yml
doorkeeper.ru.yml
doorkeeper.sk.yml
doorkeeper.sl.yml
doorkeeper.sq.yml
doorkeeper.sr-Latn.yml
doorkeeper.sr.yml
doorkeeper.sv.yml
doorkeeper.ta.yml
doorkeeper.te.yml
doorkeeper.th.yml
doorkeeper.tr.yml
doorkeeper.uk.yml
doorkeeper.zh-CN.yml
doorkeeper.zh-HK.yml
doorkeeper.zh-TW.yml
el.yml
en.yml
en_GB.yml
eo.yml
es.yml
eu.yml
fa.yml
fi.yml
fr.yml
ga.yml
gl.yml
he.yml
hi.yml
hr.yml
hu.yml
hy.yml
id.yml
io.yml
it.yml
ja.yml
ka.yml
kk.yml
ko.yml
lt.yml
lv.yml
ms.yml
nl.yml
no.yml
oc.yml
pl.yml
pt-BR.yml	New Crowdin translations (#11060)	2019-06-12 15:56:18 +02:00
pt.yml
ro.yml
ru.yml
simple_form.ar.yml
simple_form.ast.yml
simple_form.bg.yml
simple_form.bn.yml	New Crowdin translations (#11060)	2019-06-12 15:56:18 +02:00
simple_form.ca.yml
simple_form.co.yml
simple_form.cs.yml
simple_form.cy.yml
simple_form.da.yml
simple_form.de.yml
simple_form.el.yml
simple_form.en.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
simple_form.en_GB.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
simple_form.hr.yml
simple_form.hu.yml
simple_form.hy.yml
simple_form.id.yml
simple_form.io.yml
simple_form.it.yml
simple_form.ja.yml
simple_form.ka.yml
simple_form.kk.yml
simple_form.ko.yml
simple_form.lt.yml
simple_form.lv.yml
simple_form.ms.yml
simple_form.nl.yml
simple_form.no.yml
simple_form.oc.yml
simple_form.pl.yml
simple_form.pt-BR.yml	New Crowdin translations (#11060)	2019-06-12 15:56:18 +02:00
simple_form.pt.yml
simple_form.ro.yml
simple_form.ru.yml
simple_form.sk.yml
simple_form.sl.yml
simple_form.sq.yml
simple_form.sr-Latn.yml
simple_form.sr.yml
simple_form.sv.yml
simple_form.ta.yml
simple_form.te.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
sq.yml
sr-Latn.rb
sr-Latn.yml
sr.rb
sr.yml
sv.yml
ta.yml
te.yml
th.yml
tr.yml
uk.yml
zh-CN.yml
zh-HK.yml
zh-TW.yml