Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.

2019-03-16 20:59:33 +01:00

..

locale-data

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

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

ar.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ast.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

bg.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ca.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

co.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

cs.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

cy.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

da.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

de.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

defaultMessages.json

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

2019-03-16 20:59:33 +01:00

el.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

en.json

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

2019-03-16 20:59:33 +01:00

eo.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

es.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

eu.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

fa.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

fi.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

fr.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

gl.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

he.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

hr.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

hu.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

hy.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

id.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

index.js

…

io.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

it.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ja.json

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

2019-03-16 20:59:33 +01:00

ka.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

kk.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ko.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

lv.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ms.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

nl.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

no.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

oc.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

pl.json

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

2019-03-16 20:59:33 +01:00

pt-BR.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

pt.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ro.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ru.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

sk.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

sl.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

sq.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

sr-Latn.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

sr.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

sv.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

ta.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

te.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

th.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

tr.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

uk.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +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

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

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

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

whitelist_da.json

Weblate translations (2018-07-11) (#7992)

2018-07-11 01:14:38 +02:00

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

Weblate translations (2019-02-23) (#10103)

2019-02-23 18:41:28 +01:00

whitelist_ko.json

…

whitelist_lv.json

Weblate translations (2019-01-08) (#9758)

2019-01-08 14:09:57 +01:00

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

Weblate translations (2018-05-10) (#7438)

2018-05-10 14:48:26 +02:00

whitelist_sq.json

Weblate translations (2019-02-11) (#10007)

2019-02-11 07:41:35 +01:00

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

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

zh-HK.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00

zh-TW.json

Weblate translations (2019-03-16) (#10294)

2019-03-16 20:43:14 +01:00