diff options
| author | Effy Elden <github@effy.is> | 2017-04-17 01:41:33 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 01:41:33 +1000 |
| commit | acd33101c50ba0cf09c1c41616f919d37760f3f7 (patch) | |
| tree | 43564c181a7f58ce7471026bd0daa099344330e8 /config/locales/en.yml | |
| parent | fd81916e8625e5de39855522300eaeffd85ee13d (diff) | |
| parent | 99226aba9391535a20d3cc6dba0f45e5792c73d4 (diff) | |
Merge branch 'master' into fix/cache_blocking
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 474de3985..325df5045 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -81,6 +81,8 @@ en: web: Web domain_block: add_new: Add new + created_msg: Domain block is now being processed + destroyed_msg: Domain block has been undone domain: Domain new: create: Create block @@ -90,8 +92,22 @@ en: silence: Silence suspend: Suspend title: New domain block + reject_media: Reject media files + reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions + severities: + silence: Silence + suspend: Suspend severity: Severity + show: + affected_accounts: + one: One account in the database affected + other: "%{count} accounts in the database affected" + retroactive: + silence: Unsilence all existing accounts from this domain + suspend: Unsuspend all existing accounts from this domain + title: Undo domain block for %{domain} title: Domain Blocks + undo: Undo pubsubhubbub: callback_url: Callback URL confirmed: Confirmed |