Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock

2019-01-02 15:36:53 +01:00

..

locale-data

[i18n] update and corrections for Occitan locale (#9404)

2018-12-01 17:39:13 +01:00

ar.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

ast.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

bg.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

ca.json

[i18n] OC/CAT/FR «crop» => «change preview» (#9636)

2018-12-26 19:16:40 +01:00

co.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

cs.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

cy.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

da.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

de.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

defaultMessages.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-23 11:28:28 +01:00

el.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

en.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-02 15:36:53 +01:00

eo.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

es.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

eu.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

fa.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

fi.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

fr.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

gl.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

he.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

hr.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

hu.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

hy.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

id.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

index.js

…

io.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

it.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

ja.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-23 11:28:28 +01:00

ka.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

ko.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

ms.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

nl.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

no.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

oc.json

[i18n] OC/CAT/FR «crop» => «change preview» (#9636)

2018-12-26 19:16:40 +01:00

pl.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-23 11:28:28 +01:00

pt-BR.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

pt.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

ro.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

ru.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

sk.json

Weblate translations (2018-12-27) (#9642)

2018-12-27 12:25:30 +01:00

sl.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

sr-Latn.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

sr.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

sv.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

ta.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

te.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

th.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

tr.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

uk.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01: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

…

whitelist_cs.json

…

whitelist_cy.json

Weblate translations (2018-08-31) (#8535)

2018-08-31 04:28:29 +02:00

whitelist_da.json

…

whitelist_de.json

…

whitelist_el.json

…

whitelist_en.json

…

whitelist_eo.json

…

whitelist_es.json

…

whitelist_eu.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

…

whitelist_id.json

…

whitelist_io.json

…

whitelist_it.json

…

whitelist_ja.json

…

whitelist_ka.json

Add Georgian language translation (#8250)

2018-08-18 01:00:01 +09:00

whitelist_ko.json

…

whitelist_ms.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

whitelist_nl.json

…

whitelist_no.json

…

whitelist_oc.json

…

whitelist_pl.json

…

whitelist_pt-BR.json

…

whitelist_pt.json

…

whitelist_ro.json

Weblate translations (2018-09-01) (#8561)

2018-09-02 03:14:46 +02:00

whitelist_ru.json

…

whitelist_sk.json

…

whitelist_sl.json

…

whitelist_sr-Latn.json

…

whitelist_sr.json

…

whitelist_sv.json

…

whitelist_ta.json

Weblate translations (2018-09-02) (#8577)

2018-09-02 18:20:26 +02:00

whitelist_te.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

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

zh-HK.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

zh-TW.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00