Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45: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-13) (#9513)

2018-12-13 16:59:51 +01:00

ast.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

bg.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

ca.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

co.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

cs.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

cy.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

da.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

de.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

defaultMessages.json

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

2018-12-15 10:45:53 +01:00

el.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

en.json

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

2018-12-01 21:00:16 +01:00

eo.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

es.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

eu.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

fa.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

fi.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

fr.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

gl.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

he.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

hr.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

hu.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

hy.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

id.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

index.js

…

io.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

it.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

ja.json

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

2018-12-15 10:45:53 +01:00

ka.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

ko.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

ms.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

nl.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

no.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

oc.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

pl.json

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

2018-12-01 21:00:16 +01:00

pt-BR.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

pt.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

ro.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

ru.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

sk.json

Weblate translations (2018-12-13) (#9513)

2018-12-13 16:59:51 +01:00

sl.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

sr-Latn.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

sr.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

sv.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

ta.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

te.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

th.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

tr.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

uk.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +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

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

Add Georgian language translation (#8250)

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

whitelist_ko.json

…

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_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

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

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

zh-HK.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00

zh-TW.json

[i18n] Update Occitan (#9491)

2018-12-11 05:38:57 +01:00