diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-30 00:18:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 00:18:08 +0200 |
| commit | 2848c08953a8555e06791170dbf1090575e05d8a (patch) | |
| tree | 53e8e98051c24ac4fb32ce5692e241b6a6391de3 /config/locales/en.yml | |
| parent | 79725f659d5e9c449df0ff73f9363407a0a064bd (diff) | |
| parent | 969d04385157175dc9c9f46987976d8fc5771707 (diff) | |
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index be190f0f1..8e5ee8543 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -512,6 +512,7 @@ en: delete: Delete nsfw_off: Mark as not sensitive nsfw_on: Mark as sensitive + deleted: Deleted failed_to_execute: Failed to execute media: title: Media @@ -1129,7 +1130,9 @@ en: disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked. silence: While your account is limited, only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follow you. suspend: Your account has been suspended, and all of your toots and your uploaded media files have been irreversibly removed from this server, and servers where you had followers. + get_in_touch: You can reply to this e-mail to get in touch with the staff of %{instance}. review_server_policies: Review server policies + statuses: 'Specifically, for:' subject: disable: Your account %{acct} has been frozen none: Warning for %{acct} |