diff options
| author | Starfall <us@starfall.systems> | 2020-07-01 16:04:26 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-07-01 16:04:26 -0500 |
| commit | 9b8ab85007cc9b527ba8c59a3624731cd8e46ffe (patch) | |
| tree | 28cf79b4c73ec6d328136ea04a63321862096e5a /config/locales | |
| parent | 6ec1f4c99e51a13ca56d639b85168dfb874daf75 (diff) | |
| parent | 665eb1affe7ba765af476e6f00096aad3af70735 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index b3906a127..2cae0a3e3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -941,6 +941,8 @@ en: moderation: title: Moderation move_handler: + carry_blocks_over_text: This user moved from %{acct}, which you had blocked. + carry_mutes_over_text: This user moved from %{acct}, which you had muted. copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:' notification_mailer: digest: diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index d225adacb..78735e9c3 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -56,7 +56,7 @@ en: domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored email_domain_block: domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected. - with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted + with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blocked featured_tag: name: 'You might want to use one of these:' form_challenge: |