mastodon/config/locales
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
activerecord.ar.yml
activerecord.ast.yml
activerecord.ca.yml
activerecord.co.yml
activerecord.cs.yml
activerecord.cy.yml
activerecord.da.yml
activerecord.de.yml
activerecord.el.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.ka.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
activerecord.sr-Latn.yml
activerecord.sr.yml
activerecord.sv.yml
activerecord.th.yml
activerecord.uk.yml
activerecord.zh-CN.yml
activerecord.zh-HK.yml
ar.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
ast.yml Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
bg.yml
ca.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
co.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
cs.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
cy.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
da.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
de.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
devise.ar.yml
devise.ast.yml
devise.bg.yml
devise.ca.yml
devise.co.yml
devise.cs.yml I18n: Correct pluralization of Czech (#9527) 2018-12-15 17:08:54 +09:00
devise.cy.yml
devise.da.yml
devise.de.yml
devise.el.yml
devise.en.yml Add REST API for creating an account (#9572) 2018-12-24 19:12:38 +01:00
devise.eo.yml
devise.es.yml
devise.eu.yml
devise.fa.yml
devise.fi.yml
devise.fr.yml
devise.gl.yml
devise.he.yml
devise.hr.yml Do not leak existence of e-mail addresses during login attempt, part 2 (#9376) 2018-11-27 17:39:41 +01:00
devise.hu.yml
devise.id.yml
devise.io.yml
devise.it.yml
devise.ja.yml
devise.ka.yml
devise.nl.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
devise.no.yml
devise.oc.yml [i18n] update and corrections for Occitan locale (#9404) 2018-12-01 17:39:13 +01:00
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.uk.yml Do not leak existence of e-mail addresses during login attempt, part 2 (#9376) 2018-11-27 17:39:41 +01:00
devise.zh-CN.yml
devise.zh-HK.yml
devise.zh-TW.yml
doorkeeper.ar.yml
doorkeeper.ast.yml
doorkeeper.bg.yml
doorkeeper.ca.yml
doorkeeper.co.yml
doorkeeper.cs.yml I18n: Update Czech translation (#9644) 2018-12-28 09:01:15 +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
doorkeeper.fa.yml
doorkeeper.fi.yml
doorkeeper.fr.yml
doorkeeper.gl.yml
doorkeeper.he.yml
doorkeeper.hr.yml
doorkeeper.hu.yml
doorkeeper.id.yml
doorkeeper.io.yml
doorkeeper.it.yml
doorkeeper.ja.yml
doorkeeper.ka.yml
doorkeeper.nl.yml
doorkeeper.no.yml
doorkeeper.oc.yml
doorkeeper.pl.yml
doorkeeper.pt-BR.yml
doorkeeper.pt.yml
doorkeeper.ro.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 Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
en.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
en_GB.yml
eo.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
es.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
eu.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
fa.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
fi.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
fr.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
gl.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
he.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
hi.yml Weblate translations (2018-12-27) (#9642) 2018-12-27 12:25:30 +01:00
hr.yml
hu.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
id.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
io.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
it.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
ja.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
ka.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
ko.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
ms.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
nl.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
no.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
oc.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
pl.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
pt-BR.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
pt.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
ro.yml
ru.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
simple_form.ar.yml Weblate translations (2018-12-19) (#9578) 2018-12-19 21:07:05 +09:00
simple_form.ast.yml
simple_form.bg.yml
simple_form.ca.yml Weblate translations (2018-12-19) (#9578) 2018-12-19 21:07:05 +09:00
simple_form.co.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.cs.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.cy.yml
simple_form.da.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.de.yml Weblate translations (2018-12-19) (#9578) 2018-12-19 21:07:05 +09:00
simple_form.el.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.en.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
simple_form.en_GB.yml
simple_form.eo.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.es.yml
simple_form.eu.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.fa.yml
simple_form.fi.yml
simple_form.fr.yml Weblate translations (2018-12-27) (#9642) 2018-12-27 12:25:30 +01:00
simple_form.gl.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.he.yml
simple_form.hr.yml
simple_form.hu.yml
simple_form.id.yml
simple_form.io.yml
simple_form.it.yml Weblate translations (2018-12-19) (#9578) 2018-12-19 21:07:05 +09:00
simple_form.ja.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-12-19 12:58:49 +01:00
simple_form.ka.yml
simple_form.ko.yml Weblate translations (2018-12-19) (#9578) 2018-12-19 21:07:05 +09:00
simple_form.nl.yml Weblate translations (2018-12-13) (#9513) 2018-12-13 16:59:51 +01:00
simple_form.no.yml
simple_form.oc.yml Weblate translations (2018-12-27) (#9642) 2018-12-27 12:25:30 +01:00
simple_form.pl.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
simple_form.pt-BR.yml Weblate translations (2018-12-19) (#9578) 2018-12-19 21:07:05 +09:00
simple_form.pt.yml
simple_form.ro.yml
simple_form.ru.yml
simple_form.sk.yml Weblate translations (2018-12-27) (#9642) 2018-12-27 12:25:30 +01: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
simple_form.zh-TW.yml
sk.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
sl.yml
sr-Latn.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
sr.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
sv.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
te.yml
th.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
tr.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
uk.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
zh-CN.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
zh-HK.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
zh-TW.yml Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00