tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3091a184ca7ca0f788b42209db95b5d80db31b32
Mastodon/app/javascript/mastodon/locales
History
Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
..
locale-data
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-17 19:23:39 +01:00
af.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
an.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ar.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ast.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
be.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
bg.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
bn.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
br.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
bs.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ca.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ckb.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
co.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
cs.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
csb.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
cy.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
da.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
de.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
defaultMessages.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
el.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
en-GB.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
en.json
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-15 09:16:10 +01:00
eo.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
es-AR.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
es-MX.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
es.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
et.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
eu.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
fa.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
fi.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
fo.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
fr-QC.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
fr.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
fy.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ga.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
gd.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
gl.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
he.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
hi.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
hr.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
hu.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
hy.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
id.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ig.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
index.js
…
io.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
is.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
it.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ja.json
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
ka.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
kab.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
kk.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
kn.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ko.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ku.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
kw.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
la.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
lt.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
lv.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
mk.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ml.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
mr.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ms.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
my.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
nl.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
nn.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
no.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
oc.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
pa.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
pl.json
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
pt-BR.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
pt-PT.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ro.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ru.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sa.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sc.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sco.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
si.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sk.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sl.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sq.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sr-Latn.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sr.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
sv.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
szl.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ta.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
tai.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
te.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
th.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
tr.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
tt.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ug.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
uk.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
ur.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
uz.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
vi.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
whitelist_af.json
…
whitelist_an.json
New Crowdin updates (#20759)
2022-11-17 21:59:15 +09:00
whitelist_ar.json
…
whitelist_ast.json
…
whitelist_be.json
New Crowdin updates (#20942)
2022-11-25 09:40:05 +09:00
whitelist_bg.json
…
whitelist_bn.json
…
whitelist_br.json
…
whitelist_bs.json
New Crowdin updates (#20759)
2022-11-17 21:59:15 +09:00
whitelist_ca.json
…
whitelist_ckb.json
New Crowdin updates (#17771)
2022-03-17 09:33:25 +09:00
whitelist_co.json
…
whitelist_cs.json
…
whitelist_csb.json
New Crowdin updates (#23221)
2023-02-01 19:59:31 +09:00
whitelist_cy.json
…
whitelist_da.json
…
whitelist_de.json
New Crowdin updates (#21954)
2022-12-10 00:12:56 +09:00
whitelist_el.json
…
whitelist_en-GB.json
New Crowdin updates (#18255)
2022-05-06 21:53:22 +09:00
whitelist_en.json
…
whitelist_eo.json
…
whitelist_es-AR.json
…
whitelist_es-MX.json
New Crowdin updates (#16094)
2021-05-08 17:12:56 +02:00
whitelist_es.json
…
whitelist_et.json
…
whitelist_eu.json
…
whitelist_fa.json
…
whitelist_fi.json
…
whitelist_fo.json
New Crowdin updates (#20759)
2022-11-17 21:59:15 +09:00
whitelist_fr-QC.json
New Crowdin updates (#20759)
2022-11-17 21:59:15 +09:00
whitelist_fr.json
…
whitelist_fy.json
New Crowdin updates (#18561)
2022-06-04 13:44:49 +09:00
whitelist_ga.json
…
whitelist_gd.json
…
whitelist_gl.json
…
whitelist_he.json
…
whitelist_hi.json
…
whitelist_hr.json
…
whitelist_hu.json
…
whitelist_hy.json
…
whitelist_id.json
…
whitelist_ig.json
New Crowdin updates (#19517)
2022-11-01 18:42:04 +09:00
whitelist_io.json
…
whitelist_is.json
…
whitelist_it.json
…
whitelist_ja.json
…
whitelist_ka.json
…
whitelist_kab.json
…
whitelist_kk.json
…
whitelist_kn.json
…
whitelist_ko.json
…
whitelist_ku.json
…
whitelist_kw.json
…
whitelist_la.json
New Crowdin updates (#22182)
2022-12-16 12:46:39 +09:00
whitelist_lt.json
…
whitelist_lv.json
…
whitelist_mk.json
…
whitelist_ml.json
…
whitelist_mr.json
…
whitelist_ms.json
…
whitelist_my.json
New Crowdin updates (#19517)
2022-11-01 18:42:04 +09:00
whitelist_nl.json
…
whitelist_nn.json
…
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pa.json
…
whitelist_pl.json
…
whitelist_pt-BR.json
…
whitelist_pt-PT.json
…
whitelist_ro.json
…
whitelist_ru.json
…
whitelist_sa.json
…
whitelist_sc.json
…
whitelist_sco.json
New Crowdin updates (#20759)
2022-11-17 21:59:15 +09:00
whitelist_si.json
…
whitelist_sk.json
…
whitelist_sl.json
…
whitelist_sq.json
…
whitelist_sr-Latn.json
…
whitelist_sr.json
…
whitelist_sv.json
…
whitelist_szl.json
…
whitelist_ta.json
…
whitelist_tai.json
…
whitelist_te.json
…
whitelist_th.json
…
whitelist_tr.json
…
whitelist_tt.json
…
whitelist_ug.json
…
whitelist_uk.json
…
whitelist_ur.json
…
whitelist_uz.json
New Crowdin updates (#23221)
2023-02-01 19:59:31 +09:00
whitelist_vi.json
…
whitelist_zgh.json
…
whitelist_zh-CN.json
…
whitelist_zh-HK.json
…
whitelist_zh-TW.json
…
zgh.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
zh-CN.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
zh-HK.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00
zh-TW.json
New Crowdin updates (#23904)
2023-03-16 21:02:00 +09:00