From bfc539cfb4f040fcffac740b36791c26c2a74119 Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 2 Oct 2022 18:11:46 +0200 Subject: Revert "Change "Allow trends without prior review" setting to include statuses (#17977)" This reverts commit 546672e292dc3218e996048464c4c52e5d00f766. --- config/locales/en.yml | 4 ++-- config/locales/simple_form.en.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'config/locales') diff --git a/config/locales/en.yml b/config/locales/en.yml index dd341e0c8..6f0f3e953 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -807,8 +807,8 @@ en: title: Allow unauthenticated access to public timeline title: Site settings trendable_by_default: - desc_html: Specific trending content can still be explicitly disallowed - title: Allow trends without prior review + desc_html: Affects hashtags that have not been previously disallowed + title: Allow hashtags to trend without prior review trends: desc_html: Publicly display previously reviewed content that is currently trending title: Trends diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index db5b45e41..ec4c445e8 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -261,7 +261,6 @@ en: events: Enabled events url: Endpoint URL 'no': 'No' - not_recommended: Not recommended recommended: Recommended required: mark: "*" -- cgit