me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/locales
History
Thibaut Girka 76949bc007 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Dockerfile
  Took upstream version and reverted b6d0dcc5d3.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.
2019-02-26 17:04:44 +01:00
..
locale-data
ar.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ast.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
bg.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ca.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
co.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
cs.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
cy.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
da.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
de.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
defaultMessages.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
el.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
en.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
eo.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
es.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
eu.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
fa.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
fi.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
fr.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
gl.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
he.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
hr.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
hu.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
hy.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
id.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
index.js
io.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
it.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ja.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
ka.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
kk.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ko.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
lv.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ms.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
nl.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
no.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
oc.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
pl.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
pt-BR.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
pt.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ro.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ru.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
sk.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
sl.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
sq.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
sr-Latn.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
sr.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
sv.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
ta.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
te.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
th.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
tr.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
uk.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
whitelist_ar.json
whitelist_ast.json
whitelist_bg.json
whitelist_ca.json
whitelist_co.json Add Corsican localization (#7390) 2018-05-07 01:34:19 +02:00
whitelist_cs.json Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +02:00
whitelist_cy.json Weblate translations (2018-08-31) (#8535) 2018-08-31 04:28:29 +02:00
whitelist_da.json
whitelist_de.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_el.json
whitelist_en.json
whitelist_eo.json
whitelist_es.json
whitelist_eu.json
whitelist_fa.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_fi.json
whitelist_fr.json
whitelist_gl.json Weblate translations (#5946) 2017-12-09 15:35:22 +01:00
whitelist_he.json
whitelist_hr.json
whitelist_hu.json
whitelist_hy.json
whitelist_id.json
whitelist_io.json
whitelist_it.json
whitelist_ja.json
whitelist_ka.json
whitelist_kk.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
whitelist_ko.json i18n: Add korean translation (#4064) 2017-07-04 16:11:23 +02:00
whitelist_lv.json
whitelist_ms.json
whitelist_nl.json
whitelist_no.json
whitelist_oc.json
whitelist_pl.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_pt-BR.json
whitelist_pt.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ro.json
whitelist_ru.json
whitelist_sk.json Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) 2018-01-03 21:00:39 +09:00
whitelist_sl.json
whitelist_sq.json
whitelist_sr-Latn.json Fix RFC 5646 Regular Expression (#6190) 2018-01-05 04:43:50 +01:00
whitelist_sr.json
whitelist_sv.json Add Japanese translations (#5810) 2017-11-25 03:39:57 +01:00
whitelist_ta.json
whitelist_te.json
whitelist_th.json
whitelist_tr.json
whitelist_uk.json
whitelist_zh-CN.json
whitelist_zh-HK.json
whitelist_zh-TW.json Add zh-TW.json (#3459) 2017-05-30 23:09:02 +02:00
zh-CN.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
zh-HK.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
zh-TW.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00