diff options
| author | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
| commit | fd98fd86128a5cea302b8496b6c7d5464ec1958a (patch) | |
| tree | f3e304a32bed75cb8ab6b1f38652192bff71c5f1 /config/locales/simple_form.en.yml | |
| parent | 8da73d2e57284c765b232bfc6842a7ac0f0a702b (diff) | |
| parent | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f3378a83e..b1bf5c9fd 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -49,6 +49,7 @@ en: phrase: Will be matched regardless of casing in text or content warning of a post scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. setting_aggregate_reblogs: Do not show new boosts for posts that have been recently boosted (only affects newly-received boosts) + setting_always_send_emails: Normally e-mail notifications won't be sent when you are actively using Mastodon setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click setting_display_media_default: Hide media marked as sensitive setting_display_media_hide_all: Always hide media @@ -151,6 +152,7 @@ en: phrase: Keyword or phrase setting_advanced_layout: Enable advanced web interface setting_aggregate_reblogs: Group boosts in timelines + setting_always_send_emails: Always send e-mail notifications setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting setting_crop_images: Crop images in non-expanded posts to 16x9 |