3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon-docker-playground/app/javascript/mastodon/locales
History
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
 		2019-02-10 21:10:09 +01:00
..
locale-data [i18n] update and corrections for Occitan locale (#9404) 2018-12-01 17:39:13 +01:00
ar.json Weblate translations (2019-01-19) (#9867) 2019-01-19 23:43:06 +01:00
ast.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
bg.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
ca.json Weblate translations (2019-01-19) (#9867) 2019-01-19 23:43:06 +01:00
co.json Weblate translations (2019-01-15) (#9813) 2019-01-15 15:30:30 +01:00
cs.json Weblate translations (2019-01-19) (#9867) 2019-01-19 23:43:06 +01:00
cy.json Weblate translations (2019-01-17) (#9844) 2019-01-18 00:48:09 +01:00
da.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
de.json Weblate translations (2019-01-19) (#9867) 2019-01-19 23:43:06 +01:00
defaultMessages.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
el.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
en.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
eo.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
es.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
eu.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
fa.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
fi.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
fr.json Weblate translations (2019-01-15) (#9813) 2019-01-15 15:30:30 +01:00
gl.json Weblate translations (2019-01-15) (#9813) 2019-01-15 15:30:30 +01:00
he.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
hr.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
hu.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
hy.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
id.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
index.js
…
io.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
it.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
ja.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
ka.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
ko.json Weblate translations (2019-01-15) (#9813) 2019-01-15 15:30:30 +01:00
lv.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
ms.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
nl.json Weblate translations (2019-01-15) (#9813) 2019-01-15 15:30:30 +01:00
no.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
oc.json Weblate translations (2019-01-15) (#9813) 2019-01-15 15:30:30 +01:00
pl.json Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
pt-BR.json Weblate translations (2019-01-15) (#9813) 2019-01-15 15:30:30 +01:00
pt.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
ro.json Weblate translations (2019-01-17) (#9844) 2019-01-18 00:48:09 +01:00
ru.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
sk.json Weblate translations (2019-01-17) (#9844) 2019-01-18 00:48:09 +01:00
sl.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
sr-Latn.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
sr.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
sv.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
ta.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
te.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
th.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
tr.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
uk.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
whitelist_ar.json
…
whitelist_ast.json Weblate translations (2018-07-25) (#8065) 2018-07-24 20:47:13 +02:00
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 Weblate translations (2018-07-11) (#7992) 2018-07-11 01:14:38 +02:00
whitelist_de.json
…
whitelist_el.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_en.json
…
whitelist_eo.json
…
whitelist_es.json
…
whitelist_eu.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_fa.json
…
whitelist_fi.json
…
whitelist_fr.json
…
whitelist_gl.json
…
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 Add Georgian language translation (#8250) 2018-08-18 01:00:01 +09:00
whitelist_ko.json
…
whitelist_lv.json Weblate translations (2019-01-08) (#9758) 2019-01-08 14:09:57 +01:00
whitelist_ms.json Remove links to bridge.joinmastodon.org (non-functional) (#9608) 2018-12-22 23:32:00 +01:00
whitelist_nl.json
…
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pl.json
…
whitelist_pt-BR.json
…
whitelist_pt.json
…
whitelist_ro.json Weblate translations (2018-09-01) (#8561) 2018-09-02 03:14:46 +02:00
whitelist_ru.json
…
whitelist_sk.json
…
whitelist_sl.json Weblate translations (2018-05-10) (#7438) 2018-05-10 14:48:26 +02:00
whitelist_sr-Latn.json
…
whitelist_sr.json
…
whitelist_sv.json
…
whitelist_ta.json Weblate translations (2018-09-02) (#8577) 2018-09-02 18:20:26 +02:00
whitelist_te.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_th.json
…
whitelist_tr.json
…
whitelist_uk.json
…
whitelist_zh-CN.json
…
whitelist_zh-HK.json
…
whitelist_zh-TW.json
…
zh-CN.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
zh-HK.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00
zh-TW.json Remove obsolete web UI translations (#9761) 2019-01-08 17:31:58 +01:00