tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ccfc2b6dce4bfda283bb6bc968a23fe4a76951d7
Mastodon/app/javascript/mastodon/locales
History
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +02:00
..
locale-data
…
ar.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
ast.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
bg.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
bn.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
br.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
ca.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
co.json
New Crowdin updates (#14285)
2020-07-15 14:59:26 +02:00
cs.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
cy.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
da.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
de.json
New Crowdin updates (#14285)
2020-07-15 14:59:26 +02:00
defaultMessages.json
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-30 16:13:08 +02:00
el.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
en.json
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-30 16:13:08 +02:00
eo.json
New Crowdin updates (#14197)
2020-07-10 20:57:21 +02:00
es-AR.json
New Crowdin updates (#14285)
2020-07-15 14:59:26 +02:00
es.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
et.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
eu.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
fa.json
New Crowdin updates (#14285)
2020-07-15 14:59:26 +02:00
fi.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
fr.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
ga.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
gl.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
he.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
hi.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
hr.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
hu.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
hy.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
id.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
index.js
…
io.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
is.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
it.json
New Crowdin updates (#14285)
2020-07-15 14:59:26 +02:00
ja.json
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-01 20:24:23 +02:00
ka.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
kab.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
kk.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
kn.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
ko.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
ku.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
lt.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
lv.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
mk.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
ml.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
mr.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
ms.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
nl.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
nn.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
no.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
oc.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
pl.json
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-22 13:38:17 +02:00
pt-BR.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
pt-PT.json
New Crowdin updates (#14285)
2020-07-15 14:59:26 +02:00
ro.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
ru.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
sc.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
sk.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
sl.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
sq.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
sr-Latn.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
sr.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
sv.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
szl.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
ta.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
tai.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
te.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
th.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
tr.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
ug.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
uk.json
ran yarn manage:translations (#14344)
2020-07-18 19:01:16 +02:00
ur.json
reword "boost to original audience" as per #14596 (#14598)
2020-08-23 00:08:31 +02:00
vi.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
whitelist_ar.json
…
whitelist_ast.json
…
whitelist_bg.json
…
whitelist_bn.json
…
whitelist_br.json
…
whitelist_ca.json
…
whitelist_co.json
…
whitelist_cs.json
…
whitelist_cy.json
…
whitelist_da.json
…
whitelist_de.json
…
whitelist_el.json
Add el and te (#7332)
2018-05-03 15:54:10 +02:00
whitelist_en.json
…
whitelist_eo.json
…
whitelist_es-AR.json
…
whitelist_es.json
…
whitelist_et.json
…
whitelist_eu.json
…
whitelist_fa.json
…
whitelist_fi.json
…
whitelist_fr.json
…
whitelist_ga.json
…
whitelist_gl.json
…
whitelist_he.json
…
whitelist_hi.json
…
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
Add Georgian language translation (#8250)
2018-08-18 01:00:01 +09:00
whitelist_kab.json
New Crowdin translations (#12378)
2020-01-12 15:18:03 +01:00
whitelist_kk.json
…
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_lt.json
…
whitelist_lv.json
…
whitelist_mk.json
…
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
…
whitelist_nl.json
…
whitelist_nn.json
…
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pl.json
…
whitelist_pt-BR.json
…
whitelist_pt-PT.json
…
whitelist_ro.json
…
whitelist_ru.json
…
whitelist_sc.json
New Crowdin translations (#13398)
2020-05-13 22:35:20 +02:00
whitelist_sk.json
…
whitelist_sl.json
…
whitelist_sq.json
…
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_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_zh-CN.json
…
whitelist_zh-HK.json
…
whitelist_zh-TW.json
…
zh-CN.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
zh-HK.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00
zh-TW.json
New Crowdin updates (#14335)
2020-07-24 12:46:46 +02:00