djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript/mastodon/locales
History
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge 
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
 		2018-07-09 07:13:59 +02:00
..
ar.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
bg.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
ca.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
co.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
da.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
de.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
defaultMessages.json Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
el.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
en.json Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
eo.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
es.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
eu.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
fa.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
fi.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
fr.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
gl.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
he.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
hr.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
hu.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
hy.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
id.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
index.js Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
io.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
it.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
ja.json Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
ko.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
nl.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
no.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
oc.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
pl.json Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
pt-BR.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
pt.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
ru.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
sk.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
sl.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
sr-Latn.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
sr.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
sv.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
te.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
th.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
tr.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
uk.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09: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 Weblate translations (#5946) 2017-12-09 15:35:22 +01:00
whitelist_he.json
…
whitelist_hr.json
…
whitelist_hu.json
…
whitelist_hy.json Weblate translations (#6323) 2018-01-22 14:20:58 +01:00
whitelist_id.json
…
whitelist_io.json
…
whitelist_it.json
…
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
…
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pl.json
…
whitelist_pt-BR.json
…
whitelist_pt.json
…
whitelist_ru.json
…
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
…
whitelist_uk.json
…
whitelist_zh-CN.json
…
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 Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
zh-HK.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
zh-TW.json Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00