tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
22af8f756396c05c86f082da23ecfc866cedb0e3
Mastodon/app/javascript/mastodon/locales
History
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
locale-data
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-17 19:23:39 +01:00
af.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ar.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ast.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
bg.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
bn.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
br.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ca.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ckb.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
co.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
cs.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
cy.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
da.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
de.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
defaultMessages.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-02 18:46:22 +02:00
el.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
en-GB.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
en.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-02 18:46:22 +02:00
eo.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
es-AR.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
es-MX.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
es.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
et.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
eu.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
fa.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
fi.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
fr.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
fy.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ga.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
gd.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
gl.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
he.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
hi.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
hr.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
hu.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
hy.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
id.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
index.js
…
io.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
is.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
it.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ja.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-02 18:46:22 +02:00
ka.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
kab.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
kk.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
kn.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ko.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ku.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
kw.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
lt.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
lv.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
mk.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ml.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
mr.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ms.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
nl.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
nn.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
no.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
oc.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
pa.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
pl.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-02 18:46:22 +02:00
pt-BR.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
pt-PT.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ro.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ru.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sa.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sc.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
si.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sk.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sl.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sq.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sr-Latn.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sr.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
sv.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
szl.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ta.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
tai.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
te.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
th.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
tr.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
tt.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ug.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
uk.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
ur.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
vi.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
whitelist_af.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02:00
whitelist_ar.json
…
whitelist_ast.json
…
whitelist_bg.json
…
whitelist_bn.json
Weblate translations (2019-03-24) (#10362)
2019-03-24 18:44:59 +01:00
whitelist_br.json
New Crowdin translations (#11799)
2019-09-16 15:11:01 +02: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_cy.json
…
whitelist_da.json
…
whitelist_de.json
Add German translations (#11043)
2019-06-10 21:36:20 +02: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
New Crowdin translations (#11985)
2019-09-29 17:10:01 +02:00
whitelist_es-MX.json
New Crowdin updates (#16094)
2021-05-08 17:12:56 +02:00
whitelist_es.json
…
whitelist_et.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
whitelist_eu.json
…
whitelist_fa.json
…
whitelist_fi.json
…
whitelist_fr.json
…
whitelist_fy.json
New Crowdin updates (#18561)
2022-06-04 13:44:49 +09:00
whitelist_ga.json
New Crowdin translations (#11861)
2019-09-20 23:05:23 +02:00
whitelist_gd.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02:00
whitelist_gl.json
…
whitelist_he.json
…
whitelist_hi.json
Add hi.json (#10573)
2019-04-21 04:52:20 +02:00
whitelist_hr.json
…
whitelist_hu.json
…
whitelist_hy.json
…
whitelist_id.json
…
whitelist_io.json
…
whitelist_is.json
New Crowdin translations (#12378)
2020-01-12 15:18:03 +01:00
whitelist_it.json
…
whitelist_ja.json
…
whitelist_ka.json
…
whitelist_kab.json
New Crowdin translations (#12378)
2020-01-12 15:18:03 +01:00
whitelist_kk.json
Weblate translations (2019-02-23) (#10103)
2019-02-23 18:41:28 +01:00
whitelist_kn.json
New Crowdin translations (#12146)
2019-11-13 23:24:55 +01:00
whitelist_ko.json
…
whitelist_ku.json
New Crowdin updates (#14197)
2020-07-10 20:57:21 +02:00
whitelist_kw.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02:00
whitelist_lt.json
New Crowdin translations (#11060)
2019-06-12 15:56:18 +02:00
whitelist_lv.json
Weblate translations (2019-01-08) (#9758)
2019-01-08 14:09:57 +01:00
whitelist_mk.json
New Crowdin translations (#12047)
2019-10-03 03:36:52 +02:00
whitelist_ml.json
New Crowdin translations (#12146)
2019-11-13 23:24:55 +01:00
whitelist_mr.json
New Crowdin translations (#12146)
2019-11-13 23:24:55 +01:00
whitelist_ms.json
Remove links to bridge.joinmastodon.org (non-functional) (#9608)
2018-12-22 23:32:00 +01:00
whitelist_nl.json
…
whitelist_nn.json
New Crowdin translations (#11799)
2019-09-16 15:11:01 +02:00
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pa.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02:00
whitelist_pl.json
…
whitelist_pt-BR.json
…
whitelist_pt-PT.json
New Crowdin translations (#11799)
2019-09-16 15:11:01 +02:00
whitelist_ro.json
…
whitelist_ru.json
…
whitelist_sa.json
New Crowdin updates (#14388)
2020-11-09 00:56:52 +01:00
whitelist_sc.json
New Crowdin translations (#13398)
2020-05-13 22:35:20 +02:00
whitelist_si.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02:00
whitelist_sk.json
…
whitelist_sl.json
…
whitelist_sq.json
Weblate translations (2019-02-11) (#10007)
2019-02-11 07:41:35 +01:00
whitelist_sr-Latn.json
…
whitelist_sr.json
…
whitelist_sv.json
…
whitelist_szl.json
New Crowdin translations (#13749)
2020-07-02 00:45:15 +02:00
whitelist_ta.json
…
whitelist_tai.json
New Crowdin translations (#13749)
2020-07-02 00:45:15 +02:00
whitelist_te.json
…
whitelist_th.json
…
whitelist_tr.json
…
whitelist_tt.json
New Crowdin updates (#15220)
2020-12-16 03:24:55 +01:00
whitelist_ug.json
New Crowdin updates (#14197)
2020-07-10 20:57:21 +02:00
whitelist_uk.json
…
whitelist_ur.json
New Crowdin translations (#12146)
2019-11-13 23:24:55 +01:00
whitelist_vi.json
New Crowdin translations (#12378)
2020-01-12 15:18:03 +01:00
whitelist_zgh.json
New Crowdin updates (#14388)
2020-11-09 00:56:52 +01:00
whitelist_zh-CN.json
…
whitelist_zh-HK.json
…
whitelist_zh-TW.json
…
zgh.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
zh-CN.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
zh-HK.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00
zh-TW.json
New Crowdin updates (#19252)
2022-09-29 23:27:50 +09:00