Claire 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.		2023-06-18 13:41:33 +02:00
..
af.yml
an.yml
ar.yml
ast.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
be.yml
bg.yml
bn.yml
br.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
bs.yml
ca.yml
ckb.yml	New Crowdin updates (#2069)	2023-01-18 15:50:50 +01:00
co.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
cs.yml
cy.yml
da.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
de.yml
el.yml
en-GB.yml
en.yml	Change captcha to be presented even for invited users (#2227)	2023-05-25 20:13:18 +02:00
eo.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
es-AR.yml
es-MX.yml	New Crowdin updates (#2126)	2023-04-05 20:28:34 +02:00
es.yml
et.yml
eu.yml
fa.yml
fi.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
fo.yml
fr-QC.yml
fr.yml	New Crowdin updates (#2069)	2023-01-18 15:50:50 +01:00
fy.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
ga.yml
gd.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
gl.yml
he.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
hi.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
hr.yml
hu.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
hy.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
id.yml
ig.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
io.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
is.yml
it.yml
ja.yml
ka.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
kab.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
kk.yml
kn.yml
ko.yml
ku.yml
kw.yml
la.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
lt.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
lv.yml
mk.yml
ml.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
mr.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
ms.yml
my.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
nl.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
nn.yml
no.yml	New Crowdin updates (#2111)	2023-02-18 11:16:30 +01:00
oc.yml
pa.yml
pl.yml
pt-BR.yml
pt-PT.yml	New Crowdin updates (#2111)	2023-02-18 11:16:30 +01:00
ro.yml
ru.yml
sa.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
sc.yml
sco.yml
si.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.af.yml
simple_form.an.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.ar.yml
simple_form.ast.yml
simple_form.be.yml
simple_form.bg.yml
simple_form.bn.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.br.yml
simple_form.bs.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.ca.yml
simple_form.ckb.yml
simple_form.co.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.cs.yml
simple_form.cy.yml
simple_form.da.yml
simple_form.de.yml
simple_form.el.yml
simple_form.en-GB.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.en.yml	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
simple_form.eo.yml
simple_form.es-AR.yml
simple_form.es-MX.yml
simple_form.es.yml	New Crowdin updates (#2126)	2023-04-05 20:28:34 +02:00
simple_form.et.yml
simple_form.eu.yml
simple_form.fa.yml
simple_form.fi.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.fo.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.fr-QC.yml	New Crowdin updates (#2041)	2022-12-22 14:33:12 +01:00
simple_form.fr.yml	New Crowdin updates (#2041)	2022-12-22 14:33:12 +01:00
simple_form.fy.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.ga.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.gd.yml
simple_form.gl.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.he.yml
simple_form.hi.yml
simple_form.hr.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.hu.yml
simple_form.hy.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.id.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.ig.yml
simple_form.io.yml
simple_form.is.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.it.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.ja.yml
simple_form.ka.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.kab.yml
simple_form.kk.yml
simple_form.kn.yml
simple_form.ko.yml	New Crowdin updates (#2036)	2022-12-22 07:54:50 +01:00
simple_form.ku.yml	New Crowdin updates (#2069)	2023-01-18 15:50:50 +01:00
simple_form.kw.yml
simple_form.la.yml
simple_form.lt.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.lv.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.mk.yml
simple_form.ml.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.mr.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.ms.yml
simple_form.my.yml
simple_form.nl.yml
simple_form.nn.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.no.yml
simple_form.oc.yml
simple_form.pa.yml
simple_form.pl.yml
simple_form.pt-BR.yml
simple_form.pt-PT.yml	Fix root key for glitch-soc pt-PT and pt-BR yaml translations (#2065)	2023-01-04 18:47:01 +01:00
simple_form.ro.yml
simple_form.ru.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.sa.yml
simple_form.sc.yml
simple_form.sco.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.si.yml
simple_form.sk.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.sl.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.sq.yml
simple_form.sr-Latn.yml
simple_form.sr.yml
simple_form.sv.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.ta.yml
simple_form.te.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.th.yml
simple_form.tr.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.tt.yml
simple_form.ug.yml
simple_form.uk.yml
simple_form.ur.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.vi.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
simple_form.zh-CN.yml
simple_form.zh-HK.yml	New Crowdin updates (#2069)	2023-01-18 15:50:50 +01:00
simple_form.zh-TW.yml
sk.yml
sl.yml
sq.yml
sr-Latn.yml
sr.yml
sv.yml
ta.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
te.yml
th.yml
tr.yml
tt.yml
ug.yml
uk.yml
ur.yml	New Crowdin updates (#2034)	2022-12-22 00:21:39 +01:00
vi.yml
zh-CN.yml	New Crowdin updates (#2126)	2023-04-05 20:28:34 +02:00
zh-HK.yml	New Crowdin updates (#2069)	2023-01-18 15:50:50 +01:00
zh-TW.yml