diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-12 17:42:53 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:39:08 -0600 |
| commit | f60e0b62f4e5300645f235983e5b75bcf16b370d (patch) | |
| tree | 0c437e6600b7a8bdf806d63fa76ce751bbe66d58 /config/locales/simple_form.en-MP.yml | |
| parent | ec3abd7c87116ad2df5b1da5701afe68a7f74844 (diff) | |
| parent | 265b26489a9214a6c98a4dfa88f08ce490211ebc (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'config/locales/simple_form.en-MP.yml')
| -rw-r--r-- | config/locales/simple_form.en-MP.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.en-MP.yml b/config/locales/simple_form.en-MP.yml index df9ff571a..488c1c885 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: "<strong>[b]Bold[/b]</strong>, <u>[u]Underline[/u]</u>, <em>[i]Italic[/i]</em>, <code>[code]Console[/code]</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_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_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 unsettling 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 <strong>action menu</strong> (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. |