David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
activerecord.ar.yml
activerecord.ca.yml	Update and fix Catalan translation (#5773)	2017-11-21 23:17:28 +09:00
activerecord.co.yml
activerecord.de.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.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	Weblate translations 20180515 (#7496)	2018-05-15 14:25:07 +02:00
activerecord.sr-Latn.yml
activerecord.sr.yml	Adding Serbian translation (#6133)	2017-12-31 17:28:20 +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	improve zh-HK localization by referring zh-TW and zh-CN (#6988)	2018-04-01 21:57:26 +09:00
ar.yml
bg.yml
ca.yml
co.yml	Weblate translations (2018-05-10) (#7438)	2018-05-10 14:48:26 +02:00
de.yml	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
devise.ar.yml
devise.bg.yml
devise.ca.yml
devise.co.yml
devise.de.yml
devise.en.yml
devise.eo.yml
devise.es.yml
devise.eu.yml
devise.fa.yml
devise.fi.yml	Weblate translations (2018-04-15) (#7141)	2018-04-15 16:56:03 +02:00
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
devise.nl.yml
devise.no.yml
devise.oc.yml
devise.pl.yml
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.tr.yml
devise.uk.yml
devise.zh-CN.yml
devise.zh-HK.yml
devise.zh-TW.yml
doorkeeper.ar.yml
doorkeeper.bg.yml
doorkeeper.ca.yml
doorkeeper.co.yml
doorkeeper.de.yml
doorkeeper.en.yml
doorkeeper.eo.yml
doorkeeper.es.yml
doorkeeper.eu.yml	Weblate translations (2018-04-24) (#7252)	2018-04-24 11:48:11 +02:00
doorkeeper.fa.yml
doorkeeper.fi.yml
doorkeeper.fr.yml
doorkeeper.gl.yml
doorkeeper.he.yml
doorkeeper.hr.yml	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
doorkeeper.hu.yml
doorkeeper.id.yml
doorkeeper.io.yml
doorkeeper.it.yml
doorkeeper.ja.yml
doorkeeper.nl.yml
doorkeeper.no.yml	Weblate translations (#6370)	2018-01-28 22:48:09 +09:00
doorkeeper.oc.yml	[l10n] Occitan update (#7505)	2018-05-16 23:18:32 +09:00
doorkeeper.pl.yml
doorkeeper.pt-BR.yml
doorkeeper.pt.yml
doorkeeper.ru.yml
doorkeeper.sk.yml
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
eo.yml
es.yml
eu.yml
fa.yml
fi.yml
fr.yml
gl.yml
he.yml
hr.yml
hu.yml
id.yml
io.yml
it.yml
ja.yml
ko.yml
ms.yml
nl.yml
no.yml
oc.yml
pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-16 21:52:38 +02:00
pt-BR.yml
pt.yml
ru.yml
simple_form.ar.yml
simple_form.bg.yml
simple_form.ca.yml
simple_form.co.yml
simple_form.de.yml
simple_form.en.yml
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
simple_form.io.yml
simple_form.it.yml
simple_form.ja.yml
simple_form.ko.yml
simple_form.nl.yml
simple_form.no.yml
simple_form.oc.yml
simple_form.pl.yml
simple_form.pt-BR.yml
simple_form.pt.yml
simple_form.ru.yml
simple_form.sk.yml
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
simple_form.zh-TW.yml
sk.yml
sl.yml
sr-Latn.yml
sr.yml
sv.yml
te.yml
th.yml
tr.yml
uk.yml
zh-CN.yml
zh-HK.yml
zh-TW.yml