OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/config/locales
History
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 		2020-03-22 16:10:44 +01:00
..
activerecord.ar.yml
…
activerecord.ast.yml
…
activerecord.bg.yml
…
activerecord.bn.yml
…
activerecord.br.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.eo.yml
…
activerecord.es-AR.yml
…
activerecord.es.yml
…
activerecord.et.yml
…
activerecord.eu.yml
…
activerecord.fa.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
activerecord.fi.yml
…
activerecord.fr.yml
…
activerecord.gl.yml
…
activerecord.he.yml
…
activerecord.hi.yml
…
activerecord.hr.yml
…
activerecord.hu.yml
…
activerecord.hy.yml
…
activerecord.id.yml
…
activerecord.io.yml
…
activerecord.is.yml
…
activerecord.it.yml
…
activerecord.ja.yml
…
activerecord.ka.yml
…
activerecord.kab.yml
…
activerecord.kk.yml
…
activerecord.kn.yml
…
activerecord.ko.yml
…
activerecord.lt.yml
…
activerecord.lv.yml
…
activerecord.mk.yml
…
activerecord.ml.yml
…
activerecord.mr.yml
…
activerecord.ms.yml
…
activerecord.nl.yml
…
activerecord.nn.yml
…
activerecord.no.yml
…
activerecord.oc.yml
…
activerecord.pl.yml
…
activerecord.pt-BR.yml
…
activerecord.pt-PT.yml
…
activerecord.ro.yml
…
activerecord.ru.yml
…
activerecord.sk.yml
…
activerecord.sl.yml
…
activerecord.sq.yml
…
activerecord.sr-Latn.yml
…
activerecord.sr.yml
…
activerecord.sv.yml
…
activerecord.ta.yml
…
activerecord.te.yml
…
activerecord.th.yml
…
activerecord.tr.yml
…
activerecord.uk.yml
…
activerecord.ur.yml
…
activerecord.vi.yml
…
activerecord.zh-CN.yml
…
activerecord.zh-HK.yml
…
activerecord.zh-TW.yml
…
activerecord.zh_Hant.yml
…
ar.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
ast.yml New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
bg.yml
…
bn.yml
…
br.yml
…
ca.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
co.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
cs.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
cy.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
da.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
de.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
devise.ar.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
devise.ast.yml
…
devise.bg.yml
…
devise.bn.yml
…
devise.br.yml
…
devise.ca.yml
…
devise.co.yml
…
devise.cs.yml
…
devise.cy.yml
…
devise.da.yml
…
devise.de.yml
…
devise.el.yml
…
devise.en.yml
…
devise.eo.yml
…
devise.es-AR.yml
…
devise.es.yml
…
devise.et.yml
…
devise.eu.yml
…
devise.fa.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
devise.fi.yml
…
devise.fr.yml
…
devise.gl.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
devise.he.yml
…
devise.hi.yml
…
devise.hr.yml
…
devise.hu.yml
…
devise.hy.yml
…
devise.id.yml
…
devise.io.yml
…
devise.is.yml
…
devise.it.yml
…
devise.ja.yml
…
devise.ka.yml
…
devise.kab.yml New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
devise.kk.yml
…
devise.kn.yml
…
devise.ko.yml
…
devise.lt.yml
…
devise.lv.yml
…
devise.mk.yml
…
devise.ml.yml
…
devise.mr.yml
…
devise.ms.yml
…
devise.nl.yml
…
devise.nn.yml
…
devise.no.yml
…
devise.oc.yml
…
devise.pl.yml New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
devise.pt-BR.yml
…
devise.pt-PT.yml
…
devise.ro.yml
…
devise.ru.yml
…
devise.sk.yml
…
devise.sl.yml
…
devise.sq.yml
…
devise.sr-Latn.yml
…
devise.sr.yml
…
devise.sv.yml
…
devise.ta.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
devise.te.yml
…
devise.th.yml
…
devise.tr.yml
…
devise.uk.yml
…
devise.ur.yml
…
devise.vi.yml
…
devise.zh-CN.yml
…
devise.zh-HK.yml
…
devise.zh-TW.yml
…
doorkeeper.ar.yml
…
doorkeeper.ast.yml New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
doorkeeper.bg.yml
…
doorkeeper.bn.yml
…
doorkeeper.br.yml
…
doorkeeper.ca.yml
…
doorkeeper.co.yml
…
doorkeeper.cs.yml
…
doorkeeper.cy.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.da.yml
…
doorkeeper.de.yml
…
doorkeeper.el.yml
…
doorkeeper.en.yml
…
doorkeeper.eo.yml
…
doorkeeper.es-AR.yml
…
doorkeeper.es.yml
…
doorkeeper.et.yml
…
doorkeeper.eu.yml
…
doorkeeper.fa.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.fi.yml
…
doorkeeper.fr.yml
…
doorkeeper.gl.yml
…
doorkeeper.he.yml
…
doorkeeper.hi.yml
…
doorkeeper.hr.yml
…
doorkeeper.hu.yml
…
doorkeeper.hy.yml
…
doorkeeper.id.yml
…
doorkeeper.io.yml
…
doorkeeper.is.yml
…
doorkeeper.it.yml
…
doorkeeper.ja.yml
…
doorkeeper.ka.yml
…
doorkeeper.kab.yml New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
doorkeeper.kk.yml
…
doorkeeper.kn.yml
…
doorkeeper.ko.yml
…
doorkeeper.lt.yml
…
doorkeeper.lv.yml
…
doorkeeper.mk.yml
…
doorkeeper.ml.yml
…
doorkeeper.mr.yml
…
doorkeeper.ms.yml
…
doorkeeper.nl.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.nn.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.no.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.oc.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.pl.yml New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
doorkeeper.pt-BR.yml
…
doorkeeper.pt-PT.yml
…
doorkeeper.ro.yml
…
doorkeeper.ru.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.sk.yml
…
doorkeeper.sl.yml
…
doorkeeper.sq.yml
…
doorkeeper.sr-Latn.yml
…
doorkeeper.sr.yml
…
doorkeeper.sv.yml
…
doorkeeper.ta.yml
…
doorkeeper.te.yml
…
doorkeeper.th.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.tr.yml
…
doorkeeper.uk.yml
…
doorkeeper.ur.yml
…
doorkeeper.vi.yml
…
doorkeeper.zh-CN.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
doorkeeper.zh-HK.yml
…
doorkeeper.zh-TW.yml
…
el.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
en.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
en_GB.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
eo.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
es-AR.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
es.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
et.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
eu.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
fa.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
fi.yml
…
fr.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
ga.yml
…
gl.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
he.yml
…
hi.yml
…
hr.yml
…
hu.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
hy.yml
…
id.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
io.yml
…
is.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
it.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
ja.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
ka.yml
…
kab.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
kk.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
kn.yml
…
ko.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
lt.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
lv.yml
…
mk.yml
…
ml.yml
…
mr.yml
…
ms.yml
…
nl.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
nn.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
no.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
oc.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
pl.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
pt-BR.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
pt-PT.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
ro.yml
…
ru.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
simple_form.ar.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.ast.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.bg.yml
…
simple_form.bn.yml
…
simple_form.br.yml
…
simple_form.ca.yml
…
simple_form.co.yml
…
simple_form.cs.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.cy.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.da.yml
…
simple_form.de.yml
…
simple_form.el.yml
…
simple_form.en.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
simple_form.en_GB.yml
…
simple_form.eo.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.es-AR.yml
…
simple_form.es.yml
…
simple_form.et.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.eu.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.fa.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.fi.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.fr.yml
…
simple_form.gl.yml
…
simple_form.he.yml
…
simple_form.hi.yml
…
simple_form.hr.yml
…
simple_form.hu.yml
…
simple_form.hy.yml
…
simple_form.id.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.io.yml
…
simple_form.is.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.it.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.ja.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-02-06 21:36:38 +01:00
simple_form.ka.yml
…
simple_form.kab.yml New Crowdin translations (#13036) 2020-02-08 23:33:22 +01:00
simple_form.kk.yml
…
simple_form.kn.yml
…
simple_form.ko.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.lt.yml
…
simple_form.lv.yml
…
simple_form.mk.yml
…
simple_form.ml.yml
…
simple_form.mr.yml
…
simple_form.ms.yml
…
simple_form.nl.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.nn.yml
…
simple_form.no.yml
…
simple_form.oc.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.pl.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-02-09 12:15:55 +01:00
simple_form.pt-BR.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.pt-PT.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.ro.yml
…
simple_form.ru.yml
…
simple_form.sk.yml
…
simple_form.sl.yml
…
simple_form.sq.yml
…
simple_form.sr-Latn.yml
…
simple_form.sr.yml
…
simple_form.sv.yml
…
simple_form.ta.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.te.yml
…
simple_form.th.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.tr.yml
…
simple_form.uk.yml
…
simple_form.ur.yml
…
simple_form.vi.yml
…
simple_form.zh-CN.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
simple_form.zh-HK.yml
…
simple_form.zh-TW.yml
…
sk.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
sl.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
sq.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
sr-Latn.rb
…
sr-Latn.yml
…
sr.rb
…
sr.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
sv.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
ta.yml New Crowdin translations (#12953) 2020-02-03 15:52:20 +01:00
te.yml
…
th.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
tr.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
uk.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
ur.yml
…
vi.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
zh-CN.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
zh-HK.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
zh-TW.yml Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00