Merge 093e286e0f into b60d1e77a6

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

l10n/sv.js

@@ -1,6 +1,10 @@
 OC.L10N.register(
     "bbb",
     {
+    "You shared the room %s with {shareWith}." : "Du delade rummet %s med {shareWith}.",
+    "{user} shared the room %s with you." : "{user} delade rummet %s med dig.",
+    "You unshared the room %s with {shareWith}." : "Du slutade dela rummet %s med {shareWith}.",
+    "{user} unshared the room %s with you." : "{user} slutade dela rummet %s med dig.",
     "Public" : "Offentlig",
     "Internal" : "Intern",
     "Back to %s" : "Tillbaka till %s",
@@ -35,6 +39,7 @@ OC.L10N.register(
     "Server error" : "Serverfel",
     "Start" : "Start",
     "Loading" : "Läser in",
+    "You are not allowed to change this option, because this room is shared with you." : "Du får inte ändra det här alternativet eftersom detta rum delas med dig.",
     "Settings saved" : "Inställningar sparade",
     "Unexpected error occurred" : "Ett oväntat fel inträffade",
     "Send to" : "Skicka till",

l10n/sv.json

@@ -1,4 +1,8 @@
 { "translations": {
+    "You shared the room %s with {shareWith}." : "Du delade rummet %s med {shareWith}.",
+    "{user} shared the room %s with you." : "{user} delade rummet %s med dig.",
+    "You unshared the room %s with {shareWith}." : "Du slutade dela rummet %s med {shareWith}.",
+    "{user} unshared the room %s with you." : "{user} slutade dela rummet %s med dig.",
     "Public" : "Offentlig",
     "Internal" : "Intern",
     "Back to %s" : "Tillbaka till %s",
@@ -33,6 +37,7 @@
     "Server error" : "Serverfel",
     "Start" : "Start",
     "Loading" : "Läser in",
+    "You are not allowed to change this option, because this room is shared with you." : "Du får inte ändra det här alternativet eftersom detta rum delas med dig.",
     "Settings saved" : "Inställningar sparade",
     "Unexpected error occurred" : "Ett oväntat fel inträffade",
     "Send to" : "Skicka till",

lib/BigBlueButton/API.php

@@ -118,7 +118,8 @@ class API {
 		$joinMeetingParams->addUserData('bbb_skip_video_preview_on_first_join', !$room->getMediaCheck()); // 2.3
 
 		if ($room->getCleanLayout()) {
-			$joinMeetingParams->addUserData('bbb_auto_swap_layout', true);
+			$joinMeetingParams->addUserData('bbb_auto_swap_layout', true); // 2.5 and below // ToDo: remove in the future
+			$joinMeetingParams->addUserData('bbb_hide_presentation_on_join', true); // 2.6 and up
 			$joinMeetingParams->addUserData('bbb_show_participants_on_login', false);
 			$joinMeetingParams->addUserData('bbb_show_public_chat_on_login', false);
 		}