diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-24 17:28:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 17:28:22 +0100 |
| commit | 0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (patch) | |
| tree | 2eaa85c899033aab9bd1b2f9da2d727ce5788e16 /config/locales/simple_form.en.yml | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | bdc1581556b86ba25a385c9309db714eeaba1ca1 (diff) | |
Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 8386c8cf1..2f0820906 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -14,6 +14,12 @@ en: 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> 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 toot syntax. Please be mindful of the space the announcement will take up on the user's screen 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 @@ -88,6 +94,12 @@ en: silence: Silence suspend: Suspend and irreversibly delete account data warning_preset_id: Use a warning preset + announcement: + all_day: All-day event + ends_at: End of event + scheduled_at: Schedule publication + starts_at: Begin of event + text: Announcement defaults: autofollow: Invite to follow your account avatar: Avatar |