diff options
author | Reverite <github@reverite.sh> | 2019-09-07 13:03:02 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-09-07 13:03:02 -0700 |
commit | 2486f5f825ae861cdf97529f64dc4e658ddab279 (patch) | |
tree | eebbd191c621baa43a93b26d97d4766cf7ebf9cd /config/locales/simple_form.en.yml | |
parent | 54bf56d9e019e29c1509a2c5a0f23e4f1df65c90 (diff) | |
parent | 286bf110c3e69042049968440f1eb99372a7e0e6 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r-- | config/locales/simple_form.en.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index df898c621..6c315b0ed 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -5,6 +5,7 @@ en: account_warning_preset: text: You can use toot syntax, such as URLs, hashtags and mentions admin_account_action: + include_statuses: The user will see which toots 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 toot syntax. You can <a href="%{path}">add warning presets</a> to save time type_html: Choose what to do with <strong>%{acct}</strong> @@ -15,7 +16,7 @@ en: bot: This account mainly performs automated actions and might not be monitored context: One or multiple contexts where the filter should apply digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence - discoverable_html: The <a href="%{path}" target="_blank">directory</a> lets people find accounts based on interests and activity. Requires at least %{min_followers} followers + discoverable: The profile directory is another way by which your account can reach a wider audience email: You will be sent a confirmation e-mail fields: You can have up to 4 items displayed as a table on your profile header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px @@ -65,6 +66,7 @@ en: account_warning_preset: text: Preset text admin_account_action: + include_statuses: Include reported toots in the e-mail send_email_notification: Notify the user per e-mail text: Custom warning type: Action @@ -156,6 +158,7 @@ en: trending_tag: Send e-mail when an unreviewed hashtag is trending tag: listable: Allow this hashtag to appear in searches and on the profile directory + name: Hashtag trendable: Allow this hashtag to appear under trends usable: Allow toots to use this hashtag 'no': 'No' |