You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 525919c04f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2 years ago
..
af.js	Add missing locales to glitch-soc	3 years ago
ar.js	…
ast.js	Add glitch-soc front-end support for many upstream translations	5 years ago
bg.js	…
bn.js	Add glitch-soc front-end support for many upstream translations	5 years ago
br.js	Add glitch-soc front-end support for many upstream translations	5 years ago
ca.js	…
ckb.js	Add missing locales to glitch-soc	3 years ago
co.js	Add glitch-soc front-end support for many upstream translations	5 years ago
cs.js	Add glitch-soc front-end support for many upstream translations	5 years ago
cy.js	Add glitch-soc front-end support for many upstream translations	5 years ago
da.js	Add glitch-soc front-end support for many upstream translations	5 years ago
de.js	…
el.js	Add glitch-soc front-end support for many upstream translations	5 years ago
en.js	Add option to hide action bar in collapsed toots	6 years ago
eo.js	…
es-AR.js	Add glitch-soc front-end support for many upstream translations	5 years ago
es-MX.js	Add missing locales to glitch-soc	3 years ago
es.js	Clarify language RE secondary toot button (#1851)	2 years ago
et.js	Add glitch-soc front-end support for many upstream translations	5 years ago
eu.js	Add glitch-soc front-end support for many upstream translations	5 years ago
fa.js	…
fi.js	…
fr.js	…
ga.js	Add glitch-soc front-end support for many upstream translations	5 years ago
gd.js	Add missing locales to glitch-soc	3 years ago
gl.js	Add glitch-soc front-end support for many upstream translations	5 years ago
he.js	…
hi.js	Add glitch-soc front-end support for many upstream translations	5 years ago
hr.js	…
hu.js	…
hy.js	Add glitch-soc front-end support for many upstream translations	5 years ago
id.js	…
io.js	…
is.js	Add glitch-soc front-end support for many upstream translations	5 years ago
it.js	…
ja.js	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
ka.js	Add glitch-soc front-end support for many upstream translations	5 years ago
kab.js	Add glitch-soc front-end support for many upstream translations	5 years ago
kk.js	Add glitch-soc front-end support for many upstream translations	5 years ago
kn.js	Add glitch-soc front-end support for many upstream translations	5 years ago
ko.js	Translate: Korean (#1790)	2 years ago
ku.js	Add missing locales to glitch flavor	4 years ago
kw.js	Add missing locales to glitch-soc	3 years ago
lt.js	Add glitch-soc front-end support for many upstream translations	5 years ago
lv.js	Add glitch-soc front-end support for many upstream translations	5 years ago
mk.js	Add glitch-soc front-end support for many upstream translations	5 years ago
ml.js	Add glitch-soc front-end support for many upstream translations	5 years ago
mr.js	Add glitch-soc front-end support for many upstream translations	5 years ago
ms.js	Add glitch-soc front-end support for many upstream translations	5 years ago
nl.js	…
nn.js	Add glitch-soc front-end support for many upstream translations	5 years ago
no.js	…
oc.js	…
pa.js	Add missing locales to glitch-soc	3 years ago
pl.js	🌍: 🇵🇱⬆️	7 years ago
pt-BR.js	…
pt-PT.js	Fix build issues due to the “pt” locale being renamed to “pt-PT”	5 years ago
ro.js	Add glitch-soc front-end support for many upstream translations	5 years ago
ru.js	…
sa.js	Add missing locales to glitch flavor	4 years ago
sc.js	Add missing locales to glitch flavor	4 years ago
si.js	Add missing locales to glitch-soc	3 years ago
sk.js	Add glitch-soc front-end support for many upstream translations	5 years ago
sl.js	Add glitch-soc front-end support for many upstream translations	5 years ago
sq.js	Add glitch-soc front-end support for many upstream translations	5 years ago
sr-Latn.js	Add glitch-soc front-end support for many upstream translations	5 years ago
sr.js	Add glitch-soc front-end support for many upstream translations	5 years ago
sv.js	…
szl.js	Add missing locales to glitch-soc	3 years ago
ta.js	Add glitch-soc front-end support for many upstream translations	5 years ago
tai.js	Add missing locales to glitch-soc	3 years ago
te.js	Add glitch-soc front-end support for many upstream translations	5 years ago
th.js	…
tr.js	…
tt.js	Add missing locales to glitch-soc	3 years ago
ug.js	Add missing locales to glitch-soc	3 years ago
uk.js	…
ur.js	Add glitch-soc front-end support for many upstream translations	5 years ago
vi.js	Add glitch-soc front-end support for many upstream translations	5 years ago
zgh.js	Add missing locales to glitch flavor	4 years ago
zh-CN.js	Add zh-CN translations	3 years ago
zh-HK.js	…
zh-TW.js	…