Merge branch 'wireapp:develop' into develop

offsoc · Nov 6, 2024 · 2d123a4 · 2d123a4
2 parents 5e54ec5 + f4c370b
commit 2d123a4
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 3 deletions.
diff --git a/changelog.d/5-internal/email-templates-v1.0.124 b/changelog.d/5-internal/email-templates-v1.0.124
@@ -0,0 +1 @@
+Updated email templates to v1.0.124
diff --git a/services/brig/deb/opt/brig/template-version b/services/brig/deb/opt/brig/template-version
@@ -1 +1 @@
-v1.0.122
+v1.0.124
diff --git a/services/brig/deb/opt/brig/templates/de/team/email/new-team-owner-welcome-subject.txt b/services/brig/deb/opt/brig/templates/de/team/email/new-team-owner-welcome-subject.txt
@@ -0,0 +1 @@
+Sie sind einem Team auf ${brand} beigetreten
diff --git a/services/brig/deb/opt/brig/templates/de/team/email/new-team-owner-welcome.html b/services/brig/deb/opt/brig/templates/de/team/email/new-team-owner-welcome.html
diff --git a/services/brig/deb/opt/brig/templates/de/team/email/new-team-owner-welcome.txt b/services/brig/deb/opt/brig/templates/de/team/email/new-team-owner-welcome.txt
@@ -0,0 +1,27 @@
+[${brand_logo}]
+
+${brand_label_url} [${brand_url}]
+
+HERZLICHEN GLÜCKWUNSCH ${name}.
+Wir haben Ihr privates Benutzerkonto ${email} in ein Team-Konto übertragen,
+einschließlich all Ihrer Unterhaltungen und Ihres Gesprächsverlaufs. Sie sind
+jetzt Besitzer des Teams (${team_name}).
+
+Laden Sie andere Personen ein, Ihrem Team beizutreten, und passen Sie die
+Einstellungen im Team-Management an.
+
+TEAM-MANAGEMENT ÖFFNEN [${url}]Wenn Sie die Schaltfläche nicht auswählen können,
+kopieren Sie diesen Link und fügen Sie ihn in Ihren Browser ein:
+
+${url}
+
+Wenn Sie Fragen haben, dann kontaktieren Sie uns [${support}] bitte.
+
+Team ID: ${team_id}
+
+
+--------------------------------------------------------------------------------
+
+Datenschutzrichtlinien und Nutzungsbedingungen [${legal}] · Missbrauch melden
+[${misuse}]
+${copyright}. ALLE RECHTE VORBEHALTEN.
diff --git a/services/brig/deb/opt/brig/templates/en/team/email/new-team-owner-welcome-subject.txt b/services/brig/deb/opt/brig/templates/en/team/email/new-team-owner-welcome-subject.txt
@@ -0,0 +1 @@
+You joined a team on ${brand}
diff --git a/services/brig/deb/opt/brig/templates/en/team/email/new-team-owner-welcome.html b/services/brig/deb/opt/brig/templates/en/team/email/new-team-owner-welcome.html
diff --git a/services/brig/deb/opt/brig/templates/en/team/email/new-team-owner-welcome.txt b/services/brig/deb/opt/brig/templates/en/team/email/new-team-owner-welcome.txt
@@ -0,0 +1,26 @@
+[${brand_logo}]
+
+${brand_label_url} [${brand_url}]
+
+CONGRATULATIONS ${name}.
+We transferred your personal account ${email} into a team account, including all
+your conversations and history. You are now the owner of the team (${team_name}
+).
+
+Invite other people to join your team and adjust settings in your team
+management dashboard.
+
+OPEN TEAM MANAGEMENT [${url}]If you can’t select the button, copy and paste this
+link to your browser:
+
+${url}
+
+If you have any questions, please contact us [${support}].
+
+Team ID: ${team_id}
+
+
+--------------------------------------------------------------------------------
+
+Privacy policy and terms of use [${legal}] · Report Misuse [${misuse}]
+${copyright}. ALL RIGHTS RESERVED.
diff --git a/services/brig/deb/opt/brig/templates/index.html b/services/brig/deb/opt/brig/templates/index.html
diff --git a/services/brig/deb/opt/brig/templates/version b/services/brig/deb/opt/brig/templates/version
@@ -1 +1 @@
-v1.0.122
+v1.0.124