mirrors
/
vt-social
mirror of https://github.com/nullptr-live/vt-social.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
vt-social/app/javascript/mastodon/locales
History
Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream updated media and edit-related code textually close to glitch-soc
  additions (local-only and content-type).
  Ported upstream changes.
- `app/models/status_edit.rb`:
  Upstream changes textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (directMessage attribute).
  Ported upstream changes.
- `app/services/remove_status_service.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (DM timeline).
  Ported upstream changes.
- `app/services/update_status_service.rb`:
  Upstream fixed an issue with language selection. Not really a conflict,
  but textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `db/schema.rb`:
  Upstream added columns to the `status_edits` table, the conflict is because
  of an additional column (`content-type`) in glitch-soc.
  Ported upstream changes.
- `package.json`:
  Upstream dependency (express) textually adjacent to a glitch-soc-specific one
  (favico.js) got updated.
  Updated it as well.
 		2022-03-10 09:52:45 +01:00
..
locale-data [i18n] update and corrections for Occitan locale (#9404) 2018-12-01 17:39:13 +01:00
af.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ar.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ast.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
bg.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
bn.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
br.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ca.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
co.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
cs.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
cy.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
da.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
de.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
defaultMessages.json Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
el.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
en.json Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
eo.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
es-AR.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
es-MX.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
es.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
et.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
eu.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
fa.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
fi.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
fr.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ga.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
gd.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
gl.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
he.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
hi.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
hr.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
hu.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
hy.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
id.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
index.js
…
io.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
is.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
it.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ja.json Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
ka.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
kab.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
kk.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
kmr.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
kn.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ko.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ku.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
kw.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
lt.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
lv.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
mk.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ml.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
mr.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ms.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
nl.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
nn.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
no.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
oc.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
pa.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
pl.json Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
pt-BR.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
pt-PT.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ro.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ru.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sa.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sc.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
si.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sk.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sl.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sq.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sr-Latn.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sr.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
sv.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
szl.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ta.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
tai.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
te.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
th.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
tr.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
tt.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ug.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
uk.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
ur.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
vi.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09: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
…
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
…
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
…
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
…
whitelist_sr.json
…
whitelist_sv.json
…
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 Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
zh-CN.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
zh-HK.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00
zh-TW.json Chore: Update translatable strings (#17723) 2022-03-09 20:45:49 +09:00