David Yip 3550470c18 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

The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours.

2018-06-02 16:15:36 -05:00

..

ar.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

bg.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

ca.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

co.json

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

de.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

defaultMessages.json

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

2018-06-02 16:15:36 -05:00

el.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

en.json

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

2018-06-02 16:15:36 -05:00

eo.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

es.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

eu.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

fa.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

fi.json

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

fr.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

gl.json

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

he.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

hr.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

hu.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

hy.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

id.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

index.js

…

io.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

it.json

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

ja.json

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

2018-06-02 16:15:36 -05:00

ko.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

nl.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

no.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

oc.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

pl.json

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

2018-06-02 16:15:36 -05:00

pt-BR.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

pt.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

ru.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

sk.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

sl.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

sr-Latn.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

sr.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

sv.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

te.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

th.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

tr.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

uk.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +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

…

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

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

…

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

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00

zh-HK.json

Weblate translations (2018-06-02) (#7705)

2018-06-02 03:03:08 +02:00

zh-TW.json

🌍: 🇵🇱⬆️ (#7679)

2018-05-31 11:15:38 +09:00