rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/javascript/mastodon/locales
History
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream 
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
 		2018-08-01 00:18:13 +02:00
..
ar.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
ast.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
bg.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
ca.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
co.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
cs.json Weblate translations (2018-07-30) (#8096) 2018-07-30 03:43:34 +02:00
da.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
de.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
defaultMessages.json Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
el.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
en.json Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
eo.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
es.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
eu.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
fa.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
fi.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
fr.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
gl.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
he.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
hr.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
hu.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
hy.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
id.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
index.js
…
io.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
it.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
ja.json Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
ko.json Weblate translations (2018-07-30) (#8096) 2018-07-30 03:43:34 +02:00
nl.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
no.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
oc.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
pl.json Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream 2018-07-30 14:39:06 +02:00
pt-BR.json Weblate translations (2018-07-30) (#8096) 2018-07-30 03:43:34 +02:00
pt.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
ru.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
sk.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
sl.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
sr-Latn.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
sr.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
sv.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
te.json Weblate translations (2018-07-30) (#8096) 2018-07-30 03:43:34 +02:00
th.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
tr.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
uk.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
whitelist_ar.json
…
whitelist_ast.json Weblate translations (2018-07-25) (#8065) 2018-07-24 20:47:13 +02:00
whitelist_bg.json
…
whitelist_ca.json
…
whitelist_co.json Add Corsican localization (#7390) 2018-05-07 01:34:19 +02:00
whitelist_cs.json Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +02:00
whitelist_da.json Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +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 Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
zh-HK.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
zh-TW.json Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00