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

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

..

activerecord.ar.yml

…

activerecord.ast.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

activerecord.ca.yml

…

activerecord.co.yml

…

activerecord.cs.yml

Weblate translations (2018-08-11) (#8167)

2018-08-11 14:51:30 +09:00

activerecord.cy.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

activerecord.da.yml

…

activerecord.de.yml

…

activerecord.el.yml

…

activerecord.en.yml

…

activerecord.es.yml

…

activerecord.eu.yml

…

activerecord.fa.yml

…

activerecord.fr.yml

…

activerecord.gl.yml

…

activerecord.he.yml

…

activerecord.id.yml

…

activerecord.it.yml

…

activerecord.ja.yml

…

activerecord.ka.yml

Add Georgian language translation (#8250)

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

activerecord.nl.yml

…

activerecord.no.yml

…

activerecord.oc.yml

…

activerecord.pl.yml

…

activerecord.pt-BR.yml

…

activerecord.pt.yml

…

activerecord.ru.yml

[RU] Updated translation (#8164)

2018-08-11 06:39:52 +09:00

activerecord.sk.yml

…

activerecord.sl.yml

…

activerecord.sr-Latn.yml

…

activerecord.sr.yml

…

activerecord.sv.yml

…

activerecord.th.yml

…

activerecord.uk.yml

…

activerecord.zh-CN.yml

…

activerecord.zh-HK.yml

…

ar.yml

Weblate translations (2018-09-24) (#8768)

2018-09-24 18:53:42 +02:00

ast.yml

Weblate translations (2018-09-19) (#8731)

2018-09-19 16:55:08 +02:00

bg.yml

Update /terms and /about/more to use public layout (#8142)

2018-08-09 12:58:20 +02:00

ca.yml

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

2018-09-19 21:46:01 +02:00

co.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

cs.yml

Weblate translations (2018-09-19) (#8731)

2018-09-19 16:55:08 +02:00

cy.yml

Weblate translations (2018-09-24) (#8768)

2018-09-24 18:53:42 +02:00

da.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

de.yml

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

2018-09-19 21:46:01 +02:00

devise.ar.yml

…

devise.ast.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

devise.bg.yml

…

devise.ca.yml

…

devise.co.yml

…

devise.cs.yml

Weblate translations (2018-08-11) (#8167)

2018-08-11 14:51:30 +09:00

devise.cy.yml

Weblate translations (2018-09-24) (#8768)

2018-09-24 18:53:42 +02:00

devise.da.yml

Weblate translations (2018-08-22) (#8346)

2018-08-21 18:38:27 +02:00

devise.de.yml

…

devise.el.yml

…

devise.en.yml

…

devise.eo.yml

…

devise.es.yml

…

devise.eu.yml

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

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

devise.fa.yml

…

devise.fi.yml

…

devise.fr.yml

Major update for the French translation (#8348)

2018-08-23 19:43:03 +09:00

devise.gl.yml

…

devise.he.yml

…

devise.hr.yml

…

devise.hu.yml

…

devise.id.yml

…

devise.io.yml

…

devise.it.yml

…

devise.ja.yml

…

devise.ka.yml

Add Georgian language translation (#8250)

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

devise.nl.yml

…

devise.no.yml

…

devise.oc.yml

…

devise.pl.yml

i18n: Make Polish translation more gender neutral + update (#8119)

2018-08-03 00:09:24 +02:00

devise.pt-BR.yml

…

devise.pt.yml

…

devise.ru.yml

…

devise.sk.yml

…

devise.sl.yml

…

devise.sr-Latn.yml

…

devise.sr.yml

…

devise.sv.yml

…

devise.th.yml

…

devise.uk.yml

Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)

2017-05-08 01:46:36 +02:00

devise.zh-CN.yml

…

devise.zh-HK.yml

…

devise.zh-TW.yml

…

doorkeeper.ar.yml

…

doorkeeper.ast.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

doorkeeper.bg.yml

…

doorkeeper.ca.yml

…

doorkeeper.co.yml

Weblate translations (2018-08-11) (#8167)

2018-08-11 14:51:30 +09:00

doorkeeper.cs.yml

Weblate translations (2018-08-11) (#8167)

2018-08-11 14:51:30 +09:00

doorkeeper.cy.yml

Weblate translations (2018-09-24) (#8768)

2018-09-24 18:53:42 +02:00

doorkeeper.da.yml

Weblate translations (2018-08-25) (#8420)

2018-08-25 13:27:56 +02:00

doorkeeper.de.yml

Weblate translations (2018-08-11) (#8167)

2018-08-11 14:51:30 +09:00

doorkeeper.el.yml

…

doorkeeper.en.yml

Introduce OAuth scopes for bookmarks

2018-08-10 15:26:52 +02:00

doorkeeper.eo.yml

…

doorkeeper.es.yml

…

doorkeeper.eu.yml

Weblate translations (2018-08-11) (#8167)

2018-08-11 14:51:30 +09:00

doorkeeper.fa.yml

…

doorkeeper.fi.yml

…

doorkeeper.fr.yml

Major update for the French translation (#8348)

2018-08-23 19:43:03 +09:00

doorkeeper.gl.yml

…

doorkeeper.he.yml

…

doorkeeper.hr.yml

…

doorkeeper.hu.yml

…

doorkeeper.id.yml

…

doorkeeper.io.yml

…

doorkeeper.it.yml

…

doorkeeper.ja.yml

…

doorkeeper.ka.yml

Add Georgian language translation (#8250)

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

doorkeeper.nl.yml

…

doorkeeper.no.yml

…

doorkeeper.oc.yml

…

doorkeeper.pl.yml

i18n: Make Polish translation more gender neutral + update (#8119)

2018-08-03 00:09:24 +02:00

doorkeeper.pt-BR.yml

…

doorkeeper.pt.yml

…

doorkeeper.ro.yml

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

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

doorkeeper.ru.yml

[RU] Translation update: (#8147)

2018-08-09 08:50:42 +02:00

doorkeeper.sk.yml

…

doorkeeper.sl.yml

…

doorkeeper.sr-Latn.yml

…

doorkeeper.sr.yml

…

doorkeeper.sv.yml

…

doorkeeper.th.yml

…

doorkeeper.uk.yml

Weblate translations (2018-08-22) (#8346)

2018-08-21 18:38:27 +02:00

doorkeeper.zh-CN.yml

…

doorkeeper.zh-HK.yml

…

doorkeeper.zh-TW.yml

…

el.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

en_GB.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

en.yml

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

2018-09-19 21:46:01 +02:00

eo.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

es.yml

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

2018-10-01 12:43:20 +02:00

eu.yml

Weblate translations (2018-09-19) (#8731)

2018-09-19 16:55:08 +02:00

fa.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

fi.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

fr.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

gl.yml

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

2018-09-19 21:46:01 +02:00

he.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

hr.yml

Update /terms and /about/more to use public layout (#8142)

2018-08-09 12:58:20 +02:00

hu.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

id.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

io.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

it.yml

Weblate translations (2018-09-24) (#8768)

2018-09-24 18:53:42 +02:00

ja.yml

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

2018-09-19 21:46:01 +02:00

ka.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

ko.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

ms.yml

…

nl.yml

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

2018-09-19 21:46:01 +02:00

no.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

oc.yml

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

2018-09-19 21:46:01 +02:00

pl.yml

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

2018-10-01 12:43:20 +02:00

pt-BR.yml

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

2018-09-19 21:46:01 +02:00

pt.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

ro.yml

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

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

ru.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

simple_form.ar.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.ast.yml

Weblate translations (2018-09-19) (#8731)

2018-09-19 16:55:08 +02:00

simple_form.bg.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.ca.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.co.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.cs.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.cy.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.da.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.de.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.el.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.en_GB.yml

Weblate translations (2018-09-13) (#8692)

2018-09-14 00:58:42 +02:00

simple_form.en.yml

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

2018-10-01 12:43:20 +02:00

simple_form.eo.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.es.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.eu.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.fa.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.fi.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.fr.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.gl.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.he.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.hr.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.hu.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.id.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.io.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.it.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.ja.yml

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

2018-10-01 12:43:20 +02:00

simple_form.ka.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.ko.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.nl.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.no.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.oc.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.pl.yml

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

2018-10-01 12:43:20 +02:00

simple_form.pt-BR.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.pt.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.ro.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.ru.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.sk.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.sl.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.sr-Latn.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.sr.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.sv.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.th.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.tr.yml

Fix size/dimension values in avatar/header hint localizations (#8088)

2018-07-29 09:57:13 +09:00

simple_form.uk.yml

Weblate translations (2018-08-22) (#8346)

2018-08-21 18:38:27 +02:00

simple_form.zh-CN.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.zh-HK.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

simple_form.zh-TW.yml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

sk.yml

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

2018-10-01 12:43:20 +02:00

sl.yml

Update /terms and /about/more to use public layout (#8142)

2018-08-09 12:58:20 +02:00

sr-Latn.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

sr.yml

Weblate translations (2018-09-19) (#8731)

2018-09-19 16:55:08 +02:00

sv.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

te.yml

…

th.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

tr.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

uk.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

zh-CN.yml

Weblate translations (2018-09-24) (#8768)

2018-09-24 18:53:42 +02:00

zh-HK.yml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

zh-TW.yml

Weblate translations (2018-09-24) (#8768)

2018-09-24 18:53:42 +02:00