From 0a32c484e1b8819983514f6f06da30c910cdd133 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Wed, 21 Oct 2020 01:50:04 -0500 Subject: Make receiving boosts from Tavern timeline in home feed opt-in; always aggregate boosts --- config/locales/simple_form.en-MP.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/locales/simple_form.en-MP.yml b/config/locales/simple_form.en-MP.yml index 6beb88d3f..33dfa4fda 100644 --- a/config/locales/simple_form.en-MP.yml +++ b/config/locales/simple_form.en-MP.yml @@ -27,7 +27,7 @@ en-MP: setting_default_content_type_bbcode_html: "[b]Bold[/b], [u]Underline[/u], [i]Italic[/i], [code]Console[/code], ..." setting_default_language: The language of your roars can be detected automatically, but it's not always accurate setting_filter_unknown: Strictly filter unfollowed authors, including those of boosts, from your home and list timelines. Takes effect for newly-pushed items. - setting_no_boosts_home: Filters boosts from the home timeline, reguardless of the app you use. These boosts will still be available in the Boosts list. + setting_home_reblogs: Allow packmates to boost unfollowed authors and Rowdy Tavern participants to your home timeline. Note that enabling this option has the potential to place offensive or triggering Fediverse content in your home timeline without warning! setting_manual_publish: This allows you to draft, proofread, and edit your roars before publishing them. You can publish a roar from its action menu (the three dots). setting_max_history_public: How long public users and other servers may directly access roars on your public profile or ActivityPub outbox. setting_max_history_private: How long followers may directly access roars from your public profile or ActivityPub outbox. Takes precedence if shorter than the public setting. @@ -61,7 +61,7 @@ en-MP: setting_manual_publish: Manually publish roars setting_max_history_public: Roar history visible to public setting_max_history_private: Roar history visible to followers - setting_no_boosts_home: Disable boosts in home timeline + setting_home_reblogs: Allow Rowdy Tavern content in home setting_publish_in: Auto-publish setting_show_application: Disclose application used to send roars setting_style_css_profile: Custom CSS for profile page -- cgit