David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml

2018-04-01 20:24:50 -05:00

..

ar.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

bg.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

ca.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

de.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

defaultMessages.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-01 20:24:50 -05:00

en.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-01 20:24:50 -05:00

eo.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

es.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

fa.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

fi.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

fr.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

gl.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

he.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

hr.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

hu.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

hy.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

id.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

index.js

…

io.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

it.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

ja.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-01 20:24:50 -05:00

ko.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

nl.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

no.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

oc.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

pl.json

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-01 20:24:50 -05:00

pt-BR.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

pt.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

ru.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

sk.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

sr-Latn.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

sr.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

sv.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

th.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

tr.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

uk.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

whitelist_ar.json

…

whitelist_bg.json

…

whitelist_ca.json

…

whitelist_de.json

…

whitelist_en.json

…

whitelist_eo.json

…

whitelist_es.json

…

whitelist_fa.json

…

whitelist_fi.json

…

whitelist_fr.json

…

whitelist_gl.json

…

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

…

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_sr-Latn.json

…

whitelist_sr.json

…

whitelist_sv.json

…

whitelist_th.json

…

whitelist_tr.json

…

whitelist_uk.json

…

whitelist_zh-CN.json

…

whitelist_zh-HK.json

…

whitelist_zh-TW.json

…

zh-CN.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

zh-HK.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00

zh-TW.json

i18n: Add Japanese translations for domain blocks (#6979)

2018-03-31 21:09:39 +09:00