tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
396c5dea87f259255f3676bb7b30f5cfdfec9d4e
Mastodon/config/locales
History
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
..
activerecord.ar.yml
…
activerecord.ast.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
activerecord.ca.yml
…
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.cy.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
activerecord.da.yml
Weblate translations (2018-07-05) (#7950)
2018-07-05 21:50:16 +09:00
activerecord.de.yml
…
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
…
activerecord.eu.yml
Weblate translations (2018-05-31) (#7681)
2018-05-31 13:00:40 +02:00
activerecord.fa.yml
…
activerecord.fr.yml
…
activerecord.gl.yml
…
activerecord.he.yml
…
activerecord.id.yml
…
activerecord.it.yml
…
activerecord.ja.yml
…
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
…
activerecord.pt-BR.yml
…
activerecord.pt.yml
…
activerecord.ru.yml
[RU] Updated translation (#8164)
2018-08-11 06:39:52 +09:00
activerecord.sk.yml
…
activerecord.sl.yml
Weblate translations (2018-07-05) (#7950)
2018-07-05 21:50:16 +09:00
activerecord.sr-Latn.yml
…
activerecord.sr.yml
…
activerecord.sv.yml
Weblate translations (2018-07-05) (#7950)
2018-07-05 21:50:16 +09:00
activerecord.th.yml
…
activerecord.uk.yml
…
activerecord.zh-CN.yml
…
activerecord.zh-HK.yml
…
ar.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
ast.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
bg.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
ca.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
co.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
cs.yml
I18n: Correct pluralization of Czech (#9527)
2018-12-15 17:08:54 +09:00
cy.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
da.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
de.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
devise.ar.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
devise.ast.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
devise.bg.yml
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.ca.yml
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.co.yml
Weblate translations (2018-05-10) (#7438)
2018-05-10 14:48:26 +02:00
devise.cs.yml
I18n: Correct pluralization of Czech (#9527)
2018-12-15 17:08:54 +09:00
devise.cy.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
devise.da.yml
Weblate translations (2018-08-22) (#8346)
2018-08-21 18:38:27 +02:00
devise.de.yml
…
devise.el.yml
Weblate translations (2018-07-05) (#7950)
2018-07-05 21:50:16 +09:00
devise.en.yml
…
devise.eo.yml
…
devise.es.yml
…
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
…
devise.fr.yml
security/l10n [fr] do not leak registered e-mail addresses (#9375)
2018-11-27 16:40:39 +01:00
devise.gl.yml
…
devise.he.yml
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
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
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.id.yml
…
devise.io.yml
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.it.yml
…
devise.ja.yml
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.ka.yml
Add Georgian language translation (#8250)
2018-08-18 01:00:01 +09:00
devise.nl.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
devise.no.yml
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.oc.yml
[i18n] update and corrections for Occitan locale (#9404)
2018-12-01 17:39:13 +01:00
devise.pl.yml
Update i18n-tasks and change CircleCI command (#9104)
2018-10-28 07:15:20 +01:00
devise.pt-BR.yml
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.pt.yml
…
devise.ru.yml
…
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
…
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
Add consistent interpolations check to CircleCI (#9072)
2018-10-25 01:17:01 +02:00
devise.zh-TW.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
doorkeeper.ar.yml
Weblate translations (2018-07-11) (#7992)
2018-07-11 01:14:38 +02:00
doorkeeper.ast.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
doorkeeper.bg.yml
…
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.cy.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01: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
…
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
…
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
…
doorkeeper.hr.yml
…
doorkeeper.hu.yml
…
doorkeeper.id.yml
…
doorkeeper.io.yml
…
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
…
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
…
doorkeeper.ro.yml
Weblate translations (2018-09-02) (#8577)
2018-09-02 18:20:26 +02: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
…
doorkeeper.sr.yml
…
doorkeeper.sv.yml
Weblate translations (2018-07-05) (#7950)
2018-07-05 21:50:16 +09:00
doorkeeper.th.yml
…
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-12-13) (#9513)
2018-12-13 16:59:51 +01:00
en_GB.yml
Update i18n-tasks and change CircleCI command (#9104)
2018-10-28 07:15:20 +01:00
en.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
eo.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
es.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 13:23:02 +01:00
eu.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
fa.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
fi.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
fr.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
gl.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
he.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
hr.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
hu.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
id.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
io.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
it.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
ja.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
ka.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
ko.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
ms.yml
Remove unused translations (#9372)
2018-11-27 13:38:03 +01:00
nl.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
no.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
oc.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
pl.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
pt-BR.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 13:23:02 +01:00
pt.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
ro.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
ru.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
simple_form.ar.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.ast.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
simple_form.bg.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.ca.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01: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
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
simple_form.da.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.de.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.el.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.en_GB.yml
Update i18n-tasks and change CircleCI command (#9104)
2018-10-28 07:15:20 +01:00
simple_form.en.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-09 16:08:04 +01:00
simple_form.eo.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.es.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.eu.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.fa.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
simple_form.fi.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.fr.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.gl.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.he.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.hr.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.hu.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.id.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.io.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.it.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.ja.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
simple_form.ka.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.ko.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
simple_form.nl.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.no.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.oc.yml
[i18n] Update Occitan (#9491)
2018-12-11 05:38:57 +01:00
simple_form.pl.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-09 16:08:04 +01:00
simple_form.pt-BR.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
simple_form.pt.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.ro.yml
Fix broken report detail (regression from #8569) (#8795)
2018-09-26 19:48:14 +02:00
simple_form.ru.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.sk.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
simple_form.sl.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
simple_form.sr-Latn.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
simple_form.sr.yml
Weblate translations (2018-10-26) (#9113)
2018-10-29 13:20:29 +01:00
simple_form.sv.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.th.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.tr.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.uk.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.zh-CN.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.zh-HK.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
simple_form.zh-TW.yml
Remove character counter from edit profile (#9100)
2018-10-26 01:55:24 +02:00
sk.yml
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
sl.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
sr-Latn.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
sr.yml
Weblate translations (2018-12-13) (#9513)
2018-12-13 16:59:51 +01:00
sv.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
te.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
th.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
tr.yml
Weblate translations (2018-11-27) (#9367)
2018-11-27 12:50:26 +01:00
uk.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
zh-CN.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
zh-HK.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
zh-TW.yml
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00