diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-30 11:10:46 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:02:20 -0600 |
| commit | b4d97bc26baff0a9867f1e510a7630dd34b8049d (patch) | |
| tree | 4637f1ead39e9e0748066445f94798b0d5f38fd4 /config/locales | |
| parent | 08f6b74097aacb2cf1c3894d4a58c0b2272a9fa5 (diff) | |
port tootsuite#11292 to monsterfork: Add whitelist mode
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 7 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8ba43dc6b..71cb35381 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -210,6 +210,7 @@ en: manual_only: Manual trust auto_trust: Auto trust web: Web + whitelisted: Whitelisted action_logs: actions: assigned_to_self_report: "%{name} assigned report %{target} to themselves" @@ -304,6 +305,11 @@ en: week_interactions: interactions this week week_users_active: active this week week_users_new: users this week + domain_allows: + add_new: Whitelist domain + created_msg: Domain has been successfully whitelisted + destroyed_msg: Domain has been removed from the whitelist + undo: Remove from whitelist domain_blocks: add_new: Add new domain policy created_msg: Domain policy is now being processed @@ -602,6 +608,7 @@ en: apply_for_account: Request an invite change_password: Password checkbox_agreement_html: I agree to the <a href="%{rules_path}" target="_blank">server rules</a> and <a href="%{terms_path}" target="_blank">terms of service</a> + checkbox_agreement_without_rules_html: I agree to the <a href="%{terms_path}" target="_blank">terms of service</a> delete_account: Delete account delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation. didnt_get_confirmation: Didn't receive confirmation instructions? diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f8ebb7a08..962a823c3 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -53,6 +53,9 @@ en: setting_roar_lifespan_old: "<strong>This is a destructive operation!</strong><br>Back up your account before saving changes!<br>Will deselect after save" setting_roar_defederate_old: "<strong>This is an irreversible operation!</strong><br>Will deselect after save" allow_unknown_follows: If disabled, packmate requests from accounts you've never interacted with before will be automatically rejected + whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word + domain_allow: + domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored featured_tag: name: 'You might want to use one of these:' imports: |