From 16f0e90000066e719c7c0f85ddbbcf2a274835df Mon Sep 17 00:00:00 2001
From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com>
Date: Mon, 28 Apr 2025 17:04:06 +0200
Subject: [PATCH] Wording: Replace "video conference" with "meeting"

---
 lang/en/home.php                              |  8 ++--
 lang/en/rooms.php                             | 16 +++----
 lang/en/validation.php                        |  6 +--
 publiccode.yml                                | 14 +++---
 resources/js/components/RoomTabSettings.vue   | 18 ++++---
 .../js/composables/useRoomTypeSettings.js     | 14 +++---
 resources/js/views/AdminRoomTypesView.vue     | 20 +++-----
 tests/Frontend/e2e/AdminRoomTypesEdit.cy.js   | 12 ++---
 tests/Frontend/e2e/AdminRoomTypesNew.cy.js    | 14 +++---
 tests/Frontend/e2e/AdminRoomTypesView.cy.js   | 14 +++---
 .../e2e/RoomsIndexCreateNewRoom.cy.js         | 12 ++---
 tests/Frontend/e2e/RoomsViewSettings.cy.js    | 24 +++++-----
 .../RoomsViewSettingsRoomTypeActions.cy.js    | 48 +++++++++----------
 13 files changed, 105 insertions(+), 115 deletions(-)

diff --git a/lang/en/home.php b/lang/en/home.php
index d94698e8e..941c8ce93 100644
--- a/lang/en/home.php
+++ b/lang/en/home.php
@@ -12,13 +12,13 @@
             'description' => 'High quality video and audio to foster a more personal and engaging experience.',
             'title' => 'Video and Audio',
         ],
-        'description' => 'Explore what makes PILOS the perfect solution for you next video conference and how it can help you reach your audience in an engaging and interactive way.',
+        'description' => 'Explore what makes PILOS the perfect solution for you next meeting and how it can help you reach your audience in an engaging and interactive way.',
         'engagement' => [
             'description' => 'Engage your audience with interactive tools like chat, emojis, surveys and much more.',
             'title' => 'Engagement',
         ],
         'recording' => [
-            'description' => 'Record your videoconferences and make them available using fine grained permission control.',
+            'description' => 'Record your meetings and make them available using fine grained permission control.',
             'title' => 'Recording',
         ],
         'security' => [
@@ -26,10 +26,10 @@
             'title' => 'Security',
         ],
         'statistics' => [
-            'description' => 'Get detailed reports on the attendance and usage of your videoconferences.',
+            'description' => 'Get detailed reports on the attendance and usage of your meetings.',
             'title' => 'Statistics',
         ],
-        'title' => 'All you need for a great video conference experience',
+        'title' => 'All you need for a great meeting experience',
         'vision' => 'Connecting People',
     ],
     'title' => [
diff --git a/lang/en/rooms.php b/lang/en/rooms.php
index 828ffac56..0464886b8 100644
--- a/lang/en/rooms.php
+++ b/lang/en/rooms.php
@@ -14,8 +14,8 @@
         'title' => 'Change room type',
     ],
     'connection_error' => [
-        'detached' => 'Connection to ongoing video conference lost, recovery failed.',
-        'reconnecting' => 'Connection to ongoing video conference lost, trying to reconnect.',
+        'detached' => 'Connection to ongoing meeting lost, recovery failed.',
+        'reconnecting' => 'Connection to ongoing meeting lost, trying to reconnect.',
     ],
     'create' => [
         'ok' => 'Create',
@@ -111,7 +111,7 @@
         'filter' => [
             'all' => 'All files',
             'downloadable' => 'Downloadable files',
-            'use_in_meeting' => 'Files available in video conference',
+            'use_in_meeting' => 'Files available in meeting',
         ],
         'formats' => 'Allowed file formats: :formats',
         'nodata' => 'No files available',
@@ -130,7 +130,7 @@
         'upload' => 'Upload files',
         'uploaded' => 'File \':name\' uploaded',
         'use_in_next_meeting' => 'Use in the next meeting',
-        'use_in_next_meeting_disabled' => 'Not available in video conference',
+        'use_in_next_meeting_disabled' => 'Not available in meeting',
         'view' => 'View file',
     ],
     'first_and_lastname' => 'First- und last name',
@@ -395,7 +395,7 @@
         'recordings' => [
             'auto_start_recording' => 'Automatic recording start',
             'record_attendance' => 'Log attendance of participants',
-            'record_video_conference' => 'Record video conference',
+            'record_meeting' => 'Record meeting',
             'title' => 'Recordings',
         ],
         'restrictions' => [
@@ -405,12 +405,12 @@
             'lock_settings_disable_private_chat' => 'Disable private chat',
             'lock_settings_disable_public_chat' => 'Disable public chat',
             'lock_settings_hide_user_list' => 'Hide list of participants',
-            'title' => 'Restrict participant rights in video conferences',
+            'title' => 'Restrict participant rights in meeting',
             'webcams_only_for_moderator' => 'Only moderators can see the webcam',
         ],
         'title' => 'Settings',
         'unsaved_changes' => 'Caution! Room settings have been changed but not yet saved.',
-        'video_conference' => [
+        'meeting' => [
             'everyone_can_start' => 'Everyone can start the meeting',
             'lobby' => [
                 'alert' => 'Default role is set to moderator: Waiting room is active only for guests and already existing members with participant role!',
@@ -418,7 +418,7 @@
                 'title' => 'Waiting room',
             ],
             'mute_on_start' => 'Mute microphone on join',
-            'title' => 'Video conference',
+            'title' => 'Meeting',
             'welcome_message' => 'Welcome message',
         ],
     ],
diff --git a/lang/en/validation.php b/lang/en/validation.php
index 896e36444..fb792b3ca 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -42,7 +42,7 @@
         'bbb_style' => 'CSS style file',
         'city' => 'City',
         'color' => 'Color',
-        'consent_record' => 'Consent to the recording of the video conference',
+        'consent_record' => 'Consent to the recording of the meeting',
         'consent_record_attendance' => 'Consent to attendance logging',
         'consent_record_video' => 'Consent to record own video',
         'content' => 'Content',
@@ -203,13 +203,13 @@
             'required' => 'The message banner settings are missing!',
         ],
         'consent_record' => [
-            'accepted' => 'Consent to the recording of the video conference must be given.',
+            'accepted' => 'Consent to the recording of the meeting must be given.',
         ],
         'consent_record_attendance' => [
             'accepted' => 'Consent to the logging of attendance must be given.',
         ],
         'consent_streaming' => [
-            'accepted' => 'Consent to the streaming of the video conference must be given.',
+            'accepted' => 'Consent to the streaming of the meeting must be given.',
         ],
         'invalid_room_type' => 'You have not the necessary permissions to have a room with the passed room type.',
         'locale' => [
diff --git a/publiccode.yml b/publiccode.yml
index 670bedcb6..96fed4f47 100644
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -38,7 +38,7 @@ description:
       PILOS is an easy-to-use open source front-end for
       BigBlueButton servers with a built-in load balancer.
     longDescription: >-
-      All in one video conferencing platform powered by BigBlueButton™.
+      All in one meeting platform powered by BigBlueButton™.
 
       Designed with education at its core, PILOS offers a seamless, interactive,
       and secure solution for online learning, teaching, and all kinds of
@@ -46,7 +46,7 @@ description:
       video, robust collaboration tools, and an intuitive user experience.
 
 
-      **All you need for a great video conference experience:**
+      **All you need for a great meeting experience:**
 
       - **Video and Audio**
         High quality video and audio to foster a more personal and engaging experience.
@@ -55,18 +55,18 @@ description:
       - **Engagement**
         Engage your audience with interactive tools like chat, emojis, surveys and much more.
       - **Recording**
-        Record your videoconferences and make them available using fine grained permission control.
+        Record your meetings and make them available using fine grained permission control.
       - **Security**
         All communication data is securely encrypted during transmission using the WebRTC protocol.
       - **Statistics**
-        Get detailed reports on the attendance and usage of your videoconferences.
+        Get detailed reports on the attendance and usage of your meetings.
     features:
-      - Create video conference rooms
-      - Share files for  video conferences
+      - Create meeting rooms
+      - Share files for meetings
       - Manage BigBlueButton Server and Server Pools
       - Manage users and roles
       - Manage room types (room setting presets)
-      - Record video conferences
+      - Record meetings
     genericName: Videoconferencing
     screenshots:
       - .opencode/screenshots/en/home.jpg
diff --git a/resources/js/components/RoomTabSettings.vue b/resources/js/components/RoomTabSettings.vue
index 99f48746d..2916a3a01 100644
--- a/resources/js/components/RoomTabSettings.vue
+++ b/resources/js/components/RoomTabSettings.vue
@@ -196,29 +196,27 @@ const form = computed(() => {
       ],
     },
     {
-      title: t("rooms.settings.video_conference.title"),
+      title: t("rooms.settings.meeting.title"),
       items: [
         {
           setting: "everyone_can_start",
-          label: t("rooms.settings.video_conference.everyone_can_start"),
+          label: t("rooms.settings.meeting.everyone_can_start"),
           component: RoomTabSettingsToggleSwitch,
         },
         {
           setting: "mute_on_start",
-          label: t("rooms.settings.video_conference.mute_on_start"),
+          label: t("rooms.settings.meeting.mute_on_start"),
           component: RoomTabSettingsToggleSwitch,
         },
         {
           setting: "lobby",
-          label: t("rooms.settings.video_conference.lobby.title"),
+          label: t("rooms.settings.meeting.lobby.title"),
           options: [
             { value: 0, label: t("app.disabled") },
             { value: 1, label: t("app.enabled") },
             {
               value: 2,
-              label: t(
-                "rooms.settings.video_conference.lobby.only_for_guests_enabled",
-              ),
+              label: t("rooms.settings.meeting.lobby.only_for_guests_enabled"),
             },
           ],
           component: RoomTabSettingsRadioGroup,
@@ -226,7 +224,7 @@ const form = computed(() => {
         },
         {
           setting: "welcome",
-          label: t("rooms.settings.video_conference.welcome_message"),
+          label: t("rooms.settings.meeting.welcome_message"),
           component: RoomTabSettingsTextArea,
           placeholder: t("rooms.settings.none_placeholder"),
           fullWidth: true,
@@ -245,7 +243,7 @@ const form = computed(() => {
         },
         {
           setting: "record",
-          label: t("rooms.settings.recordings.record_video_conference"),
+          label: t("rooms.settings.recordings.record_meeting"),
           component: RoomTabSettingsToggleSwitch,
         },
         {
@@ -481,7 +479,7 @@ const disabled = computed(() => {
  */
 const lobbyAlert = computed(() => {
   if (settings.value.default_role === 2 && settings.value.lobby === 1)
-    return t("rooms.settings.video_conference.lobby.alert");
+    return t("rooms.settings.meeting.lobby.alert");
   return null;
 });
 
diff --git a/resources/js/composables/useRoomTypeSettings.js b/resources/js/composables/useRoomTypeSettings.js
index 493341e1b..1ded53c4f 100644
--- a/resources/js/composables/useRoomTypeSettings.js
+++ b/resources/js/composables/useRoomTypeSettings.js
@@ -22,28 +22,26 @@ export function useRoomTypeSettings() {
         ],
       },
       {
-        title: t("rooms.settings.video_conference.title"),
+        title: t("rooms.settings.meeting.title"),
         settings: [
           {
             key: "everyone_can_start",
-            label: t("rooms.settings.video_conference.everyone_can_start"),
+            label: t("rooms.settings.meeting.everyone_can_start"),
             type: "switch",
           },
           {
             key: "mute_on_start",
-            label: t("rooms.settings.video_conference.mute_on_start"),
+            label: t("rooms.settings.meeting.mute_on_start"),
             type: "switch",
           },
           {
             key: "lobby",
-            label: t("rooms.settings.video_conference.lobby.title"),
+            label: t("rooms.settings.meeting.lobby.title"),
             type: "select",
             options: {
               0: t("app.disabled"),
               1: t("app.enabled"),
-              2: t(
-                "rooms.settings.video_conference.lobby.only_for_guests_enabled",
-              ),
+              2: t("rooms.settings.meeting.lobby.only_for_guests_enabled"),
             },
           },
         ],
@@ -58,7 +56,7 @@ export function useRoomTypeSettings() {
           },
           {
             key: "record",
-            label: t("rooms.settings.recordings.record_video_conference"),
+            label: t("rooms.settings.recordings.record_meeting"),
             type: "switch",
           },
           {
diff --git a/resources/js/views/AdminRoomTypesView.vue b/resources/js/views/AdminRoomTypesView.vue
index 07f51aac7..32fa855b8 100644
--- a/resources/js/views/AdminRoomTypesView.vue
+++ b/resources/js/views/AdminRoomTypesView.vue
@@ -430,7 +430,7 @@
           -->
           <!-- Everyone can start a new meeting, not only the moderator -->
           <h4 class="text-lg font-medium">
-            {{ $t("rooms.settings.video_conference.title") }}
+            {{ $t("rooms.settings.meeting.title") }}
           </h4>
 
           <div
@@ -440,9 +440,7 @@
             <label
               for="everyone-can-start-default"
               class="col-span-12 items-center md:col-span-4 md:mb-0"
-              >{{
-                $t("rooms.settings.video_conference.everyone_can_start")
-              }}</label
+              >{{ $t("rooms.settings.meeting.everyone_can_start") }}</label
             >
             <div class="col-span-12 md:col-span-8">
               <div class="flex items-center justify-between">
@@ -492,7 +490,7 @@
             <label
               for="mute-on-start-default"
               class="col-span-12 items-center md:col-span-4 md:mb-0"
-              >{{ $t("rooms.settings.video_conference.mute_on_start") }}</label
+              >{{ $t("rooms.settings.meeting.mute_on_start") }}</label
             >
             <div class="col-span-12 md:col-span-8">
               <div class="flex items-center justify-between">
@@ -533,7 +531,7 @@
           <!-- Usage of the waiting room/guest lobby -->
           <div class="field grid grid-cols-12 gap-4" data-test="lobby-field">
             <label class="col-span-12 items-center md:col-span-4 md:mb-0">{{
-              $t("rooms.settings.video_conference.lobby.title")
+              $t("rooms.settings.meeting.lobby.title")
             }}</label>
             <div class="col-span-12 mb-2 md:col-span-8">
               <div class="flex flex-row items-center justify-between">
@@ -576,9 +574,7 @@
                       input-id="lobby-only-for-guests"
                     />
                     <label for="lobby-only-for-guests">{{
-                      $t(
-                        "rooms.settings.video_conference.lobby.only_for_guests_enabled",
-                      )
+                      $t("rooms.settings.meeting.lobby.only_for_guests_enabled")
                     }}</label>
                   </div>
                 </div>
@@ -609,7 +605,7 @@
             <div class="col-span-12">
               <!-- Alert shown when default role is moderator and waiting room is active -->
               <InlineNote v-if="showLobbyAlert" class="w-full" severity="warn">
-                {{ $t("rooms.settings.video_conference.lobby.alert") }}
+                {{ $t("rooms.settings.meeting.lobby.alert") }}
               </InlineNote>
             </div>
           </div>
@@ -674,9 +670,7 @@
             <label
               for="record-default"
               class="col-span-12 items-center md:col-span-4 md:mb-0"
-              >{{
-                $t("rooms.settings.recordings.record_video_conference")
-              }}</label
+              >{{ $t("rooms.settings.recordings.record_meeting") }}</label
             >
             <div class="col-span-12 md:col-span-8">
               <div class="flex items-center justify-between">
diff --git a/tests/Frontend/e2e/AdminRoomTypesEdit.cy.js b/tests/Frontend/e2e/AdminRoomTypesEdit.cy.js
index 8f72f7239..940f0daea 100644
--- a/tests/Frontend/e2e/AdminRoomTypesEdit.cy.js
+++ b/tests/Frontend/e2e/AdminRoomTypesEdit.cy.js
@@ -289,11 +289,11 @@ describe("Admin room types edit", function () {
     cy.get("#allow-guests-default").click();
     cy.get('[data-test="allow-guests-enforced"]').click();
 
-    cy.contains("rooms.settings.video_conference.title").should("be.visible");
+    cy.contains("rooms.settings.meeting.title").should("be.visible");
 
     cy.get('[data-test="everyone-can-start-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.everyone_can_start")
+      .and("include.text", "rooms.settings.meeting.everyone_can_start")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "everyone-can-start",
@@ -308,7 +308,7 @@ describe("Admin room types edit", function () {
 
     cy.get('[data-test="mute-on-start-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.mute_on_start")
+      .and("include.text", "rooms.settings.meeting.mute_on_start")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "mute-on-start",
@@ -323,7 +323,7 @@ describe("Admin room types edit", function () {
 
     cy.get('[data-test="lobby-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.lobby.title")
+      .and("include.text", "rooms.settings.meeting.lobby.title")
       .within(() => {
         cy.get('[data-test="lobby-disabled-field"]')
           .should("be.visible")
@@ -347,7 +347,7 @@ describe("Admin room types edit", function () {
           .should("be.visible")
           .and(
             "include.text",
-            "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+            "rooms.settings.meeting.lobby.only_for_guests_enabled",
           )
           .within(() => {
             cy.get("#lobby-only-for-guests")
@@ -385,7 +385,7 @@ describe("Admin room types edit", function () {
 
     cy.get('[data-test="record-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.recordings.record_video_conference")
+      .and("include.text", "rooms.settings.recordings.record_meeting")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "record",
diff --git a/tests/Frontend/e2e/AdminRoomTypesNew.cy.js b/tests/Frontend/e2e/AdminRoomTypesNew.cy.js
index 42314d63d..bbc5df44b 100644
--- a/tests/Frontend/e2e/AdminRoomTypesNew.cy.js
+++ b/tests/Frontend/e2e/AdminRoomTypesNew.cy.js
@@ -238,11 +238,11 @@ describe("Admin room types new", function () {
     cy.get("#allow-guests-default").click();
     cy.get('[data-test="allow-guests-enforced"]').click();
 
-    cy.contains("rooms.settings.video_conference.title").should("be.visible");
+    cy.contains("rooms.settings.meeting.title").should("be.visible");
 
     cy.get('[data-test="everyone-can-start-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.everyone_can_start")
+      .and("include.text", "rooms.settings.meeting.everyone_can_start")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "everyone-can-start",
@@ -254,7 +254,7 @@ describe("Admin room types new", function () {
 
     cy.get('[data-test="mute-on-start-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.mute_on_start")
+      .and("include.text", "rooms.settings.meeting.mute_on_start")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "mute-on-start",
@@ -269,7 +269,7 @@ describe("Admin room types new", function () {
 
     cy.get('[data-test="lobby-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.lobby.title")
+      .and("include.text", "rooms.settings.meeting.lobby.title")
       .within(() => {
         cy.get('[data-test="lobby-disabled-field"]')
           .should("be.visible")
@@ -293,7 +293,7 @@ describe("Admin room types new", function () {
           .should("be.visible")
           .and(
             "include.text",
-            "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+            "rooms.settings.meeting.lobby.only_for_guests_enabled",
           )
           .within(() => {
             cy.get("#lobby-only-for-guests")
@@ -324,7 +324,7 @@ describe("Admin room types new", function () {
 
     cy.get('[data-test="record-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.recordings.record_video_conference")
+      .and("include.text", "rooms.settings.recordings.record_meeting")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "record",
@@ -336,7 +336,7 @@ describe("Admin room types new", function () {
 
     cy.get('[data-test="record-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.recordings.record_video_conference")
+      .and("include.text", "rooms.settings.recordings.record_meeting")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "record",
diff --git a/tests/Frontend/e2e/AdminRoomTypesView.cy.js b/tests/Frontend/e2e/AdminRoomTypesView.cy.js
index de7fd19f5..a2dd5c095 100644
--- a/tests/Frontend/e2e/AdminRoomTypesView.cy.js
+++ b/tests/Frontend/e2e/AdminRoomTypesView.cy.js
@@ -205,11 +205,11 @@ describe("Admin room types view", function () {
         );
       });
 
-    cy.contains("rooms.settings.video_conference.title").should("be.visible");
+    cy.contains("rooms.settings.meeting.title").should("be.visible");
 
     cy.get('[data-test="everyone-can-start-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.everyone_can_start")
+      .and("include.text", "rooms.settings.meeting.everyone_can_start")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "everyone-can-start",
@@ -221,7 +221,7 @@ describe("Admin room types view", function () {
 
     cy.get('[data-test="mute-on-start-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.mute_on_start")
+      .and("include.text", "rooms.settings.meeting.mute_on_start")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "mute-on-start",
@@ -233,7 +233,7 @@ describe("Admin room types view", function () {
 
     cy.get('[data-test="lobby-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.lobby.title")
+      .and("include.text", "rooms.settings.meeting.lobby.title")
       .within(() => {
         cy.get('[data-test="lobby-disabled-field"]')
           .should("be.visible")
@@ -257,7 +257,7 @@ describe("Admin room types view", function () {
           .should("be.visible")
           .and(
             "include.text",
-            "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+            "rooms.settings.meeting.lobby.only_for_guests_enabled",
           )
           .within(() => {
             cy.get("#lobby-only-for-guests")
@@ -289,7 +289,7 @@ describe("Admin room types view", function () {
 
     cy.get('[data-test="record-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.recordings.record_video_conference")
+      .and("include.text", "rooms.settings.recordings.record_meeting")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "record",
@@ -301,7 +301,7 @@ describe("Admin room types view", function () {
 
     cy.get('[data-test="record-field"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.recordings.record_video_conference")
+      .and("include.text", "rooms.settings.recordings.record_meeting")
       .within(() => {
         cy.roomTypeCheckDefaultRoomSettingCheckboxField(
           "record",
diff --git a/tests/Frontend/e2e/RoomsIndexCreateNewRoom.cy.js b/tests/Frontend/e2e/RoomsIndexCreateNewRoom.cy.js
index 73a12df31..7f8dc1664 100644
--- a/tests/Frontend/e2e/RoomsIndexCreateNewRoom.cy.js
+++ b/tests/Frontend/e2e/RoomsIndexCreateNewRoom.cy.js
@@ -140,11 +140,11 @@ describe("Rooms index create new room", function () {
             cy.checkDefaultRoomSettingField("allow_guests", true, true, false);
 
             // Check that other settings exist and are shown correctly
-            cy.contains("rooms.settings.video_conference.title");
+            cy.contains("rooms.settings.meeting.title");
 
             cy.get('[data-test="room-type-everyone_can_start-setting"]').should(
               "include.text",
-              "rooms.settings.video_conference.everyone_can_start",
+              "rooms.settings.meeting.everyone_can_start",
             );
             cy.checkDefaultRoomSettingField(
               "everyone_can_start",
@@ -155,17 +155,17 @@ describe("Rooms index create new room", function () {
 
             cy.get('[data-test="room-type-mute_on_start-setting"]').should(
               "include.text",
-              "rooms.settings.video_conference.mute_on_start",
+              "rooms.settings.meeting.mute_on_start",
             );
             cy.checkDefaultRoomSettingField("mute_on_start", true, true, false);
 
             cy.get('[data-test="room-type-lobby-setting"]').should(
               "include.text",
-              "rooms.settings.video_conference.lobby.title",
+              "rooms.settings.meeting.lobby.title",
             );
             cy.checkDefaultRoomSettingField(
               "lobby",
-              "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+              "rooms.settings.meeting.lobby.only_for_guests_enabled",
               true,
               true,
             );
@@ -185,7 +185,7 @@ describe("Rooms index create new room", function () {
 
             cy.get('[data-test="room-type-record-setting"]').should(
               "include.text",
-              "rooms.settings.recordings.record_video_conference",
+              "rooms.settings.recordings.record_meeting",
             );
             cy.checkDefaultRoomSettingField("record", false, false, false);
 
diff --git a/tests/Frontend/e2e/RoomsViewSettings.cy.js b/tests/Frontend/e2e/RoomsViewSettings.cy.js
index 3349f9180..1eb7ec220 100644
--- a/tests/Frontend/e2e/RoomsViewSettings.cy.js
+++ b/tests/Frontend/e2e/RoomsViewSettings.cy.js
@@ -101,8 +101,8 @@ describe("Rooms view settings", function () {
       .should("have.value", "Short description");
 
     // Check other settings hidden
-    // Video conference settings
-    cy.contains("rooms.settings.video_conference.title").should("not.exist");
+    // Meeting settings
+    cy.contains("rooms.settings.meeting.title").should("not.exist");
 
     // Recording settings
     cy.contains("rooms.settings.recordings.title").should("not.exist");
@@ -132,12 +132,12 @@ describe("Rooms view settings", function () {
     );
 
     // Check other settings visible
-    // Video conference settings
-    cy.contains("rooms.settings.video_conference.title").should("be.visible");
+    // Meeting settings
+    cy.contains("rooms.settings.meeting.title").should("be.visible");
 
     cy.get('[data-test="room-setting-everyone_can_start"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.everyone_can_start")
+      .and("include.text", "rooms.settings.meeting.everyone_can_start")
       .within(() => {
         cy.get('[data-test="room-setting-enforced-icon"]').should("not.exist");
         cy.get("#room-setting-everyone_can_start")
@@ -147,7 +147,7 @@ describe("Rooms view settings", function () {
 
     cy.get('[data-test="room-setting-mute_on_start"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.mute_on_start")
+      .and("include.text", "rooms.settings.meeting.mute_on_start")
       .within(() => {
         cy.get('[data-test="room-setting-enforced-icon"]').should("be.visible");
         cy.get("#room-setting-mute_on_start")
@@ -157,7 +157,7 @@ describe("Rooms view settings", function () {
 
     cy.get('[data-test="room-setting-lobby"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.video_conference.lobby.title")
+      .and("include.text", "rooms.settings.meeting.lobby.title")
       .within(() => {
         cy.get('[data-test="room-setting-enforced-icon"]').should("be.visible");
         cy.get("#room-setting-lobby-0")
@@ -171,7 +171,7 @@ describe("Rooms view settings", function () {
 
     cy.get('[data-test="room-setting-welcome"]')
       .should("be.visible")
-      .should("include.text", "rooms.settings.video_conference.welcome_message")
+      .should("include.text", "rooms.settings.meeting.welcome_message")
       .should(
         "include.text",
         'rooms.settings.general.chars_{"chars":"0 / 500"}',
@@ -194,7 +194,7 @@ describe("Rooms view settings", function () {
 
     cy.get('[data-test="room-setting-record"]')
       .should("be.visible")
-      .and("include.text", "rooms.settings.recordings.record_video_conference")
+      .and("include.text", "rooms.settings.recordings.record_meeting")
       .within(() => {
         cy.get('[data-test="room-setting-enforced-icon"]').should("not.exist");
         cy.get("#room-setting-record")
@@ -469,7 +469,7 @@ describe("Rooms view settings", function () {
       .should("be.checked")
       .and("be.disabled");
 
-    // Video conference settings
+    // Meeting settings
     cy.get("#room-setting-everyone_can_start")
       .should("not.be.checked")
       .and("not.be.disabled");
@@ -602,7 +602,7 @@ describe("Rooms view settings", function () {
       .should("be.checked")
       .and("be.disabled");
 
-    // Video conference settings
+    // Meeting settings
     cy.get("#room-setting-everyone_can_start")
       .should("not.be.checked")
       .and("be.disabled");
@@ -750,7 +750,7 @@ describe("Rooms view settings", function () {
       .should("be.checked")
       .and("be.disabled");
 
-    // Video conference settings
+    // Meeting settings
     cy.get("#room-setting-everyone_can_start")
       .should("not.be.checked")
       .and("not.be.disabled");
diff --git a/tests/Frontend/e2e/RoomsViewSettingsRoomTypeActions.cy.js b/tests/Frontend/e2e/RoomsViewSettingsRoomTypeActions.cy.js
index f1ba77873..9a5df3552 100644
--- a/tests/Frontend/e2e/RoomsViewSettingsRoomTypeActions.cy.js
+++ b/tests/Frontend/e2e/RoomsViewSettingsRoomTypeActions.cy.js
@@ -79,7 +79,7 @@ describe("Rooms view settings room type actions", function () {
             cy.checkDefaultRoomSettingField("mute_on_start", true, true, false);
             cy.checkDefaultRoomSettingField(
               "lobby",
-              "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+              "rooms.settings.meeting.lobby.only_for_guests_enabled",
               true,
               true,
             );
@@ -363,11 +363,11 @@ describe("Rooms view settings room type actions", function () {
         );
 
         // Check that other settings exist and are shown correctly
-        cy.contains("rooms.settings.video_conference.title");
+        cy.contains("rooms.settings.meeting.title");
 
         cy.get('[data-test="room-type-everyone_can_start-comparison"]').should(
           "include.text",
-          "rooms.settings.video_conference.everyone_can_start",
+          "rooms.settings.meeting.everyone_can_start",
         );
         cy.checkCompareRoomSettingField(
           "everyone_can_start",
@@ -380,7 +380,7 @@ describe("Rooms view settings room type actions", function () {
 
         cy.get('[data-test="room-type-mute_on_start-comparison"]').should(
           "include.text",
-          "rooms.settings.video_conference.mute_on_start",
+          "rooms.settings.meeting.mute_on_start",
         );
         cy.checkCompareRoomSettingField(
           "mute_on_start",
@@ -393,13 +393,13 @@ describe("Rooms view settings room type actions", function () {
 
         cy.get('[data-test="room-type-lobby-comparison"]').should(
           "include.text",
-          "rooms.settings.video_conference.lobby.title",
+          "rooms.settings.meeting.lobby.title",
         );
         cy.checkCompareRoomSettingField(
           "lobby",
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           true,
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           false,
           true,
         );
@@ -421,7 +421,7 @@ describe("Rooms view settings room type actions", function () {
 
         cy.get('[data-test="room-type-record-comparison"]').should(
           "include.text",
-          "rooms.settings.recordings.record_video_conference",
+          "rooms.settings.recordings.record_meeting",
         );
         cy.checkCompareRoomSettingField(
           "record",
@@ -635,7 +635,7 @@ describe("Rooms view settings room type actions", function () {
         );
         cy.checkCompareRoomSettingField(
           "lobby",
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           true,
           "app.enabled",
           false,
@@ -776,7 +776,7 @@ describe("Rooms view settings room type actions", function () {
 
     cy.get('[data-test="room-setting-lobby"]').should(
       "include.text",
-      "rooms.settings.video_conference.lobby.alert",
+      "rooms.settings.meeting.lobby.alert",
     );
     cy.get("#room-setting-lobby-0")
       .should("not.be.disabled")
@@ -915,7 +915,7 @@ describe("Rooms view settings room type actions", function () {
           "lobby",
           "app.enabled",
           false,
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           true,
           true,
         );
@@ -1054,7 +1054,7 @@ describe("Rooms view settings room type actions", function () {
 
     cy.get('[data-test="room-setting-lobby"]').should(
       "not.include.text",
-      "rooms.settings.video_conference.lobby.alert",
+      "rooms.settings.meeting.lobby.alert",
     );
     cy.get("#room-setting-lobby-0").should("be.disabled").and("not.be.checked");
     cy.get("#room-setting-lobby-1").should("be.disabled").and("not.be.checked");
@@ -1227,9 +1227,9 @@ describe("Rooms view settings room type actions", function () {
         );
         cy.checkCompareRoomSettingField(
           "lobby",
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           true,
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           false,
           true,
         );
@@ -1373,7 +1373,7 @@ describe("Rooms view settings room type actions", function () {
 
     cy.get('[data-test="room-setting-lobby"]').should(
       "not.include.text",
-      "rooms.settings.video_conference.lobby.alert",
+      "rooms.settings.meeting.lobby.alert",
     );
     cy.get("#room-setting-lobby-0")
       .should("not.be.disabled")
@@ -1788,7 +1788,7 @@ describe("Rooms view settings room type actions", function () {
         );
         cy.checkCompareRoomSettingField(
           "lobby",
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           true,
           "app.enabled",
           false,
@@ -1937,7 +1937,7 @@ describe("Rooms view settings room type actions", function () {
         );
         cy.checkCompareRoomSettingField(
           "lobby",
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           true,
           "app.enabled",
           false,
@@ -2075,8 +2075,8 @@ describe("Rooms view settings room type actions", function () {
     );
 
     // Check other settings hidden
-    // Video conference settings
-    cy.contains("rooms.settings.video_conference.title").should("not.exist");
+    // Meeting settings
+    cy.contains("rooms.settings.meeting.title").should("not.exist");
 
     // Recording settings
     cy.contains("rooms.settings.recordings.title").should("not.exist");
@@ -2270,8 +2270,8 @@ describe("Rooms view settings room type actions", function () {
     );
 
     // Check other settings hidden
-    // Video conference settings
-    cy.contains("rooms.settings.video_conference.title").should("not.exist");
+    // Meeting settings
+    cy.contains("rooms.settings.meeting.title").should("not.exist");
 
     // Recording settings
     cy.contains("rooms.settings.recordings.title").should("not.exist");
@@ -2338,7 +2338,7 @@ describe("Rooms view settings room type actions", function () {
           "lobby",
           "app.enabled",
           false,
-          "rooms.settings.video_conference.lobby.only_for_guests_enabled",
+          "rooms.settings.meeting.lobby.only_for_guests_enabled",
           true,
           true,
         );
@@ -2467,8 +2467,8 @@ describe("Rooms view settings room type actions", function () {
     );
 
     // Check other settings hidden
-    // Video conference settings
-    cy.contains("rooms.settings.video_conference.title").should("not.exist");
+    // Meeting settings
+    cy.contains("rooms.settings.meeting.title").should("not.exist");
 
     // Recording settings
     cy.contains("rooms.settings.recordings.title").should("not.exist");