diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /config/locales/simple_form.en-GB.yml | |
parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'config/locales/simple_form.en-GB.yml')
-rw-r--r-- | config/locales/simple_form.en-GB.yml | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml index 617fb593c..89e78c9b0 100644 --- a/config/locales/simple_form.en-GB.yml +++ b/config/locales/simple_form.en-GB.yml @@ -9,3 +9,38 @@ en-GB: account_warning_preset: text: You can use post syntax, such as URLs, hashtags and mentions title: Optional. Not visible to the recipient + admin_account_action: + include_statuses: The user will see which posts have caused the moderation action or warning + send_email_notification: The user will receive an explanation of what happened with their account + text_html: Optional. You can use post syntax. You can <a href="%{path}">add warning presets</a> to save time + type_html: Choose what to do with <strong>%{acct}</strong> + types: + disable: Prevent the user from using their account, but do not delete or hide their contents. + none: Use this to send a warning to the user, without triggering any other action. + sensitive: Force all this user's media attachments to be flagged as sensitive. + silence: Prevent the user from being able to post with public visibility, hide their posts and notifications from people not following them. + suspend: Prevent any interaction from or to this account and delete its contents. Revertible within 30 days. + warning_preset_id: Optional. You can still add custom text to end of the preset + announcement: + all_day: When checked, only the dates of the time range will be displayed + ends_at: Optional. Announcement will be automatically unpublished at this time + scheduled_at: Leave blank to publish the announcement immediately + starts_at: Optional. In case your announcement is bound to a specific time range + text: You can use post syntax. Please be mindful of the space the announcement will take up on the user's screen + appeal: + text: You can only appeal a strike once + defaults: + autofollow: People who sign up through the invite will automatically follow you + avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px + bot: Signal to others that the account mainly performs automated actions and might not be monitored + context: One or multiple contexts where the filter should apply + labels: + notification_emails: + follow_request: Someone requested to follow you + mention: Someone mentioned you + pending_account: New account needs review + reblog: Someone boosted your post + report: New report is submitted + trending_tag: New trend requires review + rule: + text: Rule |