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	Weblate translations (2018-03-02) (#6588)	2018-03-02 04:36:16 +01:00
activerecord.ast.yml
activerecord.ca.yml
activerecord.co.yml	Add Corsican localization (#7390)	2018-05-07 01:34:19 +02:00
activerecord.cs.yml
activerecord.cy.yml
activerecord.da.yml
activerecord.de.yml	Weblate translations (#5922)	2017-12-08 01:59:44 +01:00
activerecord.el.yml
activerecord.en.yml	Run i18n-tasks normalize (#5003)	2017-09-19 03:27:08 +02:00
activerecord.es.yml	Weblate translations (#6370)	2018-01-28 22:48:09 +09:00
activerecord.eu.yml
activerecord.fa.yml
activerecord.fr.yml	Run i18n-tasks normalize (#5003)	2017-09-19 03:27:08 +02:00
activerecord.gl.yml
activerecord.he.yml	Run i18n-tasks normalize (#5003)	2017-09-19 03:27:08 +02:00
activerecord.id.yml	Run i18n-tasks normalize (#5003)	2017-09-19 03:27:08 +02:00
activerecord.it.yml
activerecord.ja.yml	Run i18n-tasks normalize (#5003)	2017-09-19 03:27:08 +02:00
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
activerecord.sk.yml
activerecord.sl.yml
activerecord.sr-Latn.yml
activerecord.sr.yml
activerecord.sv.yml	Weblate translations (2018-07-05) (#7950)	2018-07-05 21:50:16 +09:00
activerecord.th.yml
activerecord.uk.yml	Run i18n-tasks normalize (#5003)	2017-09-19 03:27:08 +02:00
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
bg.yml
ca.yml
co.yml	Group reports by target account (#8674)	2018-09-13 03:44:08 +02:00
cs.yml
cy.yml
da.yml
de.yml
devise.ar.yml
devise.ast.yml
devise.bg.yml
devise.ca.yml
devise.co.yml	Weblate translations (2018-05-10) (#7438)	2018-05-10 14:48:26 +02:00
devise.cs.yml
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	Weblate translations (2018-07-05) (#7950)	2018-07-05 21:50:16 +09:00
devise.en.yml
devise.eo.yml
devise.es.yml
devise.eu.yml
devise.fa.yml	Weblate translations (2018-05-20) (#7552)	2018-05-19 21:42:21 +02:00
devise.fi.yml
devise.fr.yml
devise.gl.yml
devise.he.yml
devise.hr.yml
devise.hu.yml
devise.id.yml
devise.io.yml
devise.it.yml
devise.ja.yml	Weblate translations (#6284)	2018-01-18 07:00:23 +09:00
devise.ka.yml
devise.nl.yml	Weblate translations (2018-06-02) (#7705)	2018-06-02 03:03:08 +02:00
devise.no.yml
devise.oc.yml	l10n Occitan update (#6367)	2018-01-27 08:51:03 +09:00
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	Weblate translations (2018-03-02) (#6588)	2018-03-02 04:36:16 +01:00
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
devise.zh-CN.yml	Update Simplified Chinese translations (#6306)	2018-01-21 00:11:21 +09:00
devise.zh-HK.yml
devise.zh-TW.yml
doorkeeper.ar.yml
doorkeeper.ast.yml
doorkeeper.bg.yml	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
doorkeeper.ca.yml
doorkeeper.co.yml
doorkeeper.cs.yml	Weblate translations (2018-08-11) (#8167)	2018-08-11 14:51:30 +09:00
doorkeeper.cy.yml
doorkeeper.da.yml
doorkeeper.de.yml
doorkeeper.el.yml
doorkeeper.en.yml
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	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
doorkeeper.it.yml
doorkeeper.ja.yml
doorkeeper.ka.yml
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	Weblate translations (2018-07-11) (#7992)	2018-07-11 01:14:38 +02:00
doorkeeper.sl.yml
doorkeeper.sr-Latn.yml
doorkeeper.sr.yml
doorkeeper.sv.yml
doorkeeper.th.yml
doorkeeper.uk.yml
doorkeeper.zh-CN.yml
doorkeeper.zh-HK.yml
doorkeeper.zh-TW.yml
el.yml
en.yml
en_GB.yml
eo.yml
es.yml
eu.yml	Weblate translations (2018-09-19) (#8731)	2018-09-19 16:55:08 +02:00
fa.yml
fi.yml	Group reports by target account (#8674)	2018-09-13 03:44:08 +02:00
fr.yml
gl.yml
he.yml
hr.yml
hu.yml
id.yml
io.yml
it.yml
ja.yml
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	Weblate translations (2018-06-25) (#7890)	2018-06-25 13:31:48 +02:00
nl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
no.yml
oc.yml
pl.yml
pt-BR.yml
pt.yml
ro.yml
ru.yml
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
simple_form.ca.yml	Fix broken report detail (regression from #8569) (#8795)	2018-09-26 19:48:14 +02:00
simple_form.co.yml
simple_form.cs.yml
simple_form.cy.yml
simple_form.da.yml	Fix broken report detail (regression from #8569) (#8795)	2018-09-26 19:48:14 +02:00
simple_form.de.yml
simple_form.el.yml
simple_form.en.yml
simple_form.en_GB.yml	Weblate translations (2018-09-13) (#8692)	2018-09-14 00:58:42 +02:00
simple_form.eo.yml
simple_form.es.yml
simple_form.eu.yml
simple_form.fa.yml
simple_form.fi.yml
simple_form.fr.yml
simple_form.gl.yml
simple_form.he.yml
simple_form.hr.yml
simple_form.hu.yml
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
simple_form.it.yml
simple_form.ja.yml
simple_form.ka.yml
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
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
simple_form.pt.yml
simple_form.ro.yml
simple_form.ru.yml
simple_form.sk.yml	Fix broken report detail (regression from #8569) (#8795)	2018-09-26 19:48:14 +02:00
simple_form.sl.yml
simple_form.sr-Latn.yml
simple_form.sr.yml
simple_form.sv.yml
simple_form.th.yml
simple_form.tr.yml
simple_form.uk.yml
simple_form.zh-CN.yml
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
sk.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
sl.yml
sr-Latn.yml	Group reports by target account (#8674)	2018-09-13 03:44:08 +02:00
sr.yml
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
uk.yml
zh-CN.yml
zh-HK.yml
zh-TW.yml	Weblate translations (2018-09-24) (#8768)	2018-09-24 18:53:42 +02:00