David Yip 3550470c18

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours.

2018-06-02 16:15:36 -05: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.co.yml

Add Corsican localization (#7390)

2018-05-07 01:34:19 +02: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.eu.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02: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 (2018-05-10) (#7438)

2018-05-10 14:48:26 +02: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.sl.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02: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

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

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

bg.yml

Add headings to the security settings page (#6661)

2018-03-07 01:39:40 +01:00

ca.yml

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

2018-05-27 13:20:15 +02:00

co.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

de.yml

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

2018-05-27 13:20:15 +02:00

devise.ar.yml

Weblate translations (2018-03-13) (#6777)

2018-03-13 16:16:51 +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.co.yml

Weblate translations (2018-05-10) (#7438)

2018-05-10 14:48:26 +02:00

devise.de.yml

Weblate translations 20180503 (#7325)

2018-05-03 19:12:09 +09: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.eu.yml

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

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

devise.fa.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

devise.fi.yml

Weblate translations (2018-04-15) (#7141)

2018-04-15 16:56:03 +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

Weblate translations (2018-04-24) (#7252)

2018-04-24 11:48:11 +02:00

devise.ja.yml

Weblate translations (#6284)

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

devise.nl.yml

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

2018-06-02 03:03:08 +02: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 (2018-03-09) (#6708)

2018-03-09 18:38:13 +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

Add :few keys for sk lang plurals (#7551)

2018-05-20 03:46:18 +09:00

devise.sl.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02: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

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01: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

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

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

devise.zh-TW.yml

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02:00

doorkeeper.ar.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02: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 20180515 (#7496)

2018-05-15 14:25:07 +02:00

doorkeeper.co.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

doorkeeper.de.yml

Weblate translations 20180503 (#7325)

2018-05-03 19:12:09 +09:00

doorkeeper.en.yml

Add REST API for Web Push Notifications subscriptions (#7445)

2018-05-11 11:49:12 +02:00

doorkeeper.eo.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

doorkeeper.es.yml

Weblate translations (#6370)

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

doorkeeper.eu.yml

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

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

doorkeeper.fa.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

doorkeeper.fi.yml

Weblate translations (2018-04-15) (#7141)

2018-04-15 16:56:03 +02:00

doorkeeper.fr.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

doorkeeper.gl.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02: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

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +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

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

doorkeeper.ja.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

doorkeeper.nl.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02:00

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

🌍: 🇵🇱⬆️ (#7494)

2018-05-16 01:20:40 +09:00

doorkeeper.pt-BR.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

doorkeeper.pt.yml

Weblate translations (#6228)

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

doorkeeper.ru.yml

Russian language for 2.4.0 (#7512)

2018-05-16 16:25:11 +02:00

doorkeeper.sk.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02:00

doorkeeper.sl.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02: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 (2018-03-11) (#6742)

2018-03-11 16:21:26 +01: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

i18n: Update Simplified Chinese translations (#7565)

2018-05-21 13:40:48 +02:00

doorkeeper.zh-HK.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02:00

doorkeeper.zh-TW.yml

Weblate translations (2018-04-02) (#7007)

2018-04-02 13:43:30 +02:00

el.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

en.yml

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

2018-05-25 18:59:02 +02:00

eo.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

es.yml

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

2018-05-19 22:41:10 +02:00

eu.yml

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

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

fa.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

fi.yml

Improve payload format of Web Push API now that it's open (#7521)

2018-05-19 14:46:47 +02:00

fr.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

gl.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-06-02 16:15:36 -05:00

he.yml

Add resend confirmation for admin (#7378)

2018-05-06 10:59:03 +02:00

hr.yml

Add headings to the security settings page (#6661)

2018-03-07 01:39:40 +01:00

hu.yml

Improve payload format of Web Push API now that it's open (#7521)

2018-05-19 14:46:47 +02:00

id.yml

Add resend confirmation for admin (#7378)

2018-05-06 10:59:03 +02:00

io.yml

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +02:00

it.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

ja.yml

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

2018-05-27 13:20:15 +02:00

ko.yml

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

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

ms.yml

Weblate translations 20180503 (#7325)

2018-05-03 19:12:09 +09:00

nl.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-06-02 16:15:36 -05:00

no.yml

Improve payload format of Web Push API now that it's open (#7521)

2018-05-19 14:46:47 +02:00

oc.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-06-02 16:15:36 -05:00

pl.yml

🌍: 🇵🇱⬆️ (#7580)

2018-05-21 23:12:35 +02:00

pt-BR.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-06-02 16:15:36 -05:00

pt.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

ru.yml

[RU] Added mastodon-light string (#7583)

2018-05-22 18:06:53 +09:00

simple_form.ar.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

simple_form.bg.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.ca.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

simple_form.co.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

simple_form.de.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

simple_form.en.yml

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

2018-05-18 08:47:10 -05:00

simple_form.eo.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

simple_form.es.yml

Weblate translations (2018-03-13) (#6777)

2018-03-13 16:16:51 +01:00

simple_form.eu.yml

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

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

simple_form.fa.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

simple_form.fi.yml

Weblate translations (2018-05-10) (#7438)

2018-05-10 14:48:26 +02:00

simple_form.fr.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

simple_form.gl.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

simple_form.he.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.hr.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.hu.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.id.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.io.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.it.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

simple_form.ja.yml

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

2018-05-27 13:20:15 +02:00

simple_form.ko.yml

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

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

simple_form.nl.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

simple_form.no.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.oc.yml

[i18n] Update for Occitan (#7558)

2018-05-20 20:26:32 +02:00

simple_form.pl.yml

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

2018-05-21 16:40:02 +02:00

simple_form.pt-BR.yml

Weblate translations (2018-05-20) (#7552)

2018-05-19 21:42:21 +02:00

simple_form.pt.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.ru.yml

[RU] Updated strings for 2.4.0 (#7555)

2018-05-20 01:03:24 +02:00

simple_form.sk.yml

Weblate translations (2018-05-31) (#7681)

2018-05-31 13:00:40 +02:00

simple_form.sl.yml

Weblate translations 20180515 (#7496)

2018-05-15 14:25:07 +02:00

simple_form.sr-Latn.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.sr.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.sv.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

simple_form.th.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.tr.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.uk.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

simple_form.zh-CN.yml

[WIP] i18n: Update Simplified Chinese translations (#7576)

2018-05-22 15:26:42 +02:00

simple_form.zh-HK.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

simple_form.zh-TW.yml

Change avatar size on form hints (#6707)

2018-03-09 10:57:33 +01:00

sk.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-06-02 16:15:36 -05:00

sl.yml

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

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

sr-Latn.yml

Improve payload format of Web Push API now that it's open (#7521)

2018-05-19 14:46:47 +02:00

sr.yml

Improve payload format of Web Push API now that it's open (#7521)

2018-05-19 14:46:47 +02:00

sv.yml

Weblate translations (2018-05-26) (#7624)

2018-05-26 04:45:58 +02:00

te.yml

Weblate translations 20180503 (#7325)

2018-05-03 19:12:09 +09:00

th.yml

Add resend confirmation for admin (#7378)

2018-05-06 10:59:03 +02:00

tr.yml

Add resend confirmation for admin (#7378)

2018-05-06 10:59:03 +02:00

uk.yml

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +02:00

zh-CN.yml

[WIP] i18n: Update Simplified Chinese translations (#7576)

2018-05-22 15:26:42 +02:00

zh-HK.yml

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

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

zh-TW.yml

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +02:00