From 47055841d83fe2e6d6d936e6c9674bbac2df572d Mon Sep 17 00:00:00 2001
From: Melissa Autumn <melissa@thunderbird.net>
Date: Tue, 10 Sep 2024 14:46:06 -0700
Subject: [PATCH 1/3] Re-work waiting list action, and string extract.

---
 frontend/src/components/GenericModal.vue     |   1 -
 frontend/src/locales/en.json                 |  51 ++++++-
 frontend/src/views/LoginView.vue             |  37 +++--
 frontend/src/views/WaitingListActionView.vue | 146 +++++++++++--------
 4 files changed, 150 insertions(+), 85 deletions(-)

diff --git a/frontend/src/components/GenericModal.vue b/frontend/src/components/GenericModal.vue
index ef0a8454..040eaefb 100644
--- a/frontend/src/components/GenericModal.vue
+++ b/frontend/src/components/GenericModal.vue
@@ -84,7 +84,6 @@ onUnmounted(() => {
   width: 100%;
   flex-direction: column;
   align-items: center;
-  margin-top: 1rem;
 }
 
 .modal-actions {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f4881cbe..94d1af43 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,7 +1,8 @@
 {
   "app": {
     "summary": "Invite others to grab times on your calendar. Choose a date. Make appointments as easy as it gets.",
-    "title": "Thunderbird Appointment"
+    "title": "Thunderbird Appointment",
+    "tagline": "Plan less, do more"
   },
   "error": {
     "actionNeeded": "Action needed",
@@ -320,6 +321,35 @@
     "de": "German",
     "en": "English"
   },
+  "login": {
+    "login": {
+      "title": "Simplify your day – just enter your email:",
+      "intro": {
+        "returning": [
+          "Returning?",
+          "{strong} We'll recognize you and direct you to your account."
+        ],
+        "new": [
+          "New?",
+          "{strong} We'll help you set up quickly."
+        ]
+      }
+    },
+    "signUp": {
+      "title": "Have an invite code? Enter it here"
+    },
+    "confirm": {
+      "title": "Complete your sign up",
+      "intro": [
+        "Please confirm your email to join our waiting list.",
+        "Check your inbox for more information shortly."
+      ]
+    },
+    "form": {
+      "privacy": "Your privacy is important to us.",
+      "no-invite-code": "If you don't have an invite code, add your email to our waiting list."
+    }
+  },
   "placeholder": {
     "biWeeklyCafeDates": "Bi-weekly Café Dates…",
     "emailAddress": "john.doe{'@'}example.com",
@@ -417,15 +447,22 @@
   },
   "waitingList": {
     "adminInviteNotice": "Notice: The Send button will not re-invite people already accepted, but you can still select them. Use the filters for clarity!",
-    "confirmHeading": "Your email is confirmed!",
-    "confirmInfo": "Your email is now confirmed and if selected you will be contacted about an invite code in the future.",
+    "confirmHeading": "You’re on the waitlist",
+    "confirmInfo": "You'll receive an invitation as soon as registration opens.",
     "errorHeading": "There was a problem with that link",
     "errorInfo": "Unfortunately this link is expired or is invalid.",
-    "leaveHeading": "You successfully left the waiting list",
-    "leaveInfo": "Sorry to see you go. You're welcome to re-join the waiting list at any time!",
+    "leaveHeading": "You’ve been removed from the waitlist",
+    "leaveInfo": "Your email has been successfully removed from our waitlist.\nIf you change your mind, you can always rejoin.",
     "signUpAlreadyExists": "You are already on the waiting list.",
     "signUpCheckYourEmail": "Check your email for more information.",
-    "signUpHeading": "Just one more step!",
-    "signUpInfo": "Before you can be added to the waiting list, you need to confirm your email address."
+    "signUpHeading": "Complete your sign up",
+    "signUpInfo": [
+      "Please confirm your email to join our waiting list.",
+      "Check your inbox for more information shortly."
+    ],
+    "marketing": [
+      "Own your calendar, share your time.",
+      "Thunderbird Appointment simplifies the way you find time to connect so you can soar past the planning, and get to the living."
+    ]
   }
 }
diff --git a/frontend/src/views/LoginView.vue b/frontend/src/views/LoginView.vue
index e5a70d84..b3b0a3d5 100644
--- a/frontend/src/views/LoginView.vue
+++ b/frontend/src/views/LoginView.vue
@@ -9,11 +9,8 @@ import {
 import {
   BooleanResponse,
   AuthUrlResponse,
-  Exception,
   AuthUrl,
   Error,
-  PydanticExceptionDetail,
-  ExceptionDetail,
   PydanticException,
 } from '@/models';
 import { posthog, usePosthog } from '@/composables/posthog';
@@ -214,34 +211,43 @@ const onEnter = () => {
     <template v-slot:header>
       <word-mark/>
       <h2 id="title" v-if="loginStep === LoginSteps.Login">
-        Simplify your day – just enter your email:
+        {{ t('login.login.title') }}
       </h2>
       <h2 id="title" v-else-if="loginStep === LoginSteps.SignUp">
-        Have an invite code? Enter it here
+        {{ t('login.signUp.title') }}
       </h2>
       <h2 id="title" v-else>
-        Complete your sign up
+        {{ t('login.confirm.title') }}
       </h2>
     </template>
     <div class="intro-text" v-if="loginStep === LoginSteps.Login">
-      <p><strong>Returning?</strong> We'll recognize you and direct you to your account.</p>
-      <p><strong>New?</strong> We'll help you set up quickly.</p>
+      <i18n-t keypath="login.login.intro.returning.1" tag="p">
+        <template v-slot:strong>
+          <strong>{{ t('login.login.intro.returning.0') }}</strong>
+        </template>
+      </i18n-t>
+      <i18n-t keypath="login.login.intro.new.1" tag="p">
+        <template v-slot:strong>
+          <strong>{{ t('login.login.intro.new.0') }}</strong>
+        </template>
+      </i18n-t>
     </div>
     <div class="intro-text" v-if="loginStep === LoginSteps.SignUpConfirm">
-      <p><strong>Please confirm your email to join our waiting list.</strong></p>
-      <p>Check your inbox for more information shortly.</p>
+      <p><strong>{{ t('login.confirm.intro.0') }}</strong></p>
+      <p>{{ t('login.confirm.intro.1') }}</p>
     </div>
     <div class="form-body">
       <form v-if="loginStep !== LoginSteps.SignUpConfirm" class="form" ref="formRef" autocomplete="off" @submit.prevent @keyup.enter="() => onEnter()">
-        <text-input name="email" v-model="email" :required="true" :help="loginStep === LoginSteps.Login || hideInviteField ? 'Your privacy is important to us.' : null">{{ t('label.email') }}</text-input>
+        <text-input name="email" v-model="email" :required="true" :help="loginStep === LoginSteps.Login || hideInviteField ? t('login.form.privacy') : null">{{ t('label.email') }}</text-input>
         <text-input v-if="isPasswordAuth" name="password" v-model="password" :required="true">{{ t('label.password') }}</text-input>
-        <text-input v-if="loginStep === LoginSteps.SignUp && !hideInviteField" name="inviteCode" v-model="inviteCode" help="If you don't have an invite code, add your email to our waiting list">{{ t('label.inviteCode') }}</text-input>
+        <text-input v-if="loginStep === LoginSteps.SignUp && !hideInviteField" name="inviteCode" v-model="inviteCode" :help="t('login.form.no-invite-code')">{{ t('label.inviteCode') }}</text-input>
       </form>
     </div>
     <template v-slot:actions>
       <primary-button
         class="btn-continue"
         :title="t('label.continue')"
+        :disabled="isLoading"
         @click="onEnter()"
         v-if="loginStep !== LoginSteps.SignUpConfirm"
       >
@@ -250,6 +256,7 @@ const onEnter = () => {
       <primary-button
         class="btn-close"
         :title="t('label.close')"
+        :disabled="isLoading"
         @click="router.push({name: 'home'})"
         v-else
       >
@@ -257,7 +264,7 @@ const onEnter = () => {
       </primary-button>
     </template>
     <template v-slot:footer>
-      <router-link :to="{name: 'home'}">Plan less, do more</router-link>
+      <router-link :to="{name: 'home'}">{{ t('app.tagline') }}</router-link>
     </template>
   </generic-modal>
   </div>
@@ -270,6 +277,10 @@ const onEnter = () => {
   gap: 0.983125rem;
   margin-bottom: 1.5625rem;
 }
+/* Tweak the generic-modal's modal-body style */
+:deep(.modal-body) {
+  margin-top: 1rem;
+}
 .form-body {
   display: flex;
   flex-direction: column;
diff --git a/frontend/src/views/WaitingListActionView.vue b/frontend/src/views/WaitingListActionView.vue
index cafd20e9..2109696d 100644
--- a/frontend/src/views/WaitingListActionView.vue
+++ b/frontend/src/views/WaitingListActionView.vue
@@ -1,20 +1,25 @@
 <script setup lang="ts">
 import { inject, onMounted, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import {MetricEvents, WaitingListAction} from '@/definitions';
-import { WaitingListActionResponse } from '@/models';
 import { useI18n } from 'vue-i18n';
-import { callKey } from '@/keys';
-import ArtSuccessfulBooking from '@/elements/arts/ArtSuccessfulBooking.vue';
-import ArtLeave from '@/elements/arts/ArtLeave.vue';
-import ArtInvalidLink from '@/elements/arts/ArtInvalidLink.vue';
-import LoadingSpinner from '@/elements/LoadingSpinner.vue';
-import PrimaryButton from '@/elements/PrimaryButton.vue';
-import {posthog, usePosthog} from "@/composables/posthog";
+import { useRoute, useRouter } from 'vue-router';
+import {
+  callKey,
+} from '@/keys';
+import {
+  WaitingListActionResponse,
+} from '@/models';
+import { posthog, usePosthog } from '@/composables/posthog';
+import { MetricEvents, WaitingListAction } from '@/definitions';
+import GenericModal from '@/components/GenericModal.vue';
+import HomeView from '@/views/HomeView.vue';
+import PrimaryButton from '@/tbpro/elements/PrimaryButton.vue';
+import WordMark from '@/elements/WordMark.vue';
 
+// component constants
 const route = useRoute();
 const router = useRouter();
 
+// component constants
 const { t } = useI18n();
 
 // component constants
@@ -22,12 +27,9 @@ const call = inject(callKey);
 
 const isLoading = ref(false);
 const isError = ref(false);
+const errorMsg = ref(null);
 const action = ref(null);
 
-const goHome = () => {
-  router.push('/');
-};
-
 onMounted(async () => {
   isLoading.value = true;
   const { data, error }: WaitingListActionResponse = await call('waiting-list/action').post({
@@ -48,68 +50,84 @@ onMounted(async () => {
     return;
   }
 
- if (usePosthog) {
+  if (usePosthog) {
     if (action.value === WaitingListAction.Confirm) {
       posthog.capture(MetricEvents.WaitingListEmailConfirmed, {});
     } else if (action.value === WaitingListAction.Leave) {
       posthog.capture(MetricEvents.WaitingListEmailRemoved, {});
     }
   }
-
 });
 </script>
 
 <template>
-  <div class="flex-center h-full flex-col gap-12 p-4">
-    <div v-if="isLoading">
-      <loading-spinner/>
-    </div>
-    <div v-else-if="isError" class="flex-center flex-col gap-8 px-4">
-      <art-invalid-link class="my-6 h-auto max-w-sm"/>
-      <div class="text-xl font-semibold text-sky-600">
+  <div>
+  <home-view></home-view>
+  <generic-modal :error-message="errorMsg">
+    <template v-slot:header>
+      <word-mark/>
+      <h2 id="title" v-if="isError">
         {{ t('waitingList.errorHeading') }}
-      </div>
-      <div class="text-center text-gray-800 dark:text-gray-300">
-        {{ t('waitingList.errorInfo') }}<br>
-      </div>
-      <primary-button
-        :label="t('label.home')"
-        class="btn-back"
-        @click="goHome"
-        :title="t('label.home')"
-      />
+      </h2>
+      <h2 id="title" v-else-if="action === WaitingListAction.Confirm">
+        {{ t('waitingList.confirmHeading') }}
+      </h2>
+      <h2 id="title" v-else-if="action === WaitingListAction.Leave">
+        {{ t('waitingList.leaveHeading') }}
+      </h2>
+    </template>
+    <img class="img is-dark-mode" src="@/assets/svg/ftue-finish-dark.svg" :alt="t('ftue.finishAltText')"/>
+    <img class="img is-light-mode" src="@/assets/svg/ftue-finish.svg" :alt="t('ftue.finishAltText')"/>
+    <div class="intro-text" v-if="isError">
+      <p>{{ t('waitingList.errorInfo') }}</p>
+    </div>
+    <div class="intro-text" v-else-if="action === WaitingListAction.Confirm">
+      <p>{{ t('waitingList.confirmInfo') }}</p>
+    </div>
+    <div class="intro-text" v-else-if="action === WaitingListAction.Leave">
+      <p>{{ t('waitingList.leaveInfo') }}</p>
     </div>
-    <div v-else class="flex-center flex-col gap-8 px-4">
-      <template v-if="action === WaitingListAction.Confirm">
-        <art-successful-booking class="my-6 h-auto max-w-sm"/>
-        <div class="text-xl font-semibold text-sky-600">
-          {{ t('waitingList.confirmHeading') }}
-        </div>
-        <div class="text-center text-gray-800 dark:text-gray-300">
-          {{ t('waitingList.confirmInfo') }}<br>
-        </div>
-        <primary-button
-          :label="t('label.home')"
-          class="btn-back"
-          @click="goHome"
-          :title="t('label.home')"
-        />
-      </template>
-      <template v-else>
-        <art-leave class="my-6 h-auto max-w-sm"/>
-        <div class="text-xl font-semibold text-sky-600">
-          {{ t('waitingList.leaveHeading') }}
-        </div>
-        <div class="text-center text-gray-800 dark:text-gray-300">
-          {{ t('waitingList.leaveInfo') }}
-        </div>
-        <primary-button
-          :label="t('label.home')"
-          class="btn-back"
-          @click="goHome"
-          :title="t('label.home')"
-        />
-      </template>
+    <div class="intro-text marketing-text">
+      <p><strong>{{ t('waitingList.marketing.0') }}</strong></p>
+      <p>{{ t('waitingList.marketing.1') }}</p>
     </div>
+
+    <template v-slot:actions>
+      <primary-button
+        class="btn-close"
+        :title="t('label.close')"
+        :disabled="isLoading"
+        @click="router.push({name: 'home'})"
+      >
+        {{ t('label.close') }}
+      </primary-button>
+    </template>
+    <template v-slot:footer>
+      <router-link :to="{name: 'home'}">{{ t('app.tagline') }}</router-link>
+    </template>
+  </generic-modal>
   </div>
 </template>
+<style scoped>
+.img {
+  margin-top: -1rem;
+  margin-bottom: 1rem;
+}
+.intro-text {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+  max-width:30.0rem;
+  margin-bottom: 1rem;
+  white-space: break-spaces;
+}
+.marketing-text {
+  margin-bottom: 1.5625rem;
+}
+
+.btn-close {
+  /* Right align */
+  margin-right: 2rem;
+  margin-left: auto;
+}
+</style>

From 805b9a7ae2ebfde949c474f9da64f8b538f17b72 Mon Sep 17 00:00:00 2001
From: Melissa Autumn <melissa@thunderbird.net>
Date: Tue, 10 Sep 2024 15:50:13 -0700
Subject: [PATCH 2/3] Update confirm your email...email

---
 backend/src/appointment/l10n/en/email.ftl     |  9 ++--
 .../templates/email/confirm_email.jinja2      | 52 ++++++++++++-------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/backend/src/appointment/l10n/en/email.ftl b/backend/src/appointment/l10n/en/email.ftl
index fcb2f08c..cc1258fb 100644
--- a/backend/src/appointment/l10n/en/email.ftl
+++ b/backend/src/appointment/l10n/en/email.ftl
@@ -171,11 +171,12 @@ new-account-mail-plain = You've been invited to Thunderbird Appointment.
 
 ## Confirm Email for waiting list
 confirm-email-mail-subject = Confirm your email to join the waiting list!
-confirm-email-mail-confirm-action = Confirm your email
-confirm-email-mail-decline-action = Remove your email
+confirm-email-mail-confirm-action = Confirm
 confirm-email-mail-html-heading = Thank you for your interest in Thunderbird Appointment.
-confirm-email-mail-html-body = Before we add you to our waiting list we need you to confirm your email address below.
-confirm-email-mail-html-body-2 = Did you receive this email in error, or are you no longer interested?
+confirm-email-mail-html-body = To join our waiting list, please confirm your email by clicking the button below or pasting this link into your browser:
+confirm-email-mail-html-body-2 = If you received this email in error or are no longer interested, you can
+confirm-email-mail-html-body-2-link-text = remove your email.
+
 # Variables:
 # $confirm_email_url (String) - URL to confirm your email
 # $decline_email_url (String) - URL to remove the email from the waiting list
diff --git a/backend/src/appointment/templates/email/confirm_email.jinja2 b/backend/src/appointment/templates/email/confirm_email.jinja2
index d21f16ab..fe84feaa 100644
--- a/backend/src/appointment/templates/email/confirm_email.jinja2
+++ b/backend/src/appointment/templates/email/confirm_email.jinja2
@@ -1,17 +1,30 @@
 {% extends "includes/base.jinja2" %}
 {# Code begins! #}
 {% block introduction %}
-  <div style="color: {{ colour_text_base }}; text-align: center; line-height: 16px;">
+  <div style="color: {{ colour_text_base }}; text-align: center; line-height: 16px;margin-bottom: 32px;">
     <p style="font-weight: 700; margin: 0;">
       {{ l10n('confirm-email-mail-html-heading') }}
     </p>
   </div>
 {% endblock %}
 {% block call_to_action %}
-  <p>
-    {{ l10n('confirm-email-mail-html-body') }}
+  <center>
+    <p style="max-width: 380px; text-align: center;">
+      {{ l10n('confirm-email-mail-html-body') }}
+    </p>
+  </center>
+  <p style="
+    color: {{ colour_tbpro_apmt_primary }};
+    font-size: 13px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    text-decoration-line: underline;
+    margin-bottom: 32px;
+    ">
+    {{ confirm_email_url }}
   </p>
-  <div style="margin-bottom: 12px">
+  <div style="margin-bottom: 32px">
     <a
       href="{{ confirm_email_url }}"
       style="
@@ -28,20 +41,23 @@
         "
     >{{ l10n('confirm-email-mail-confirm-action') }}</a>
   </div>
-  <p>
+  <center>
+    <p style="
+    color: {{ colour_text_muted }};
+    text-align: center;
+    font-size: 9px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: normal;
+    margin-bottom: 32px;
+    max-width: 315px;
+    ">
     {{ l10n('confirm-email-mail-html-body-2') }}
-  </p>
-  <div>
-    <a
-      href="{{ decline_email_url }}"
-      style="
-        display: inline-block;
-        font-size: 13px;
-        padding: 12px 24px;
+    <a style="
         color: {{ colour_tbpro_apmt_primary }};
-        text-decoration-line: underline;
-        font-weight: 400;
-        "
-    >{{ l10n('confirm-email-mail-decline-action') }}</a>
-  </div>
+        text-decoration-line: underline;"
+       href="{{ decline_email_url }}">{{ l10n('confirm-email-mail-html-body-2-link-text') }}</a>
+  </p>
+  </center>
+  
 {% endblock %}

From 53d6e647c961fc18d9aaee3fd48ca463e91f7b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <mail@devmount.de>
Date: Wed, 11 Sep 2024 12:46:11 +0200
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8C=90=20Update=20German=20translatio?=
 =?UTF-8?q?n,=20sort=20lang=20keys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/appointment/l10n/de/email.ftl |  9 ++--
 frontend/src/locales/de.json              | 52 ++++++++++++++++++++---
 frontend/src/locales/en.json              | 52 +++++++++++------------
 3 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/backend/src/appointment/l10n/de/email.ftl b/backend/src/appointment/l10n/de/email.ftl
index 2d4539a8..c37774e1 100644
--- a/backend/src/appointment/l10n/de/email.ftl
+++ b/backend/src/appointment/l10n/de/email.ftl
@@ -171,11 +171,12 @@ new-account-mail-plain = Du wurdest zu Thunderbird Appointment eingeladen.
 
 ## Confirm Email for waiting list
 confirm-email-mail-subject = Bestätige deine E-Mail-Adresse um der Warteliste beizutreten!
-confirm-email-mail-confirm-action = Bestätige deine E-Mail-Adresse
-confirm-email-mail-decline-action = Entferne deine E-Mail-Adresse
+confirm-email-mail-confirm-action = Bestätigen
 confirm-email-mail-html-heading = Danke für Dein Interesse an Thunderbird Appointment.
-confirm-email-mail-html-body = Bevor wir Dich auf unsere Warteliste setzen, musst Du Deine E-Mail-Adresse unten bestätigen.
-confirm-email-mail-html-body-2 = Hast Du diese E-Mail irrtümlich erhalten, oder bist nicht mehr interessiert?
+confirm-email-mail-html-body = Um der Warteliste beizutreten, bestätige bitte deine E-Mail-Adresse, indem du den Button unten klickst oder diesen Link in deinen Browser einfügst:
+confirm-email-mail-html-body-2 = Hast Du diese E-Mail irrtümlich erhalten, oder bist nicht mehr interessiert, dann kannst du
+confirm-email-mail-html-body-2-link-text = deine E-Mail-Adresse entfernen.
+
 # Variables:
 # $confirm_email_url (String) - URL to confirm your email
 # $decline_email_url (String) - URL to remove the email from the waiting list
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8062e004..ca997740 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,6 +1,7 @@
 {
   "app": {
     "summary": "Lass Freunde und Kollegen Zeiten in deinem Kalender wählen. Terminabsprachen so simpel wie möglich.",
+    "tagline": "Weniger planen, mehr schaffen",
     "title": "Thunderbird Appointment"
   },
   "error": {
@@ -317,6 +318,38 @@
     "de": "Deutsch",
     "en": "Englisch"
   },
+  "login": {
+    "confirm": {
+      "intro": [
+        "Bitte bestätige die Registrierung um der Warteliste beizutreten.",
+        "Check dein Postfach, du erhälst in Kürze weitere Informationen."
+      ],
+      "title": "Vervollständige die Registrierung"
+    },
+    "form": {
+      "no-invite-code": "Wenn du keinen Einladungscode hast, setze deine E-Mail-Adresse auf unsere Warteliste.",
+      "privacy": "Datenschutz ist uns wichtig."
+    },
+    "login": {
+      "intro": {
+        "new": [
+          "Neu hier?",
+          "{strong} Wir helfen bei der schnellen Einrichtung."
+        ],
+        "returning": [
+          "Du bist zurück?",
+          "{strong} Wir leiten dich zu deinem Benutzerkonto weiter."
+        ]
+      },
+      "title": "Mach deinen Tag leichter – gibt deine E-Mail-Adresse ein:"
+    },
+    "signUp": {
+      "title": "Du hast einen Einladungscode? Gib ihn hier ein"
+    }
+  },
+  "navBar": {
+    "report-bug": "Fehler melden"
+  },
   "placeholder": {
     "biWeeklyCafeDates": "Zweiwöchentliche Café-Treffen …",
     "emailAddress": "max.muster{'@'}beispiel.de",
@@ -414,15 +447,22 @@
   },
   "waitingList": {
     "adminInviteNotice": "Hinweis: Der Senden-Button wird bereits akzeptierte Personen nicht erneut einladen, sie können aber dennoch ausgewählt werden. Verwende die Filter für eine bessere Übersicht!",
-    "confirmHeading": "Deine E-Mail-Adresse wurde bestätigt!",
-    "confirmInfo": "Deine E-Mail-Adresse ist nun bestätigt. Sobald Du ausgewählt wurdest, wirst Du einen Einladungscode bekommen.",
+    "confirmHeading": "Du bist auf der Warteliste",
+    "confirmInfo": "Du bekommst eine Einladung sobald die Registrierung startet.",
     "errorHeading": "Es gab ein Problem mit diesem Link",
     "errorInfo": "Leider ist dieser Link abgelaufen oder ungültig.",
-    "leaveHeading": "Du hast die Warteliste erfolgreich verlassen",
-    "leaveInfo": "Schade, dass Du gehst. Du kannst Dich jederzeit wieder auf die Warteliste setzen lassen!",
+    "leaveHeading": "Du wurdest von von der Warteliste entfernt",
+    "leaveInfo": "Deine E-Mail-Adresse wurde erfolgreich von unserer Warteliste entfernt. Falls du deine Meinung änderst, kannst du dich jederzeit wieder auf die Warteliste setzen lassen.",
+    "marketing": [
+      "Behalte deinen Kalender, teile deine Zeit.",
+      "Thunderbird Appointment vereinfacht die Art und Weise gemeinsamer Terminfindung, um durch weniger Planen mehr Zeit für die wichtigen Dinge zu haben."
+    ],
     "signUpAlreadyExists": "Du bist bereits auf der Warteliste.",
     "signUpCheckYourEmail": "Weitere Informationen findest Du in Deiner E-Mail.",
-    "signUpHeading": "Nur noch ein Schritt!",
-    "signUpInfo": "Bevor Du in die Warteliste aufgenommen werden kannst, musst Du Deine E-Mail-Adresse bestätigen."
+    "signUpHeading": "Registrierung abschließen",
+    "signUpInfo": [
+      "Bitte bestätige deine E-Mail-Adresse, um auf die Warteliste zu kommen.",
+      "In Kürze erhätst du weitere Informationen in deinen Posteingang."
+    ]
   }
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 94d1af43..f57bc01c 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,8 +1,8 @@
 {
   "app": {
     "summary": "Invite others to grab times on your calendar. Choose a date. Make appointments as easy as it gets.",
-    "title": "Thunderbird Appointment",
-    "tagline": "Plan less, do more"
+    "tagline": "Plan less, do more",
+    "title": "Thunderbird Appointment"
   },
   "error": {
     "actionNeeded": "Action needed",
@@ -92,9 +92,6 @@
     },
     "zoom": "Zoom"
   },
-  "navBar": {
-    "report-bug": "Report Bug"
-  },
   "icons": {
     "calendar": "Calendar",
     "critical": "Critical",
@@ -322,34 +319,37 @@
     "en": "English"
   },
   "login": {
+    "confirm": {
+      "intro": [
+        "Please confirm your email to join our waiting list.",
+        "Check your inbox for more information shortly."
+      ],
+      "title": "Complete your sign up"
+    },
+    "form": {
+      "no-invite-code": "If you don't have an invite code, add your email to our waiting list.",
+      "privacy": "Your privacy is important to us."
+    },
     "login": {
-      "title": "Simplify your day – just enter your email:",
       "intro": {
-        "returning": [
-          "Returning?",
-          "{strong} We'll recognize you and direct you to your account."
-        ],
         "new": [
           "New?",
           "{strong} We'll help you set up quickly."
+        ],
+        "returning": [
+          "Returning?",
+          "{strong} We'll recognize you and direct you to your account."
         ]
-      }
+      },
+      "title": "Simplify your day – just enter your email:"
     },
     "signUp": {
       "title": "Have an invite code? Enter it here"
-    },
-    "confirm": {
-      "title": "Complete your sign up",
-      "intro": [
-        "Please confirm your email to join our waiting list.",
-        "Check your inbox for more information shortly."
-      ]
-    },
-    "form": {
-      "privacy": "Your privacy is important to us.",
-      "no-invite-code": "If you don't have an invite code, add your email to our waiting list."
     }
   },
+  "navBar": {
+    "report-bug": "Report Bug"
+  },
   "placeholder": {
     "biWeeklyCafeDates": "Bi-weekly Café Dates…",
     "emailAddress": "john.doe{'@'}example.com",
@@ -453,16 +453,16 @@
     "errorInfo": "Unfortunately this link is expired or is invalid.",
     "leaveHeading": "You’ve been removed from the waitlist",
     "leaveInfo": "Your email has been successfully removed from our waitlist.\nIf you change your mind, you can always rejoin.",
+    "marketing": [
+      "Own your calendar, share your time.",
+      "Thunderbird Appointment simplifies the way you find time to connect so you can soar past the planning, and get to the living."
+    ],
     "signUpAlreadyExists": "You are already on the waiting list.",
     "signUpCheckYourEmail": "Check your email for more information.",
     "signUpHeading": "Complete your sign up",
     "signUpInfo": [
       "Please confirm your email to join our waiting list.",
       "Check your inbox for more information shortly."
-    ],
-    "marketing": [
-      "Own your calendar, share your time.",
-      "Thunderbird Appointment simplifies the way you find time to connect so you can soar past the planning, and get to the living."
     ]
   }
 }