vt-social/app/javascript/mastodon/locales
Thibaut Girka dae5e446fe Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.
2020-02-09 12:15:55 +01:00
..
locale-data
ar.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
ast.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
bg.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
bn.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
br.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ca.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
co.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
cs.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
cy.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
da.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
de.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
defaultMessages.json Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
el.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
en.json Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
eo.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
es-AR.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
es.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
et.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
eu.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
fa.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
fi.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
fr.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ga.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
gl.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
he.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
hi.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
hr.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
hu.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
hy.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
id.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
index.js
io.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
is.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
it.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ja.json Merge branch 'master' into glitch-soc/merge-upstream 2020-02-06 21:36:38 +01:00
ka.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
kab.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
kk.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
kn.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ko.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
lt.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
lv.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
mk.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ml.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
mr.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ms.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
nl.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
nn.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
no.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
oc.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
pl.json Merge branch 'master' into glitch-soc/merge-upstream 2020-02-09 12:15:55 +01:00
pt-BR.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
pt-PT.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ro.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ru.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
sk.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
sl.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
sq.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
sr-Latn.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
sr.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
sv.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ta.json New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
te.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
th.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
tr.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
uk.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
ur.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
vi.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01: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_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.json
whitelist_eo.json
whitelist_es-AR.json New Crowdin translations (#11985) 2019-09-29 17:10:01 +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_ga.json New Crowdin translations (#11861) 2019-09-20 23:05:23 +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
whitelist_kn.json New Crowdin translations (#12146) 2019-11-13 23:24:55 +01:00
whitelist_ko.json
whitelist_lt.json New Crowdin translations (#11060) 2019-06-12 15:56:18 +02:00
whitelist_lv.json
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
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_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_sk.json
whitelist_sl.json
whitelist_sq.json
whitelist_sr-Latn.json
whitelist_sr.json
whitelist_sv.json
whitelist_ta.json
whitelist_te.json
whitelist_th.json
whitelist_tr.json
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 translations (#12953) 2020-02-03 15:52:20 +01:00
zh-HK.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
zh-TW.json New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00