Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2022-12-11 20:15:04 +01:00
6 changed files with 18 additions and 11 deletions

View File

@@ -704,6 +704,9 @@ en:
content_retention:
preamble: Control how user-generated content is stored in Mastodon.
title: Content retention
default_noindex:
desc_html: Affects all users who have not changed this setting themselves
title: Opt users out of search engine indexing by default
discovery:
follow_recommendations: Follow recommendations
preamble: Surfacing interesting content is instrumental in onboarding new users who may not know anyone Mastodon. Control how various discovery features work on your server.