Glitch-Shrike/app/javascript/mastodon/locales
Claire 0092fe50ac Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
..
af.json
an.json
ar.json
ast.json
be.json
bg.json
bn.json
br.json
bs.json
ca.json
ckb.json
co.json
cs.json
cy.json
da.json
de.json
el.json
en-GB.json
en.json
eo.json
es-AR.json
es-MX.json
es.json
et.json
eu.json
fa.json
fi.json
fo.json
fr-QC.json
fr.json
fy.json
ga.json
gd.json
gl.json
global_locale.ts
he.json
hi.json
hr.json
hu.json
hy.json
id.json
ig.json
index.ts
intl_provider.tsx
io.json
is.json
it.json
ja.json
ka.json
kab.json
kk.json
kn.json
ko.json
ku.json
kw.json
la.json
load_locale.ts
lt.json
lv.json
mk.json
ml.json
mr.json
ms.json
my.json
nl.json
nn.json
no.json
oc.json
pa.json
pl.json
pt-BR.json
pt-PT.json
ro.json
ru.json
sa.json
sc.json
sco.json
si.json
sk.json
sl.json
sq.json
sr-Latn.json
sr.json
sv.json
szl.json
ta.json
tai.json
te.json
th.json
tr.json
tt.json
ug.json
uk.json
ur.json
uz.json
vi.json
zgh.json
zh-CN.json
zh-HK.json
zh-TW.json