autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v3.2.0' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2020-07-27 22:21:35 +02:00
parent 06b6353483 93dd413a47
commit 8126ac030e
675 changed files with 20546 additions and 6950 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/locales/simple_form.en.yml
+2 -1
View File
@@ -57,7 +57,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:
@@ -153,6 +153,7 @@ en:
setting_use_blurhash: Show colorful gradients for hidden media
setting_use_pending_items: Slow mode
severity: Severity
sign_in_token_attempt: Security code
type: Import type
username: Username
username_or_email: Username or Email