djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-18 16:43:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript/mastodon/locales
History
Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/models/status.rb`:
  Conflict because of slight change in how glitch-soc handles the scope to
  filter out local-only posts for anonymous viewers.
  Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
  Conflict because upstream redesigned that page while glitch-soc had a minor
  change to support hiding the number of followers.
  Ported glitch-soc's change on top of upstream's redesign.

Additional changes:
- `app/models/account_statuses_filter.rb`:
  See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
..
locale-data
[i18n] update and corrections for Occitan locale (#9404)
2018-12-01 17:39:13 +01:00
af.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ar.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
ast.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
bg.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
bn.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
br.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
ca.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
co.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
cs.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
cy.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
da.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
de.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
defaultMessages.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-01 09:59:18 +01:00
el.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
en.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-08 20:22:54 +01:00
eo.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
es-AR.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
es-MX.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
es.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
et.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
eu.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
fa.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
fi.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
fr.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ga.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
gd.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
gl.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
he.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
hi.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
hr.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
hu.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
hy.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
id.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
index.js
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
io.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
is.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
it.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ja.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-02 18:02:48 +01:00
ka.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
kab.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
kk.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
kmr.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
kn.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ko.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ku.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
kw.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
lt.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
lv.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
mk.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
ml.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
mr.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ms.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
nl.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
nn.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
no.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
oc.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
pa.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
pl.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-01 09:59:18 +01:00
pt-BR.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
pt-PT.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
ro.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
ru.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
sa.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
sc.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
si.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
sk.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
sl.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
sq.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
sr-Latn.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
sr.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
sv.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
szl.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ta.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
tai.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
te.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
th.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
tr.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
tt.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ug.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
uk.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
ur.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
vi.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
whitelist_af.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02: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_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
…
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
…
whitelist_eo.json
…
whitelist_es-AR.json
New Crowdin translations (#11985)
2019-09-29 17:10:01 +02:00
whitelist_es-MX.json
New Crowdin updates (#16094)
2021-05-08 17:12:56 +02:00
whitelist_es.json
…
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
…
whitelist_fi.json
…
whitelist_fr.json
…
whitelist_ga.json
New Crowdin translations (#11861)
2019-09-20 23:05:23 +02:00
whitelist_gd.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02:00
whitelist_gl.json
Weblate translations (#5946)
2017-12-09 15:35:22 +01:00
whitelist_he.json
…
whitelist_hi.json
Add hi.json (#10573)
2019-04-21 04:52:20 +02:00
whitelist_hr.json
…
whitelist_hu.json
…
whitelist_hy.json
Weblate translations (#6323)
2018-01-22 14:20:58 +01:00
whitelist_id.json
…
whitelist_io.json
…
whitelist_is.json
New Crowdin translations (#12378)
2020-01-12 15:18:03 +01:00
whitelist_it.json
…
whitelist_ja.json
…
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_kmr.json
New Crowdin updates (#16354)
2021-10-17 10:28:51 +09:00
whitelist_kn.json
New Crowdin translations (#12146)
2019-11-13 23:24:55 +01:00
whitelist_ko.json
…
whitelist_ku.json
New Crowdin updates (#14197)
2020-07-10 20:57:21 +02:00
whitelist_kw.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +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
…
whitelist_nn.json
New Crowdin translations (#11799)
2019-09-16 15:11:01 +02:00
whitelist_no.json
…
whitelist_oc.json
…
whitelist_pa.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +02:00
whitelist_pl.json
…
whitelist_pt-BR.json
…
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
…
whitelist_sa.json
New Crowdin updates (#14388)
2020-11-09 00:56:52 +01:00
whitelist_sc.json
New Crowdin translations (#13398)
2020-05-13 22:35:20 +02:00
whitelist_si.json
New Crowdin updates (#15719)
2021-04-22 00:04:58 +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_szl.json
New Crowdin translations (#13749)
2020-07-02 00:45:15 +02:00
whitelist_ta.json
Weblate translations (2018-09-02) (#8577)
2018-09-02 18:20:26 +02:00
whitelist_tai.json
New Crowdin translations (#13749)
2020-07-02 00:45:15 +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_tt.json
New Crowdin updates (#15220)
2020-12-16 03:24:55 +01:00
whitelist_ug.json
New Crowdin updates (#14197)
2020-07-10 20:57:21 +02:00
whitelist_uk.json
…
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_zgh.json
New Crowdin updates (#14388)
2020-11-09 00:56:52 +01:00
whitelist_zh-CN.json
…
whitelist_zh-HK.json
…
whitelist_zh-TW.json
…
zgh.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
zh-CN.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00
zh-HK.json
Chore: Update translatable strings (#17495)
2022-02-28 14:14:52 +01:00
zh-TW.json
New Crowdin updates (#17628)
2022-03-01 18:38:36 +09:00