David Yip 67e77f230e

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

Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.

2018-04-08 19:05:02 -05:00

..

ar.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02:00

bg.json

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

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

ca.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02: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-08 19:05:02 -05:00

en.json

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

2018-04-08 19:05:02 -05:00

eo.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02:00

es.json

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

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

fa.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02:00

fi.json

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

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

fr.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02: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

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

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 'tootsuite/master' into glitchsoc/master

2018-04-03 19:17:20 +00:00

ko.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02: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: improve "Welcome" translation in Portuguese (#7068)

2018-04-07 21:36:03 +02:00

pt.json

i18n: improve "Welcome" translation in Portuguese (#7068)

2018-04-07 21:36:03 +02:00

ru.json

Russian language updated (#7005)

2018-04-02 19:49:06 +09:00

sk.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02: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

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_de.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +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_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_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_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: Add Japanese translations for domain blocks (#6979)

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

zh-HK.json

i18n: update zh-HK translation (#7004)

2018-04-02 19:11:37 +09:00

zh-TW.json

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02:00