diff --git a/app/auth/templates/auth/mfa.html b/app/auth/templates/auth/mfa.html index 07a17d5c..fa9921e6 100644 --- a/app/auth/templates/auth/mfa.html +++ b/app/auth/templates/auth/mfa.html @@ -11,8 +11,8 @@
- Your account is protected with multi-factor authentication (MFA).

- To continue with the sign-in you need to provide the access code from your authenticator. + Your account is protected with Two Factor Authentication.

+ You will need to enter your 2FA authentication code.
@@ -20,9 +20,7 @@
Token
-
Please enter the 6-digit number displayed in your MFA application - (Google Authenticator, Authy, MyDigiPassword, etc) here -
+
Please enter the 2FA code from your 2FA authenticator
{{ otp_token_form.token(class="form-control", autofocus="true") }} {{ render_field_errors(otp_token_form.token) }} @@ -32,7 +30,7 @@ {{ otp_token_form.remember.description }}
- + {% if enable_fido %} @@ -45,12 +43,12 @@
- If you have troubles with your authentication app, you can use the recovery code to login.
- Use Recovery Codes + If you cannot access your authenticator application you can instead use a recovery code.
+ Use Recovery Code
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/dashboard/templates/dashboard/api_key.html b/app/dashboard/templates/dashboard/api_key.html index c9a03995..48c00f01 100644 --- a/app/dashboard/templates/dashboard/api_key.html +++ b/app/dashboard/templates/dashboard/api_key.html @@ -15,25 +15,22 @@

API Key

@@ -93,9 +90,9 @@
{{ new_api_key_form.csrf_token }} -

New Api Key

+

New API Key

- {{ new_api_key_form.name(class="form-control", placeholder="Chrome, Firefox") }} + {{ new_api_key_form.name(class="form-control", placeholder="Chrome") }} {{ render_field_errors(new_api_key_form.name) }}
Name of the api key, e.g. where it will be used.
@@ -153,4 +150,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/dashboard/templates/dashboard/custom_alias.html b/app/dashboard/templates/dashboard/custom_alias.html index 790fc61f..f6113416 100644 --- a/app/dashboard/templates/dashboard/custom_alias.html +++ b/app/dashboard/templates/dashboard/custom_alias.html @@ -32,11 +32,11 @@ id="prefix" type="text" pattern="[0-9a-z-_]{1,}" - title="Only lowercase letter, number, dash (-), underscore (_) can be used in alias prefix." - placeholder="email alias, for example newsletter-123_xyz" + title="Only lowercase letters, numbers, dashes (-) and underscores (_) are currently supported." + placeholder="Email alias, for example newsletter-123_xyz" autofocus required>
- Only lowercase letter, number, dash (-), underscore (_) can be used. + Only lowercase letters, numbers, dashes (-) and underscores (_) are currently supported.
@@ -78,7 +78,7 @@ + placeholder="Note, can be anything to help you remember why you created this alias. This field is optional."> diff --git a/app/dashboard/templates/dashboard/custom_domain.html b/app/dashboard/templates/dashboard/custom_domain.html index 3353570b..22d7e34f 100644 --- a/app/dashboard/templates/dashboard/custom_domain.html +++ b/app/dashboard/templates/dashboard/custom_domain.html @@ -14,21 +14,19 @@

Custom Domains

{% if not current_user.is_premium() %} {% endif %}
diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html index e1faf494..9036063d 100644 --- a/app/dashboard/templates/dashboard/directory.html +++ b/app/dashboard/templates/dashboard/directory.html @@ -102,7 +102,7 @@ {{ render_field_errors(new_dir_form.name) }}
Directory name must be at least 3 characters. - Only lowercase letter, number, dash (-), underscore (_) can be used. + Only lowercase letters, numbers, dashes (-) and underscores (_) are currently supported.
@@ -143,4 +143,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/dashboard/templates/dashboard/mfa_cancel.html b/app/dashboard/templates/dashboard/mfa_cancel.html index 4d3183d1..3a9ae226 100644 --- a/app/dashboard/templates/dashboard/mfa_cancel.html +++ b/app/dashboard/templates/dashboard/mfa_cancel.html @@ -8,21 +8,20 @@ {% block default_content %}
-

Multi Factor Authentication

+

Two Factor Authentication

- To cancel MFA, please enter the 6-digit number in your TOTP application - (Google Authenticator, Authy, MyDigiPassword, etc) here. + To remove 2FA please enter your 2FA code from the authenticator app.

{{ otp_token_form.csrf_token }}
Token
-
The 6-digit number displayed on your phone.
+
The 6-digit 2FA code.
{{ otp_token_form.token(class="form-control", autofocus="true") }} {{ render_field_errors(otp_token_form.token) }} - +
diff --git a/app/dashboard/templates/dashboard/mfa_setup.html b/app/dashboard/templates/dashboard/mfa_setup.html index b0995e8e..8f417739 100644 --- a/app/dashboard/templates/dashboard/mfa_setup.html +++ b/app/dashboard/templates/dashboard/mfa_setup.html @@ -11,9 +11,8 @@ {% block default_content %}
-

Multi Factor Authentication

-

Please open a TOTP application (Google Authenticator, Authy, MyDigiPassword, etc) - on your smartphone and scan the following QR Code: +

Two Factor Authentication

+

You will need to use a 2FA application like Google Authenticator or Authy on your phone or PC and scan the following QR Code:

@@ -28,7 +27,7 @@
- Or you can use the manual entry with the following key: + Or you can manually enter the following secret key:
@@ -38,11 +37,11 @@ {{ otp_token_form.csrf_token }}
Token
-
Please enter the 6-digit number displayed on your phone.
+
Please enter the 6-digit number displayed in your authenticator app.
{{ otp_token_form.token(class="form-control", placeholder="") }} {{ render_field_errors(otp_token_form.token) }} - +
diff --git a/app/dashboard/templates/dashboard/pricing.html b/app/dashboard/templates/dashboard/pricing.html index 644e1635..edab4eb7 100644 --- a/app/dashboard/templates/dashboard/pricing.html +++ b/app/dashboard/templates/dashboard/pricing.html @@ -25,12 +25,13 @@
Premium
    -
  • Unlimited alias
    • +
  • + Unlimited aliases
  • Unlimited custom domains
  • - Catch-all (or wildcard) alias + Catch-all (or wildcard) aliases
  • Up to 50 directories (or usernames) @@ -43,7 +44,7 @@
-
More info on our Pricing +
More information is available on our Pricing Page
@@ -98,4 +99,4 @@ } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/dashboard/templates/dashboard/recovery_code.html b/app/dashboard/templates/dashboard/recovery_code.html index 9fa494cf..b8e4a748 100644 --- a/app/dashboard/templates/dashboard/recovery_code.html +++ b/app/dashboard/templates/dashboard/recovery_code.html @@ -9,8 +9,8 @@

Recovery codes

- If you lose access to your authentication device, you can use one of these backup codes to login to your - account. Each code may be used only once. Make a copy of these codes, and store it somewhere safe. + In the event you lose access to your authenticator app you can use one of these recovery codes to gain access to your account again. + Each code can only be used once, make sure to store them in a safe place.

    @@ -32,7 +32,7 @@
    - Beware: Generating new codes invalidates all the previous ones, make sure to write down the new ones! + Warning: Generating new codes will invalidate the older ones.
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index 1c4296d6..c151f617 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -104,10 +104,9 @@
-
One-Time Password (TOTP)
+
Two Factor Authentication
- Secure your account with One-Time Password.
- This requires having applications like Google Authenticator, Authy, MyDigiPassword, etc. + Secure your account with 2FA, you'll be asked for a code generated through an app when you login.
{% if not current_user.enable_otp %} Setup TOTP @@ -124,7 +123,7 @@ Change password
- You will receive an email containing instructions on how to change password. + You will receive an email containing instructions on how to change your password.
@@ -136,7 +135,7 @@
Random Alias
-
Choose how to create your email alias by default
+
Change the way random aliases are generated by default.
- +
@@ -156,15 +155,14 @@
Newsletters
- Every now and then we can send you an email - to let you know about a new feature that might be useful to you. + We will occasionally send you emails with new feature announcements.
- +
@@ -181,22 +179,22 @@ Manage Subscription {% elif manual_sub %} - You are on the Premium plan. The plan ends {{ manual_sub.end_at | dt }} + You are on the Premium plan which expires {{ manual_sub.end_at | dt }} ({{ manual_sub.end_at.format("YYYY-MM-DD") }}). {% if manual_sub.is_giveaway %}
- To support SimpleLogin it's possible to change to a paid plan.
+ To gain additional features and support Simple Login you can upgrade to a Premium plan.
Upgrade {% endif %} {% elif current_user.lifetime %} - You have the lifetime licence. + You have lifetime access to the Premium plan. {% if not current_user.paid_lifetime %}
- To support SimpleLogin it's possible to change to a paid plan.
+ To support Simple Login you can switch to a paid plan.
Upgrade {% endif %} {% elif current_user.in_trial() %} - You are in the trial period. The trial ends {{ current_user.trial_end | dt }}. + Your Premium trial expires {{ current_user.trial_end | dt }}. {% else %} You are on the Free plan. {% endif %} diff --git a/app/oauth/templates/oauth/authorize.html b/app/oauth/templates/oauth/authorize.html index 93e2d4fa..a34587fa 100644 --- a/app/oauth/templates/oauth/authorize.html +++ b/app/oauth/templates/oauth/authorize.html @@ -98,7 +98,7 @@
@@ -196,4 +196,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/footer.html b/templates/footer.html index ed994c53..a251867b 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -12,10 +12,10 @@ Feature Requests
  • - Dev Documentation + Developer Documentation
  • - Uptime + Status
  • Contact Us
    • @@ -119,4 +119,4 @@ } } }) - \ No newline at end of file + diff --git a/templates/header.html b/templates/header.html index 667ab045..3b50c0ef 100644 --- a/templates/header.html +++ b/templates/header.html @@ -62,9 +62,9 @@ {% if current_user.in_trial() %} - Premium ends {{ current_user.trial_end|dt }} + Premium expires {{ current_user.trial_end|dt }} + title="After you signed up you were given a free 7 day Premium trial, after this period your account will automatically be downgraded to the Free plan."> {% elif current_user.is_premium() %}