diff options
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 6e2d956d6..7d57f82ec 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -7,6 +7,7 @@ en: admin_account_action: send_email_notification: The creature will receive an explanation of what happened with their account text_html: Optional. You can use roar syntax. You can <a href="%{path}">add warning presets</a> to save time + include_statuses: The creature will see which roars have caused the moderation action or warning type_html: Choose what to do with <strong>%{acct}</strong> warning_preset_id: Optional. You can still add custom text to end of the preset defaults: @@ -75,7 +76,12 @@ en: account_warning_preset: text: Preset text admin_account_action: +<<<<<<< HEAD send_email_notification: Notify the creature per e-mail +======= + include_statuses: Include reported toots in the e-mail + send_email_notification: Notify the user per e-mail +>>>>>>> 73ca0bb92... Add option to include reported statuses in warning e-mail (#11639) text: Custom warning type: Action types: |