about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml4
-rw-r--r--config/locales/simple_form.en.yml1
2 files changed, 2 insertions, 3 deletions
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: "*"