8 commits

Author	SHA1	Message	Date
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
atsu1125	7bc7da565b	translation glitch's preferences [ja]	2021-10-20 13:04:50 +09:00
Julianne420	ebb4de7d3e	Add zh-CN translations	2021-10-07 23:40:18 +02:00
Jeong Arm	0843a3dd6d	Fix typo on simple_form.ko.yml	2021-08-06 20:06:05 +02:00
Jeong Arm	69b5139d2a	Add Korean translations	2021-08-06 20:06:05 +02:00
otrapersona	29870d2be6	Glitchsoc translation to 'es' language (#1439) ... glitch-soc-specific translation to 'es' language	2020-10-19 22:17:29 +02:00
Thibaut Girka	9e04b9d8df	Add support for setting Content Warning for CW-less outgoing toots	2020-05-30 18:27:00 +02:00
Thibaut Girka	041c769182	Move glitch-specific ruby-side locales to their own files	2020-05-30 12:54:17 +02:00