Thibaut Girka 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.

2019-04-04 14:53:52 +02:00

..

locale-data

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

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

ar.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ast.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

bg.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

bn.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ca.json

i18n: update Catalan translation (#10458)

2019-04-04 10:25:20 +09:00

co.json

Update Corsican translations (#10418)

2019-03-29 22:06:16 +09:00

cs.json

I18n: Improve Czech translation (#10454)

2019-04-03 00:10:27 +09:00

cy.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

da.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

de.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

defaultMessages.json

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

2019-04-01 21:28:31 +02:00

el.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

en.json

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

2019-04-01 21:28:31 +02:00

eo.json

Esperanto translations (#10461)

2019-04-03 18:19:10 +09:00

es.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

eu.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

fa.json

l10n update: fa (#10417)

2019-03-29 22:04:55 +09:00

fi.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

fr.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

gl.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

he.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

hr.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

hu.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

hy.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

id.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

index.js

Finalized theme loading and stuff

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

io.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

it.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ja.json

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

2019-04-01 21:28:31 +02:00

ka.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

kk.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ko.json

Add missing Korean translations (#10416)

2019-03-29 22:14:24 +09:00

lv.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ms.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

nl.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

no.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

oc.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

pl.json

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

2019-03-28 13:01:33 +01:00

pt-BR.json

Re-dd PT-br translations (#10459)

2019-04-03 07:24:39 +09:00

pt.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ro.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ru.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sk.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sl.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sq.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sr-Latn.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sr.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sv.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ta.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

te.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

th.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

tr.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

uk.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

whitelist_ar.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ast.json

Weblate translations (2018-07-25) (#8065)

2018-07-24 20:47:13 +02:00

whitelist_bg.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_bn.json

Weblate translations (2019-03-24) (#10362)

2019-03-24 18:44:59 +01:00

whitelist_ca.json

Fix minor Japanese translations (#3099)

2017-05-17 17:50:39 +02:00

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

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_el.json

Add el and te (#7332)

2018-05-03 15:54:10 +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_eu.json

Add el and te (#7332)

2018-05-03 15:54:10 +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_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

i18n: Add korean translation (#4064)

2017-07-04 16:11:23 +02:00

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

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

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

2018-09-02 03:14:46 +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_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

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

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

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

whitelist_te.json

Add el and te (#7332)

2018-05-03 15:54:10 +02: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

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

zh-HK.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

zh-TW.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00