djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 09:34:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
12c8ac9e14
tootlab-mastodon/app/javascript/mastodon/locales
History
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
2020-06-09 10:39:20 +02:00
..
locale-data [i18n] update and corrections for Occitan locale (#9404) 2018-12-01 17:39:13 +01:00
ar.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
ast.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
bg.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
bn.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
br.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
ca.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
co.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
cs.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
cy.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
da.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
de.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
defaultMessages.json Merge branch 'master' into glitch-soc/merge-upstream 2020-05-28 13:44:57 +02:00
el.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
en.json Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
eo.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
es-AR.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
es.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
et.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
eu.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
fa.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
fi.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
fr.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
ga.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
gl.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
he.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
hi.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
hr.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
hu.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
hy.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
id.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
index.js Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
io.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
is.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
it.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
ja.json Merge branch 'master' into glitch-soc/merge-upstream 2020-05-14 18:49:10 +02:00
ka.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
kab.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
kk.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
kn.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
ko.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
lt.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
lv.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
mk.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
ml.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
mr.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
ms.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
nl.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
nn.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
no.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
oc.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
pl.json Merge branch 'master' into glitch-soc/merge-upstream 2020-05-14 18:49:10 +02:00
pt-BR.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
pt-PT.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
ro.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
ru.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
sc.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
sk.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
sl.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
sq.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
sr-Latn.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
sr.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
sv.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
ta.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
te.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
th.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
tr.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
uk.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
ur.json Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
vi.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02: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_bn.json Weblate translations (2019-03-24) (#10362) 2019-03-24 18:44:59 +01:00
whitelist_br.json New Crowdin translations (#11799) 2019-09-16 15:11:01 +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 German translations (#11043) 2019-06-10 21:36:20 +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-AR.json New Crowdin translations (#11985) 2019-09-29 17:10:01 +02:00
whitelist_es.json Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
whitelist_et.json New Crowdin translations (#11305) 2019-08-17 22:02:37 +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_ga.json New Crowdin translations (#11861) 2019-09-20 23:05:23 +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_hi.json Add hi.json (#10573) 2019-04-21 04:52:20 +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_is.json New Crowdin translations (#12378) 2020-01-12 15:18:03 +01: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_kab.json New Crowdin translations (#12378) 2020-01-12 15:18:03 +01:00
whitelist_kk.json Weblate translations (2019-02-23) (#10103) 2019-02-23 18:41:28 +01:00
whitelist_kn.json New Crowdin translations (#12146) 2019-11-13 23:24:55 +01:00
whitelist_ko.json i18n: Add korean translation (#4064) 2017-07-04 16:11:23 +02:00
whitelist_lt.json New Crowdin translations (#11060) 2019-06-12 15:56:18 +02:00
whitelist_lv.json Weblate translations (2019-01-08) (#9758) 2019-01-08 14:09:57 +01:00
whitelist_mk.json New Crowdin translations (#12047) 2019-10-03 03:36:52 +02:00
whitelist_ml.json New Crowdin translations (#12146) 2019-11-13 23:24:55 +01:00
whitelist_mr.json New Crowdin translations (#12146) 2019-11-13 23:24:55 +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_nn.json New Crowdin translations (#11799) 2019-09-16 15:11:01 +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-PT.json New Crowdin translations (#11799) 2019-09-16 15:11:01 +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_sc.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +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_sq.json Weblate translations (2019-02-11) (#10007) 2019-02-11 07:41:35 +01: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_ur.json New Crowdin translations (#12146) 2019-11-13 23:24:55 +01:00
whitelist_vi.json New Crowdin translations (#12378) 2020-01-12 15:18:03 +01: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 New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
zh-HK.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00
zh-TW.json New Crowdin translations (#13398) 2020-05-13 22:35:20 +02:00