Merge branch 'dev' into fix/app-notification

wireapp · Dec 12, 2024 · 50c4bf4 · 50c4bf4
2 parents ab0aa1f + ad9574f
commit 50c4bf4
Show file tree

Hide file tree

Showing 63 changed files with 211 additions and 291 deletions.
diff --git a/.env.localhost b/.env.localhost
@@ -19,7 +19,6 @@ ENABLE_DEV_BACKEND_API="true"
 #FEATURE_DEFAULT_LOGIN_TEMPORARY_CLIENT="false"
 #FEATURE_APPLOCK_UNFOCUS_TIMEOUT="30"
 #FEATURE_APPLOCK_SCHEDULED_TIMEOUT="30"
-#FEATURE_ENABLE_MLS="true"
 #FEATURE_USE_CORE_CRYPTO="true"
 
 # staging

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "@wireapp/avs": "10.0.4",
     "@wireapp/avs-debugger": "0.0.7",
     "@wireapp/commons": "5.4.0",
-    "@wireapp/core": "46.13.0",
+    "@wireapp/core": "46.14.0",
     "@wireapp/react-ui-kit": "9.28.0",
     "@wireapp/store-engine-dexie": "2.1.15",
     "@wireapp/telemetry": "0.1.4",

diff --git a/server/config/client.config.ts b/server/config/client.config.ts
@@ -63,7 +63,6 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
       ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY: env.FEATURE_ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY == 'true',
       ENABLE_EXTRA_CLIENT_ENTROPY: env.FEATURE_ENABLE_EXTRA_CLIENT_ENTROPY == 'true',
       ENABLE_MEDIA_EMBEDS: env.FEATURE_ENABLE_MEDIA_EMBEDS != 'false',
-      ENABLE_MLS: env.FEATURE_ENABLE_MLS == 'true',
       ENABLE_PROTEUS_CORE_CRYPTO: env.FEATURE_ENABLE_PROTEUS_CORE_CRYPTO == 'true',
       ENABLE_SSO: env.FEATURE_ENABLE_SSO == 'true',
       ENFORCE_CONSTANT_BITRATE: env.FEATURE_ENFORCE_CONSTANT_BITRATE == 'true',

diff --git a/server/config/env.ts b/server/config/env.ts
@@ -78,8 +78,6 @@ export type Env = {
   FEATURE_ALLOWED_FILE_UPLOAD_EXTENSIONS: string;
 
   /** will enable the MLS protocol */
-  FEATURE_ENABLE_MLS?: string;
-
   FEATURE_USE_CORE_CRYPTO?: string;
 
   FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD?: string;

diff --git a/src/i18n/ar-SA.json b/src/i18n/ar-SA.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/bn-BD.json b/src/i18n/bn-BD.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/ca-ES.json b/src/i18n/ca-ES.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/cs-CZ.json b/src/i18n/cs-CZ.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/da-DK.json b/src/i18n/da-DK.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json
@@ -764,7 +764,7 @@
   "guestOptionsInfoHeader": "Andere per Link einladen",
   "guestOptionsInfoModalAction": "Link erstellen",
   "guestOptionsInfoModalCancel": "Abbrechen",
-  "guestOptionsInfoModalFormLabel": "Guest link password",
+  "guestOptionsInfoModalFormLabel": "Gäste-Link Passwort",
   "guestOptionsInfoModalTitle": "Passwortgesicherten Link erstellen",
   "guestOptionsInfoModalTitleBoldSubTitle": "Sie können das Passwort später nicht ändern. Denken Sie daran, es zu kopieren und zu speichern.",
   "guestOptionsInfoModalTitleSubTitle": "Personen, die über den Gäste-Link an der Unterhaltung teilnehmen möchten, müssen zuerst dieses Passwort eingeben.",
@@ -776,7 +776,7 @@
   "guestOptionsPasswordCopyToClipboard": "Passwort kopieren",
   "guestOptionsPasswordCopyToClipboardSuccess": "Passwort kopiert",
   "guestOptionsPasswordForceToCopy": "Sie müssen das Passwort kopieren, damit Sie es speichern und an die Personen weitergeben können, die Sie einladen möchten.",
-  "guestOptionsPasswordRadioLabel": "Guest link password",
+  "guestOptionsPasswordRadioLabel": "Gäste-Link Passwort",
   "guestOptionsPasswordRadioOptionNotSecured": "Nicht passwortgesichert",
   "guestOptionsPasswordRadioOptionSecured": "Passwortgesichert",
   "guestOptionsRevokeLink": "Link widerrufen",
@@ -906,7 +906,7 @@
   "modalAccountCreateMessage": "Wenn Sie ein Benutzerkonto erstellen, verlieren Sie den Gesprächsverlauf dieses Gästebereichs.",
   "modalAccountDeletionAction": "Löschen",
   "modalAccountDeletionHeadline": "Benutzerkonto löschen",
-  "modalAccountDeletionMessage": "We will send you an email. Follow the link to delete your account permanently.",
+  "modalAccountDeletionMessage": "Wir senden Ihnen eine E-Mail. Folgen Sie dem Link, um Ihr Benutzerkonto endgültig zu löschen.",
   "modalAccountLeaveGuestRoomAction": "Verlassen",
   "modalAccountLeaveGuestRoomHeadline": "Gästebereich verlassen?",
   "modalAccountLeaveGuestRoomMessage": "Der Gesprächsverlauf wird gelöscht. Um ihn zu behalten, erstellen Sie beim nächsten Mal ein Benutzerkonto.",
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Status der Dienste konnte nicht geändert werden.",
   "modalConversationRemoveAction": "Entfernen",
   "modalConversationRemoveCloseBtn": "Fenster 'Entfernen' schließen",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Für mich löschen",
+  "modalConversationRemoveGroupHeadline": "Gruppe {conversation} für mich löschen?",
+  "modalConversationRemoveGroupMessage": "Sie können dann nicht mehr auf die Gruppe und ihren Inhalt zugreifen. Es gibt keine Möglichkeit, sie wiederherzustellen.",
   "modalConversationRemoveGuestsHeadline": "Gastzugang deaktivieren?",
   "modalConversationRemoveGuestsMessage": "Aktuelle Gäste werden aus der Unterhaltung entfernt. Neue Gäste können nicht hinzugefügt werden.",
   "modalConversationRemoveGuestsOrServicesAction": "Deaktivieren",
@@ -1611,7 +1611,7 @@
   "videoCallOverlayViewModeLabel": "View mode",
   "videoCallOverlayViewModeSpeakers": "Nur aktive Sprecher anzeigen",
   "videoCallParticipantConnecting": "Verbinden…",
-  "videoCallParticipantRaisedHandRaiseDuration": "Hand raised for {duration}",
+  "videoCallParticipantRaisedHandRaiseDuration": "Hand seit {duration} gehoben",
   "videoCallParticipantRaisedSelfHandUp": "You have raised your hand up",
   "videoCallParticipantRaisedSortByTime": "Die erste Person auf der Liste hob zuerst die Hand.",
   "videoCallParticipantRaisedTheirHandUp": "{name} has raised their hand up",

diff --git a/src/i18n/el-GR.json b/src/i18n/el-GR.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/es-ES.json b/src/i18n/es-ES.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/et-EE.json b/src/i18n/et-EE.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/fa-IR.json b/src/i18n/fa-IR.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/fi-FI.json b/src/i18n/fi-FI.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/fr-FR.json b/src/i18n/fr-FR.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/ga-IE.json b/src/i18n/ga-IE.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/he-IL.json b/src/i18n/he-IL.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",

diff --git a/src/i18n/hi-IN.json b/src/i18n/hi-IN.json
@@ -1061,9 +1061,9 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGroupAction": "Remove",
-  "modalConversationRemoveGroupHeadline": "Remove group conversation?",
-  "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.",
+  "modalConversationRemoveGroupAction": "Delete for Me",
+  "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
+  "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
   "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
   "modalConversationRemoveGuestsOrServicesAction": "Disable",