marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/javascript/mastodon/locales
History
Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/views/layouts/application.html.haml

Edited:
        app/helpers/application_helper.rb
        app/views/admin/domain_blocks/new.html.haml

Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.

Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
 		2018-08-26 14:23:24 +02:00
..
ar.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
ast.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
bg.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
ca.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
co.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
cs.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
da.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
de.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
defaultMessages.json Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
el.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
en.json Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
eo.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
es.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
eu.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
fa.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
fi.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
fr.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
gl.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
he.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
hr.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
hu.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
hy.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
id.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
index.js Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
io.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
it.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
ja.json Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
ka.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
ko.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
nl.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
no.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
oc.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
pl.json Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
pt-BR.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
pt.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
ru.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
sk.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
sl.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
sr-Latn.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
sr.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
sv.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
te.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
th.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
tr.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
uk.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
whitelist_ar.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ast.json Weblate translations (2018-07-25) (#8065) 2018-07-24 20:47:13 +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_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 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_ka.json Add Georgian language translation (#8250) 2018-08-18 01:00:01 +09: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 Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
zh-HK.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
zh-TW.json Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00