tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
e7b3a4263e5a22a64b7fdc3a965fa38e1935157a
Mastodon/app/javascript/mastodon/locales
History
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
2018-05-27 13:20:15 +02:00
..
ar.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
bg.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
ca.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
co.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
de.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
defaultMessages.json
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-27 13:20:15 +02:00
el.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
en.json
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-21 16:40:02 +02:00
eo.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
es.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
eu.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
fa.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
fi.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
fr.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
gl.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
he.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
hr.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
hu.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
hy.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
id.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
index.js
…
io.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
it.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
ja.json
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-27 13:20:15 +02:00
ko.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
nl.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
no.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
oc.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
pl.json
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-05-21 16:30:24 -05:00
pt-BR.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
pt.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
ru.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
sk.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
sl.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
sr-Latn.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
sr.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
sv.json
Weblate translations (2018-05-26) (#7624)
2018-05-26 04:45:58 +02:00
te.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
th.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
tr.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
uk.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
whitelist_ar.json
…
whitelist_bg.json
…
whitelist_ca.json
…
whitelist_co.json
Add Corsican localization (#7390)
2018-05-07 01:34:19 +02:00
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.json
…
whitelist_eu.json
Add el and te (#7332)
2018-05-03 15:54:10 +02:00
whitelist_fa.json
…
whitelist_fi.json
…
whitelist_fr.json
…
whitelist_gl.json
…
whitelist_he.json
…
whitelist_hr.json
…
whitelist_hu.json
…
whitelist_hy.json
…
whitelist_id.json
…
whitelist_io.json
…
whitelist_it.json
…
whitelist_ja.json
…
whitelist_ko.json
…
whitelist_nl.json
…
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pl.json
…
whitelist_pt-BR.json
…
whitelist_pt.json
…
whitelist_ru.json
…
whitelist_sk.json
…
whitelist_sl.json
Weblate translations (2018-05-10) (#7438)
2018-05-10 14:48:26 +02:00
whitelist_sr-Latn.json
…
whitelist_sr.json
…
whitelist_sv.json
…
whitelist_te.json
Add el and te (#7332)
2018-05-03 15:54:10 +02:00
whitelist_th.json
…
whitelist_tr.json
…
whitelist_uk.json
…
whitelist_zh-CN.json
…
whitelist_zh-HK.json
…
whitelist_zh-TW.json
…
zh-CN.json
[WIP] i18n: Update Simplified Chinese translations (#7576)
2018-05-22 15:26:42 +02:00
zh-HK.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00
zh-TW.json
Add media timeline (#6631)
2018-05-21 12:43:38 +02:00