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 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 Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02: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 Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
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 Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ast.json Weblate translations (2018-07-25) (#8065) 2018-07-24 20:47:13 +02:00
whitelist_bg.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ca.json Fix minor Japanese translations (#3099) 2017-05-17 17:50:39 +02:00
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 Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_el.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_en.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_eo.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_es.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_eu.json Add el and te (#7332) 2018-05-03 15:54:10 +02:00
whitelist_fa.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_fi.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_fr.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_gl.json Weblate translations (#5946) 2017-12-09 15:35:22 +01:00
whitelist_he.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_hr.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_hu.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_hy.json Weblate translations (#6323) 2018-01-22 14:20:58 +01:00
whitelist_id.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_io.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_it.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ja.json Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725) 2017-06-13 03:55:28 +02:00
whitelist_ka.json Add Georgian language translation (#8250) 2018-08-18 01:00:01 +09:00
whitelist_ko.json i18n: Add korean translation (#4064) 2017-07-04 16:11:23 +02:00
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 Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_no.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_oc.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_pl.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_pt-BR.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_pt.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_ro.json Weblate translations (2018-09-01) (#8561) 2018-09-02 03:14:46 +02:00
whitelist_ru.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
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 Weblate translations (2018-05-10) (#7438) 2018-05-10 14:48:26 +02:00
whitelist_sr-Latn.json Fix RFC 5646 Regular Expression (#6190) 2018-01-05 04:43:50 +01:00
whitelist_sr.json Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) 2018-01-03 21:00:39 +09:00
whitelist_sv.json Add Japanese translations (#5810) 2017-11-25 03:39:57 +01:00
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 Add th.json. (#3588) 2017-06-05 17:02:41 +02:00
whitelist_tr.json Fix duplicated values in nl.json (#2931) 2017-05-09 14:12:35 +02:00
whitelist_uk.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_zh-CN.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_zh-HK.json Fix regular expression for RFC 5646 (regression from #3604) (#4133) 2017-07-10 14:02:18 +02:00
whitelist_zh-TW.json Add zh-TW.json (#3459) 2017-05-30 23:09:02 +02:00
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