fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-30 20:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/config/locales-glitch
History
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
..
en.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
es.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
ja.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
ko.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
pl.yml Move glitch-specific ruby-side locales to their own files 2020-05-30 12:54:17 +02:00
simple_form.en.yml Move glitch-specific ruby-side locales to their own files 2020-05-30 12:54:17 +02:00
simple_form.es.yml Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
simple_form.ja.yml translation glitch's preferences [ja] 2021-10-20 13:04:50 +09:00
simple_form.ko.yml Fix typo on simple_form.ko.yml 2021-08-06 20:06:05 +02:00
simple_form.pl.yml Move glitch-specific ruby-side locales to their own files 2020-05-30 12:54:17 +02:00
simple_form.zh-CN.yml Add zh-CN translations 2021-10-07 23:40:18 +02:00
zh-CN.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00