Reword some sentences.

app/dashboard/templates/dashboard/api_key.html

@@ -15,25 +15,22 @@
       <h1 class="h3"> API Key
         <a class="ml-3 text-info" style="font-size: 12px" data-toggle="collapse" href="#howtouse" role="button"
            aria-expanded="false" aria-controls="collapseExample">
-          How to use <i class="fe fe-chevrons-down"></i>
+          What is this? <i class="fe fe-chevrons-down"></i>
         </a>
       </h1>
 
       <div class="alert alert-primary collapse" id="howtouse" role="alert">
-        The API Key is used on the SimpleLogin Chrome/Firefox/Safari extension. <br>
+        An API key is primarily used by the SimpleLogin browser extensions but can also be used by <a href="https://app.simplelogin.io/developer/" target="_blank">developer apps<i class="fe fe-external-link"></i></a>.
-        You can install the Chrome extension on
+        <br><br>You can install the official SimpleLogin browser extensions through the following links:
         <a href="https://chrome.google.com/webstore/detail/simplelogin-extension/dphilobhebphkdjbpfohgikllaljmgbn"
-           target="_blank">Chrome Store<i class="fe fe-external-link"></i></a>,
+           target="_blank">Chrome<i class="fe fe-external-link"></i></a>,
-        Firefox add-on on <a href="https://addons.mozilla.org/en-GB/firefox/addon/simplelogin/"
+        <a href="https://addons.mozilla.org/en-GB/firefox/addon/simplelogin/"
-                             target="_blank">Firefox<i
+           target="_blank">Firefox<i class="fe fe-external-link"></i></a> &
-          class="fe fe-external-link"></i></a>
+        <a href="https://apps.apple.com/us/app/simplelogin/id1494051017?mt=12&fbclid=IwAR0M0nnEKgoieMkmx91TSXrtcScj7GouqRxGgXeJz2un_5ydhIKlbAI79Io"
-        and Safari extension on <a
+            target="_blank">Safari<i class="fe fe-external-link"></i></a>
-          href="https://apps.apple.com/us/app/simplelogin/id1494051017?mt=12&fbclid=IwAR0M0nnEKgoieMkmx91TSXrtcScj7GouqRxGgXeJz2un_5ydhIKlbAI79Io"
-          target="_blank">AppStore<i class="fe fe-external-link"></i></a>
         <br>
-        Please copy and paste the API key below into the extension to get started. <br>
         <span class="text-danger">
-          ⚠️Your API Keys are secret and should be treated as passwords.
+          ⚠️API Keys should be kept secret and treated like passwords, they can be used to gain access to your account.
         </span>
       </div>
 
@@ -93,9 +90,9 @@
       <form method="post">
         {{ new_api_key_form.csrf_token }}
         <input type="hidden" name="form-name" value="create">
-        <h2 class="h4">New Api Key</h2>
+        <h2 class="h4">New API Key</h2>
 
-        {{ 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) }}
         <div class="small-text">Name of the api key, e.g. where it will be used.</div>
 

app/dashboard/templates/dashboard/custom_domain.html

@@ -14,21 +14,19 @@
       <h1 class="h3"> Custom Domains
         <a class="ml-3 text-info" style="font-size: 12px" data-toggle="collapse" href="#howtouse" role="button"
            aria-expanded="false" aria-controls="collapseExample">
-          How to use <i class="fe fe-chevrons-down"></i>
+          What is this? <i class="fe fe-chevrons-down"></i>
         </a>
       </h1>
 
       {% if not current_user.is_premium() %}
         <div class="alert alert-danger" role="alert">
-          This feature is only available in premium plan.
+            This feature is only available for Premium users. <a href="https://app.simplelogin.io/dashboard/pricing" target="_blank">Upgrade<i class="fe fe-external-link"></i></a>
         </div>
       {% endif %}
 
       <div class="alert alert-primary collapse" id="howtouse" role="alert">
-        If you own a domain, let's say <b>example.com</b>, you will be able to create aliases with this domain, for
+        Here you can add your own domain, you can then add custom aliases using it.
-        example
+        Catch-all mailboxes can also be setup to create new aliases on the fly.
-        contact@example.com, help@example.com, etc with SimpleLogin. <br>
-        You could also enable <b>catch-all</b> feature that allows you to create aliases on-the-fly.
       </div>
 
       <div class="row">

app/dashboard/templates/dashboard/mfa_cancel.html

@@ -8,21 +8,21 @@
 {% block default_content %}
   <div class="card">
     <div class="card-body">
-      <h1 class="h2">Multi Factor Authentication</h1>
+      <h1 class="h2">Two Factor Authentication</h1>
       <p>
-        To cancel MFA, please enter the 6-digit number in your TOTP application
+        To remove 2FA please enter your 2FA code from the authenticator app.
-        (Google Authenticator, Authy, MyDigiPassword, etc) here.
+        Alternatively you can enter a recovery code here instead.
       </p>
 
       <form method="post">
         {{ otp_token_form.csrf_token }}
 
         <div class="font-weight-bold mt-5">Token</div>
-        <div class="small-text">The 6-digit number displayed on your phone.</div>
+        <div class="small-text">The 6-digit 2FA code or recovery code.</div>
 
         {{ otp_token_form.token(class="form-control", autofocus="true") }}
         {{ render_field_errors(otp_token_form.token) }}
-        <button class="btn btn-lg btn-danger mt-2">Cancel MFA</button>
+        <button class="btn btn-lg btn-danger mt-2">Remove 2FA</button>
       </form>
     </div>
 

app/dashboard/templates/dashboard/mfa_setup.html

@@ -11,7 +11,7 @@
 {% block default_content %}
   <div class="card">
     <div class="card-body">
-      <h1 class="h3">Multi Factor Authentication</h1>
+      <h1 class="h3">Two Factor Authentication</h1>
       <p>Please open a TOTP application (Google Authenticator, Authy, MyDigiPassword, etc)
         on your smartphone and scan the following QR Code:
       </p>

app/dashboard/templates/dashboard/recovery_code.html

@@ -9,8 +9,8 @@
     <div class="card-body">
       <h1 class="h3">Recovery codes</h1>
       <p>
-        If you lose access to your authentication device, you can use one of these backup codes to login to your
+        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.
-        account. Each code may be used only once. Make a copy of these codes, and store it somewhere safe.
+        Each code may be used only once and you will not be able to view these again, make sure to store them in a safe place.
       </p>
 
       <ul>
@@ -32,7 +32,7 @@
         <input type="submit" class="btn btn-outline-primary" value="Generate New Codes">
       </form>
       <div class="small-text">
-        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.
       </div>
 
     </div>

app/dashboard/templates/dashboard/setting.html

@@ -106,10 +106,9 @@
 
     <div class="card" id="totp">
       <div class="card-body">
-        <div class="card-title">One-Time Password (TOTP)</div>
+        <div class="card-title">Two Factor Authentication</div>
         <div class="mb-3">
-          Secure your account with One-Time Password. <br>
+          Secure your account with 2FA, you'll be asked for a code generated through an app when you login. <br>
-          This requires having applications like Google Authenticator, Authy, MyDigiPassword, etc.
         </div>
         {% if not current_user.enable_otp %}
           <a href="{{ url_for('dashboard.mfa_setup') }}" class="btn btn-outline-primary">Setup TOTP</a>
@@ -149,7 +148,7 @@
                 {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %} selected {% endif %} >Based
               on {{ AliasGeneratorEnum.uuid.name.upper() }}</option>
           </select>
-          <button class="btn btn-outline-primary">Update Preference</button>
+          <button class="btn btn-outline-primary">Update</button>
         </form>
       </div>
     </div>
@@ -198,7 +197,7 @@
             <a href="{{ url_for('dashboard.pricing') }}" class="btn btn-sm btn-outline-primary">Upgrade</a>
           {% endif %}
         {% elif current_user.in_trial() %}
-          You are in the trial period. The trial ends {{ current_user.trial_end | dt }}.
+          Your Premium trial ends {{ current_user.trial_end | dt }}.
         {% else %}
           You are on the Free plan.
         {% endif %}

templates/footer.html

@@ -12,10 +12,10 @@
                 Feature Requests <i class="fe fe-external-link"></i>
               </a></li>
               <li class="list-inline-item"><a href="https://docs.simplelogin.io" target="_blank">
-                Dev Documentation <i class="fe fe-external-link"></i>
+                Developer Documentation <i class="fe fe-external-link"></i>
               </a></li>
               <li class="list-inline-item"><a href="https://status.simplelogin.io" target="_blank">
-                Uptime <i class="fe fe-external-link"></i>
+                Status <i class="fe fe-external-link"></i>
               </a></li>
               <li class="list-inline-item"><a href="mailto:hi@simplelogin.io">Contact Us
                 <i class="fe fe-external-link"></i></a></li>

templates/header.html

@@ -62,9 +62,9 @@
               </span>
 
               {% if current_user.in_trial() %}
-                <small class="text-success d-block mt-1">Premium ends {{ current_user.trial_end|dt }}
+                <small class="text-success d-block mt-1">Premium expires {{ current_user.trial_end|dt }}
                 <i class="fe fe-info" data-toggle="tooltip"
-                   title="When you signed up, your account is upgraded to the premium plan for 7 days (the trial period). After this period, your account will come back to the free plan"></i>
+                   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."></i>
                 </small>
               {% elif current_user.is_premium() %}