namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/locales
History
David Yip 6dd676e006
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	config/locales/pl.yml

The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc.  Resolution: remove the themes key-related
changes, i.e. accept-ours.
2018-05-21 16:30:24 -05: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-21 16:40:02 +02:00
el.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
en.json Merge branch 'master' into glitch-soc/merge-upstream 2018-05-21 16:40:02 +02:00
eo.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
es.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
eu.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
fa.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
fi.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
fr.json Add media timeline (#6631) 2018-05-21 12:43:38 +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 Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
io.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
it.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
ja.json Merge branch 'master' into glitch-soc/merge-upstream 2018-05-21 16:40:02 +02:00
ko.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
nl.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
no.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
oc.json Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
pl.json Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-21 16:30:24 -05:00
pt-BR.json Add media timeline (#6631) 2018-05-21 12:43:38 +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 Add media timeline (#6631) 2018-05-21 12:43:38 +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 Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_bg.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ca.json Fix minor Japanese translations (#3099) 2017-05-17 17:50:39 +02:00
whitelist_co.json Add Corsican localization (#7390) 2018-05-07 01:34:19 +02:00
whitelist_de.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_el.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_en.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_eo.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_es.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_eu.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_fa.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_fi.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_fr.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_gl.json Weblate translations (#5946) 2017-12-09 15:35:22 +01:00
whitelist_he.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_hr.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_hu.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_hy.json Weblate translations (#6323) 2018-01-22 14:20:58 +01:00
whitelist_id.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_io.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_it.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ja.json Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725) 2017-06-13 03:55:28 +02:00
whitelist_ko.json i18n: Add korean translation (#4064) 2017-07-04 16:11:23 +02:00
whitelist_nl.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_no.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_oc.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_pl.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_pt-BR.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_pt.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ru.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_sk.json Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) 2018-01-03 21:00:39 +09:00
whitelist_sl.json Weblate translations (2018-05-10) (#7438) 2018-05-10 14:48:26 +02:00
whitelist_sr-Latn.json Fix RFC 5646 Regular Expression (#6190) 2018-01-05 04:43:50 +01:00
whitelist_sr.json Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) 2018-01-03 21:00:39 +09:00
whitelist_sv.json Add Japanese translations (#5810) 2017-11-25 03:39:57 +01:00
whitelist_te.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_th.json Add th.json. (#3588) 2017-06-05 17:02:41 +02:00
whitelist_tr.json Fix duplicated values in nl.json (#2931) 2017-05-09 14:12:35 +02:00
whitelist_uk.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_zh-CN.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_zh-HK.json Fix regular expression for RFC 5646 (regression from #3604) (#4133) 2017-07-10 14:02:18 +02:00
whitelist_zh-TW.json Add zh-TW.json (#3459) 2017-05-30 23:09:02 +02:00
zh-CN.json i18n: Update Simplified Chinese translations (#7565) 2018-05-21 13:40:48 +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