tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/javascript/mastodon/locales
History
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
locale-data
…
ar.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
ast.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
bg.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
bn.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
ca.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
co.json
New Crowdin translations (#11596)
2019-08-19 19:05:13 +02:00
cs.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
cy.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
da.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
de.json
New Crowdin translations (#11596)
2019-08-19 19:05:13 +02:00
defaultMessages.json
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 12:07:50 +02:00
el.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
en.json
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 12:07:50 +02:00
eo.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
es.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
et.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
eu.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
fa.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
fi.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
fr.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
gl.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
he.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
hi.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
hr.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
hu.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
hy.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
id.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
index.js
…
io.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
it.json
New Crowdin translations (#11593)
2019-08-18 03:48:39 +02:00
ja.json
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
ka.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
kk.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
ko.json
New Crowdin translations (#11596)
2019-08-19 19:05:13 +02:00
lt.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
lv.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
ms.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
nl.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
no.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
oc.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
pl.json
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
pt-BR.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
pt.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
ro.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
ru.json
New Crowdin translations (#11596)
2019-08-19 19:05:13 +02:00
sk.json
New Crowdin translations (#11596)
2019-08-19 19:05:13 +02:00
sl.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
sq.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
sr-Latn.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
sr.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
sv.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
ta.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
te.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
th.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
tr.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
uk.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
whitelist_ar.json
…
whitelist_ast.json
…
whitelist_bg.json
…
whitelist_bn.json
…
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.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_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_it.json
…
whitelist_ja.json
…
whitelist_ka.json
…
whitelist_kk.json
…
whitelist_ko.json
…
whitelist_lt.json
New Crowdin translations (#11060)
2019-06-12 15:56:18 +02:00
whitelist_lv.json
…
whitelist_ms.json
…
whitelist_nl.json
…
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pl.json
…
whitelist_pt-BR.json
…
whitelist_pt.json
…
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_zh-CN.json
…
whitelist_zh-HK.json
…
whitelist_zh-TW.json
…
zh-CN.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
zh-HK.json
New Crowdin translations (#11305)
2019-08-17 22:02:37 +02:00
zh-TW.json
New Crowdin translations (#11596)
2019-08-19 19:05:13 +02:00