mastodon/config/locales
Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/views/layouts/application.html.haml

Edited:
        app/helpers/application_helper.rb
        app/views/admin/domain_blocks/new.html.haml

Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.

Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
2018-08-26 14:23:24 +02:00
..
activerecord.ar.yml Weblate translations (2018-03-02) (#6588) 2018-03-02 04:36:16 +01:00
activerecord.ast.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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.cs.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
activerecord.da.yml Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
activerecord.de.yml Weblate translations (#5922) 2017-12-08 01:59:44 +01:00
activerecord.el.yml Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09: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.ka.yml Add Georgian language translation (#8250) 2018-08-18 01:00:01 +09:00
activerecord.nl.yml Weblate translations (2018-05-10) (#7438) 2018-05-10 14:48:26 +02:00
activerecord.no.yml
activerecord.oc.yml Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +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 [RU] Updated translation (#8164) 2018-08-11 06:39:52 +09:00
activerecord.sk.yml Add Slovak translation (#6052) 2017-12-17 11:26:42 +09:00
activerecord.sl.yml Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +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.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 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-08-22) (#8346) 2018-08-21 18:38:27 +02:00
ast.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09: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-08-10 16:22:31 +02:00
co.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
cs.yml Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
da.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
de.yml Weblate translations (2018-08-12) (#8171) 2018-08-13 18:17:20 +02:00
devise.ar.yml Weblate translations (2018-03-13) (#6777) 2018-03-13 16:16:51 +01:00
devise.ast.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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.cs.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
devise.da.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
devise.de.yml Weblate translations 20180503 (#7325) 2018-05-03 19:12:09 +09:00
devise.el.yml Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +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 Major update for the French translation (#8348) 2018-08-23 19:43:03 +09: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
devise.io.yml
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.ka.yml Add Georgian language translation (#8250) 2018-08-18 01:00:01 +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 i18n: Make Polish translation more gender neutral + update (#8119) 2018-08-03 00:09:24 +02: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 Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
devise.sl.yml Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +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
devise.uk.yml
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-06-25) (#7890) 2018-06-25 13:31:48 +02:00
doorkeeper.ar.yml Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +02:00
doorkeeper.ast.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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-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.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 Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +02:00
doorkeeper.en.yml Introduce OAuth scopes for bookmarks 2018-08-10 15:26:52 +02:00
doorkeeper.eo.yml Weblate translations (2018-07-18) (#8047) 2018-07-18 15:38:35 +09:00
doorkeeper.es.yml Weblate translations (#6370) 2018-01-28 22:48:09 +09:00
doorkeeper.eu.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
doorkeeper.fa.yml Weblate translations (2018-06-16) (#7815) 2018-06-16 12:56:28 +02:00
doorkeeper.fi.yml Weblate translations (2018-04-15) (#7141) 2018-04-15 16:56:03 +02:00
doorkeeper.fr.yml Major update for the French translation (#8348) 2018-08-23 19:43:03 +09:00
doorkeeper.gl.yml Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +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-07-18) (#8047) 2018-07-18 15:38:35 +09:00
doorkeeper.ja.yml Weblate translations (2018-07-14) (#8016) 2018-07-14 10:54:11 +09:00
doorkeeper.ka.yml Add Georgian language translation (#8250) 2018-08-18 01:00:01 +09:00
doorkeeper.nl.yml Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +02:00
doorkeeper.no.yml Weblate translations (#6370) 2018-01-28 22:48:09 +09:00
doorkeeper.oc.yml Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +02:00
doorkeeper.pl.yml i18n: Make Polish translation more gender neutral + update (#8119) 2018-08-03 00:09:24 +02:00
doorkeeper.pt-BR.yml Weblate translations (2018-07-14) (#8016) 2018-07-14 10:54:11 +09:00
doorkeeper.pt.yml Weblate translations (#6228) 2018-01-09 20:30:28 +09: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 Weblate translations (2018-07-25) (#8065) 2018-07-24 20:47:13 +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-07-05) (#7950) 2018-07-05 21:50:16 +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 Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +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-06-25) (#7890) 2018-06-25 13:31:48 +02:00
el.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
en.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
eo.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
es.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
eu.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
fa.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
fi.yml Fix a variable for a Finnish translation (#8299) 2018-08-20 02:16:40 +09:00
fr.yml Major update for the French translation (#8348) 2018-08-23 19:43:03 +09:00
gl.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
he.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
hr.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
hu.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
id.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
io.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
it.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
ja.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
ka.yml Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
ko.yml Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +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-08-22 20:56:32 +02:00
no.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
oc.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
pl.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
pt-BR.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
pt.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
ru.yml Added endorse strings, fixed footer 'developers' string (#8183) 2018-08-13 18:17:20 +02:00
simple_form.ar.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
simple_form.ast.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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 size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.co.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
simple_form.cs.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
simple_form.da.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
simple_form.de.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
simple_form.el.yml Weblate translations (2018-08-11) (#8167) 2018-08-11 14:51:30 +09:00
simple_form.en.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
simple_form.eo.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.es.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.eu.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
simple_form.fa.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
simple_form.fi.yml Change language opt-out to language opt-in (#7823) 2018-06-17 13:54:02 +02:00
simple_form.fr.yml Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
simple_form.gl.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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 size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.ja.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
simple_form.ka.yml Add Georgian language translation (#8250) 2018-08-18 01:00:01 +09:00
simple_form.ko.yml Weblate translations (2018-07-30) (#8096) 2018-07-30 03:43:34 +02:00
simple_form.nl.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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 size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.pl.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
simple_form.pt-BR.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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.ru.yml [RU] Updated translation (#8164) 2018-08-11 06:39:52 +09:00
simple_form.sk.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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 size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.sv.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09: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 size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.zh-HK.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
simple_form.zh-TW.yml Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
sk.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +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 Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
sr.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
sv.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
te.yml Weblate translations 20180503 (#7325) 2018-05-03 19:12:09 +09:00
th.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
tr.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
uk.yml Weblate translations (2018-08-22) (#8346) 2018-08-21 18:38:27 +02:00
zh-CN.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
zh-HK.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
zh-TW.yml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00