David Yip 1b8fcd4df5

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml

2018-03-02 21:46:44 -06:00

..

activerecord.ar.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

activerecord.ca.yml

Update and fix Catalan translation (#5773)

2017-11-21 23:17:28 +09:00

activerecord.de.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

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.fa.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.fr.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.gl.yml

Weblate translations (#6228)

2018-01-09 20:30:28 +09:00

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

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.ja.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.nl.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

activerecord.no.yml

Update Norwegian translations (#2937)

2017-05-09 14:01:45 +02:00

activerecord.oc.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.pl.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.pt-BR.yml

l10n: PT-BR translation updated (#5362)

2017-10-13 06:16:43 +09:00

activerecord.pt.yml

Weblate translations (#6228)

2018-01-09 20:30:28 +09:00

activerecord.ru.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.sk.yml

Add Slovak translation (#6052)

2017-12-17 11:26:42 +09:00

activerecord.sr-Latn.yml

Adding Serbian latin translations (#6146)

2018-01-02 20:39:12 +09:00

activerecord.sr.yml

Adding Serbian translation (#6133)

2017-12-31 17:28:20 +09:00

activerecord.th.yml

Add Thai langauge (#2903)

2017-05-08 15:56:00 +02:00

activerecord.uk.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

activerecord.zh-CN.yml

Updating Chinese (Simplified) translations (#5508)

2017-10-30 12:34:58 +09:00

ar.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

bg.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

ca.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

de.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

devise.ar.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.bg.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

devise.ca.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.de.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.en.yml

Update Simplified Chinese translations (#6280)

2018-01-17 16:47:25 +01:00

devise.eo.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.es.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

devise.fa.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

devise.fi.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

devise.fr.yml

Weblate translations (#6323)

2018-01-22 14:20:58 +01:00

devise.gl.yml

Weblate translations (#6323)

2018-01-22 14:20:58 +01:00

devise.he.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

devise.hr.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.hu.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.id.yml

Add Indonesian (Bahasa Indonesia / id) translation (#2200)

2017-04-21 19:16:26 +02:00

devise.io.yml

Add Ido (io) translation (#2202)

2017-04-21 19:15:25 +02:00

devise.it.yml

Fix italian translation

2017-04-13 22:26:32 +02:00

devise.ja.yml

Weblate translations (#6284)

2018-01-18 07:00:23 +09:00

devise.nl.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

devise.no.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

devise.oc.yml

l10n Occitan update (#6367)

2018-01-27 08:51:03 +09:00

devise.pl.yml

Weblate translations (#6284)

2018-01-18 07:00:23 +09:00

devise.pt-BR.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

devise.pt.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.ru.yml

Russian language updated (#6397)

2018-02-01 07:33:54 +09:00

devise.sk.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.sr-Latn.yml

Adding Serbian latin translations (#6146)

2018-01-02 20:39:12 +09:00

devise.sr.yml

Adding Serbian translation (#6133)

2017-12-31 17:28:20 +09:00

devise.sv.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

devise.th.yml

Add Thai langauge (#2903)

2017-05-08 15:56:00 +02:00

devise.tr.yml

Normalize locale files (#5429)

2017-10-17 11:45:59 +02:00

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

Update Simplified Chinese translations (#6306)

2018-01-21 00:11:21 +09:00

devise.zh-HK.yml

Update Traditional Chinese, HK (zh-HK) translation (#1759)

2017-04-15 02:48:30 +02:00

devise.zh-TW.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

doorkeeper.ar.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

doorkeeper.bg.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.ca.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

doorkeeper.de.yml

Update German translation (#5133)

2017-09-28 20:45:09 +02:00

doorkeeper.en.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.eo.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

doorkeeper.es.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

doorkeeper.fa.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.fi.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.fr.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

doorkeeper.gl.yml

Weblate translations (#6228)

2018-01-09 20:30:28 +09:00

doorkeeper.he.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

doorkeeper.hr.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.hu.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

doorkeeper.id.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.io.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.it.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.ja.yml

Weblate translations (#5946)

2017-12-09 15:35:22 +01:00

doorkeeper.nl.yml

Weblate translations (#6228)

2018-01-09 20:30:28 +09:00

doorkeeper.no.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

doorkeeper.oc.yml

l10n i18n OC: corrections (#5962)

2017-12-11 00:07:24 +09:00

doorkeeper.pl.yml

Weblate translations (#6284)

2018-01-18 07:00:23 +09:00

doorkeeper.pt-BR.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

doorkeeper.pt.yml

Weblate translations (#6228)

2018-01-09 20:30:28 +09:00

doorkeeper.ru.yml

Russian language updated (#6397)

2018-02-01 07:33:54 +09:00

doorkeeper.sk.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

doorkeeper.sr-Latn.yml

Adding Serbian latin translations (#6146)

2018-01-02 20:39:12 +09:00

doorkeeper.sr.yml

Adding Serbian translation (#6133)

2017-12-31 17:28:20 +09:00

doorkeeper.sv.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

doorkeeper.th.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.uk.yml

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

doorkeeper.zh-CN.yml

Improve Chinese (Simplified) Translations (#6024)

2017-12-14 19:33:29 +01:00

doorkeeper.zh-HK.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

doorkeeper.zh-TW.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

en.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

eo.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

es.yml

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

fa.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

fi.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

fr.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

gl.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

he.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

hr.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

hu.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

id.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

io.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

it.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

ja.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

ko.yml

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

nl.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

no.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

oc.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

pl.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

pt-BR.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

pt.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

ru.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

simple_form.ar.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.bg.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

simple_form.ca.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.de.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.en.yml

Normalize simple_form.en.yml.

2018-02-09 09:41:57 -06:00

simple_form.eo.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.es.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

simple_form.fa.yml

Weblate translations (#6228)

2018-01-09 20:30:28 +09:00

simple_form.fi.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

simple_form.fr.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.gl.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.he.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

simple_form.hr.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

simple_form.hu.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.id.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

simple_form.io.yml

Add Ido (io) translation (#2202)

2017-04-21 19:15:25 +02:00

simple_form.it.yml

Fix italian translation

2017-04-13 22:26:32 +02:00

simple_form.ja.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

simple_form.ko.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

simple_form.nl.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.no.yml

Weblate translations (#6370)

2018-01-28 22:48:09 +09:00

simple_form.oc.yml

l10n Occitan language update (#6346)

2018-01-24 13:29:03 +01:00

simple_form.pl.yml

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00

simple_form.pt-BR.yml

Weblate translations (#5922)

2017-12-08 01:59:44 +01:00

simple_form.pt.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.ru.yml

Russian language updated (#6397)

2018-02-01 07:33:54 +09:00

simple_form.sk.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.sr-Latn.yml

Adding Serbian latin translations (#6146)

2018-01-02 20:39:12 +09:00

simple_form.sr.yml

Adding Serbian latin translations (#6146)

2018-01-02 20:39:12 +09:00

simple_form.sv.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

simple_form.th.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

simple_form.tr.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

simple_form.uk.yml

Run i18n-tasks normalize (#5003)

2017-09-19 03:27:08 +02:00

simple_form.zh-CN.yml

Update Simplified Chinese translations (#6280)

2018-01-17 16:47:25 +01:00

simple_form.zh-HK.yml

Enhance for the Chinese translation (#3198)

2017-05-21 11:23:59 +02:00

simple_form.zh-TW.yml

Improve Traditional Chinese translation (#6166)

2018-01-04 05:00:50 +01:00

sk.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

sr-Latn.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

sr.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

sv.yml

Weblate translations (2018-03-02) (#6588)

2018-03-02 04:36:16 +01:00

th.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

tr.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

uk.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

zh-CN.yml

Redesign landing page (again) (#6486)

2018-02-22 01:03:48 +01:00

zh-HK.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

zh-TW.yml

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00