From 5d6a4963a0e315cc991fc296396f511f1beeca78 Mon Sep 17 00:00:00 2001
From: Agent-XD <155189348+Agent-XD@users.noreply.github.com>
Date: Wed, 3 Jan 2024 15:35:42 +0400
Subject: [PATCH] Small fixes (#1991)

* remove proprietary mention

* Add forum mention

* Sync activation.txt with activation.html

* Add subdomain information

* Make info look better

* Fix wording
---
 templates/dashboard/custom_alias.html         | 2 +-
 templates/dashboard/mfa_setup.html            | 2 +-
 templates/dashboard/notification.html         | 2 +-
 templates/dashboard/support.html              | 2 +-
 templates/dashboard/unsubscribe.html          | 8 ++++----
 templates/emails/transactional/activation.txt | 2 ++
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/templates/dashboard/custom_alias.html b/templates/dashboard/custom_alias.html
index 18ea4450..cf9cc23d 100644
--- a/templates/dashboard/custom_alias.html
+++ b/templates/dashboard/custom_alias.html
@@ -17,7 +17,7 @@
               <b>hello@{{ FIRST_ALIAS_DOMAIN }}</b>,
               <b>me@{{ FIRST_ALIAS_DOMAIN }}</b>, etc.
               <br />
-              If you add your own domain, this restriction is removed, and you can fully customize the alias.
+              If you add your own domain (or subdomain), this restriction is removed, and you can fully customize the alias.
               <br />
             </div>
           </div>
diff --git a/templates/dashboard/mfa_setup.html b/templates/dashboard/mfa_setup.html
index 564c9aa0..79442306 100644
--- a/templates/dashboard/mfa_setup.html
+++ b/templates/dashboard/mfa_setup.html
@@ -12,7 +12,7 @@
     <div class="card-body">
       <h1 class="h3">Two Factor Authentication - TOTP</h1>
       <p>
-        You will need to use a 2FA application like Google Authenticator or Authy on your phone or PC and scan the following QR Code:
+        You will need to use a 2FA application like Proton Pass or Aegis on your phone or PC and scan the following QR Code:
       </p>
       <canvas id="qr"></canvas>
       <script>
diff --git a/templates/dashboard/notification.html b/templates/dashboard/notification.html
index 0b2ccdba..25fc1e9b 100644
--- a/templates/dashboard/notification.html
+++ b/templates/dashboard/notification.html
@@ -10,7 +10,7 @@
       <div>{{ notification.message | safe }}</div>
       <form method="post"
             class="float-right mt-3"
-            onsubmit="return confirm('This operation is not reversible, please confirm');">
+            onsubmit="return confirm('This operation is irreversible, please confirm');">
         <button class="btn btn-outline-danger">Delete</button>
       </form>
     </div>
diff --git a/templates/dashboard/support.html b/templates/dashboard/support.html
index 4009e6ce..81b7a68a 100644
--- a/templates/dashboard/support.html
+++ b/templates/dashboard/support.html
@@ -18,7 +18,7 @@
           <br />
           For generic questions, i.e. not related to your account, we recommend to post the question on
           our
-          <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a>
+          <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a> or <a href="https://forum.simplelogin.io/">our official forum</a>
           where our community can help answer the question
           and other people with the same question can find the answer there.
         </div>
diff --git a/templates/dashboard/unsubscribe.html b/templates/dashboard/unsubscribe.html
index f1cfa87d..1866a307 100644
--- a/templates/dashboard/unsubscribe.html
+++ b/templates/dashboard/unsubscribe.html
@@ -1,17 +1,17 @@
 {% extends "default.html" %}
 
 {% set active_page = "dashboard" %}
-{% block title %}Block an alias{% endblock %}
+{% block title %}Deactivate an alias{% endblock %}
 {% block default_content %}
 
   <div class="card">
     <div class="card-body">
-      <h1 class="h3">Block alias</h1>
+      <h1 class="h3">Deactivate alias</h1>
       <p>
-        You are about to block the alias
+        You are about to deactivate the alias
         <a href="mailto:{{ alias }}" target="_blank">{{ alias }}</a>
       </p>
-      <p>After this, you will stop receiving all emails sent to this alias, please confirm.</p>
+      <p>After this, you will stop receiving all emails sent to this alias, please confirm. You will always be able to re-activate it untill you will decide to delete it.</p>
       <form method="post">
         <button class="btn btn-warning">Confirm</button>
       </form>
diff --git a/templates/emails/transactional/activation.txt b/templates/emails/transactional/activation.txt
index ecc3f907..304008cf 100644
--- a/templates/emails/transactional/activation.txt
+++ b/templates/emails/transactional/activation.txt
@@ -4,4 +4,6 @@
 Thank you for choosing SimpleLogin.
 
 To get started, please confirm that {{email}} is your email address using this link {{activation_link}} within 1 hour.
+
+If it wasn't you, maybe someone entered your email by mistake. In this case you can ignore this mail.
 {% endblock %}